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 0000000..a33529d Binary files /dev/null and b/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/643f7bc3ab8403c54e49ba2bd815a9dc3d436dc7.cache differ diff --git a/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/dce9b1c9d699b66995294a4c1abd80a446c5418f.cache b/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/dce9b1c9d699b66995294a4c1abd80a446c5418f.cache new file mode 100644 index 0000000..a94b263 Binary files /dev/null and b/.godot/shader_cache/SkyShaderRD/32e644776a5e9ab00dac4b488ebdfb1c6b8c099fb9ca13e35d927e23ccb264a0/dce9b1c9d699b66995294a4c1abd80a446c5418f.cache differ diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index d1752dc..b2668f6 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ 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):