From d09fef34f7e2bd743ce541248af30ad8dbc17765 Mon Sep 17 00:00:00 2001 From: Valentin Stark Date: Sat, 1 Apr 2023 16:19:37 +0200 Subject: [PATCH] Camera collisions --- ...lding-5ee7dca069a2497be3bb28c4d56856bf.cfg | 2 +- ...state-9d991e3bcaa18250a5137d16090bc9f4.cfg | 2 +- ...state-171b6540a4c3cdae5b0905e52ed5116f.cfg | 170 +++++++++++++++ ...lding-171b6540a4c3cdae5b0905e52ed5116f.cfg | 5 + .godot/editor/create_recent.Node | 6 +- .godot/editor/editor_layout.cfg | 4 +- .godot/editor/filesystem_cache8 | 196 +++++++++--------- .godot/editor/filesystem_update4 | 4 + .godot/editor/project_metadata.cfg | 4 +- .godot/editor/recent_dirs | 4 +- .godot/editor/script_editor_cache.cfg | 30 +-- ...7bc3ab8403c54e49ba2bd815a9dc3d436dc7.cache | Bin 0 -> 16680 bytes ...b1c9d699b66995294a4c1abd80a446c5418f.cache | Bin 0 -> 16692 bytes .godot/uid_cache.bin | Bin 3366 -> 3402 bytes scenes/3DWorld.tscn | 10 +- scenes/Instance.tscn | 44 ++-- scenes/camera.tscn | 12 ++ scripts/Board.gd | 2 +- scripts/Camera3D.gd | 7 + 19 files changed, 349 insertions(+), 153 deletions(-) create mode 100644 .godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg create mode 100644 .godot/editor/camera.tscn-folding-171b6540a4c3cdae5b0905e52ed5116f.cfg create mode 100644 .godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/643f7bc3ab8403c54e49ba2bd815a9dc3d436dc7.cache create mode 100644 .godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/dce9b1c9d699b66995294a4c1abd80a446c5418f.cache create mode 100644 scenes/camera.tscn diff --git a/.godot/editor/3DWorld.tscn-folding-5ee7dca069a2497be3bb28c4d56856bf.cfg b/.godot/editor/3DWorld.tscn-folding-5ee7dca069a2497be3bb28c4d56856bf.cfg index baef3a3..a4a52b5 100644 --- a/.godot/editor/3DWorld.tscn-folding-5ee7dca069a2497be3bb28c4d56856bf.cfg +++ b/.godot/editor/3DWorld.tscn-folding-5ee7dca069a2497be3bb28c4d56856bf.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("DirectionalLight3D"), PackedStringArray("Transform", "Light", "Shadow", "Directional Shadow"), NodePath("Highlighter"), PackedStringArray("Transform"), NodePath("WorldEnvironment"), PackedStringArray("environment"), NodePath("Camera3D"), PackedStringArray("Transform"), NodePath("GridMap"), PackedStringArray("Cell")] +node_unfolds=[NodePath("DirectionalLight3D"), PackedStringArray("Transform", "Light", "Shadow", "Directional Shadow"), NodePath("Highlighter"), PackedStringArray("Transform"), NodePath("WorldEnvironment"), PackedStringArray("environment"), NodePath("GridMap"), PackedStringArray("Cell")] resource_unfolds=[] nodes_folded=[] diff --git a/.godot/editor/Instance.tscn-editstate-9d991e3bcaa18250a5137d16090bc9f4.cfg b/.godot/editor/Instance.tscn-editstate-9d991e3bcaa18250a5137d16090bc9f4.cfg index 819df0f..cf77aa9 100644 --- a/.godot/editor/Instance.tscn-editstate-9d991e3bcaa18250a5137d16090bc9f4.cfg +++ b/.godot/editor/Instance.tscn-editstate-9d991e3bcaa18250a5137d16090bc9f4.cfg @@ -97,7 +97,7 @@ Anim={ "auto_orthogonal_enabled": true, "cinematic_preview": false, "display_mode": 20, -"distance": 12.7619, +"distance": 6.89487, "doppler": false, "frame_time": false, "gizmos": true, diff --git a/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg b/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg new file mode 100644 index 0000000..9e76560 --- /dev/null +++ b/.godot/editor/camera.tscn-editstate-171b6540a4c3cdae5b0905e52ed5116f.cfg @@ -0,0 +1,170 @@ +[editor_states] + +Anim={ +"visible": false +} +2D={ +"grid_offset": Vector2(0, 0), +"grid_snap_active": false, +"grid_step": Vector2(8, 8), +"grid_visibility": 1, +"ofs": Vector2(-847.508, -325.329), +"primary_grid_steps": 8, +"show_edit_locks": true, +"show_guides": true, +"show_helpers": false, +"show_origin": true, +"show_rulers": true, +"show_transformation_gizmos": true, +"show_viewport": true, +"show_zoom_control": true, +"smart_snap_active": false, +"snap_guides": true, +"snap_node_anchors": true, +"snap_node_center": true, +"snap_node_parent": true, +"snap_node_sides": true, +"snap_other_nodes": true, +"snap_pixel": true, +"snap_relative": false, +"snap_rotation": false, +"snap_rotation_offset": 0.0, +"snap_rotation_step": 0.261799, +"snap_scale": false, +"snap_scale_step": 0.1, +"zoom": 0.561231 +} +3D={ +"fov": 70.01, +"gizmos_status": { +"AudioListener3D": 0, +"AudioStreamPlayer3D": 0, +"CPUParticles3D": 0, +"CSGShape3D": 0, +"Camera3D": 0, +"CollisionObject3D": 0, +"CollisionPolygon3D": 0, +"CollisionShape3D": 0, +"Decal": 0, +"FogVolume": 0, +"GPUParticles3D": 0, +"GPUParticlesCollision3D": 0, +"Joint3D": 0, +"Light3D": 0, +"LightmapGI": 0, +"LightmapProbe": 0, +"Marker3D": 0, +"NavigationLink3D": 0, +"NavigationRegion3D": 0, +"OccluderInstance3D": 0, +"Path3D": 0, +"PhysicalBone3D": 0, +"RayCast3D": 0, +"ReflectionProbe": 0, +"ShapeCast3D": 0, +"Skeleton3D": 0, +"SoftBody3D": 0, +"SpringArm3D": 0, +"VehicleWheel3D": 0, +"VisibleOnScreenNotifier3D": 0, +"VoxelGI": 0 +}, +"local_coords": false, +"preview_sun_env": { +"environ_ao_enabled": false, +"environ_enabled": true, +"environ_energy": 1.0, +"environ_gi_enabled": false, +"environ_glow_enabled": true, +"environ_ground_color": Color(0.2, 0.169, 0.133, 1), +"environ_sky_color": Color(0.385, 0.454, 0.55, 1), +"environ_tonemap_enabled": true, +"sun_color": Color(1, 1, 1, 1), +"sun_enabled": true, +"sun_energy": 1.0, +"sun_max_distance": 100.0, +"sun_rotation": Vector2(-1.0472, 2.61799) +}, +"rotate_snap": 5.0, +"scale_snap": 5.0, +"show_grid": true, +"show_origin": true, +"snap_enabled": false, +"translate_snap": 0.1, +"viewport_mode": 1, +"viewports": [{ +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 25.3648, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": true, +"position": Vector3(0, 0, 0), +"use_environment": false, +"use_orthogonal": false, +"view_type": 0, +"x_rotation": 0.21202, +"y_rotation": -7.89147 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": false, +"position": Vector3(0, 0, 0), +"use_environment": false, +"use_orthogonal": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": false, +"position": Vector3(0, 0, 0), +"use_environment": false, +"use_orthogonal": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": false, +"position": Vector3(0, 0, 0), +"use_environment": false, +"use_orthogonal": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}], +"zfar": 4000.01, +"znear": 0.05 +} diff --git a/.godot/editor/camera.tscn-folding-171b6540a4c3cdae5b0905e52ed5116f.cfg b/.godot/editor/camera.tscn-folding-171b6540a4c3cdae5b0905e52ed5116f.cfg new file mode 100644 index 0000000..f3891c4 --- /dev/null +++ b/.godot/editor/camera.tscn-folding-171b6540a4c3cdae5b0905e52ed5116f.cfg @@ -0,0 +1,5 @@ +[folding] + +node_unfolds=[NodePath("RayCast3D"), PackedStringArray("Transform")] +resource_unfolds=[] +nodes_folded=[] diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index 48bcdef..30902c1 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,13 +1,13 @@ +Node3D +RayCast3D +Camera3D GridMap MeshInstance3D -RayCast3D -Node3D Node FogVolume VoxelGI ReflectionProbe WorldEnvironment -Camera3D AnimationTree StaticBody3D CollisionShape3D diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index e3d505c..1201ba1 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"] +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"] [ScriptEditor] -open_scripts=["res://scripts/Board.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/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 ded6197..9829cc8 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,99 +1,99 @@ 2a60927148abd1d33b818b535e306557 -::res://::1680352161 -export_presets.cfg::TextFile::-1::1679835270::0::1::::<><>:: -icon.png::CompressedTexture2D::4672001524465425285::1676574357::1676664790::1::::<><>:: -README.md::TextFile::-1::1676578345::0::1::::<><>:: -test.tscn::PackedScene::2574507083474873372::1679697032::0::1::::<><>::res://scripts/Camera3D.gd -::res://assets/::1680198063 -animestyled_hdr.hdr::CompressedTexture2D::7983615197667896801::1679693431::1679693542::1::::<><>:: -environment.tres::Environment::8600195688495287911::1680198063::0::1::::<><>::uid://dl0k8gegahjf2 -sky.exr::CompressedTexture2D::3639266560030997135::1679692720::1679692784::1::::<><>:: -water.gdshader::Shader::-1::1677015851::0::1::::<><>:: -water.material::ShaderMaterial::9221375527372224942::1680198063::0::1::::<><>::res://assets/water.gdshader -::res://assets/blocs/::1680198063 -0_sides.glb::PackedScene::7036506600244808940::1677003366::1677015904::1::::<><>:: -0_sides_grass.png::CompressedTexture2D::4551055068461159203::1677003427::1677015904::1::::<><>:: -1_side.glb::PackedScene::5601417408597394875::1677003385::1677015904::1::::<><>:: -1_side_grass.png::CompressedTexture2D::5160492229365512154::1677003427::1677015904::1::::<><>:: -2_side_angle.glb::PackedScene::8081534368546731168::1677003412::1677015905::1::::<><>:: -2_side_angle_grass.png::CompressedTexture2D::6576443529465065670::1677003428::1677015904::1::::<><>:: -2_side_opposite.glb::PackedScene::3205848216587541745::1677003400::1677015905::1::::<><>:: -2_side_opposite_grass.png::CompressedTexture2D::2747904460042865810::1677003428::1677015904::1::::<><>:: -3_side_angle.glb::PackedScene::4729157567058414100::1677003421::1677015905::1::::<><>:: -3_side_angle_grass.png::CompressedTexture2D::707802073040230165::1677003428::1677015904::1::::<><>:: -4_sides.glb::PackedScene::139420628202576697::1677003373::1677015905::1::::<><>:: -4_sides_grass.png::CompressedTexture2D::7961782411803042998::1677003428::1677015904::1::::<><>:: -blocs.meshlib::MeshLibrary::3161916306234183153::1677960056::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -blocs.tscn::PackedScene::3779811605783367088::1680198063::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -::res://assets/entities/::1679682604 -character.tscn::PackedScene::7228591986680468162::1679682604::0::1::::<><>::uid://cnra1i2164n8e<>uid://bluw1mspkoy71<>uid://dttdl45idwmdq<>uid://bnm2cr6xrmyne<>uid://q1bmi2lut4w5 -fox.glb::PackedScene::7089061536691691956::1679682604::1679682604::1::::<><>:: -fox.tscn::PackedScene::4613905625060549040::1679682604::0::1::::<><>::uid://cnra1i2164n8e<>uid://bluw1mspkoy71<>uid://dttdl45idwmdq<>uid://bnm2cr6xrmyne<>uid://q1bmi2lut4w5 -fox_bow_normal.png::CompressedTexture2D::1176777928757515382::1679682604::1679682604::1::::<><>:: -fox_Diffuse.png::CompressedTexture2D::5720437650261590386::1679682604::1679682604::1::::<><>:: -fox_Normal.png::CompressedTexture2D::3201168382057197354::1679682604::1679682604::1::::<><>:: -fox_sword_diffuse.png::CompressedTexture2D::8532276622129965190::1679682604::1679682604::1::::<><>:: -fox_sword_metal.png::CompressedTexture2D::3325292056282865326::1679682604::1679682604::1::::<><>:: -untitled.glb::PackedScene::8289928114728968037::1679682604::1679682604::1::::<><>:: -untitled_bow_normal.png::CompressedTexture2D::7148468192894957643::1679682604::1679682604::1::::<><>:: -untitled_Diffuse.png::CompressedTexture2D::8759823716231481420::1679682604::1679682604::1::::<><>:: -untitled_Normal.png::CompressedTexture2D::5131651999745619224::1679682604::1679682604::1::::<><>:: -untitled_sword_diffuse.png::CompressedTexture2D::2430240386759295821::1679682604::1679682604::1::::<><>:: -untitled_sword_metal.png::CompressedTexture2D::4375004727585147220::1679682604::1679682604::1::::<><>:: -::res://assets/images/::1677444734 -colors.png::CompressedTexture2D::2558953172502239658::1671825732::1677081411::1::::<><>:: -grass_top.png::CompressedTexture2D::3263707750932711970::1676919772::1677078622::1::::<><>:: -::res://assets/test/::1677960056 -0.meshlib::MeshLibrary::6379551927050851299::1677960056::0::1::::<><>::uid://b53thhe2sa6x0 -bloc_complet.glb::PackedScene::1436864023732800907::1677257344::1677257344::1::::<><>:: -bloc_complet_albedo.png::CompressedTexture2D::5276576783821208744::1677257344::1677257344::1::::<><>:: -bloc_complet_normal.png::CompressedTexture2D::5644009833993754604::1677257344::1677257344::1::::<><>:: -cube2.meshlib::MeshLibrary::3248060020865890420::1677960056::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -cube.meshlib::MeshLibrary::1045877065266806205::1677960056::0::1::::<><>::uid://chgapiyga3x6o<>uid://cmoaaucso40hs<>uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -qsdqsdqsdqsd.meshlib::MeshLibrary::1593950579925346496::1677960056::0::1::::<><>::uid://b53thhe2sa6x0<>uid://cfr1s2lqng8eo<>uid://c0xxcgdm7s2ak<>uid://bffdt5if5pnda<>uid://kc4nqve8lx14<>uid://dlo0nmochxy4u -sdqs.meshlib::MeshLibrary::2440886030015449773::1677960056::0::1::::<><>::uid://b53thhe2sa6x0 -::res://assets/test/falaise/::1677960056 -0_side.glb::PackedScene::926904251936000157::1677960056::1677960056::1::::<><>:: -0_side_albedo.png::CompressedTexture2D::362102280152487699::1677960056::1677960056::1::::<><>:: -0_side_normal.png::CompressedTexture2D::2983731232992759135::1677960056::1677960056::1::::<><>:: -1_side.glb::PackedScene::4565931373474501537::1677960056::1677960056::1::::<><>:: -1_side_albedo.png::CompressedTexture2D::1386901564540314436::1677960056::1677960056::1::::<><>:: -1_side_normal.png::CompressedTexture2D::2244488129912329411::1677960056::1677960056::1::::<><>:: -2_side_angle.glb::PackedScene::6720181574216093458::1677960056::1677960056::1::::<><>:: -2_side_angle_albedo.png::CompressedTexture2D::3203394165305483317::1677960056::1677960056::1::::<><>:: -2_side_angle_normal.png::CompressedTexture2D::224673940555521924::1677960056::1677960056::1::::<><>:: -2_side_opposite.glb::PackedScene::4786642724453658829::1677960056::1677960056::1::::<><>:: -2_side_opposite_albedo.png::CompressedTexture2D::8221723943153431338::1677960056::1677960056::1::::<><>:: -2_side_opposite_normal.png::CompressedTexture2D::9126347123866776588::1677960056::1677960056::1::::<><>:: -3_side.glb::PackedScene::6182580778961635135::1677960056::1677960056::1::::<><>:: -3_side_albedo.png::CompressedTexture2D::9001542224236469691::1677960056::1677960056::1::::<><>:: -3_side_normal.png::CompressedTexture2D::1934142266868228080::1677960056::1677960056::1::::<><>:: -4_side.glb::PackedScene::1171198570960035210::1677960056::1677960056::1::::<><>:: -4_side_albedo.png::CompressedTexture2D::3760184257221090574::1677960056::1677960056::1::::<><>:: -4_side_normal.png::CompressedTexture2D::2943842844897212093::1677960056::1677960056::1::::<><>:: -blocs.meshlib::MeshLibrary::5001218139483850589::1677960056::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/::1677960056 -bloc_select.png::CompressedTexture2D::1141775147858261351::1677960056::1677960056::1::::<><>:: -::res://scenes/::1680198064 -3DWorld.gdshader::Shader::-1::1679829541::0::1::::<><>:: -3DWorld.tscn::PackedScene::3599411568061770725::1680198063::0::1::::<><>::res://scripts/Ground.gd<>res://scripts/Board.gd<>res://scripts/Camera3D.gd<>uid://dur874iy77jjr<>uid://qjc4ttmkxbch -3DWorld.VoxelGI_data.res::VoxelGIData::7277764935364316181::1679688605::0::1::::<><>:: -fog.gdshader::Shader::-1::1679829541::0::1::::<><>:: -Game.tscn::PackedScene::9075056520838281688::1677106092::0::1::::<><>::uid://brjt1u0dgbmi4<>uid://d1sd7pxywgunu -HUD.tscn::PackedScene::9021570906125339886::1680198063::0::1::::<><>::res://scripts/Map.gd -Instance.tscn::PackedScene::4220804716574195494::1680198064::0::1::::<><>::res://scripts/Instance3D.gd<>uid://dw2latnr2vbxc<>uid://cfd2s833ldeuy<>uid://bavhx67iarml6<>uid://b3ljxodmxmuhg<>uid://c831hydrcv4i6 -WorldGeneration.tscn::PackedScene::1108513713840477990::1680198063::0::1::::<><>::res://scripts/WorldGeneration.gd -::res://scenes/MultiColorFog/::1679756576 -MultiColorFogMaterial.tres::ShaderMaterial::-1::1610706439::0::1::::<><>::res://MultiColorFog/MultiColorFog.shader -MultiColorFogOverlay.tscn::PackedScene::-1::1610706439::0::1::::<><>::res://MultiColorFog/MultiColorFogMaterial.tres -::res://scripts/::1680037452 -Board.gd::GDScript::-1::1680037452::0::1::::<>Node3D<>:: -Camera3D.gd::GDScript::-1::1679764692::0::1::::<>Camera3D<>:: -Chunk.gd::GDScript::-1::1680037271::0::1::::Chunk<>GridMap<>:: -Entity.gd::GDScript::-1::1679949455::0::1::::Entity<>Node<>:: -Global.gd::GDScript::-1::1677079629::0::1::::<>Node<>:: -Ground.gd::GDScript::-1::1680036683::0::1::::<>Node3D<>:: -Instance3D.gd::GDScript::-1::1679951014::0::1::::<>CharacterBody3D<>:: -Map.gd::GDScript::-1::1678572216::0::1::::<>TextureRect<>:: -World.gd::GDScript::-1::1680036046::0::1::::World<>Node<>:: -WorldGeneration.gd::GDScript::-1::1680014648::0::1::::<>Control<>:: +::res://::1680357297 +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 +animestyled_hdr.hdr::CompressedTexture2D::7983615197667896801::1680357289::1680357289::1::::<><>:: +environment.tres::Environment::8600195688495287911::1680357289::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 +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::::<><>:: +1_side_grass.png::CompressedTexture2D::5160492229365512154::1677174532::1677174532::1::::<><>:: +2_side_angle.glb::PackedScene::8081534368546731168::1677174532::1677174532::1::::<><>:: +2_side_angle_grass.png::CompressedTexture2D::6576443529465065670::1677174532::1677174532::1::::<><>:: +2_side_opposite.glb::PackedScene::3205848216587541745::1677174532::1677174532::1::::<><>:: +2_side_opposite_grass.png::CompressedTexture2D::2747904460042865810::1677174532::1677174532::1::::<><>:: +3_side_angle.glb::PackedScene::4729157567058414100::1677174532::1677174532::1::::<><>:: +3_side_angle_grass.png::CompressedTexture2D::707802073040230165::1677174532::1677174532::1::::<><>:: +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 +::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::::<><>:: +fox.tscn::PackedScene::4613905625060549040::1680357275::0::1::::<><>::uid://cnra1i2164n8e<>uid://bluw1mspkoy71<>uid://dttdl45idwmdq<>uid://bnm2cr6xrmyne<>uid://q1bmi2lut4w5 +fox_bow_normal.png::CompressedTexture2D::1176777928757515382::1679435438::1679435438::1::::<><>:: +fox_Diffuse.png::CompressedTexture2D::5720437650261590386::1679435437::1679435438::1::::<><>:: +fox_Normal.png::CompressedTexture2D::3201168382057197354::1679435437::1679435438::1::::<><>:: +fox_sword_diffuse.png::CompressedTexture2D::8532276622129965190::1679435438::1679435438::1::::<><>:: +fox_sword_metal.png::CompressedTexture2D::3325292056282865326::1679435438::1679435438::1::::<><>:: +untitled.glb::PackedScene::8289928114728968037::1679673425::1679673440::1::::<><>:: +untitled_bow_normal.png::CompressedTexture2D::7148468192894957643::1679673439::1679673440::1::::<><>:: +untitled_Diffuse.png::CompressedTexture2D::8759823716231481420::1679673439::1679673440::1::::<><>:: +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 +bloc_select.png::CompressedTexture2D::1141775147858261351::1677618805::1677619095::1::::<><>:: +::res://scenes/::1680357289 +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.VoxelGI_data.res::VoxelGIData::7277764935364316181::1680357289::0::1::::<><>:: +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 +::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<>:: +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<>:: +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<>:: +WorldGeneration.gd::GDScript::-1::1680357289::0::1::::<>Control<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index beebbce..39f1b16 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -5,3 +5,7 @@ res://scenes/3DWorld.tscn 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/Camera3D.gd diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index d6b9f0c..1bfec0c 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/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", "res://assets/blocs/4_sides.glb"] -scripts=["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", "Vector2"] +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"] [color_picker] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index a3e1c04..e925517 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,8 +1,8 @@ +res://scenes +res://scripts res://assets /home/valentin/Documents/Gridmap/scripts -res://scripts res:// -res://scenes res://assets/entities res://assets/test/falaise res://assets/blocs diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 61630d7..bed49c2 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -63,16 +63,12 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 14, +"column": 41, "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 20, -"scroll_position": 2.0, -"selection": true, -"selection_from_column": 14, -"selection_from_line": 20, -"selection_to_column": 32, -"selection_to_line": 20, +"scroll_position": 3.0, +"selection": false, "syntax_highlighter": "GDScript" } @@ -95,12 +91,16 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 19, +"column": 1, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 19, +"row": 7, "scroll_position": 0.0, -"selection": false, +"selection": true, +"selection_from_column": 1, +"selection_from_line": 7, +"selection_to_column": 55, +"selection_to_line": 10, "syntax_highlighter": "GDScript" } @@ -109,11 +109,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 46, +"column": 28, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 26, -"scroll_position": 18.0, +"row": 8, +"scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -137,10 +137,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 47, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 7, +"row": 9, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/643f7bc3ab8403c54e49ba2bd815a9dc3d436dc7.cache b/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/643f7bc3ab8403c54e49ba2bd815a9dc3d436dc7.cache new file mode 100644 index 0000000000000000000000000000000000000000..a33529d58431250888948ab3946ebee93041104d GIT binary patch literal 16680 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 literal 0 HcmV?d00001 diff --git a/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/dce9b1c9d699b66995294a4c1abd80a446c5418f.cache b/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/dce9b1c9d699b66995294a4c1abd80a446c5418f.cache new file mode 100644 index 0000000000000000000000000000000000000000..a94b263675a5845d1d7bdabe547312c5505beeb5 GIT binary patch literal 16692 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 literal 0 HcmV?d00001 diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index d1752dc17fa926e5058b64f59796b9a15fdb54c7..b2668f6e2742c3e4cd96a6e76e1efb410396ef2d 100644 GIT binary patch delta 47 zcmZ1`bxMlSeIuhPugV(l+m9}NHcXdbU|=XpEw<9vFHTO)OD)zlwM>f9Z6l*9F8~uj0?+^e diff --git a/scenes/3DWorld.tscn b/scenes/3DWorld.tscn index 6ce15ff..7de580b 100644 --- a/scenes/3DWorld.tscn +++ b/scenes/3DWorld.tscn @@ -2,9 +2,9 @@ [ext_resource type="Script" path="res://scripts/Ground.gd" id="3_f4vd0"] [ext_resource type="Script" path="res://scripts/Board.gd" id="3_g32xc"] -[ext_resource type="Script" path="res://scripts/Camera3D.gd" id="3_lkvuw"] [ext_resource type="Environment" uid="uid://dur874iy77jjr" path="res://assets/environment.tres" id="4_dycnn"] [ext_resource type="Texture2D" uid="uid://qjc4ttmkxbch" path="res://assets/ui/bloc_select.png" id="4_nyumm"] +[ext_resource type="PackedScene" uid="uid://dd7byfyvsblbw" path="res://scenes/camera.tscn" id="5_6daj8"] [node name="Board" type="Node3D"] script = ExtResource("3_g32xc") @@ -12,7 +12,7 @@ script = ExtResource("3_g32xc") [node name="Ground" type="Node3D" parent="." node_paths=PackedStringArray("camera")] transform = Transform3D(0.999999, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) script = ExtResource("3_f4vd0") -camera = NodePath("../Camera3D") +camera = NodePath("../Camera") metadata/_editor_floor_ = Vector3(0, 0, 0) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] @@ -32,12 +32,10 @@ texture = ExtResource("4_nyumm") [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = ExtResource("4_dycnn") -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.820851, 0.571143, 0, -0.571143, 0.820851, 0, 8.70843, 0) -script = ExtResource("3_lkvuw") - [node name="GridMap" type="GridMap" parent="."] cell_size = Vector3(1, 1, 1) cell_center_x = false cell_center_y = false cell_center_z = false + +[node name="Camera" parent="." instance=ExtResource("5_6daj8")] diff --git a/scenes/Instance.tscn b/scenes/Instance.tscn index 7f832c6..b149792 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.80287e-09, 0.387758, -0.000800519) -bones/4/rotation = Quaternion(-0.607974, 0.192244, 0.159278, 0.753685) +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/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.636043, 2.23772e-08, -2.13547e-08, 0.771653) +bones/5/rotation = Quaternion(0.64589, 2.49867e-08, -1.65369e-08, 0.76343) 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.636747, -0.134009, -0.262501, 0.712522) +bones/8/rotation = Quaternion(-0.63955, -0.130382, -0.244286, 0.717147) 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.43562e-06, -3.15463e-07, -0.505819, 0.86264) +bones/9/rotation = Quaternion(-1.56888e-06, -2.53229e-07, -0.52928, 0.848447) 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.00421036, -0.105617) -bones/11/rotation = Quaternion(-0.753685, 0.159278, -0.192243, 0.607974) +bones/11/position = Vector3(0.327701, 0.00438682, -0.0989702) +bones/11/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) 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.753685, 0.159278, -0.192243, 0.607974) +bones/12/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) 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.679592, 0.461843, 0.244522, 0.514845) +bones/14/rotation = Quaternion(-0.677754, 0.461139, 0.251483, 0.514546) 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.0333e-06, 2.53638e-07, 0.488558, 0.872532) +bones/15/rotation = Quaternion(-2.00292e-06, 2.78858e-07, 0.475317, 0.879815) 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.128557, -0.0319018) -bones/16/rotation = Quaternion(-0.753685, 0.159278, -0.192244, 0.607974) +bones/16/position = Vector3(-0.358609, -0.128686, -0.0367831) +bones/16/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) 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.753685, 0.159278, -0.192243, 0.607974) +bones/17/rotation = Quaternion(-0.755861, 0.151965, -0.183688, 0.609786) 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.0891353, 3.26041e-08, -3.43612e-09, 0.99602) +bones/18/rotation = Quaternion(-0.041098, 3.65798e-08, -1.43497e-08, 0.999155) 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.0310456, 1.21785e-09, 1.32724e-08, 0.999518) +bones/19/rotation = Quaternion(0.15068, -1.39783e-09, -1.68703e-08, 0.988583) 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.213945, -6.941e-09, -4.30992e-09, 0.976846) +bones/20/rotation = Quaternion(0.166686, -1.85944e-09, -1.38362e-08, 0.98601) 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.245662, -5.59292e-09, 6.13994e-09, 0.969356) +bones/21/rotation = Quaternion(0.127648, -1.26351e-08, 4.30914e-10, 0.99182) 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.753686, 0.159278, -0.192243, 0.607972) +bones/22/rotation = Quaternion(-0.755862, 0.151966, -0.183687, 0.609785) 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.326767, -0.333414, -0.160467, 0.86966) +bones/23/rotation = Quaternion(-0.283592, -0.340761, -0.142839, 0.884904) 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.540206, 4.74854e-08, -2.72443e-07, 0.841533) +bones/24/rotation = Quaternion(0.47454, 6.53177e-08, -2.28393e-07, 0.880234) 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.260926, 0.224917, 0.209506, 0.915116) +bones/25/rotation = Quaternion(-0.213886, 0.234083, 0.19185, 0.928791) 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.489128, -5.60148e-08, 2.19699e-07, 0.872212) +bones/26/rotation = Quaternion(0.415183, -3.50262e-08, 1.96514e-07, 0.909738) bones/26/scale = Vector3(1, 0.99997, 1.00006) bones/27/name = "Bone.013" bones/27/parent = -1 diff --git a/scenes/camera.tscn b/scenes/camera.tscn new file mode 100644 index 0000000..73b678e --- /dev/null +++ b/scenes/camera.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=2 format=3 uid="uid://dd7byfyvsblbw"] + +[ext_resource type="Script" path="res://scripts/Camera3D.gd" id="1_a8nwa"] + +[node name="Camera" type="Camera3D"] +transform = Transform3D(1, 0, 0, 0, 0.863519, 0.504317, 0, -0.504317, 0.863519, 0, 0, 0) +script = ExtResource("1_a8nwa") + +[node name="RayCast3D" type="RayCast3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10, 0) +target_position = Vector3(0, -20, 0) +collision_mask = 128 diff --git a/scripts/Board.gd b/scripts/Board.gd index 9d5ff23..99f8628 100644 --- a/scripts/Board.gd +++ b/scripts/Board.gd @@ -6,7 +6,7 @@ const Entity3D = preload("res://scenes/Instance.tscn") @onready var ground = $Ground -@onready var camera =$Camera3D +@onready var camera =$Camera @onready var highlighter = $Highlighter @onready var gridmap = $GridMap diff --git a/scripts/Camera3D.gd b/scripts/Camera3D.gd index eba31ad..5782a26 100644 --- a/scripts/Camera3D.gd +++ b/scripts/Camera3D.gd @@ -2,12 +2,15 @@ extends Camera3D const MOVE_MARGIN = 20 const MOVE_SPEED = 30 +const HEIGHT_OFFSET = 5 @export var min_zoom: float = 10 @export var max_zoom: float = 100 @export var zoom_sensibility: float = 1.4 +@onready var ray = $RayCast3D + func _process(delta): var m_pos = get_viewport().get_mouse_position() calc_move(m_pos, delta) @@ -15,6 +18,10 @@ func _process(delta): zoom(-1000) if Input.is_action_just_released("zoom_out"): zoom(1000) + var height = ray.get_collision_point().y + HEIGHT_OFFSET + if position.y != height: + var tween = get_tree().create_tween() + tween.tween_property(self, "position:y", height, 0.1) func calc_move(m_pos, delta):