diff --git a/assets/greyboxing/city.blend b/assets/greyboxing/city.blend new file mode 100644 index 0000000..9038d41 Binary files /dev/null and b/assets/greyboxing/city.blend differ diff --git a/assets/greyboxing/city.blend.import b/assets/greyboxing/city.blend.import new file mode 100644 index 0000000..e8715c1 --- /dev/null +++ b/assets/greyboxing/city.blend.import @@ -0,0 +1,53 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b7w8cn15vsiy0" +path="res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn" + +[deps] + +source_file="res://assets/greyboxing/city.blend" +dest_files=["res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +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/export_geometry_nodes_instances=false +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/assets/greyboxing/city.blend1 b/assets/greyboxing/city.blend1 new file mode 100644 index 0000000..739859c Binary files /dev/null and b/assets/greyboxing/city.blend1 differ diff --git a/maps/city.tscn b/maps/city.tscn index 952f2c5..3756a80 100644 --- a/maps/city.tscn +++ b/maps/city.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=3 uid="uid://dmkw8cmalm5k"] +[gd_scene load_steps=15 format=3 uid="uid://dmkw8cmalm5k"] [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"] [ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"] @@ -10,6 +10,7 @@ [ext_resource type="PackedScene" uid="uid://482s38k0yv35" path="res://maps/Components/stairs.tscn" id="8_pxgdh"] [ext_resource type="PackedScene" uid="uid://cmfagvnymc2yr" path="res://assets/ladder/ladder.fbx" id="9_ukfuy"] [ext_resource type="PackedScene" uid="uid://bod7boex72igr" path="res://assets/ladder/ladder-top.fbx" id="10_wctvs"] +[ext_resource type="PackedScene" uid="uid://b7w8cn15vsiy0" path="res://assets/greyboxing/city.blend" id="11_wctvs"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"] sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) @@ -47,14 +48,11 @@ visible = false [node name="Greybox" type="CSGCombiner3D" parent="."] transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 0, 0, 0) +visible = false use_collision = true collision_layer = 3 collision_mask = 5 -[node name="Map" type="Sprite3D" parent="Greybox"] -transform = Transform3D(5.65685, -5.65685, -2.47269e-08, 0, -3.49691e-07, 0.8, -5.65685, -5.65685, -2.47269e-08, 141.335, 0, -122.33) -texture = ExtResource("3_ruo5i") - [node name="CSGBox3D11" type="CSGBox3D" parent="Greybox"] transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 149.932, -1, -129.284) use_collision = true @@ -1182,3 +1180,9 @@ transform = Transform3D(0.747027, 0, -0.664797, 0, 1, 0, 0.664797, 0, 0.747027, use_collision = true size = Vector3(16, 19, 4.5) material = ExtResource("3_cieeo") + +[node name="Map" type="Sprite3D" parent="."] +transform = Transform3D(0, -8, -3.49691e-08, 0, -3.49691e-07, 0.8, -8, 0, 0, 13.4386, 0, -186.439) +texture = ExtResource("3_ruo5i") + +[node name="city" parent="." instance=ExtResource("11_wctvs")]