diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f7e0db5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +file/ diff --git a/.godot/editor/HUD.tscn-editstate-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg b/.godot/editor/HUD.tscn-editstate-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg index 77340bf..d84b97b 100644 --- a/.godot/editor/HUD.tscn-editstate-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg +++ b/.godot/editor/HUD.tscn-editstate-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-1356.58, -1294.81), +"ofs": Vector2(-1560.62, -648), "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.25 +"zoom": 0.353553 } 3D={ "fov": 70.01, diff --git a/.godot/editor/HUD.tscn-folding-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg b/.godot/editor/HUD.tscn-folding-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg index fafb51a..96457e4 100644 --- a/.godot/editor/HUD.tscn-folding-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg +++ b/.godot/editor/HUD.tscn-folding-2ea9781d6f9f7562c1d276c7fdd0b0ab.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[] -resource_unfolds=["res://scenes/HUD.tscn::PlaceholderTexture2D_qrglo", PackedStringArray()] +node_unfolds=[NodePath("Map"), PackedStringArray("Layout", "Layout/Transform")] +resource_unfolds=["res://scenes/Map.tscn::PlaceholderTexture2D_cpkb8", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/Map.tscn-editstate-0eae408d73bd72b5f9fda5a893b5871f.cfg b/.godot/editor/Map.tscn-editstate-0eae408d73bd72b5f9fda5a893b5871f.cfg index 9d68af5..e3c145e 100644 --- a/.godot/editor/Map.tscn-editstate-0eae408d73bd72b5f9fda5a893b5871f.cfg +++ b/.godot/editor/Map.tscn-editstate-0eae408d73bd72b5f9fda5a893b5871f.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-35.886, -12.5758), +"ofs": Vector2(-741.786, -110.608), "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": 11.9865 +"zoom": 1.05946 } 3D={ "fov": 70.01, diff --git a/.godot/editor/Map.tscn-folding-0eae408d73bd72b5f9fda5a893b5871f.cfg b/.godot/editor/Map.tscn-folding-0eae408d73bd72b5f9fda5a893b5871f.cfg index 88803b6..916b21c 100644 --- a/.godot/editor/Map.tscn-folding-0eae408d73bd72b5f9fda5a893b5871f.cfg +++ b/.godot/editor/Map.tscn-folding-0eae408d73bd72b5f9fda5a893b5871f.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("tile_set")] -resource_unfolds=["res://scenes/Map.tscn::TileSet_kpt5o", PackedStringArray("Resource", "Rendering")] +node_unfolds=[NodePath("."), PackedStringArray("Layout", "Layout/Transform"), NodePath("Cursor"), PackedStringArray("Layout", "Layout/Transform")] +resource_unfolds=["res://scenes/Map.tscn::PlaceholderTexture2D_cpkb8", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/Map_Cursor.gd-folding-5672bd25b1f9748fb1cab34c55f89893.cfg b/.godot/editor/Map_Cursor.gd-folding-5672bd25b1f9748fb1cab34c55f89893.cfg new file mode 100644 index 0000000..e860dd4 --- /dev/null +++ b/.godot/editor/Map_Cursor.gd-folding-5672bd25b1f9748fb1cab34c55f89893.cfg @@ -0,0 +1,3 @@ +[folding] + +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg b/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg index 9e76560..84a8863 100644 --- a/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg +++ b/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg @@ -97,7 +97,7 @@ Anim={ "auto_orthogonal_enabled": true, "cinematic_preview": false, "display_mode": 20, -"distance": 25.3648, +"distance": 10.0727, "doppler": false, "frame_time": false, "gizmos": true, diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index 30902c1..67641c5 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,3 +1,6 @@ +Control +Container +TextureRect Node3D RayCast3D Camera3D @@ -13,7 +16,6 @@ StaticBody3D CollisionShape3D Sprite3D CharacterBody3D -TextureRect TileMap SpotLight3D DirectionalLight3D diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 1201ba1..19556da 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -16,11 +16,11 @@ dock_5="Inspector,Node,History" [EditorNode] -open_scenes=["res://scenes/WorldGeneration.tscn", "res://scenes/3DWorld.tscn", "res://assets/blocs/blocs.tscn", "res://scenes/HUD.tscn", "res://scenes/Instance.tscn", "res://scenes/camera.tscn"] +open_scenes=["res://scenes/WorldGeneration.tscn", "res://scenes/3DWorld.tscn", "res://assets/blocs/blocs.tscn", "res://scenes/HUD.tscn", "res://scenes/Instance.tscn", "res://scenes/camera.tscn", "res://scenes/Map.tscn", "res://scenes/Game.tscn"] [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/Instance3D.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/Instance3D.gd", "res://scripts/Map.gd", "res://scripts/Map_Cursor.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 9829cc8..1bd7510 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,16 +1,16 @@ 2a60927148abd1d33b818b535e306557 -::res://::1680357297 +::res://::1680362959 export_presets.cfg::TextFile::-1::1680357289::0::1::::<><>:: icon.png::CompressedTexture2D::4672001524465425285::1676578483::1676582905::1::::<><>:: README.md::TextFile::-1::1676578483::0::1::::<><>:: test.tscn::PackedScene::2574507083474873372::1680357289::0::1::::<><>::res://scripts/Camera3D.gd -::res://assets/::1680357289 +::res://assets/::1680362965 animestyled_hdr.hdr::CompressedTexture2D::7983615197667896801::1680357289::1680357289::1::::<><>:: -environment.tres::Environment::8600195688495287911::1680357289::0::1::::<><>::uid://dl0k8gegahjf2 +environment.tres::Environment::8600195688495287911::1680362965::0::1::::<><>::uid://dl0k8gegahjf2 sky.exr::CompressedTexture2D::3639266560030997135::1680357289::1680357289::1::::<><>:: water.gdshader::Shader::-1::1677174532::0::1::::<><>:: -water.material::ShaderMaterial::9221375527372224942::1680357289::0::1::::<><>::res://assets/water.gdshader -::res://assets/blocs/::1680357289 +water.material::ShaderMaterial::9221375527372224942::1680362965::0::1::::<><>::res://assets/water.gdshader +::res://assets/blocs/::1680362965 0_sides.glb::PackedScene::7036506600244808940::1677174532::1677174532::1::::<><>:: 0_sides_grass.png::CompressedTexture2D::4551055068461159203::1677174532::1677174532::1::::<><>:: 1_side.glb::PackedScene::5601417408597394875::1677174532::1677617210::1::::<><>:: @@ -24,7 +24,7 @@ water.material::ShaderMaterial::9221375527372224942::1680357289::0::1::::<><>::r 4_sides.glb::PackedScene::139420628202576697::1677174532::1677174532::1::::<><>:: 4_sides_grass.png::CompressedTexture2D::7961782411803042998::1677174532::1677174532::1::::<><>:: blocs.meshlib::MeshLibrary::3161916306234183153::1677617602::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -blocs.tscn::PackedScene::3779811605783367088::1680357289::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u +blocs.tscn::PackedScene::3779811605783367088::1680362965::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u ::res://assets/entities/::1680357275 character.tscn::PackedScene::7228591986680468162::1679670402::0::1::::<><>::uid://cnra1i2164n8e<>uid://bluw1mspkoy71<>uid://dttdl45idwmdq<>uid://bnm2cr6xrmyne<>uid://q1bmi2lut4w5 fox.glb::PackedScene::7089061536691691956::1624458238::1679435438::1::::<><>:: @@ -40,59 +40,29 @@ untitled_Diffuse.png::CompressedTexture2D::8759823716231481420::1679673439::1679 untitled_Normal.png::CompressedTexture2D::5131651999745619224::1679673438::1679673440::1::::<><>:: untitled_sword_diffuse.png::CompressedTexture2D::2430240386759295821::1679673439::1679673440::1::::<><>:: untitled_sword_metal.png::CompressedTexture2D::4375004727585147220::1679673440::1679673440::1::::<><>:: -::res://assets/images/::1677174532 -colors.png::CompressedTexture2D::2558953172502239658::1677174532::1677174532::1::::<><>:: -grass_top.png::CompressedTexture2D::3263707750932711970::1677174532::1677174532::1::::<><>:: -::res://assets/test/::1677702706 -0.meshlib::MeshLibrary::6379551927050851299::1677616339::0::1::::<><>::uid://b53thhe2sa6x0 -bloc_complet.glb::PackedScene::1436864023732800907::1677175567::1677177205::1::::<><>:: -bloc_complet_albedo.png::CompressedTexture2D::5276576783821208744::1677177183::1677177210::1::::<><>:: -bloc_complet_normal.png::CompressedTexture2D::5644009833993754604::1677177183::1677177214::1::::<><>:: -cube2.meshlib::MeshLibrary::3248060020865890420::1677616019::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -cube.meshlib::MeshLibrary::1045877065266806205::1677615937::0::1::::<><>::uid://chgapiyga3x6o<>uid://cmoaaucso40hs<>uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -qsdqsdqsdqsd.meshlib::MeshLibrary::1593950579925346496::1677617437::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -sdqs.meshlib::MeshLibrary::2440886030015449773::1677616939::0::1::::<><>::uid://b53thhe2sa6x0 -::res://assets/test/falaise/::1677702801 -0_side.glb::PackedScene::926904251936000157::1677185189::1677702749::1::::<><>:: -0_side_albedo.png::CompressedTexture2D::362102280152487699::1677702749::1677702750::1::::<><>:: -0_side_normal.png::CompressedTexture2D::2983731232992759135::1677702749::1677702750::1::::<><>:: -1_side.glb::PackedScene::4565931373474501537::1677185329::1677702749::1::::<><>:: -1_side_albedo.png::CompressedTexture2D::1386901564540314436::1677702749::1677702750::1::::<><>:: -1_side_normal.png::CompressedTexture2D::2244488129912329411::1677702749::1677702750::1::::<><>:: -2_side_angle.glb::PackedScene::6720181574216093458::1677185062::1677702749::1::::<><>:: -2_side_angle_albedo.png::CompressedTexture2D::3203394165305483317::1677702749::1677702750::1::::<><>:: -2_side_angle_normal.png::CompressedTexture2D::224673940555521924::1677702749::1677702750::1::::<><>:: -2_side_opposite.glb::PackedScene::4786642724453658829::1677185135::1677702750::1::::<><>:: -2_side_opposite_albedo.png::CompressedTexture2D::8221723943153431338::1677702750::1677702750::1::::<><>:: -2_side_opposite_normal.png::CompressedTexture2D::9126347123866776588::1677702750::1677702750::1::::<><>:: -3_side.glb::PackedScene::6182580778961635135::1677185270::1677702750::1::::<><>:: -3_side_albedo.png::CompressedTexture2D::9001542224236469691::1677702750::1677702750::1::::<><>:: -3_side_normal.png::CompressedTexture2D::1934142266868228080::1677702750::1677702750::1::::<><>:: -4_side.glb::PackedScene::1171198570960035210::1677184997::1677702750::1::::<><>:: -4_side_albedo.png::CompressedTexture2D::3760184257221090574::1677702750::1677702750::1::::<><>:: -4_side_normal.png::CompressedTexture2D::2943842844897212093::1677702750::1677702750::1::::<><>:: -blocs.meshlib::MeshLibrary::5001218139483850589::1677702801::0::1::::<><>::uid://ffn1ia7c3x60<>uid://birlu82nfgbsx<>uid://t03cipsdfuim<>uid://68inkwq5fe2v<>uid://blv0o0tit1gob<>uid://dg3l2dsc7n6s<>uid://dpewuerjdlgms<>uid://d3a4ur67k13wa<>uid://d1ioc5uj71iud<>uid://2s6bm46h6kfw<>uid://bttpxki4m82q1<>uid://bh7awq00jlfkn -::res://assets/ui/::1677619095 +::res://assets/ui/::1680363309 bloc_select.png::CompressedTexture2D::1141775147858261351::1677618805::1677619095::1::::<><>:: -::res://scenes/::1680357289 +cursor.png::CompressedTexture2D::1407698875963358091::1664126270::1680363317::1::::<><>:: +::res://scenes/::1680362965 3DWorld.gdshader::Shader::-1::1680357289::0::1::::<><>:: -3DWorld.tscn::PackedScene::3599411568061770725::1680357289::0::1::::<><>::res://scripts/Ground.gd<>res://scripts/Board.gd<>res://scripts/Camera3D.gd<>uid://dur874iy77jjr<>uid://qjc4ttmkxbch +3DWorld.tscn::PackedScene::3599411568061770725::1680362965::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::1680362965::0::1::::<><>::res://scripts/Camera3D.gd fog.gdshader::Shader::-1::1680357289::0::1::::<><>:: Game.tscn::PackedScene::9075056520838281688::1677174532::0::1::::<><>::uid://brjt1u0dgbmi4<>uid://d1sd7pxywgunu -HUD.tscn::PackedScene::9021570906125339886::1680357257::0::1::::<><>::res://scripts/Map.gd -Instance.tscn::PackedScene::4220804716574195494::1680357289::0::1::::<><>::res://scripts/Instance3D.gd<>uid://dw2latnr2vbxc<>uid://cfd2s833ldeuy<>uid://bavhx67iarml6<>uid://b3ljxodmxmuhg<>uid://c831hydrcv4i6 -WorldGeneration.tscn::PackedScene::1108513713840477990::1680357256::0::1::::<><>::res://scripts/WorldGeneration.gd +HUD.tscn::PackedScene::9021570906125339886::1680362965::0::1::::<><>::res://scripts/Map.gd +Instance.tscn::PackedScene::4220804716574195494::1680362965::0::1::::<><>::res://scripts/Instance3D.gd<>uid://dw2latnr2vbxc<>uid://cfd2s833ldeuy<>uid://bavhx67iarml6<>uid://b3ljxodmxmuhg<>uid://c831hydrcv4i6 +WorldGeneration.tscn::PackedScene::1108513713840477990::1680362965::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/::1680357289 -Board.gd::GDScript::-1::1680357289::0::1::::<>Node3D<>:: -Camera3D.gd::GDScript::-1::1680357289::0::1::::<>Camera3D<>:: +::res://scripts/::1680358689 +Board.gd::GDScript::-1::1680357658::0::1::::<>Node3D<>:: +Camera3D.gd::GDScript::-1::1680358689::0::1::::<>Camera3D<>:: Chunk.gd::GDScript::-1::1680357289::0::1::::Chunk<>GridMap<>:: Entity.gd::GDScript::-1::1680357289::0::1::::Entity<>Node<>:: Global.gd::GDScript::-1::1677174532::0::1::::<>Node<>:: -Ground.gd::GDScript::-1::1680357289::0::1::::<>Node3D<>:: +Ground.gd::GDScript::-1::1680357645::0::1::::<>Node3D<>:: Instance3D.gd::GDScript::-1::1680357289::0::1::::<>CharacterBody3D<>:: Map.gd::GDScript::-1::1678219623::0::1::::<>TextureRect<>:: World.gd::GDScript::-1::1680357289::0::1::::World<>Node<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 39f1b16..c9a632c 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -6,6 +6,9 @@ res://assets/blocs/blocs.tscn res://scenes/HUD.tscn res://scenes/Instance.tscn res://scenes/camera.tscn -res://scripts/Ground.gd -res://scripts/Board.gd +res://scripts/Map_Cursor.gd +res://scenes/Map.tscn +res://scenes/Game.tscn +res://scripts/World.gd res://scripts/Camera3D.gd +res://assets/water.gdshader diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 1bfec0c..fa42614 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -11,8 +11,8 @@ run_reload_scripts=true [recent_files] -scenes=["res://scenes/camera.tscn", "res://scenes/Instance.tscn", "res://scenes/HUD.tscn", "res://assets/blocs/blocs.tscn", "res://scenes/3DWorld.tscn", "res://scenes/WorldGeneration.tscn", "res://test.tscn", "res://assets/entities/fox.tscn", "res://assets/entities/character.tscn", "res://assets/entities/fox.glb"] -scripts=["res://scripts/Camera3D.gd", "Vector2i", "res://scripts/Entity.gd", "res://scripts/Chunk.gd", "res://scripts/Instance3D.gd", "res://scripts/WorldGeneration.gd", "res://scripts/World.gd", "res://scripts/Board.gd", "res://scripts/Ground.gd", "res://scripts/Mouse.gd"] +scenes=["res://scenes/Game.tscn", "res://scenes/Map.tscn", "res://scenes/camera.tscn", "res://scenes/Instance.tscn", "res://scenes/HUD.tscn", "res://assets/blocs/blocs.tscn", "res://scenes/3DWorld.tscn", "res://scenes/WorldGeneration.tscn", "res://test.tscn", "res://assets/entities/fox.tscn"] +scripts=["res://scripts/Map_Cursor.gd", "res://scripts/Map.gd", "Vector2i", "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/recent_dirs b/.godot/editor/recent_dirs index e925517..0a436e7 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -4,7 +4,5 @@ res://assets /home/valentin/Documents/Gridmap/scripts res:// res://assets/entities -res://assets/test/falaise res://assets/blocs -res://assets/test /home/valentin/Documents/Gridmap diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index bed49c2..dddbda1 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -17,16 +17,12 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 9, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 65, -"scroll_position": 63.0, -"selection": true, -"selection_from_column": 9, -"selection_from_line": 65, -"selection_to_column": 13, -"selection_to_line": 65, +"row": 16, +"scroll_position": 60.0, +"selection": false, "syntax_highlighter": "GDScript" } @@ -39,7 +35,7 @@ state={ "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 81, -"scroll_position": 49.0, +"scroll_position": 51.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -51,7 +47,7 @@ state={ "breakpoints": PackedInt32Array(), "column": 13, "folded_lines": Array[int]([]), -"h_scroll_position": 374, +"h_scroll_position": 0, "row": 8, "scroll_position": 0.0, "selection": false, @@ -63,11 +59,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 41, +"column": 59, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 20, -"scroll_position": 3.0, +"row": 24, +"scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -113,7 +109,7 @@ state={ "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 8, -"scroll_position": 0.0, +"scroll_position": 8.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -127,7 +123,7 @@ state={ "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 103, -"scroll_position": 89.0, +"scroll_position": 84.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -145,3 +141,17 @@ state={ "selection": false, "syntax_highlighter": "GDScript" } + +[res://scripts/Map_Cursor.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 87, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 6, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} diff --git a/.godot/editor/water.gdshader-folding-afd7452f7adf4ad714bcb59923ff4385.cfg b/.godot/editor/water.gdshader-folding-afd7452f7adf4ad714bcb59923ff4385.cfg new file mode 100644 index 0000000..e860dd4 --- /dev/null +++ b/.godot/editor/water.gdshader-folding-afd7452f7adf4ad714bcb59923ff4385.cfg @@ -0,0 +1,3 @@ +[folding] + +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/water.material-folding-3631a1ad48c82fa676d48240427e2249.cfg b/.godot/editor/water.material-folding-3631a1ad48c82fa676d48240427e2249.cfg index 5a8047f..e5909ab 100644 --- a/.godot/editor/water.material-folding-3631a1ad48c82fa676d48240427e2249.cfg +++ b/.godot/editor/water.material-folding-3631a1ad48c82fa676d48240427e2249.cfg @@ -1,3 +1,3 @@ [folding] -sections_unfolded=PackedStringArray("Shader Parameters") +sections_unfolded=PackedStringArray("Shader Parameters", "shader") diff --git a/.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.ctex b/.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.ctex new file mode 100644 index 0000000..88f9cc1 Binary files /dev/null and b/.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.ctex differ diff --git a/.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.md5 b/.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.md5 new file mode 100644 index 0000000..8e8399c --- /dev/null +++ b/.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.md5 @@ -0,0 +1,3 @@ +source_md5="be736809fe988a3d3a39984793cd0073" +dest_md5="f7674c612bccb19668e40be8c0145bc8" + diff --git a/.godot/imported/sand.jpg-0c3ef32421264e24ca08b224b2b5bbef.ctex b/.godot/imported/sand.jpg-0c3ef32421264e24ca08b224b2b5bbef.ctex new file mode 100644 index 0000000..71296fd Binary files /dev/null and b/.godot/imported/sand.jpg-0c3ef32421264e24ca08b224b2b5bbef.ctex differ diff --git a/.godot/imported/sand.jpg-0c3ef32421264e24ca08b224b2b5bbef.md5 b/.godot/imported/sand.jpg-0c3ef32421264e24ca08b224b2b5bbef.md5 new file mode 100644 index 0000000..429a538 --- /dev/null +++ b/.godot/imported/sand.jpg-0c3ef32421264e24ca08b224b2b5bbef.md5 @@ -0,0 +1,3 @@ +source_md5="a41fdc42542af2e6206a3ea0ef199dfa" +dest_md5="4d248f7ea412cc8227c05c46ba13825d" + diff --git a/.godot/imported/sand_texture.png-c68e566105f571c3ba817b9267a0ad0d.ctex b/.godot/imported/sand_texture.png-c68e566105f571c3ba817b9267a0ad0d.ctex new file mode 100644 index 0000000..12f22e4 Binary files /dev/null and b/.godot/imported/sand_texture.png-c68e566105f571c3ba817b9267a0ad0d.ctex differ diff --git a/.godot/imported/sand_texture.png-c68e566105f571c3ba817b9267a0ad0d.md5 b/.godot/imported/sand_texture.png-c68e566105f571c3ba817b9267a0ad0d.md5 new file mode 100644 index 0000000..38e202b --- /dev/null +++ b/.godot/imported/sand_texture.png-c68e566105f571c3ba817b9267a0ad0d.md5 @@ -0,0 +1,3 @@ +source_md5="9c5d0f006f1c1408d5fd22d00911a964" +dest_md5="b1bbe67abb3443052a7398e177662c47" + diff --git a/.godot/imported/snow_texture.jpg-d57441e86e429a899cca723d2ba20a7e.ctex b/.godot/imported/snow_texture.jpg-d57441e86e429a899cca723d2ba20a7e.ctex new file mode 100644 index 0000000..4c03839 Binary files /dev/null and b/.godot/imported/snow_texture.jpg-d57441e86e429a899cca723d2ba20a7e.ctex differ diff --git a/.godot/imported/snow_texture.jpg-d57441e86e429a899cca723d2ba20a7e.md5 b/.godot/imported/snow_texture.jpg-d57441e86e429a899cca723d2ba20a7e.md5 new file mode 100644 index 0000000..5c24870 --- /dev/null +++ b/.godot/imported/snow_texture.jpg-d57441e86e429a899cca723d2ba20a7e.md5 @@ -0,0 +1,3 @@ +source_md5="bf91f62a120cd93afd39efa851900fd9" +dest_md5="3ecde1700932fc57f933b39ebf2a063a" + diff --git a/.godot/imported/stone.jpg-fd755efc15e7d9ce91290d83176a58e9.ctex b/.godot/imported/stone.jpg-fd755efc15e7d9ce91290d83176a58e9.ctex new file mode 100644 index 0000000..c38003f Binary files /dev/null and b/.godot/imported/stone.jpg-fd755efc15e7d9ce91290d83176a58e9.ctex differ diff --git a/.godot/imported/stone.jpg-fd755efc15e7d9ce91290d83176a58e9.md5 b/.godot/imported/stone.jpg-fd755efc15e7d9ce91290d83176a58e9.md5 new file mode 100644 index 0000000..ba2276b --- /dev/null +++ b/.godot/imported/stone.jpg-fd755efc15e7d9ce91290d83176a58e9.md5 @@ -0,0 +1,3 @@ +source_md5="4e54bfc8b38fb1e5a9c509089e637d9a" +dest_md5="0e455ce4ec98b1217a9680db642f3074" + diff --git a/.godot/imported/stone_texture.jpg-033a4ee2e855cd7617c199787b45ab7d.ctex b/.godot/imported/stone_texture.jpg-033a4ee2e855cd7617c199787b45ab7d.ctex new file mode 100644 index 0000000..0f1cb5d Binary files /dev/null and b/.godot/imported/stone_texture.jpg-033a4ee2e855cd7617c199787b45ab7d.ctex differ diff --git a/.godot/imported/stone_texture.jpg-033a4ee2e855cd7617c199787b45ab7d.md5 b/.godot/imported/stone_texture.jpg-033a4ee2e855cd7617c199787b45ab7d.md5 new file mode 100644 index 0000000..2334b89 --- /dev/null +++ b/.godot/imported/stone_texture.jpg-033a4ee2e855cd7617c199787b45ab7d.md5 @@ -0,0 +1,3 @@ +source_md5="5000dceb3c7b3ab9d5069e48ca26a264" +dest_md5="9e7fe639dafacf882be29f3e42e980fd" + diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index b2668f6..f3a908e 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/assets/ui/cursor.png b/assets/ui/cursor.png new file mode 100644 index 0000000..7b1ce1a Binary files /dev/null and b/assets/ui/cursor.png differ diff --git a/assets/ui/cursor.png.import b/assets/ui/cursor.png.import new file mode 100644 index 0000000..b340c41 --- /dev/null +++ b/assets/ui/cursor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ub5uhu2a7etv" +path="res://.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/cursor.png" +dest_files=["res://.godot/imported/cursor.png-82ad823c135e628aa60880ccb75c079d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/files/.gdignore b/files/.gdignore new file mode 100644 index 0000000..e69de29 diff --git a/assets/images/colors.png b/files/images/colors.png similarity index 100% rename from assets/images/colors.png rename to files/images/colors.png diff --git a/assets/images/colors.png.import b/files/images/colors.png.import similarity index 100% rename from assets/images/colors.png.import rename to files/images/colors.png.import diff --git a/assets/images/grass_top.png.import b/files/images/grass_top.png.import similarity index 100% rename from assets/images/grass_top.png.import rename to files/images/grass_top.png.import diff --git a/files/sand.jpg b/files/sand.jpg new file mode 100644 index 0000000..fb4df89 Binary files /dev/null and b/files/sand.jpg differ diff --git a/files/stone.jpg b/files/stone.jpg new file mode 100644 index 0000000..84ca1e6 Binary files /dev/null and b/files/stone.jpg differ diff --git a/assets/test/0.meshlib b/files/test/0.meshlib similarity index 100% rename from assets/test/0.meshlib rename to files/test/0.meshlib diff --git a/assets/test/bloc_complet.glb b/files/test/bloc_complet.glb similarity index 100% rename from assets/test/bloc_complet.glb rename to files/test/bloc_complet.glb diff --git a/assets/test/bloc_complet.glb.import b/files/test/bloc_complet.glb.import similarity index 100% rename from assets/test/bloc_complet.glb.import rename to files/test/bloc_complet.glb.import diff --git a/assets/test/bloc_complet_albedo.png b/files/test/bloc_complet_albedo.png similarity index 100% rename from assets/test/bloc_complet_albedo.png rename to files/test/bloc_complet_albedo.png diff --git a/assets/test/bloc_complet_albedo.png.import b/files/test/bloc_complet_albedo.png.import similarity index 100% rename from assets/test/bloc_complet_albedo.png.import rename to files/test/bloc_complet_albedo.png.import diff --git a/assets/test/bloc_complet_normal.png b/files/test/bloc_complet_normal.png similarity index 100% rename from assets/test/bloc_complet_normal.png rename to files/test/bloc_complet_normal.png diff --git a/assets/test/bloc_complet_normal.png.import b/files/test/bloc_complet_normal.png.import similarity index 100% rename from assets/test/bloc_complet_normal.png.import rename to files/test/bloc_complet_normal.png.import diff --git a/assets/test/cube.meshlib b/files/test/cube.meshlib similarity index 100% rename from assets/test/cube.meshlib rename to files/test/cube.meshlib diff --git a/assets/test/cube2.meshlib b/files/test/cube2.meshlib similarity index 100% rename from assets/test/cube2.meshlib rename to files/test/cube2.meshlib diff --git a/assets/test/falaise/0_side.glb b/files/test/falaise/0_side.glb similarity index 100% rename from assets/test/falaise/0_side.glb rename to files/test/falaise/0_side.glb diff --git a/assets/test/falaise/0_side.glb.import b/files/test/falaise/0_side.glb.import similarity index 100% rename from assets/test/falaise/0_side.glb.import rename to files/test/falaise/0_side.glb.import diff --git a/assets/test/falaise/0_side_albedo.png b/files/test/falaise/0_side_albedo.png similarity index 100% rename from assets/test/falaise/0_side_albedo.png rename to files/test/falaise/0_side_albedo.png diff --git a/assets/test/falaise/0_side_albedo.png.import b/files/test/falaise/0_side_albedo.png.import similarity index 100% rename from assets/test/falaise/0_side_albedo.png.import rename to files/test/falaise/0_side_albedo.png.import diff --git a/assets/test/falaise/0_side_normal.png b/files/test/falaise/0_side_normal.png similarity index 100% rename from assets/test/falaise/0_side_normal.png rename to files/test/falaise/0_side_normal.png diff --git a/assets/test/falaise/0_side_normal.png.import b/files/test/falaise/0_side_normal.png.import similarity index 100% rename from assets/test/falaise/0_side_normal.png.import rename to files/test/falaise/0_side_normal.png.import diff --git a/assets/test/falaise/1_side.glb b/files/test/falaise/1_side.glb similarity index 100% rename from assets/test/falaise/1_side.glb rename to files/test/falaise/1_side.glb diff --git a/assets/test/falaise/1_side.glb.import b/files/test/falaise/1_side.glb.import similarity index 100% rename from assets/test/falaise/1_side.glb.import rename to files/test/falaise/1_side.glb.import diff --git a/assets/test/falaise/1_side_albedo.png b/files/test/falaise/1_side_albedo.png similarity index 100% rename from assets/test/falaise/1_side_albedo.png rename to files/test/falaise/1_side_albedo.png diff --git a/assets/test/falaise/1_side_albedo.png.import b/files/test/falaise/1_side_albedo.png.import similarity index 100% rename from assets/test/falaise/1_side_albedo.png.import rename to files/test/falaise/1_side_albedo.png.import diff --git a/assets/test/falaise/1_side_normal.png b/files/test/falaise/1_side_normal.png similarity index 100% rename from assets/test/falaise/1_side_normal.png rename to files/test/falaise/1_side_normal.png diff --git a/assets/test/falaise/1_side_normal.png.import b/files/test/falaise/1_side_normal.png.import similarity index 100% rename from assets/test/falaise/1_side_normal.png.import rename to files/test/falaise/1_side_normal.png.import diff --git a/assets/test/falaise/2_side_angle.glb b/files/test/falaise/2_side_angle.glb similarity index 100% rename from assets/test/falaise/2_side_angle.glb rename to files/test/falaise/2_side_angle.glb diff --git a/assets/test/falaise/2_side_angle.glb.import b/files/test/falaise/2_side_angle.glb.import similarity index 100% rename from assets/test/falaise/2_side_angle.glb.import rename to files/test/falaise/2_side_angle.glb.import diff --git a/assets/test/falaise/2_side_angle_albedo.png b/files/test/falaise/2_side_angle_albedo.png similarity index 100% rename from assets/test/falaise/2_side_angle_albedo.png rename to files/test/falaise/2_side_angle_albedo.png diff --git a/assets/test/falaise/2_side_angle_albedo.png.import b/files/test/falaise/2_side_angle_albedo.png.import similarity index 100% rename from assets/test/falaise/2_side_angle_albedo.png.import rename to files/test/falaise/2_side_angle_albedo.png.import diff --git a/assets/test/falaise/2_side_angle_normal.png b/files/test/falaise/2_side_angle_normal.png similarity index 100% rename from assets/test/falaise/2_side_angle_normal.png rename to files/test/falaise/2_side_angle_normal.png diff --git a/assets/test/falaise/2_side_angle_normal.png.import b/files/test/falaise/2_side_angle_normal.png.import similarity index 100% rename from assets/test/falaise/2_side_angle_normal.png.import rename to files/test/falaise/2_side_angle_normal.png.import diff --git a/assets/test/falaise/2_side_opposite.glb b/files/test/falaise/2_side_opposite.glb similarity index 100% rename from assets/test/falaise/2_side_opposite.glb rename to files/test/falaise/2_side_opposite.glb diff --git a/assets/test/falaise/2_side_opposite.glb.import b/files/test/falaise/2_side_opposite.glb.import similarity index 100% rename from assets/test/falaise/2_side_opposite.glb.import rename to files/test/falaise/2_side_opposite.glb.import diff --git a/assets/test/falaise/2_side_opposite_albedo.png b/files/test/falaise/2_side_opposite_albedo.png similarity index 100% rename from assets/test/falaise/2_side_opposite_albedo.png rename to files/test/falaise/2_side_opposite_albedo.png diff --git a/assets/test/falaise/2_side_opposite_albedo.png.import b/files/test/falaise/2_side_opposite_albedo.png.import similarity index 100% rename from assets/test/falaise/2_side_opposite_albedo.png.import rename to files/test/falaise/2_side_opposite_albedo.png.import diff --git a/assets/test/falaise/2_side_opposite_normal.png b/files/test/falaise/2_side_opposite_normal.png similarity index 100% rename from assets/test/falaise/2_side_opposite_normal.png rename to files/test/falaise/2_side_opposite_normal.png diff --git a/assets/test/falaise/2_side_opposite_normal.png.import b/files/test/falaise/2_side_opposite_normal.png.import similarity index 100% rename from assets/test/falaise/2_side_opposite_normal.png.import rename to files/test/falaise/2_side_opposite_normal.png.import diff --git a/assets/test/falaise/3_side.glb b/files/test/falaise/3_side.glb similarity index 100% rename from assets/test/falaise/3_side.glb rename to files/test/falaise/3_side.glb diff --git a/assets/test/falaise/3_side.glb.import b/files/test/falaise/3_side.glb.import similarity index 100% rename from assets/test/falaise/3_side.glb.import rename to files/test/falaise/3_side.glb.import diff --git a/assets/test/falaise/3_side_albedo.png b/files/test/falaise/3_side_albedo.png similarity index 100% rename from assets/test/falaise/3_side_albedo.png rename to files/test/falaise/3_side_albedo.png diff --git a/assets/test/falaise/3_side_albedo.png.import b/files/test/falaise/3_side_albedo.png.import similarity index 100% rename from assets/test/falaise/3_side_albedo.png.import rename to files/test/falaise/3_side_albedo.png.import diff --git a/assets/test/falaise/3_side_normal.png b/files/test/falaise/3_side_normal.png similarity index 100% rename from assets/test/falaise/3_side_normal.png rename to files/test/falaise/3_side_normal.png diff --git a/assets/test/falaise/3_side_normal.png.import b/files/test/falaise/3_side_normal.png.import similarity index 100% rename from assets/test/falaise/3_side_normal.png.import rename to files/test/falaise/3_side_normal.png.import diff --git a/assets/test/falaise/4_side.glb b/files/test/falaise/4_side.glb similarity index 100% rename from assets/test/falaise/4_side.glb rename to files/test/falaise/4_side.glb diff --git a/assets/test/falaise/4_side.glb.import b/files/test/falaise/4_side.glb.import similarity index 100% rename from assets/test/falaise/4_side.glb.import rename to files/test/falaise/4_side.glb.import diff --git a/assets/test/falaise/4_side_albedo.png b/files/test/falaise/4_side_albedo.png similarity index 100% rename from assets/test/falaise/4_side_albedo.png rename to files/test/falaise/4_side_albedo.png diff --git a/assets/test/falaise/4_side_albedo.png.import b/files/test/falaise/4_side_albedo.png.import similarity index 100% rename from assets/test/falaise/4_side_albedo.png.import rename to files/test/falaise/4_side_albedo.png.import diff --git a/assets/test/falaise/4_side_normal.png b/files/test/falaise/4_side_normal.png similarity index 100% rename from assets/test/falaise/4_side_normal.png rename to files/test/falaise/4_side_normal.png diff --git a/assets/test/falaise/4_side_normal.png.import b/files/test/falaise/4_side_normal.png.import similarity index 100% rename from assets/test/falaise/4_side_normal.png.import rename to files/test/falaise/4_side_normal.png.import diff --git a/assets/test/falaise/blocs.meshlib b/files/test/falaise/blocs.meshlib similarity index 100% rename from assets/test/falaise/blocs.meshlib rename to files/test/falaise/blocs.meshlib diff --git a/assets/test/qsdqsdqsdqsd.meshlib b/files/test/qsdqsdqsdqsd.meshlib similarity index 100% rename from assets/test/qsdqsdqsdqsd.meshlib rename to files/test/qsdqsdqsdqsd.meshlib diff --git a/assets/test/sdqs.meshlib b/files/test/sdqs.meshlib similarity index 100% rename from assets/test/sdqs.meshlib rename to files/test/sdqs.meshlib diff --git a/assets/images/grass_top.png b/files/texures/grass_top_texture.png similarity index 100% rename from assets/images/grass_top.png rename to files/texures/grass_top_texture.png diff --git a/files/texures/sand_texture.png b/files/texures/sand_texture.png new file mode 100644 index 0000000..f541df2 Binary files /dev/null and b/files/texures/sand_texture.png differ diff --git a/files/texures/snow_top_texture.jpg b/files/texures/snow_top_texture.jpg new file mode 100644 index 0000000..a6e2690 Binary files /dev/null and b/files/texures/snow_top_texture.jpg differ diff --git a/files/texures/stone_texture.jpg b/files/texures/stone_texture.jpg new file mode 100644 index 0000000..d5264b8 Binary files /dev/null and b/files/texures/stone_texture.jpg differ diff --git a/scenes/HUD.tscn b/scenes/HUD.tscn index b9a8f3c..eafb4f0 100644 --- a/scenes/HUD.tscn +++ b/scenes/HUD.tscn @@ -1,8 +1,6 @@ -[gd_scene load_steps=3 format=3 uid="uid://d1sd7pxywgunu"] +[gd_scene load_steps=2 format=3 uid="uid://d1sd7pxywgunu"] -[ext_resource type="Script" path="res://scripts/Map.gd" id="1_r6n8f"] - -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_qrglo"] +[ext_resource type="PackedScene" uid="uid://dla77ra2m245t" path="res://scenes/Map.tscn" id="1_7g3fl"] [node name="HUD" type="Control"] layout_mode = 3 @@ -14,10 +12,7 @@ offset_bottom = -347.0 grow_horizontal = 2 grow_vertical = 2 -[node name="Map" type="TextureRect" parent="."] +[node name="Map" parent="." instance=ExtResource("1_7g3fl")] layout_mode = 0 -offset_right = 293.0 -offset_bottom = 293.0 -texture = SubResource("PlaceholderTexture2D_qrglo") -expand_mode = 5 -script = ExtResource("1_r6n8f") +offset_right = 256.0 +offset_bottom = 248.0 diff --git a/scenes/Instance.tscn b/scenes/Instance.tscn index b149792..5ba26a7 100644 --- a/scenes/Instance.tscn +++ b/scenes/Instance.tscn @@ -2092,15 +2092,15 @@ bones/4/name = "Bone" bones/4/parent = -1 bones/4/rest = Transform3D(1, -2.5291e-08, -6.43127e-08, 6.49611e-08, 0.0265338, 0.999648, -2.35757e-08, -0.999648, 0.0265338, 1.86265e-09, 0.417916, -2.98023e-08) bones/4/enabled = true -bones/4/position = Vector3(3.05039e-09, 0.399455, -0.000490062) -bones/4/rotation = Quaternion(-0.609786, 0.183688, 0.151965, 0.755861) +bones/4/position = Vector3(3.35222e-09, 0.394763, -0.000614595) +bones/4/rotation = Quaternion(-0.616304, 0.148683, 0.122054, 0.763653) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Bone.001" bones/5/parent = 4 bones/5/rest = Transform3D(1, 6.49611e-08, 3.22196e-08, 3.04846e-08, 0.0265337, -0.999648, -6.57931e-08, 0.999648, 0.0265337, 5.25223e-09, 1.53668e-08, 0.132351) bones/5/enabled = true bones/5/position = Vector3(5.25223e-09, 1.53668e-08, 0.132351) -bones/5/rotation = Quaternion(0.64589, 2.49867e-08, -1.65369e-08, 0.76343) +bones/5/rotation = Quaternion(0.66786, 4.48033e-08, -4.04325e-09, 0.744287) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Hood" bones/6/parent = 5 @@ -2121,14 +2121,14 @@ bones/8/parent = 7 bones/8/rest = Transform3D(0.432955, 0.625736, -0.648848, 0.0448991, 0.703947, 0.708832, 0.900297, -0.336025, 0.276682, 5.82709e-08, 0.177444, -2.03371e-08) bones/8/enabled = true bones/8/position = Vector3(5.82709e-08, 0.177444, -2.03371e-08) -bones/8/rotation = Quaternion(-0.63955, -0.130382, -0.244286, 0.717147) +bones/8/rotation = Quaternion(-0.645783, -0.12472, -0.202985, 0.725401) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "Bone.007" bones/9/parent = 8 bones/9/rest = Transform3D(0.993116, 0.117134, -5.41402e-07, -0.117134, 0.993116, 5.5995e-07, 6.03264e-07, -4.92679e-07, 1, -7.73984e-09, 0.162903, -8.55013e-08) bones/9/enabled = true bones/9/position = Vector3(-7.73984e-09, 0.162903, -8.55013e-08) -bones/9/rotation = Quaternion(-1.56888e-06, -2.53229e-07, -0.52928, 0.848447) +bones/9/rotation = Quaternion(-1.59936e-06, -2.75824e-07, -0.57764, 0.816291) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "Sword" bones/10/parent = 9 @@ -2141,15 +2141,15 @@ bones/11/name = "Bone.008" bones/11/parent = 4 bones/11/rest = Transform3D(1, 3.55271e-15, -3.8117e-08, 3.81036e-08, -0.0265341, 0.999648, -1.0114e-09, -0.999648, -0.0265341, 0.480619, 0.00333734, 0.125734) bones/11/enabled = true -bones/11/position = Vector3(0.327701, 0.00438682, -0.0989702) -bones/11/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) +bones/11/position = Vector3(0.327701, 0.00479431, -0.0836176) +bones/11/rotation = Quaternion(-0.763653, 0.122055, -0.148684, 0.616304) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "Bone.011" bones/12/parent = 4 bones/12/rest = Transform3D(1, 3.10862e-15, -6.95332e-09, 6.95087e-09, -0.0265341, 0.999648, -1.84497e-10, -0.999648, -0.0265341, 0.287738, 0.203267, 0.120427) bones/12/enabled = true bones/12/position = Vector3(0.291431, 0.236535, 0.000400938) -bones/12/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) +bones/12/rotation = Quaternion(-0.763653, 0.122054, -0.148683, 0.616304) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "Bone.019" bones/13/parent = 4 @@ -2163,91 +2163,91 @@ bones/14/parent = 13 bones/14/rest = Transform3D(0.432955, -0.625736, 0.648848, -0.044899, 0.703947, 0.708832, -0.900297, -0.336025, 0.276683, 4.20827e-08, 0.177444, 3.85194e-08) bones/14/enabled = true bones/14/position = Vector3(4.20827e-08, 0.177444, 3.85194e-08) -bones/14/rotation = Quaternion(-0.677754, 0.461139, 0.251483, 0.514546) +bones/14/rotation = Quaternion(-0.672768, 0.460852, 0.267779, 0.513121) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Bone.021" bones/15/parent = 14 bones/15/rest = Transform3D(0.993116, -0.117134, 4.12768e-07, 0.117134, 0.993116, 8.259e-07, -5.06667e-07, -7.71865e-07, 1, 1.81458e-10, 0.162903, -8.5116e-09) bones/15/enabled = true bones/15/position = Vector3(1.81458e-10, 0.162903, -8.5116e-09) -bones/15/rotation = Quaternion(-2.00292e-06, 2.78858e-07, 0.475317, 0.879815) +bones/15/rotation = Quaternion(-1.9142e-06, 2.48061e-07, 0.441444, 0.897289) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "Bone.022" bones/16/parent = 4 bones/16/rest = Transform3D(1, 3.55271e-15, -3.8117e-08, 3.81036e-08, -0.0265341, 0.999648, -1.0114e-09, -0.999648, -0.0265341, -0.480619, 0.00333737, 0.125734) bones/16/enabled = true -bones/16/position = Vector3(-0.358609, -0.128686, -0.0367831) -bones/16/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) +bones/16/position = Vector3(-0.358609, -0.12896, -0.0470895) +bones/16/rotation = Quaternion(-0.763653, 0.122054, -0.148683, 0.616304) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "Bone.023" bones/17/parent = 4 bones/17/rest = Transform3D(1, 4.88498e-15, -6.95333e-09, 6.95088e-09, -0.0265341, 0.999648, -1.84495e-10, -0.999648, -0.0265341, -0.287738, 0.203267, 0.120427) bones/17/enabled = true bones/17/position = Vector3(-0.285902, 0.16505, -0.138443) -bones/17/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) +bones/17/rotation = Quaternion(-0.763653, 0.122054, -0.148683, 0.616304) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "Tail_1" bones/18/parent = 4 bones/18/rest = Transform3D(1, 2.31377e-08, 6.49611e-08, -2.48533e-08, 0.999648, 0.0265338, -6.43243e-08, -0.0265338, 0.999648, 7.52368e-09, 0.139991, -0.0720165) bones/18/enabled = true bones/18/position = Vector3(7.52368e-09, 0.139991, -0.0720165) -bones/18/rotation = Quaternion(-0.041098, 3.65798e-08, -1.43497e-08, 0.999155) +bones/18/rotation = Quaternion(0.0702261, 3.01488e-08, -1.78576e-08, 0.997531) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "Tail_2" bones/19/parent = 18 bones/19/rest = Transform3D(1, -3.40006e-15, -2.66127e-15, 3.40006e-15, 1, 7.45058e-09, 2.66127e-15, -7.45058e-09, 1, 5.70345e-16, 0.132915, -2.04718e-09) bones/19/enabled = true bones/19/position = Vector3(5.70345e-16, 0.132915, -2.04718e-09) -bones/19/rotation = Quaternion(0.15068, -1.39783e-09, -1.68703e-08, 0.988583) +bones/19/rotation = Quaternion(0.0911433, -8.20852e-10, 1.38384e-08, 0.995838) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "Tail_3" bones/20/parent = 19 bones/20/rest = Transform3D(1, 9.71445e-17, -8.4713e-22, -9.71445e-17, 1, 2.13933e-24, 8.4713e-22, -2.13933e-24, 1, -1.10819e-15, 0.132915, -2.98023e-08) bones/20/enabled = true bones/20/position = Vector3(-1.10819e-15, 0.132915, -2.98023e-08) -bones/20/rotation = Quaternion(0.166686, -1.85944e-09, -1.38362e-08, 0.98601) +bones/20/rotation = Quaternion(0.0560446, 1.04804e-09, 9.63864e-10, 0.998428) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "Tail_4" bones/21/parent = 20 bones/21/rest = Transform3D(1, 9.71445e-17, -9.72421e-26, -9.71445e-17, 1, 2.13933e-24, 9.72421e-26, -2.13933e-24, 1, -1.16371e-15, 0.132915, -2.98023e-08) bones/21/enabled = true bones/21/position = Vector3(-1.16371e-15, 0.132915, -2.98023e-08) -bones/21/rotation = Quaternion(0.127648, -1.26351e-08, 4.30914e-10, 0.99182) +bones/21/rotation = Quaternion(0.186877, 1.51832e-08, 7.26407e-09, 0.982383) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "Bone.003" bones/22/parent = 4 bones/22/rest = Transform3D(1, -6.49611e-08, -1.74055e-08, 1.56754e-08, -0.0265388, 0.999648, -6.54002e-08, -0.999648, -0.0265388, -2.83161e-15, -1.57499e-10, -3.06139e-08) bones/22/enabled = true bones/22/position = Vector3(-2.27119e-09, -0.00627534, -0.0291115) -bones/22/rotation = Quaternion(-0.755862, 0.151966, -0.183687, 0.609785) +bones/22/rotation = Quaternion(-0.763654, 0.122054, -0.148683, 0.616302) bones/22/scale = Vector3(0.963893, 0.963829, 0.963391) bones/23/name = "Bone.002" bones/23/parent = 22 bones/23/rest = Transform3D(1, -5.68103e-08, -1.28744e-07, 7.358e-08, 0.990947, 0.13425, 1.19952e-07, -0.13425, 0.990947, 0.103074, 0.0448339, 0.0144274) bones/23/enabled = true bones/23/position = Vector3(0.103074, 0.0448339, 0.0144274) -bones/23/rotation = Quaternion(-0.283592, -0.340761, -0.142839, 0.884904) +bones/23/rotation = Quaternion(-0.302203, -0.33774, -0.150595, 0.878594) bones/23/scale = Vector3(1.00015, 0.999976, 0.999842) bones/24/name = "L_leg_3" bones/24/parent = 23 bones/24/rest = Transform3D(1, 1.46768e-07, 1.41892e-07, -1.08988e-07, 0.97155, -0.236835, -1.72615e-07, 0.236835, 0.97155, -1.09502e-08, 0.131148, -7.90992e-09) bones/24/enabled = true bones/24/position = Vector3(-1.09502e-08, 0.131148, -7.90992e-09) -bones/24/rotation = Quaternion(0.47454, 6.53177e-08, -2.28393e-07, 0.880234) +bones/24/rotation = Quaternion(0.503263, 4.05288e-08, -2.28607e-07, 0.864134) bones/24/scale = Vector3(1, 0.999986, 1.00002) bones/25/name = "R_leg_1" bones/25/parent = 22 bones/25/rest = Transform3D(1, 5.68103e-08, 2.09964e-07, -8.44838e-08, 0.990947, 0.13425, -2.00436e-07, -0.13425, 0.990947, -0.103074, 0.0448339, 0.0144275) bones/25/enabled = true bones/25/position = Vector3(-0.103074, 0.0448339, 0.0144275) -bones/25/rotation = Quaternion(-0.213886, 0.234083, 0.19185, 0.928791) +bones/25/rotation = Quaternion(-0.234407, 0.230208, 0.199313, 0.923218) bones/25/scale = Vector3(1.00008, 0.999967, 0.999928) bones/26/name = "R_leg_2" bones/26/parent = 25 bones/26/rest = Transform3D(1, -1.57459e-07, -1.39286e-07, 1.19991e-07, 0.97155, -0.236835, 1.72615e-07, 0.236835, 0.97155, 1.35965e-08, 0.131148, -5.11595e-09) bones/26/enabled = true bones/26/position = Vector3(1.35965e-08, 0.131148, -5.11595e-09) -bones/26/rotation = Quaternion(0.415183, -3.50262e-08, 1.96514e-07, 0.909738) +bones/26/rotation = Quaternion(0.447938, -7.90506e-08, 2.07422e-07, 0.894065) bones/26/scale = Vector3(1, 0.99997, 1.00006) bones/27/name = "Bone.013" bones/27/parent = -1 diff --git a/scenes/Map.tscn b/scenes/Map.tscn new file mode 100644 index 0000000..b4f01db --- /dev/null +++ b/scenes/Map.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=5 format=3 uid="uid://dla77ra2m245t"] + +[ext_resource type="Script" path="res://scripts/Map.gd" id="1_yowpa"] +[ext_resource type="Texture2D" uid="uid://ub5uhu2a7etv" path="res://assets/ui/cursor.png" id="2_lr2t4"] +[ext_resource type="Script" path="res://scripts/Map_Cursor.gd" id="3_67qgj"] + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_cpkb8"] + +[node name="Map" type="TextureRect"] +offset_right = 256.0 +offset_bottom = 256.0 +texture = SubResource("PlaceholderTexture2D_cpkb8") +expand_mode = 5 +script = ExtResource("1_yowpa") + +[node name="Cursor" type="TextureRect" parent="." node_paths=PackedStringArray("map")] +layout_mode = 1 +offset_right = 37.0 +offset_bottom = 37.0 +pivot_offset = Vector2(25, 25) +texture = ExtResource("2_lr2t4") +expand_mode = 1 +script = ExtResource("3_67qgj") +map = NodePath("..") diff --git a/scripts/Camera3D.gd b/scripts/Camera3D.gd index 5782a26..ad088cd 100644 --- a/scripts/Camera3D.gd +++ b/scripts/Camera3D.gd @@ -22,6 +22,7 @@ func _process(delta): if position.y != height: var tween = get_tree().create_tween() tween.tween_property(self, "position:y", height, 0.1) + Global.world.player_position = Global.world.get_real_coordinates(Vector2i(position.x, position.z)) func calc_move(m_pos, delta): diff --git a/scripts/Map_Cursor.gd b/scripts/Map_Cursor.gd new file mode 100644 index 0000000..243175a --- /dev/null +++ b/scripts/Map_Cursor.gd @@ -0,0 +1,7 @@ +extends TextureRect + +@export var map = TextureRect + +func _process(delta): + position.x = remap(Global.world.player_position.x, 0, Global.world.width, 0, map.size.x) - size.x / 2 + position.y = remap(Global.world.player_position.y, 0, Global.world.height, 0, map.size.y) - size.y / 2 diff --git a/scripts/World.gd b/scripts/World.gd index 64b6f4a..6b6bffa 100644 --- a/scripts/World.gd +++ b/scripts/World.gd @@ -14,6 +14,9 @@ var height: int var chunk_size = 64 var chunk_number = 6 + +var player_position: Vector2i + func get_neighbours_8_at_same_height(point: Vector2i): var neighbours = 0 var current_bloc = get_height(Vector2i(point.x, point.y))