From a8b66a60dca81a4e5d4ab995226b77ba29bc70c3 Mon Sep 17 00:00:00 2001 From: IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com> Date: Sat, 16 Jul 2022 04:20:11 +0200 Subject: basic camera movement also events for other movements --- godot/scenes/Game.tscn | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn index a37a7eb..320f926 100644 --- a/godot/scenes/Game.tscn +++ b/godot/scenes/Game.tscn @@ -1,18 +1,33 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://native/Game.gdns" type="Script" id=1] -[ext_resource path="res://scenes/SpinningCube.tscn" type="PackedScene" id=2] +[ext_resource path="res://native/BasicDie.gdns" type="Script" id=2] [sub_resource type="CubeMesh" id=1] +[sub_resource type="BoxShape" id=2] + [node name="Game" type="Spatial"] script = ExtResource( 1 ) -[node name="Camera" type="Camera" parent="."] -transform = Transform( 0.572229, -0.327396, 0.751909, 0, 0.916856, 0.399217, -0.820094, -0.228443, 0.524651, 4.71648, 2.5, 3.45846 ) -current = true +[node name="RigidBody" type="RigidBody" parent="."] +script = ExtResource( 2 ) +base/camera_offset = 500.0 +base/camera_clamp = Vector2( 0, -1 ) +shooting/max_force = 100.0 +shooting/up_angle = 5.0 +input/mouse_sensitivity = Vector2( 0.05, 0.05 ) -[node name="SpinningCube" parent="." instance=ExtResource( 2 )] +[node name="MeshInstance" type="MeshInstance" parent="RigidBody"] mesh = SubResource( 1 ) material/0 = null -base/rotate_speed = 1.0 + +[node name="CollisionShape" type="CollisionShape" parent="RigidBody"] +shape = SubResource( 2 ) + +[node name="CameraArmHorizontal" type="Spatial" parent="RigidBody"] + +[node name="CameraArmVertical" type="Spatial" parent="RigidBody/CameraArmHorizontal"] + +[node name="Camera" type="Camera" parent="RigidBody/CameraArmHorizontal/CameraArmVertical"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10 ) -- cgit From bc0a59f2955b1e8bfd0870860d33c04205e6389e Mon Sep 17 00:00:00 2001 From: IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com> Date: Sat, 16 Jul 2022 05:58:09 +0200 Subject: applying force after pressing leftclick and dragging the mouse --- godot/scenes/Game.tscn | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn index 320f926..f569f85 100644 --- a/godot/scenes/Game.tscn +++ b/godot/scenes/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://native/Game.gdns" type="Script" id=1] [ext_resource path="res://native/BasicDie.gdns" type="Script" id=2] @@ -7,15 +7,20 @@ [sub_resource type="BoxShape" id=2] +[sub_resource type="CubeMesh" id=3] + +[sub_resource type="BoxShape" id=4] + [node name="Game" type="Spatial"] script = ExtResource( 1 ) [node name="RigidBody" type="RigidBody" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.25589, 0 ) script = ExtResource( 2 ) -base/camera_offset = 500.0 -base/camera_clamp = Vector2( 0, -1 ) +camera/camera_clamp = Vector2( 0, -1.5 ) shooting/max_force = 100.0 -shooting/up_angle = 5.0 +shooting/up_angle = 1.0 +shooting/stopping_velocity = 10.0 input/mouse_sensitivity = Vector2( 0.05, 0.05 ) [node name="MeshInstance" type="MeshInstance" parent="RigidBody"] @@ -31,3 +36,13 @@ shape = SubResource( 2 ) [node name="Camera" type="Camera" parent="RigidBody/CameraArmHorizontal/CameraArmVertical"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10 ) + +[node name="StaticBody" type="StaticBody" parent="."] +transform = Transform( 100, 0, 0, 0, 0.1, 0, 0, 0, 100, 0, 0, 0 ) + +[node name="MeshInstance" type="MeshInstance" parent="StaticBody"] +mesh = SubResource( 3 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="StaticBody"] +shape = SubResource( 4 ) -- cgit From 5678a04042b7b2ea52a927101cf66064535dc272 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Jul 2022 11:42:39 +0200 Subject: add separate shooting intensity --- godot/scenes/Game.tscn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn index f569f85..ca90458 100644 --- a/godot/scenes/Game.tscn +++ b/godot/scenes/Game.tscn @@ -17,11 +17,11 @@ script = ExtResource( 1 ) [node name="RigidBody" type="RigidBody" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.25589, 0 ) script = ExtResource( 2 ) -camera/camera_clamp = Vector2( 0, -1.5 ) -shooting/max_force = 100.0 +camera/camera_clamp = Vector2( 1.608, -2.526 ) +shooting/max_force = 30.0 shooting/up_angle = 1.0 -shooting/stopping_velocity = 10.0 -input/mouse_sensitivity = Vector2( 0.05, 0.05 ) +input/camera_mouse_sensitivity = Vector2( 0.01, 0.008 ) +input/shoot_sensitivity = 0.069 [node name="MeshInstance" type="MeshInstance" parent="RigidBody"] mesh = SubResource( 1 ) -- cgit From fe8d9853148e7d3a798d9e14cb0288f7538f88ba Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Jul 2022 14:34:11 +0200 Subject: new node structure --- godot/scenes/Game.tscn | 53 ++-------------------- godot/scenes/levels/test_scene/TestScene.tscn | 11 ----- godot/scenes/levels/test_scene_movement/Floor.tscn | 22 +++++++++ .../test_scene_movement/TestSceneMovement.tscn | 32 +++++++++++++ godot/scenes/levels/test_scene_movement/Wall.tscn | 23 ++++++++++ godot/scenes/objects/Camera.tscn | 10 ++++ godot/scenes/objects/Player.tscn | 14 ++++++ 7 files changed, 104 insertions(+), 61 deletions(-) delete mode 100644 godot/scenes/levels/test_scene/TestScene.tscn create mode 100644 godot/scenes/levels/test_scene_movement/Floor.tscn create mode 100644 godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn create mode 100644 godot/scenes/levels/test_scene_movement/Wall.tscn create mode 100644 godot/scenes/objects/Camera.tscn create mode 100644 godot/scenes/objects/Player.tscn (limited to 'godot/scenes') diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn index 0eb902d..72fef4e 100644 --- a/godot/scenes/Game.tscn +++ b/godot/scenes/Game.tscn @@ -1,56 +1,9 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://native/Game.gdns" type="Script" id=1] -[ext_resource path="res://native/BasicDie.gdns" type="Script" id=2] -[ext_resource path="res://scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn" type="PackedScene" id=2] - -[sub_resource type="CubeMesh" id=1] - -[sub_resource type="BoxShape" id=2] - -[sub_resource type="CubeMesh" id=3] - -[sub_resource type="BoxShape" id=4] +[ext_resource path="res://scenes/levels/test_scene_movement/TestSceneMovement.tscn" type="PackedScene" id=2] [node name="Game" type="Spatial"] script = ExtResource( 1 ) -[node name="Camera" type="Camera" parent="."] -transform = Transform( -0.538224, 0.336461, -0.772728, 0, 0.916856, 0.399217, 0.842802, 0.214868, -0.493474, -6.58972, 3.31005, -7.31211 ) -current = true -fov = 64.6875 - -[node name="TestSceneUuuhhh" parent="." instance=ExtResource( 2 )] - -[node name="RigidBody" type="RigidBody" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.25589, 0 ) -script = ExtResource( 2 ) -camera/camera_clamp = Vector2( 1.608, -2.526 ) -shooting/max_force = 30.0 -shooting/up_angle = 1.0 -input/camera_mouse_sensitivity = Vector2( 0.01, 0.008 ) -input/shoot_sensitivity = 0.069 - -[node name="MeshInstance" type="MeshInstance" parent="RigidBody"] -mesh = SubResource( 1 ) -material/0 = null - -[node name="CollisionShape" type="CollisionShape" parent="RigidBody"] -shape = SubResource( 2 ) - -[node name="CameraArmHorizontal" type="Spatial" parent="RigidBody"] - -[node name="CameraArmVertical" type="Spatial" parent="RigidBody/CameraArmHorizontal"] - -[node name="Camera" type="Camera" parent="RigidBody/CameraArmHorizontal/CameraArmVertical"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10 ) - -[node name="StaticBody" type="StaticBody" parent="."] -transform = Transform( 100, 0, 0, 0, 0.1, 0, 0, 0, 100, 0, 0, 0 ) - -[node name="MeshInstance" type="MeshInstance" parent="StaticBody"] -mesh = SubResource( 3 ) -material/0 = null - -[node name="CollisionShape" type="CollisionShape" parent="StaticBody"] -shape = SubResource( 4 ) +[node name="TestScene" parent="." instance=ExtResource( 2 )] diff --git a/godot/scenes/levels/test_scene/TestScene.tscn b/godot/scenes/levels/test_scene/TestScene.tscn deleted file mode 100644 index ed981f8..0000000 --- a/godot/scenes/levels/test_scene/TestScene.tscn +++ /dev/null @@ -1,11 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://scenes/levels/test_scene/Floor.tscn" type="PackedScene" id=1] -[ext_resource path="res://scenes/W8.tscn" type="PackedScene" id=2] - -[node name="TestScene" type="Spatial"] - -[node name="Floor" parent="." instance=ExtResource( 1 )] - -[node name="RigidBody" parent="." instance=ExtResource( 2 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0339947, 2.91518, -1.40456 ) diff --git a/godot/scenes/levels/test_scene_movement/Floor.tscn b/godot/scenes/levels/test_scene_movement/Floor.tscn new file mode 100644 index 0000000..f8970a7 --- /dev/null +++ b/godot/scenes/levels/test_scene_movement/Floor.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://assets/textures/grass-texture-26.jpg" type="Texture" id=1] + +[sub_resource type="CubeMesh" id=1] + +[sub_resource type="SpatialMaterial" id=3] +albedo_texture = ExtResource( 1 ) + +[sub_resource type="BoxShape" id=2] + +[node name="StaticBody" type="StaticBody"] + +[node name="MeshInstance" type="MeshInstance" parent="."] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 ) +mesh = SubResource( 1 ) +skeleton = NodePath("../CollisionShape") +material/0 = SubResource( 3 ) + +[node name="CollisionShape" type="CollisionShape" parent="."] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 ) +shape = SubResource( 2 ) diff --git a/godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn b/godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn new file mode 100644 index 0000000..688f1c7 --- /dev/null +++ b/godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn @@ -0,0 +1,32 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Wall.tscn" type="PackedScene" id=1] +[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Floor.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/objects/Player.tscn" type="PackedScene" id=3] + +[node name="TestScene" type="Spatial"] + +[node name="Floor" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0290833, -0.981747, 0.00208664 ) + +[node name="Floor2" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, -20 ) + +[node name="Floor3" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, -1, 0 ) + +[node name="Floor4" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, -1, -20 ) + +[node name="Floor5" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 40, -1, 0 ) + +[node name="Floor6" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 40, -1, -20 ) + +[node name="Wall" parent="." instance=ExtResource( 1 )] +transform = Transform( 0.766044, 0, 0.642788, 0, 2, 0, -0.642788, 0, 0.766044, 19.47, 0, -14 ) + +[node name="PlayerRoot" parent="." instance=ExtResource( 3 )] +input/camera_mouse_sensitivity = Vector2( 0.014, 0.01 ) +input/shoot_sensitivity = 0.041 diff --git a/godot/scenes/levels/test_scene_movement/Wall.tscn b/godot/scenes/levels/test_scene_movement/Wall.tscn new file mode 100644 index 0000000..e3afe23 --- /dev/null +++ b/godot/scenes/levels/test_scene_movement/Wall.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://assets/textures/sandstone-brick-wall-texture.jpg" type="Texture" id=1] + +[sub_resource type="CubeMesh" id=1] + +[sub_resource type="SpatialMaterial" id=2] +albedo_texture = ExtResource( 1 ) + +[sub_resource type="ConvexPolygonShape" id=3] +points = PoolVector3Array( 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, -1, 1, 1, -1, -1, -1, 1, -1, -1, -1, 1, -1, -1, -1 ) + +[node name="StaticBody" type="StaticBody"] + +[node name="MeshInstance" type="MeshInstance" parent="."] +transform = Transform( 0.3, 0, 0, 0, 1, 0, 0, 0, 5, 0, 1, 0 ) +mesh = SubResource( 1 ) +skeleton = NodePath("") +material/0 = SubResource( 2 ) + +[node name="CollisionShape" type="CollisionShape" parent="."] +transform = Transform( 0.3, 0, 0, 0, 1, 0, 0, 0, 5, 0, 1, 0 ) +shape = SubResource( 3 ) diff --git a/godot/scenes/objects/Camera.tscn b/godot/scenes/objects/Camera.tscn new file mode 100644 index 0000000..1c13dd0 --- /dev/null +++ b/godot/scenes/objects/Camera.tscn @@ -0,0 +1,10 @@ +[gd_scene format=2] + +[node name="CameraRoot" type="Spatial"] + +[node name="CameraArmHorizontal" type="Spatial" parent="."] + +[node name="CameraArmVertical" type="Spatial" parent="CameraArmHorizontal"] + +[node name="Camera" type="Camera" parent="CameraArmHorizontal/CameraArmVertical"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10 ) diff --git a/godot/scenes/objects/Player.tscn b/godot/scenes/objects/Player.tscn new file mode 100644 index 0000000..0d162f4 --- /dev/null +++ b/godot/scenes/objects/Player.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/objects/W8.tscn" type="PackedScene" id=1] +[ext_resource path="res://scenes/objects/Camera.tscn" type="PackedScene" id=2] +[ext_resource path="res://native/BasicDie.gdns" type="Script" id=3] + +[node name="PlayerRoot" type="Spatial"] +script = ExtResource( 3 ) + +[node name="W8" parent="." instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 ) + +[node name="Camera" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 ) -- cgit From 635cfebff3ec0ce5b74ac728a5655339755efe39 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Jul 2022 15:12:11 +0200 Subject: better mouse handling. correct impulse --- godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn | 2 -- godot/scenes/objects/Player.tscn | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn b/godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn index 688f1c7..d23236b 100644 --- a/godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn +++ b/godot/scenes/levels/test_scene_movement/TestSceneMovement.tscn @@ -28,5 +28,3 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 40, -1, -20 ) transform = Transform( 0.766044, 0, 0.642788, 0, 2, 0, -0.642788, 0, 0.766044, 19.47, 0, -14 ) [node name="PlayerRoot" parent="." instance=ExtResource( 3 )] -input/camera_mouse_sensitivity = Vector2( 0.014, 0.01 ) -input/shoot_sensitivity = 0.041 diff --git a/godot/scenes/objects/Player.tscn b/godot/scenes/objects/Player.tscn index 0d162f4..f8a3fba 100644 --- a/godot/scenes/objects/Player.tscn +++ b/godot/scenes/objects/Player.tscn @@ -6,6 +6,12 @@ [node name="PlayerRoot" type="Spatial"] script = ExtResource( 3 ) +camera/camera_clamp = Vector2( 0, -2 ) +shooting/max_force = 30.0 +shooting/up_angle = 1.0 +shooting/stopping_velocity = 0.003 +input/camera_mouse_sensitivity = Vector2( 0.003, 0.002 ) +input/shoot_sensitivity = 0.3 [node name="W8" parent="." instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 ) -- cgit From ea7596edf57149b3c3f84378276c9d0558aed050 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Jul 2022 15:47:20 +0200 Subject: better stopping detection --- godot/scenes/objects/Player.tscn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/objects/Player.tscn b/godot/scenes/objects/Player.tscn index f8a3fba..9730147 100644 --- a/godot/scenes/objects/Player.tscn +++ b/godot/scenes/objects/Player.tscn @@ -6,12 +6,12 @@ [node name="PlayerRoot" type="Spatial"] script = ExtResource( 3 ) -camera/camera_clamp = Vector2( 0, -2 ) +camera/camera_clamp = Vector2( 0, -1.3 ) shooting/max_force = 30.0 shooting/up_angle = 1.0 shooting/stopping_velocity = 0.003 input/camera_mouse_sensitivity = Vector2( 0.003, 0.002 ) -input/shoot_sensitivity = 0.3 +input/shoot_sensitivity = 0.1 [node name="W8" parent="." instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 ) -- cgit From bdf6f0328e870c308299f37155b9e89d91a2859c Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Jul 2022 16:01:31 +0200 Subject: fix up angle and force --- godot/scenes/objects/Player.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'godot/scenes') diff --git a/godot/scenes/objects/Player.tscn b/godot/scenes/objects/Player.tscn index 9730147..aeb8f51 100644 --- a/godot/scenes/objects/Player.tscn +++ b/godot/scenes/objects/Player.tscn @@ -8,7 +8,7 @@ script = ExtResource( 3 ) camera/camera_clamp = Vector2( 0, -1.3 ) shooting/max_force = 30.0 -shooting/up_angle = 1.0 +shooting/up_angle = 0.3 shooting/stopping_velocity = 0.003 input/camera_mouse_sensitivity = Vector2( 0.003, 0.002 ) input/shoot_sensitivity = 0.1 -- cgit