Translated some scripts from GDscript to C#

pull/3/head
kziolkowski 10 months ago
parent 4f312209b3
commit d4b7c0bf45

@ -2,7 +2,7 @@
[ext_resource type="Texture2D" uid="uid://cvn2p215jq2am" path="res://graphics/mockups/concerned.png" id="1_5jpx2"] [ext_resource type="Texture2D" uid="uid://cvn2p215jq2am" path="res://graphics/mockups/concerned.png" id="1_5jpx2"]
[ext_resource type="Script" uid="uid://dke381v8tafqn" path="res://scripts/GdScript/player_3d.gd" id="1_08wm4"] [ext_resource type="Script" uid="uid://dke381v8tafqn" path="res://scripts/GdScript/player_3d.gd" id="1_08wm4"]
[ext_resource type="Script" uid="uid://c4fc60lv6436s" path="res://scripts/GdScript/camera_pivot.gd" id="3_drcdp"] [ext_resource type="Script" uid="uid://c81bn1w8o0n2n" path="res://scripts/CSharp/Common/CameraPivot.cs" id="3_3trg2"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1vdrh"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1vdrh"]
radius = 0.0478421 radius = 0.0478421
@ -28,7 +28,7 @@ shape = SubResource("CapsuleShape3D_1vdrh")
[node name="CameraPivot" type="Node3D" parent="CharacterBody3D"] [node name="CameraPivot" type="Node3D" parent="CharacterBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.159723, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.159723, 0)
script = ExtResource("3_drcdp") script = ExtResource("3_3trg2")
[node name="SubPivot" type="Node3D" parent="CharacterBody3D/CameraPivot"] [node name="SubPivot" type="Node3D" parent="CharacterBody3D/CameraPivot"]
transform = Transform3D(1, 0, 0, 0, 0.901878, 0.431991, 0, -0.431991, 0.901878, 0, 0, 0) transform = Transform3D(1, 0, 0, 0, 0.901878, 0.431991, 0, -0.431991, 0.901878, 0, 0, 0)

@ -1,12 +1,14 @@
[gd_scene load_steps=3 format=3 uid="uid://ob04y3syvo0e"] [gd_scene load_steps=3 format=3 uid="uid://ob04y3syvo0e"]
[ext_resource type="Script" uid="uid://bfwe1vlfyknm7" path="res://scripts/GdScript/interaction_area.gd" id="1_26v5g"] [ext_resource type="Script" uid="uid://cgkea4bmd6a8f" path="res://scripts/CSharp/Common/InteractionArea.cs" id="1_b15wn"]
[sub_resource type="SphereShape3D" id="SphereShape3D_i8sim"] [sub_resource type="SphereShape3D" id="SphereShape3D_i8sim"]
radius = 1.0 radius = 1.0
[node name="InteractionArea" type="Node3D"] [node name="InteractionArea" type="Node3D" node_paths=PackedStringArray("_area", "_label")]
script = ExtResource("1_26v5g") script = ExtResource("1_b15wn")
_area = NodePath("Area3D")
_label = NodePath("Label3D")
[node name="Area3D" type="Area3D" parent="."] [node name="Area3D" type="Area3D" parent="."]
collision_mask = 16 collision_mask = 16

@ -1,6 +1,4 @@
[gd_scene load_steps=5 format=3 uid="uid://br7yq757cawts"] [gd_scene load_steps=4 format=3 uid="uid://br7yq757cawts"]
[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://graphics/eyes_atlas.png" id="1_y80ib"]
[sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"] [sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"]
@ -23,14 +21,3 @@ surface_material_override/0 = SubResource("StandardMaterial3D_8tgff")
[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000976563, -0.0739136, -0.00112915) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000976563, -0.0739136, -0.00112915)
shape = SubResource("BoxShape3D_t58di") shape = SubResource("BoxShape3D_t58di")
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("1_y80ib")
region_enabled = true
region_rect = Rect2(546, -51, 305, 257)
[node name="Sprite2D2" type="Sprite2D" parent="."]
position = Vector2(387, -114)
texture = ExtResource("1_y80ib")
region_enabled = true
region_rect = Rect2(1717, -38, 374, 204)

@ -1,7 +1,8 @@
[gd_scene load_steps=12 format=3 uid="uid://dx7gn5yiq1aki"] [gd_scene load_steps=13 format=3 uid="uid://dx7gn5yiq1aki"]
[ext_resource type="PackedScene" uid="uid://dd3giw31imfk4" path="res://prefabs/player.tscn" id="1_aa8yc"] [ext_resource type="PackedScene" uid="uid://dd3giw31imfk4" path="res://prefabs/player.tscn" id="1_aa8yc"]
[ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://graphics/mockups/trees/darktree1.png" id="2_k41x3"] [ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://graphics/mockups/trees/darktree1.png" id="2_k41x3"]
[ext_resource type="Script" uid="uid://b4h7k5w0jsjri" path="res://scripts/CSharp/Common/CameraController.cs" id="2_tykdc"]
[ext_resource type="Texture2D" uid="uid://fcm6etmmj65d" path="res://graphics/mockups/trees/darktree2.png" id="3_tykdc"] [ext_resource type="Texture2D" uid="uid://fcm6etmmj65d" path="res://graphics/mockups/trees/darktree2.png" id="3_tykdc"]
[ext_resource type="Texture2D" uid="uid://c8h24ouqcqlxv" path="res://graphics/mockups/trees/darktree3.png" id="4_4u5mu"] [ext_resource type="Texture2D" uid="uid://c8h24ouqcqlxv" path="res://graphics/mockups/trees/darktree3.png" id="4_4u5mu"]
[ext_resource type="Texture2D" uid="uid://dcimm8umxko8" path="res://graphics/mockups/trees/darktree4.png" id="5_y2pux"] [ext_resource type="Texture2D" uid="uid://dcimm8umxko8" path="res://graphics/mockups/trees/darktree4.png" id="5_y2pux"]
@ -21,6 +22,7 @@ position = Vector2(586, 343)
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
position = Vector2(578, 327) position = Vector2(578, 327)
script = ExtResource("2_tykdc")
[node name="background" type="Node2D" parent="."] [node name="background" type="Node2D" parent="."]

@ -1375,5 +1375,3 @@ shaded = true
texture = ExtResource("26_7nyv4") texture = ExtResource("26_7nyv4")
[node name="Player3d" parent="." instance=ExtResource("27_mqdni")] [node name="Player3d" parent="." instance=ExtResource("27_mqdni")]
[connection signal="interacted" from="semi_cat/InteractionArea" to="semi_cat/Dialogic" method="open" binds= ["semi_cat"]]

@ -0,0 +1,16 @@
using Godot;
namespace Babushka.scripts.CSharp.Common;
public partial class CameraController : Camera2D
{
[Export] private float _multiplier = 1.0f;
[Export] private Node2D _followNode;
// Called every frame. 'delta' is the elapsed time since the previous frame.
public override void _Process(double delta)
{
this.Position = _followNode.Transform.Origin * _multiplier;
}
}

@ -0,0 +1,45 @@
using Godot;
namespace Babushka.scripts.CSharp.Common;
public partial class CameraPivot : Node3D
{
[Export] private bool _canPitch;
[Export] private bool _canYaw;
[Export] private float _rotateSpeed = 0.003f;
[Export] private Node3D _subPivot;
public override void _Ready()
{
Input.MouseMode = Input.MouseModeEnum.Captured;
}
public override void _Input(InputEvent @event)
{
if(@event.IsActionPressed("click"))
{
if (Input.MouseMode == Input.MouseModeEnum.Visible)
{
Input.MouseMode = Input.MouseModeEnum.Captured;
}
}
if (@event.IsActionPressed("ui_cancel"))
{
Input.MouseMode = Input.MouseModeEnum.Visible;
}
if (@event is InputEventMouseMotion test)
{
if (Input.MouseMode != Input.MouseModeEnum.Captured)
return;
if (_canYaw)
_subPivot.RotateX(test.Relative.Y * -_rotateSpeed);
if(_canPitch)
this.RotateY(test.Relative.X * -_rotateSpeed);
}
}
}

@ -0,0 +1,29 @@
using Godot;
namespace Babushka.scripts.CSharp.Common;
public partial class InteractionArea : Node3D
{
[Export] private Area3D _area;
[Export] private Label3D _label;
[Signal]
public delegate void InteractedEventHandler();
public override void _Process(double d)
{
if (_area.HasOverlappingBodies())
_label.Show();
else
_label.Hide();
}
public override void _Input(InputEvent @event)
{
if(@event.IsAction("interact") && @event.IsPressed() && _area.HasOverlappingBodies())
EmitSignal(SignalName.Interacted);
}
}

@ -1,17 +0,0 @@
using Godot;
namespace Babushka.scripts.CSharp.Common;
public partial class test : Node2D
{
// Called when the node enters the scene tree for the first time.
public override void _Ready()
{
}
// Called every frame. 'delta' is the elapsed time since the previous frame.
public override void _Process(double delta)
{
}
}

@ -1,6 +0,0 @@
namespace Babushka.scripts.CSharp.Common;
public class test2
{
}

@ -1,5 +1,7 @@
extends Camera2D extends Camera2D
# DEPRECATED, please use the version from the C#-folder
@export var multiplier = 1.0 @export var multiplier = 1.0
@export var followNode: Node2D @export var followNode: Node2D

@ -1,5 +1,7 @@
extends Node3D extends Node3D
# DEPRECATED, please use C# version
@export var canPitch: bool = false @export var canPitch: bool = false
@export var canYaw: bool = false @export var canYaw: bool = false
@export var rotateSpeed: float = 0.003 @export var rotateSpeed: float = 0.003

@ -1,5 +1,7 @@
extends Node3D extends Node3D
# DEPRECATED
@onready var area_3d: Area3D = $Area3D @onready var area_3d: Area3D = $Area3D
@onready var label_3d: Label3D = $Label3D @onready var label_3d: Label3D = $Label3D

Loading…
Cancel
Save