From d40c9af92fbf2b6fe9929f61c5d7255e76e2bdf9 Mon Sep 17 00:00:00 2001 From: karl Date: Mon, 18 Nov 2019 18:31:34 +0100 Subject: [PATCH] Move factory to own scene --- Level/Buildings/Factory.tscn | 24 ++++++++++++++++++++++ Level/World.tscn | 40 +++++++++--------------------------- 2 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 Level/Buildings/Factory.tscn diff --git a/Level/Buildings/Factory.tscn b/Level/Buildings/Factory.tscn new file mode 100644 index 0000000..67ebc89 --- /dev/null +++ b/Level/Buildings/Factory.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=2 format=2] + +[sub_resource type="CylinderMesh" id=4] +top_radius = 20.0 +bottom_radius = 35.0 +height = 100.0 + +[node name="Factory" type="Spatial"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -185, 0, -191 ) + +[node name="MeshInstance" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 50, 0 ) +mesh = SubResource( 4 ) +material/0 = null + +[node name="MeshInstance2" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 50, 60 ) +mesh = SubResource( 4 ) +material/0 = null + +[node name="MeshInstance3" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 50, -60 ) +mesh = SubResource( 4 ) +material/0 = null diff --git a/Level/World.tscn b/Level/World.tscn index dfa4703..ed0c7ff 100644 --- a/Level/World.tscn +++ b/Level/World.tscn @@ -5,25 +5,21 @@ [ext_resource path="res://Level/Buildings/PlayerHouse.tscn" type="PackedScene" id=3] [ext_resource path="res://Level/Buildings/BuildingBlock.tscn" type="PackedScene" id=4] [ext_resource path="res://Level/Buildings/MeldewesenHome.tscn" type="PackedScene" id=5] +[ext_resource path="res://Level/Buildings/Factory.tscn" type="PackedScene" id=6] [sub_resource type="PlaneMesh" id=1] size = Vector2( 500, 500 ) -[sub_resource type="ConcavePolygonShape" id=5] +[sub_resource type="ConcavePolygonShape" id=2] data = PoolVector3Array( 250, 0, 250, -250, 0, 250, 250, 0, -250, -250, 0, 250, -250, 0, -250, 250, 0, -250 ) -[sub_resource type="NavigationMesh" id=6] +[sub_resource type="NavigationMesh" id=3] -[sub_resource type="CylinderMesh" id=9] -top_radius = 20.0 -bottom_radius = 35.0 -height = 100.0 +[sub_resource type="ProceduralSky" id=5] -[sub_resource type="ProceduralSky" id=7] - -[sub_resource type="Environment" id=8] +[sub_resource type="Environment" id=6] background_mode = 2 -background_sky = SubResource( 7 ) +background_sky = SubResource( 5 ) [node name="World" type="Navigation"] @@ -35,7 +31,7 @@ material/0 = null [node name="StaticBody" type="StaticBody" parent="Ground"] [node name="CollisionShape" type="CollisionShape" parent="Ground/StaticBody"] -shape = SubResource( 5 ) +shape = SubResource( 2 ) [node name="Player" parent="." instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 7 ) @@ -44,7 +40,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 7 ) transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 15.0831, 1.63203, 88.0992 ) [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] -navmesh = SubResource( 6 ) +navmesh = SubResource( 3 ) [node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 3 )] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 13, 0, 14 ) @@ -206,28 +202,12 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46, 0, -88 ) [node name="BuildingBlock23" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 73, 0, -88 ) -[node name="Factory" type="Spatial" parent="NavigationMeshInstance"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -185, 0, -191 ) - -[node name="MeshInstance" type="MeshInstance" parent="NavigationMeshInstance/Factory"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 50, 0 ) -mesh = SubResource( 9 ) -material/0 = null - -[node name="MeshInstance2" type="MeshInstance" parent="NavigationMeshInstance/Factory"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 50, 60 ) -mesh = SubResource( 9 ) -material/0 = null - -[node name="MeshInstance3" type="MeshInstance" parent="NavigationMeshInstance/Factory"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 50, -60 ) -mesh = SubResource( 9 ) -material/0 = null +[node name="Factory" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 6 )] [node name="Environment" type="Spatial" parent="."] [node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"] -environment = SubResource( 8 ) +environment = SubResource( 6 ) [node name="DirectionalLight" type="DirectionalLight" parent="Environment"] transform = Transform( 0.642788, -0.262003, -0.719846, 0, -0.939693, 0.34202, -0.766044, -0.219846, -0.604023, 0, 7, 0 )