diff --git a/asset_dev/.gdignore b/asset_dev/.gdignore new file mode 100644 index 0000000..e69de29 diff --git a/asset_dev/arrow.blend.import b/asset_dev/arrow.blend.import deleted file mode 100644 index 69ebbf2..0000000 --- a/asset_dev/arrow.blend.import +++ /dev/null @@ -1,51 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://byrygy8j6yeur" -path="res://.godot/imported/arrow.blend-1949ba7817111c1571d46022071c640d.scn" - -[deps] - -source_file="res://asset_dev/arrow.blend" -dest_files=["res://.godot/imported/arrow.blend-1949ba7817111c1571d46022071c640d.scn"] - -[params] - -nodes/root_type="" -nodes/root_name="" -nodes/apply_root_scale=true -nodes/root_scale=1.0 -nodes/import_as_skeleton_bones=false -meshes/ensure_tangents=true -meshes/generate_lods=true -meshes/create_shadow_meshes=true -meshes/light_baking=1 -meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false -skins/use_named_skins=true -animation/import=true -animation/fps=30 -animation/trimming=false -animation/remove_immutable_tracks=true -animation/import_rest_as_RESET=false -import_script/path="" -_subresources={} -blender/nodes/visible=0 -blender/nodes/active_collection_only=false -blender/nodes/punctual_lights=true -blender/nodes/cameras=true -blender/nodes/custom_properties=true -blender/nodes/modifiers=1 -blender/meshes/colors=false -blender/meshes/uvs=true -blender/meshes/normals=true -blender/meshes/tangents=true -blender/meshes/skins=2 -blender/meshes/export_bones_deforming_mesh_only=false -blender/materials/unpack_enabled=true -blender/materials/export_materials=1 -blender/animation/limit_playback=true -blender/animation/always_sample=true -blender/animation/group_tracks=true diff --git a/asset_dev/concrete_building_1.blend b/asset_dev/concrete_building_1.blend new file mode 100644 index 0000000..75b9d45 --- /dev/null +++ b/asset_dev/concrete_building_1.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ad08124b6f76cb818f7457166c586d51b37bb967425451378bdb8023ba007cb +size 1090160 diff --git a/asset_dev/concrete_building_1.blend1 b/asset_dev/concrete_building_1.blend1 new file mode 100644 index 0000000..3fa6590 Binary files /dev/null and b/asset_dev/concrete_building_1.blend1 differ diff --git a/asset_dev/concrete_building_1.xcf b/asset_dev/concrete_building_1.xcf new file mode 100644 index 0000000..0d27f6a Binary files /dev/null and b/asset_dev/concrete_building_1.xcf differ diff --git a/asset_dev/concrete_building_1/concrete_building_1.png b/asset_dev/concrete_building_1/concrete_building_1.png new file mode 100644 index 0000000..9f73200 --- /dev/null +++ b/asset_dev/concrete_building_1/concrete_building_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:443247db0240d65cbb443006ad4733da458aa747a35ca0cc09d456382465a5be +size 5748 diff --git a/asset_dev/concrete_building_1/concrete_building_1_doors.png b/asset_dev/concrete_building_1/concrete_building_1_doors.png new file mode 100644 index 0000000..ed11bc4 --- /dev/null +++ b/asset_dev/concrete_building_1/concrete_building_1_doors.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c0e0b98cb3b569aff94f3621147d5ad0e03e89b9be264138307de658b50869c +size 5237 diff --git a/asset_dev/concrete_building_1/concrete_building_1_lower.png b/asset_dev/concrete_building_1/concrete_building_1_lower.png new file mode 100644 index 0000000..96b0968 --- /dev/null +++ b/asset_dev/concrete_building_1/concrete_building_1_lower.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7de8ac187b0681f2f2c42c708a3e827ec4d1d9b8c8c4f0e87d19a3b75eaeeba1 +size 6181 diff --git a/asset_dev/concrete_building_1/corrugated_iron_roof.png b/asset_dev/concrete_building_1/corrugated_iron_roof.png new file mode 100644 index 0000000..654c1e6 --- /dev/null +++ b/asset_dev/concrete_building_1/corrugated_iron_roof.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd3a31d803bf8b0e7cf8023440471d3d19ae7a840379fe3bf737c7230b5374ec +size 823 diff --git a/asset_dev/concrete_building_2.blend b/asset_dev/concrete_building_2.blend new file mode 100644 index 0000000..9b8bb61 --- /dev/null +++ b/asset_dev/concrete_building_2.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f9a978cb71f858f546358e86e74cc64d2b2cad1a757c0131af7a344d587d0cd +size 1088464 diff --git a/asset_dev/concrete_building_2.blend1 b/asset_dev/concrete_building_2.blend1 new file mode 100644 index 0000000..fcd8d90 Binary files /dev/null and b/asset_dev/concrete_building_2.blend1 differ diff --git a/asset_dev/concrete_building_doors.xcf b/asset_dev/concrete_building_doors.xcf new file mode 100644 index 0000000..da01673 Binary files /dev/null and b/asset_dev/concrete_building_doors.xcf differ diff --git a/asset_dev/corrugated_iron_roof.xcf b/asset_dev/corrugated_iron_roof.xcf new file mode 100644 index 0000000..8ece4b7 Binary files /dev/null and b/asset_dev/corrugated_iron_roof.xcf differ diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1.bin b/assets/models/scenery/city/concrete_building_1/concrete_building_1.bin new file mode 100644 index 0000000..080a552 Binary files /dev/null and b/assets/models/scenery/city/concrete_building_1/concrete_building_1.bin differ diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf b/assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf new file mode 100644 index 0000000..7a9cee9 --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf @@ -0,0 +1,319 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.60", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"Building", + "scale":[ + 8, + 4, + 8 + ], + "translation":[ + 0, + 4, + 0 + ] + } + ], + "materials":[ + { + "doubleSided":true, + "name":"UpperMaterial", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":0 + }, + "metallicFactor":0 + } + }, + { + "doubleSided":true, + "name":"LowerMaterial", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":1 + }, + "metallicFactor":0 + } + }, + { + "doubleSided":true, + "name":"Doors", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":2 + }, + "metallicFactor":0, + "roughnessFactor":0.5 + } + } + ], + "meshes":[ + { + "name":"Cube", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2 + }, + "indices":3, + "material":0 + }, + { + "attributes":{ + "POSITION":4, + "NORMAL":5, + "TEXCOORD_0":6 + }, + "indices":7, + "material":1 + }, + { + "attributes":{ + "POSITION":8, + "NORMAL":9, + "TEXCOORD_0":10 + }, + "indices":11, + "material":2 + } + ] + } + ], + "textures":[ + { + "sampler":0, + "source":0 + }, + { + "sampler":0, + "source":1 + }, + { + "sampler":0, + "source":2 + } + ], + "images":[ + { + "mimeType":"image/png", + "name":"concrete_building_1", + "uri":"concrete_building_1.png" + }, + { + "mimeType":"image/png", + "name":"concrete_building_1_lower", + "uri":"concrete_building_1_lower.png" + }, + { + "mimeType":"image/png", + "name":"concrete_building_1_doors", + "uri":"concrete_building_1_doors.png" + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":16, + "max":[ + 1, + 5, + 1 + ], + "min":[ + -1, + 1, + -1 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":16, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":16, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5123, + "count":24, + "type":"SCALAR" + }, + { + "bufferView":4, + "componentType":5126, + "count":20, + "max":[ + 1, + 5, + 1 + ], + "min":[ + -1, + -1, + -1 + ], + "type":"VEC3" + }, + { + "bufferView":5, + "componentType":5126, + "count":20, + "type":"VEC3" + }, + { + "bufferView":6, + "componentType":5126, + "count":20, + "type":"VEC2" + }, + { + "bufferView":7, + "componentType":5123, + "count":30, + "type":"SCALAR" + }, + { + "bufferView":8, + "componentType":5126, + "count":4, + "max":[ + 1, + 1, + 1 + ], + "min":[ + -1, + -1, + 1 + ], + "type":"VEC3" + }, + { + "bufferView":9, + "componentType":5126, + "count":4, + "type":"VEC3" + }, + { + "bufferView":10, + "componentType":5126, + "count":4, + "type":"VEC2" + }, + { + "bufferView":11, + "componentType":5123, + "count":6, + "type":"SCALAR" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":192, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":192, + "byteOffset":192, + "target":34962 + }, + { + "buffer":0, + "byteLength":128, + "byteOffset":384, + "target":34962 + }, + { + "buffer":0, + "byteLength":48, + "byteOffset":512, + "target":34963 + }, + { + "buffer":0, + "byteLength":240, + "byteOffset":560, + "target":34962 + }, + { + "buffer":0, + "byteLength":240, + "byteOffset":800, + "target":34962 + }, + { + "buffer":0, + "byteLength":160, + "byteOffset":1040, + "target":34962 + }, + { + "buffer":0, + "byteLength":60, + "byteOffset":1200, + "target":34963 + }, + { + "buffer":0, + "byteLength":48, + "byteOffset":1260, + "target":34962 + }, + { + "buffer":0, + "byteLength":48, + "byteOffset":1308, + "target":34962 + }, + { + "buffer":0, + "byteLength":32, + "byteOffset":1356, + "target":34962 + }, + { + "buffer":0, + "byteLength":12, + "byteOffset":1388, + "target":34963 + } + ], + "samplers":[ + { + "magFilter":9728, + "minFilter":9984 + } + ], + "buffers":[ + { + "byteLength":1400, + "uri":"concrete_building_1.bin" + } + ] +} diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf.import b/assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf.import new file mode 100644 index 0000000..61d020d --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://mhycq1tk1bpm" +path="res://.godot/imported/concrete_building_1.gltf-84d219d30344fe17dcda274c2e11fd55.scn" + +[deps] + +source_file="res://assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf" +dest_files=["res://.godot/imported/concrete_building_1.gltf-84d219d30344fe17dcda274c2e11fd55.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1.png b/assets/models/scenery/city/concrete_building_1/concrete_building_1.png new file mode 100644 index 0000000..9f73200 --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:443247db0240d65cbb443006ad4733da458aa747a35ca0cc09d456382465a5be +size 5748 diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1.png.import b/assets/models/scenery/city/concrete_building_1/concrete_building_1.png.import new file mode 100644 index 0000000..9f56a46 --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dj60e8ri2fco" +path="res://.godot/imported/concrete_building_1.png-651f43a2a3f1436757c2a40347d0d83a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/models/scenery/city/concrete_building_1/concrete_building_1.png" +dest_files=["res://.godot/imported/concrete_building_1.png-651f43a2a3f1436757c2a40347d0d83a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1_doors.png b/assets/models/scenery/city/concrete_building_1/concrete_building_1_doors.png new file mode 100644 index 0000000..ed11bc4 --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1_doors.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c0e0b98cb3b569aff94f3621147d5ad0e03e89b9be264138307de658b50869c +size 5237 diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1_doors.png.import b/assets/models/scenery/city/concrete_building_1/concrete_building_1_doors.png.import new file mode 100644 index 0000000..b663bac --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1_doors.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://quv2sjch7bqi" +path="res://.godot/imported/concrete_building_1_doors.png-a4633d8c31799cfc7c34f5051194e1dc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/models/scenery/city/concrete_building_1/concrete_building_1_doors.png" +dest_files=["res://.godot/imported/concrete_building_1_doors.png-a4633d8c31799cfc7c34f5051194e1dc.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=true +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=0 diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1_lower.png b/assets/models/scenery/city/concrete_building_1/concrete_building_1_lower.png new file mode 100644 index 0000000..96b0968 --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1_lower.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7de8ac187b0681f2f2c42c708a3e827ec4d1d9b8c8c4f0e87d19a3b75eaeeba1 +size 6181 diff --git a/assets/models/scenery/city/concrete_building_1/concrete_building_1_lower.png.import b/assets/models/scenery/city/concrete_building_1/concrete_building_1_lower.png.import new file mode 100644 index 0000000..0cf7564 --- /dev/null +++ b/assets/models/scenery/city/concrete_building_1/concrete_building_1_lower.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bmd47c1rjkqi4" +path="res://.godot/imported/concrete_building_1_lower.png-eb9c9976869c7bd91f14725d210a970c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/models/scenery/city/concrete_building_1/concrete_building_1_lower.png" +dest_files=["res://.godot/imported/concrete_building_1_lower.png-eb9c9976869c7bd91f14725d210a970c.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=true +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=0 diff --git a/assets/textures/concrete_building_1/concrete_building_1.png b/assets/textures/concrete_building_1/concrete_building_1.png new file mode 100644 index 0000000..9f73200 --- /dev/null +++ b/assets/textures/concrete_building_1/concrete_building_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:443247db0240d65cbb443006ad4733da458aa747a35ca0cc09d456382465a5be +size 5748 diff --git a/assets/textures/concrete_building_1/concrete_building_1.png.import b/assets/textures/concrete_building_1/concrete_building_1.png.import new file mode 100644 index 0000000..16a5b26 --- /dev/null +++ b/assets/textures/concrete_building_1/concrete_building_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bq3mji3mogsjy" +path="res://.godot/imported/concrete_building_1.png-0e1ef85c387bc0098cd8172e72685d4a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/concrete_building_1/concrete_building_1.png" +dest_files=["res://.godot/imported/concrete_building_1.png-0e1ef85c387bc0098cd8172e72685d4a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/assets/textures/concrete_building_1/concrete_building_1_lower.png b/assets/textures/concrete_building_1/concrete_building_1_lower.png new file mode 100644 index 0000000..0c52b7b --- /dev/null +++ b/assets/textures/concrete_building_1/concrete_building_1_lower.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a101306f25978ceb948f030ab1d711e329ec9b40dd8000148fa774be24ae26a8 +size 793 diff --git a/assets/textures/concrete_building_1/concrete_building_1_lower.png.import b/assets/textures/concrete_building_1/concrete_building_1_lower.png.import new file mode 100644 index 0000000..76f1a10 --- /dev/null +++ b/assets/textures/concrete_building_1/concrete_building_1_lower.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cauvebw3slacj" +path.bptc="res://.godot/imported/concrete_building_1_lower.png-45bbd959e1dd11a9b930268c076a98e3.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/concrete_building_1/concrete_building_1_lower.png" +dest_files=["res://.godot/imported/concrete_building_1_lower.png-45bbd959e1dd11a9b930268c076a98e3.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/levels/debug_level/debug_level.tscn b/levels/debug_level/debug_level.tscn index 097f344..6bfb468 100644 --- a/levels/debug_level/debug_level.tscn +++ b/levels/debug_level/debug_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://bm2o3mex10v11"] +[gd_scene load_steps=27 format=3 uid="uid://bm2o3mex10v11"] [ext_resource type="Terrain3DStorage" uid="uid://bu1gewgsgc5hm" path="res://levels/debug_level/terrain_3d_storage.res" id="1_nlsu2"] [ext_resource type="Texture2D" path="res://assets/textures/grass_fairway/grass_fairway_albedo.dds" id="2_e4m27"] @@ -9,6 +9,7 @@ [ext_resource type="Shader" path="res://src/shaders/psx_water.gdshader" id="6_0efu4"] [ext_resource type="Texture2D" uid="uid://con5a36t6n6sq" path="res://assets/textures/clear_sea_water_2048x2048.png" id="7_t86h2"] [ext_resource type="PackedScene" uid="uid://cy7t2tc4y3b4" path="res://src/player/shot_setup/shot_setup.tscn" id="8_h44v5"] +[ext_resource type="PackedScene" uid="uid://dagh38vap4t1d" path="res://src/scenery/city/concrete_building_1.tscn" id="10_lf15j"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_rpgb7"] noise_type = 0 @@ -68,13 +69,14 @@ texture_list = Array[Terrain3DTextureAsset]([SubResource("Terrain3DTextureAsset_ [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_h8tes"] panorama = ExtResource("3_f2t2n") -[sub_resource type="Sky" id="Sky_68xob"] +[sub_resource type="Sky" id="Sky_2xshh"] sky_material = SubResource("PanoramaSkyMaterial_h8tes") [sub_resource type="Environment" id="Environment_k6wwx"] background_mode = 2 -sky = SubResource("Sky_68xob") +sky = SubResource("Sky_2xshh") ambient_light_source = 2 +ambient_light_color = Color(0.838897, 0.838897, 0.838897, 1) volumetric_fog_enabled = true volumetric_fog_density = 0.005 volumetric_fog_emission = Color(0, 1, 1, 1) @@ -126,7 +128,7 @@ assets = SubResource("Terrain3DAssets_eq5uw") environment = SubResource("Environment_k6wwx") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, -0.149535, 0.988756, 0, -0.988756, -0.149535, 0, 0, 0) +transform = Transform3D(1, 0, 0, 0, 0.29404, 0.955793, 0, -0.955793, 0.29404, 0, 0, 0) [node name="Player" type="MeshInstance3D" parent="."] transform = Transform3D(-0.480912, 0, -0.876769, 0, 1, 0, 0.876769, 0, -0.480912, 222.404, 5, 265.619) @@ -137,4 +139,16 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0) mesh = SubResource("PlaneMesh_2ywhk") [node name="ShotSetup" parent="." instance=ExtResource("8_h44v5")] -transform = Transform3D(-0.82092, 0, -0.571043, 0, 1, 0, 0.571043, 0, -0.82092, 218.499, 4.5, 294.341) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 218.499, 4.5, 294.341) + +[node name="Buildings" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 129.404, -9.53674e-07, 309.4) + +[node name="ConcreteBuilding1" parent="Buildings" instance=ExtResource("10_lf15j")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0) + +[node name="ConcreteBuilding2" parent="Buildings" instance=ExtResource("10_lf15j")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 20) + +[node name="ConcreteBuilding3" parent="Buildings" instance=ExtResource("10_lf15j")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 40) diff --git a/project.godot b/project.godot index 9deef79..df21ffd 100644 --- a/project.godot +++ b/project.godot @@ -145,7 +145,7 @@ select_putter={ [physics] -3d/default_angular_damp=5.0 +3d/default_angular_damp=2.0 3d/sleep_threshold_angular=0.3 [rendering] diff --git a/src/scenery/city/concrete_building_1.tscn b/src/scenery/city/concrete_building_1.tscn new file mode 100644 index 0000000..deb487f --- /dev/null +++ b/src/scenery/city/concrete_building_1.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=3 format=3 uid="uid://dagh38vap4t1d"] + +[ext_resource type="PackedScene" uid="uid://mhycq1tk1bpm" path="res://assets/models/scenery/city/concrete_building_1/concrete_building_1.gltf" id="1_id6ph"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_5g4vq"] +size = Vector3(16, 24, 16) + +[node name="ConcreteBuilding1" instance=ExtResource("1_id6ph")] + +[node name="StaticBody3D" type="StaticBody3D" parent="." index="1"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 12, 0) +shape = SubResource("BoxShape3D_5g4vq") diff --git a/src/ui/main_theme.tres b/src/ui/main_theme.tres index 202f0b6..0531677 100644 --- a/src/ui/main_theme.tres +++ b/src/ui/main_theme.tres @@ -15,7 +15,10 @@ font_weight = 800 ClubSelectLabel/base_type = &"Label" ClubSelectLabel/colors/font_color = Color(1, 0.933333, 0.894118, 1) ClubSelectLabel/colors/font_outline_color = Color(0, 0, 0, 1) +ClubSelectLabel/colors/font_shadow_color = Color(0, 0, 0, 1) ClubSelectLabel/constants/outline_size = 2 +ClubSelectLabel/constants/shadow_offset_x = 2 +ClubSelectLabel/constants/shadow_offset_y = 0 ClubSelectLabel/font_sizes/font_size = 28 ClubSelectLabel/fonts/font = SubResource("SystemFont_dpm3o") ShotFeedback/base_type = &"Label"