From 296474e27426ecbb19c490b936e04c03f82a83f2 Mon Sep 17 00:00:00 2001 From: Valentin Stark Date: Wed, 5 Apr 2023 23:36:38 +0200 Subject: [PATCH] Debuggage pawn --- ...state-171b6540a4c3cdae5b0905e52ed5116f.cfg | 18 +++--- .godot/editor/editor_layout.cfg | 2 +- .godot/editor/filesystem_cache8 | 24 ++++---- .godot/editor/filesystem_update4 | 5 -- .godot/editor/project_metadata.cfg | 2 +- .godot/editor/script_editor_cache.cfg | 52 ++++++++++-------- .godot/uid_cache.bin | Bin 2008 -> 1970 bytes scenes/Pawn.tscn | 44 +++++++-------- scripts/Pawn.gd | 2 +- 9 files changed, 74 insertions(+), 75 deletions(-) diff --git a/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg b/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg index d4aac3c..cf77aa9 100644 --- a/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg +++ b/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-847.508, -325.329), +"ofs": Vector2(-114.654, -46.1878), "primary_grid_steps": 8, "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.561231 +"zoom": 5.65685 } 3D={ "fov": 70.01, @@ -85,31 +85,31 @@ Anim={ "sun_max_distance": 100.0, "sun_rotation": Vector2(-1.0472, 2.61799) }, -"rotate_snap": 5.0, -"scale_snap": 5.0, +"rotate_snap": 0.555556, +"scale_snap": 1.25, "show_grid": true, "show_origin": true, "snap_enabled": false, -"translate_snap": 0.1, +"translate_snap": 0.001, "viewport_mode": 1, "viewports": [{ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, "display_mode": 20, -"distance": 8.63572, +"distance": 6.89487, "doppler": false, "frame_time": false, "gizmos": true, "half_res": false, "information": false, "listener": true, -"position": Vector3(0, 0, 0), +"position": Vector3(0, 0.0473186, 0), "use_environment": false, "use_orthogonal": false, "view_type": 0, -"x_rotation": 0.0418504, -"y_rotation": -8.20563 +"x_rotation": 0.661445, +"y_rotation": -8.48052 }, { "auto_orthogonal": false, "auto_orthogonal_enabled": true, diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 5ec1389..eea2ee2 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -20,7 +20,7 @@ open_scenes=["res://scenes/WorldGeneration.tscn", "res://scenes/camera.tscn", "r [ScriptEditor] -open_scripts=["res://scripts/Board.gd", "res://scripts/Camera3D.gd", "res://scripts/Chunk.gd", "res://scripts/Entity.gd", "res://scripts/Ground.gd", "res://scripts/Pawn.gd", "res://scripts/Map.gd", "res://scripts/Map_Cursor.gd", "res://scripts/World.gd", "res://scripts/WorldGeneration.gd"] +open_scripts=["res://scripts/Board.gd", "res://scripts/Camera3D.gd", "res://scripts/Chunk.gd", "res://scripts/Entity.gd", "res://scripts/Ground.gd", "res://scripts/Map.gd", "res://scripts/Map_Cursor.gd", "res://scripts/Pawn.gd", "res://scripts/World.gd", "res://scripts/WorldGeneration.gd"] open_help=["Vector2i"] script_split_offset=70 list_split_offset=0 diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 88770de..82bd81a 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ 2a60927148abd1d33b818b535e306557 -::res://::1680636497 +::res://::1680729873 export_presets.cfg::TextFile::-1::1680357289::0::1::::<><>:: icon.png::CompressedTexture2D::4672001524465425285::1676578483::1676582905::1::::<><>:: README.md::TextFile::-1::1676578483::0::1::::<><>:: @@ -43,29 +43,29 @@ untitled_sword_metal.png::CompressedTexture2D::4375004727585147220::1679673440:: ::res://assets/ui/::1680363317 bloc_select.png::CompressedTexture2D::1141775147858261351::1677618805::1677619095::1::::<><>:: cursor.png::CompressedTexture2D::1407698875963358091::1664126270::1680363317::1::::<><>:: -::res://scenes/::1680636497 +::res://scenes/::1680645800 3DWorld.gdshader::Shader::-1::1680357289::0::1::::<><>:: 3DWorld.tscn::PackedScene::3599411568061770725::1680365982::0::1::::<><>::res://scripts/Ground.gd<>res://scripts/Board.gd<>uid://dur874iy77jjr<>uid://qjc4ttmkxbch<>uid://dd7byfyvsblbw 3DWorld.VoxelGI_data.res::VoxelGIData::7277764935364316181::1680357289::0::1::::<><>:: -camera.tscn::PackedScene::7435992546840103852::1680636506::0::1::::<><>::res://scripts/Camera3D.gd +camera.tscn::PackedScene::7435992546840103852::1680645800::0::1::::<><>::res://scripts/Camera3D.gd fog.gdshader::Shader::-1::1680357289::0::1::::<><>:: Game.tscn::PackedScene::9075056520838281688::1680365982::0::1::::<><>::uid://brjt1u0dgbmi4<>uid://d1sd7pxywgunu HUD.tscn::PackedScene::9021570906125339886::1680365982::0::1::::<><>::uid://dla77ra2m245t -Instance.tscn::PackedScene::-1::1680636497::0::1::::<><>::res://scripts/Pawn.gd<>uid://dw2latnr2vbxc<>uid://cfd2s833ldeuy<>uid://bavhx67iarml6<>uid://b3ljxodmxmuhg<>uid://c831hydrcv4i6 Map.tscn::PackedScene::7933340314411983611::1680365982::0::1::::<><>::res://scripts/Map.gd<>uid://ub5uhu2a7etv<>res://scripts/Map_Cursor.gd -WorldGeneration.tscn::PackedScene::1108513713840477990::1680636283::0::1::::<><>::res://scripts/WorldGeneration.gd +Pawn.tscn::PackedScene::255140051271089418::1680645800::0::1::::<><>::res://scripts/Pawn.gd<>uid://dw2latnr2vbxc<>uid://cfd2s833ldeuy<>uid://bavhx67iarml6<>uid://b3ljxodmxmuhg<>uid://c831hydrcv4i6 +WorldGeneration.tscn::PackedScene::1108513713840477990::1680645800::0::1::::<><>::res://scripts/WorldGeneration.gd ::res://scenes/MultiColorFog/::1680357289 MultiColorFogMaterial.tres::ShaderMaterial::-1::1680357289::0::1::::<><>::res://MultiColorFog/MultiColorFog.shader MultiColorFogOverlay.tscn::PackedScene::-1::1680357289::0::1::::<><>::res://MultiColorFog/MultiColorFogMaterial.tres -::res://scripts/::1680636497 -Board.gd::GDScript::-1::1680373251::0::1::::<>Node3D<>:: +::res://scripts/::1680645798 +Board.gd::GDScript::-1::1680636926::0::1::::<>Node3D<>:: Camera3D.gd::GDScript::-1::1680363887::0::1::::<>Camera3D<>:: Chunk.gd::GDScript::-1::1680636506::0::1::::Chunk<>GridMap<>:: Entity.gd::GDScript::-1::1680460427::0::1::::Entity<>Node<>:: Global.gd::GDScript::-1::1677174532::0::1::::<>Node<>:: -Ground.gd::GDScript::-1::1680634654::0::1::::<>Node3D<>:: +Ground.gd::GDScript::-1::1680636926::0::1::::<>Node3D<>:: Map.gd::GDScript::-1::1678219623::0::1::::<>TextureRect<>:: -Map_Cursor.gd::GDScript::-1::1680365687::0::1::::<>TextureRect<>:: -Pawn.gd::GDScript::-1::1680636330::0::1::::<>CharacterBody3D<>:: -World.gd::GDScript::-1::1680636085::0::1::::World<>Node<>:: -WorldGeneration.gd::GDScript::-1::1680357289::0::1::::<>Control<>:: +Map_Cursor.gd::GDScript::-1::1680636926::0::1::::<>TextureRect<>:: +Pawn.gd::GDScript::-1::1680636872::0::1::::<>CharacterBody3D<>:: +World.gd::GDScript::-1::1680636896::0::1::::World<>Node<>:: +WorldGeneration.gd::GDScript::-1::1680645798::0::1::::<>Control<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 6cb2b2f..46844ac 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,10 +1,5 @@ res://scenes/WorldGeneration.tscn res://assets/water.material res://scenes/camera.tscn -res://scripts/Instance3D.gd -res://scripts/Chunk.gd -res://scripts/Ground.gd -res://scripts/World.gd res://scenes/Pawn.tscn -res://scripts/Board.gd res://scripts/Pawn.gd diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index ce9eeff..618e51d 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -11,7 +11,7 @@ run_reload_scripts=true [recent_files] -scenes=["res://scenes/Instance.tscn", "res://scenes/camera.tscn", "res://scenes/WorldGeneration.tscn", "res://scenes/Game.tscn", "res://scenes/Map.tscn", "res://scenes/HUD.tscn", "res://assets/blocs/blocs.tscn", "res://scenes/3DWorld.tscn", "res://test.tscn", "res://assets/entities/fox.tscn"] +scenes=["res://scenes/Pawn.tscn", "res://scenes/camera.tscn", "res://scenes/WorldGeneration.tscn", "res://scenes/Instance.tscn", "res://scenes/Game.tscn", "res://scenes/Map.tscn", "res://scenes/HUD.tscn", "res://assets/blocs/blocs.tscn", "res://scenes/3DWorld.tscn", "res://test.tscn"] scripts=["Vector2i", "res://scripts/Map_Cursor.gd", "res://scripts/Map.gd", "res://scripts/Camera3D.gd", "res://scripts/Entity.gd", "res://scripts/Chunk.gd", "res://scripts/Instance3D.gd", "res://scripts/WorldGeneration.gd", "res://scripts/World.gd", "res://scripts/Board.gd"] [color_picker] diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index bb27c05..0e9b336 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -3,11 +3,11 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 29, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 51, -"scroll_position": 33.0, +"row": 49, +"scroll_position": 44.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -17,12 +17,16 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 19, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 14, -"scroll_position": 12.0, -"selection": false, +"row": 59, +"scroll_position": 38.0, +"selection": true, +"selection_from_column": 0, +"selection_from_line": 58, +"selection_to_column": 20, +"selection_to_line": 58, "syntax_highlighter": "GDScript" } @@ -35,7 +39,7 @@ state={ "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 25, -"scroll_position": 16.0, +"scroll_position": 14.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -59,11 +63,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 59, +"column": 53, "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 24, -"scroll_position": 0.0, +"scroll_position": 13.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -87,11 +91,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 39, +"column": 24, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 4, -"scroll_position": 0.0, +"row": 23, +"scroll_position": 11.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -101,11 +105,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 46, +"column": 43, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 3, -"scroll_position": 0.0, +"row": 112, +"scroll_position": 113.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -115,11 +119,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 25, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 41, -"scroll_position": 0.0, +"row": 16, +"scroll_position": 2.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -129,10 +133,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 87, +"column": 15, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 6, +"row": 4, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -143,11 +147,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 29, +"column": 80, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 6, -"scroll_position": 0.0, +"row": 48, +"scroll_position": 30.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index 201ccfccd57efaea8368f4bb2023b78ff75f94f5..791c7071c741663868c303fd8d939d46c36aa5b7 100644 GIT binary patch delta 22 ecmcb?zlonwXCosI`($Hw#mU>)l_rO_ delta 56 zcmdnQe}kV