diff --git a/asset_dev/arrow.blend b/asset_dev/arrow/arrow.blend similarity index 100% rename from asset_dev/arrow.blend rename to asset_dev/arrow/arrow.blend diff --git a/asset_dev/arrow.blend1 b/asset_dev/arrow/arrow.blend1 similarity index 100% rename from asset_dev/arrow.blend1 rename to asset_dev/arrow/arrow.blend1 diff --git a/asset_dev/concrete_building/concrete_building_1.blend b/asset_dev/concrete_building/concrete_building_1.blend new file mode 100644 index 0000000..4e29f43 --- /dev/null +++ b/asset_dev/concrete_building/concrete_building_1.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a21dae2269930150cdf12f6e5faea2b968692bc449be5d7e3f06dbbc3090c154 +size 1090160 diff --git a/asset_dev/concrete_building_1.blend1 b/asset_dev/concrete_building/concrete_building_1.blend1 similarity index 98% rename from asset_dev/concrete_building_1.blend1 rename to asset_dev/concrete_building/concrete_building_1.blend1 index 3fa6590..5ff6ca7 100644 Binary files a/asset_dev/concrete_building_1.blend1 and b/asset_dev/concrete_building/concrete_building_1.blend1 differ diff --git a/asset_dev/concrete_building_1/concrete_building_1.png b/asset_dev/concrete_building/concrete_building_1.png similarity index 100% rename from asset_dev/concrete_building_1/concrete_building_1.png rename to asset_dev/concrete_building/concrete_building_1.png diff --git a/asset_dev/concrete_building_1.xcf b/asset_dev/concrete_building/concrete_building_1.xcf similarity index 100% rename from asset_dev/concrete_building_1.xcf rename to asset_dev/concrete_building/concrete_building_1.xcf diff --git a/asset_dev/concrete_building_1/concrete_building_1_doors.png b/asset_dev/concrete_building/concrete_building_1_doors.png similarity index 100% rename from asset_dev/concrete_building_1/concrete_building_1_doors.png rename to asset_dev/concrete_building/concrete_building_1_doors.png diff --git a/asset_dev/concrete_building_1/concrete_building_1_lower.png b/asset_dev/concrete_building/concrete_building_1_lower.png similarity index 100% rename from asset_dev/concrete_building_1/concrete_building_1_lower.png rename to asset_dev/concrete_building/concrete_building_1_lower.png diff --git a/asset_dev/concrete_building_2.blend b/asset_dev/concrete_building/concrete_building_2.blend similarity index 100% rename from asset_dev/concrete_building_2.blend rename to asset_dev/concrete_building/concrete_building_2.blend diff --git a/asset_dev/concrete_building_2.blend1 b/asset_dev/concrete_building/concrete_building_2.blend1 similarity index 100% rename from asset_dev/concrete_building_2.blend1 rename to asset_dev/concrete_building/concrete_building_2.blend1 diff --git a/asset_dev/concrete_building_doors.xcf b/asset_dev/concrete_building/concrete_building_doors.xcf similarity index 97% rename from asset_dev/concrete_building_doors.xcf rename to asset_dev/concrete_building/concrete_building_doors.xcf index da01673..69ba53f 100644 Binary files a/asset_dev/concrete_building_doors.xcf and b/asset_dev/concrete_building/concrete_building_doors.xcf differ diff --git a/asset_dev/concrete_building_1/corrugated_iron_roof.png b/asset_dev/concrete_building/corrugated_iron_roof.png similarity index 100% rename from asset_dev/concrete_building_1/corrugated_iron_roof.png rename to asset_dev/concrete_building/corrugated_iron_roof.png diff --git a/asset_dev/corrugated_iron_roof.xcf b/asset_dev/concrete_building/corrugated_iron_roof.xcf similarity index 98% rename from asset_dev/corrugated_iron_roof.xcf rename to asset_dev/concrete_building/corrugated_iron_roof.xcf index 8ece4b7..9532132 100644 Binary files a/asset_dev/corrugated_iron_roof.xcf and b/asset_dev/concrete_building/corrugated_iron_roof.xcf differ diff --git a/asset_dev/concrete_building_1.blend b/asset_dev/concrete_building_1.blend deleted file mode 100644 index 75b9d45..0000000 --- a/asset_dev/concrete_building_1.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ad08124b6f76cb818f7457166c586d51b37bb967425451378bdb8023ba007cb -size 1090160 diff --git a/asset_dev/kana_signboard/kana_signboard.blend b/asset_dev/kana_signboard/kana_signboard.blend new file mode 100644 index 0000000..a3ca292 --- /dev/null +++ b/asset_dev/kana_signboard/kana_signboard.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3a0b32755ef2fbc4c5ce5f929c5546d133324c0048f78afafff0a7ad779a6d3 +size 995200 diff --git a/asset_dev/kana_signboard/kana_signboard.blend1 b/asset_dev/kana_signboard/kana_signboard.blend1 new file mode 100644 index 0000000..ac60cdb Binary files /dev/null and b/asset_dev/kana_signboard/kana_signboard.blend1 differ diff --git a/asset_dev/kana_signboard/kana_signboard.png b/asset_dev/kana_signboard/kana_signboard.png new file mode 100644 index 0000000..5627909 --- /dev/null +++ b/asset_dev/kana_signboard/kana_signboard.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1264191293783d4db86c7542aca4aadab12029247834b4adecc8e17858e3f01c +size 1182 diff --git a/asset_dev/kana_signboard/kana_signboard.xcf b/asset_dev/kana_signboard/kana_signboard.xcf new file mode 100644 index 0000000..9ea2eb9 Binary files /dev/null and b/asset_dev/kana_signboard/kana_signboard.xcf differ diff --git a/assets/models/scenery/city/kana_signboard/kana_signboard.bin b/assets/models/scenery/city/kana_signboard/kana_signboard.bin new file mode 100644 index 0000000..12df531 Binary files /dev/null and b/assets/models/scenery/city/kana_signboard/kana_signboard.bin differ diff --git a/assets/models/scenery/city/kana_signboard/kana_signboard.gltf b/assets/models/scenery/city/kana_signboard/kana_signboard.gltf new file mode 100644 index 0000000..77bfd81 --- /dev/null +++ b/assets/models/scenery/city/kana_signboard/kana_signboard.gltf @@ -0,0 +1,303 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.60", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0, + 1, + 2 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"Signboard" + }, + { + "mesh":1, + "name":"Arm", + "translation":[ + 0, + 0, + 2 + ] + }, + { + "mesh":2, + "name":"Arm.001", + "translation":[ + 0, + -3, + 2 + ] + } + ], + "materials":[ + { + "doubleSided":true, + "name":"Signboard", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":0 + }, + "metallicFactor":0, + "roughnessFactor":0.800000011920929 + } + }, + { + "doubleSided":true, + "name":"ArmMetal", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.010329755954444408, + 0.006048833951354027, + 0.013702086172997952, + 1 + ], + "metallicFactor":0, + "roughnessFactor":0.75 + } + } + ], + "meshes":[ + { + "name":"Cube", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2 + }, + "indices":3, + "material":0 + } + ] + }, + { + "name":"Cube.001", + "primitives":[ + { + "attributes":{ + "POSITION":4, + "NORMAL":5, + "TEXCOORD_0":6 + }, + "indices":7, + "material":1 + } + ] + }, + { + "name":"Cube.002", + "primitives":[ + { + "attributes":{ + "POSITION":8, + "NORMAL":9, + "TEXCOORD_0":10 + }, + "indices":7, + "material":1 + } + ] + } + ], + "textures":[ + { + "sampler":0, + "source":0 + } + ], + "images":[ + { + "mimeType":"image/png", + "name":"kana_signboard", + "uri":"kana_signboard.png" + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":24, + "max":[ + 0.125, + 2, + 1 + ], + "min":[ + -0.125, + -2, + -1 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":24, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":24, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5123, + "count":36, + "type":"SCALAR" + }, + { + "bufferView":4, + "componentType":5126, + "count":24, + "max":[ + 0.050000011920928955, + 1.5499999523162842, + -0.6000000238418579 + ], + "min":[ + -0.050000011920928955, + 1.4500000476837158, + -1 + ], + "type":"VEC3" + }, + { + "bufferView":5, + "componentType":5126, + "count":24, + "type":"VEC3" + }, + { + "bufferView":6, + "componentType":5126, + "count":24, + "type":"VEC2" + }, + { + "bufferView":7, + "componentType":5123, + "count":36, + "type":"SCALAR" + }, + { + "bufferView":8, + "componentType":5126, + "count":24, + "max":[ + 0.050000011920928955, + 1.5499999523162842, + -0.6000000238418579 + ], + "min":[ + -0.050000011920928955, + 1.4500000476837158, + -1 + ], + "type":"VEC3" + }, + { + "bufferView":9, + "componentType":5126, + "count":24, + "type":"VEC3" + }, + { + "bufferView":10, + "componentType":5126, + "count":24, + "type":"VEC2" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":288, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":288, + "byteOffset":288, + "target":34962 + }, + { + "buffer":0, + "byteLength":192, + "byteOffset":576, + "target":34962 + }, + { + "buffer":0, + "byteLength":72, + "byteOffset":768, + "target":34963 + }, + { + "buffer":0, + "byteLength":288, + "byteOffset":840, + "target":34962 + }, + { + "buffer":0, + "byteLength":288, + "byteOffset":1128, + "target":34962 + }, + { + "buffer":0, + "byteLength":192, + "byteOffset":1416, + "target":34962 + }, + { + "buffer":0, + "byteLength":72, + "byteOffset":1608, + "target":34963 + }, + { + "buffer":0, + "byteLength":288, + "byteOffset":1680, + "target":34962 + }, + { + "buffer":0, + "byteLength":288, + "byteOffset":1968, + "target":34962 + }, + { + "buffer":0, + "byteLength":192, + "byteOffset":2256, + "target":34962 + } + ], + "samplers":[ + { + "magFilter":9728, + "minFilter":9984 + } + ], + "buffers":[ + { + "byteLength":2448, + "uri":"kana_signboard.bin" + } + ] +} diff --git a/assets/models/scenery/city/kana_signboard/kana_signboard.gltf.import b/assets/models/scenery/city/kana_signboard/kana_signboard.gltf.import new file mode 100644 index 0000000..6ce41a2 --- /dev/null +++ b/assets/models/scenery/city/kana_signboard/kana_signboard.gltf.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://hwc1px831dgm" +path="res://.godot/imported/kana_signboard.gltf-73c3e014b8ad17e3e2e60741b101a04d.scn" + +[deps] + +source_file="res://assets/models/scenery/city/kana_signboard/kana_signboard.gltf" +dest_files=["res://.godot/imported/kana_signboard.gltf-73c3e014b8ad17e3e2e60741b101a04d.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/kana_signboard/kana_signboard.png b/assets/models/scenery/city/kana_signboard/kana_signboard.png new file mode 100644 index 0000000..5627909 --- /dev/null +++ b/assets/models/scenery/city/kana_signboard/kana_signboard.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1264191293783d4db86c7542aca4aadab12029247834b4adecc8e17858e3f01c +size 1182 diff --git a/assets/models/scenery/city/kana_signboard/kana_signboard.png.import b/assets/models/scenery/city/kana_signboard/kana_signboard.png.import new file mode 100644 index 0000000..65f9ef9 --- /dev/null +++ b/assets/models/scenery/city/kana_signboard/kana_signboard.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d0lsrrx0r5wnu" +path="res://.godot/imported/kana_signboard.png-df5c2bac4af401b9119c5caf6808262a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/models/scenery/city/kana_signboard/kana_signboard.png" +dest_files=["res://.godot/imported/kana_signboard.png-df5c2bac4af401b9119c5caf6808262a.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/levels/debug_level/debug_level.tscn b/levels/debug_level/debug_level.tscn index 6bfb468..af0a692 100644 --- a/levels/debug_level/debug_level.tscn +++ b/levels/debug_level/debug_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://bm2o3mex10v11"] +[gd_scene load_steps=28 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"] @@ -10,6 +10,7 @@ [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"] +[ext_resource type="PackedScene" uid="uid://cjubxs7peir5k" path="res://src/scenery/city/kana_signboard.tscn" id="11_evxup"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_rpgb7"] noise_type = 0 @@ -147,6 +148,9 @@ 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="kana_signboard" parent="Buildings/ConcreteBuilding1" instance=ExtResource("11_evxup")] +transform = Transform3D(-8.74228e-08, 0, -2, 0, 2, 0, 2, 0, -8.74228e-08, 10.8, 12, 7) + [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) diff --git a/src/scenery/city/kana_signboard.tscn b/src/scenery/city/kana_signboard.tscn new file mode 100644 index 0000000..0264d7f --- /dev/null +++ b/src/scenery/city/kana_signboard.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=3 format=3 uid="uid://cjubxs7peir5k"] + +[ext_resource type="PackedScene" uid="uid://hwc1px831dgm" path="res://assets/models/scenery/city/kana_signboard/kana_signboard.gltf" id="1_o4tvg"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_kp4b0"] +size = Vector3(0.1, 0.1, 0.4) + +[node name="kana_signboard" instance=ExtResource("1_o4tvg")] + +[node name="StaticBody3D" type="StaticBody3D" parent="." index="3"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"] +shape = SubResource("BoxShape3D_kp4b0") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D" index="1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 1.2) +shape = SubResource("BoxShape3D_kp4b0") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D" index="2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.5, 1.2) +shape = SubResource("BoxShape3D_kp4b0")