This commit is contained in:
karl 2019-11-23 17:09:55 +01:00
parent 14f645f245
commit f360cb69c7
8 changed files with 1117 additions and 24 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://Level/Objects/LargeWall.tscn" type="PackedScene" id=1] [ext_resource path="res://Level/Objects/LargeWall.tscn" type="PackedScene" id=1]
[ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=2] [ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=2]
[ext_resource path="res://Level/Objects/Roof.tscn" type="PackedScene" id=3]
[node name="LongBuilding" type="Spatial"] [node name="LongBuilding" type="Spatial"]
@ -66,3 +67,6 @@ transform = Transform( -4.37114e-08, 0, -0.7, 0, 1, 0, 1, 0, -3.0598e-08, -31.50
[node name="Wall8" parent="Walls" instance=ExtResource( 2 )] [node name="Wall8" parent="Walls" instance=ExtResource( 2 )]
transform = Transform( -4.37114e-08, 0, -0.7, 0, 1, 0, 1, 0, -3.0598e-08, -31.5015, 0, 77.0825 ) transform = Transform( -4.37114e-08, 0, -0.7, 0, 1, 0, 1, 0, -3.0598e-08, -31.5015, 0, 77.0825 )
[node name="Roof" parent="." instance=ExtResource( 3 )]
transform = Transform( 7.5, 0, 0, 0, 4, 0, 0, 0, 3.7, 0, 12, 64 )

View File

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://Level/Objects/LargeWall.tscn" type="PackedScene" id=1] [ext_resource path="res://Level/Objects/LargeWall.tscn" type="PackedScene" id=1]
[ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=2] [ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=2]
[ext_resource path="res://Level/Objects/Roof.tscn" type="PackedScene" id=3]
[node name="RectTower" type="Spatial"] [node name="RectTower" type="Spatial"]
@ -11,30 +12,18 @@ transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.134
[node name="LargeWall7" parent="." instance=ExtResource( 1 )] [node name="LargeWall7" parent="." instance=ExtResource( 1 )]
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 12, 0 ) transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 12, 0 )
[node name="LargeWall11" parent="." instance=ExtResource( 1 )]
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 24, 0 )
[node name="LargeWall5" parent="." instance=ExtResource( 1 )] [node name="LargeWall5" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 12, 14.2772 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 12, 14.2772 )
[node name="LargeWall10" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 24, 14.2772 )
[node name="LargeWall2" parent="." instance=ExtResource( 1 )] [node name="LargeWall2" parent="." instance=ExtResource( 1 )]
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 0, 0 ) transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 0, 0 )
[node name="LargeWall6" parent="." instance=ExtResource( 1 )] [node name="LargeWall6" parent="." instance=ExtResource( 1 )]
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 12, 0 ) transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 12, 0 )
[node name="LargeWall9" parent="." instance=ExtResource( 1 )]
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 24, 0 )
[node name="LargeWall8" parent="." instance=ExtResource( 1 )] [node name="LargeWall8" parent="." instance=ExtResource( 1 )]
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 12, -14.2661 ) transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 12, -14.2661 )
[node name="LargeWall12" parent="." instance=ExtResource( 1 )]
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 24, -14.2661 )
[node name="Wall" parent="." instance=ExtResource( 2 )] [node name="Wall" parent="." instance=ExtResource( 2 )]
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 0, -14.1777 ) transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 0, -14.1777 )
@ -64,3 +53,6 @@ transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 0, 6, -
[node name="Wall6" parent="." instance=ExtResource( 2 )] [node name="Wall6" parent="." instance=ExtResource( 2 )]
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 0, 6, 13.8908 ) transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 0, 6, 13.8908 )
[node name="Roof" parent="." instance=ExtResource( 3 )]
transform = Transform( 3.2, 0, 0, 0, 3.2, 0, 0, 0, 3.2, 0, 24, 0 )

View File

@ -0,0 +1,26 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Models/Material.material" type="Material" id=1]
[ext_resource path="res://Materials/Roof.tres" type="Material" id=2]
[sub_resource type="ArrayMesh" id=1]
resource_name = "Cube"
surfaces/0 = {
"aabb": AABB( -1, -1, -1, 2, 0.60001, 2 ),
"array_data": PoolByteArray( 255, 144, 230, 190, 205, 204, 204, 190, 0, 0, 0, 128, 0, 108, 65, 0, 19, 64, 149, 127, 0, 57, 0, 0, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 63, 0, 108, 65, 0, 54, 59, 158, 127, 0, 54, 0, 0, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 63, 0, 108, 65, 0, 11, 65, 148, 127, 0, 54, 0, 52, 255, 144, 230, 62, 205, 204, 204, 190, 0, 0, 0, 128, 0, 108, 65, 0, 202, 59, 158, 127, 0, 57, 0, 52, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 63, 163, 85, 0, 0, 54, 59, 98, 127, 0, 54, 0, 60, 255, 144, 230, 190, 205, 204, 204, 190, 0, 0, 0, 128, 163, 85, 0, 0, 54, 59, 98, 127, 0, 57, 0, 58, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 191, 163, 85, 0, 0, 54, 59, 98, 127, 0, 54, 0, 58, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 63, 0, 129, 0, 0, 127, 0, 0, 127, 0, 48, 0, 52, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 191, 0, 129, 0, 0, 127, 0, 0, 127, 0, 48, 0, 56, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 191, 0, 129, 0, 0, 127, 0, 0, 127, 0, 54, 0, 56, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 63, 0, 129, 0, 0, 127, 0, 0, 127, 0, 54, 0, 52, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 191, 93, 85, 0, 0, 202, 59, 158, 127, 0, 54, 0, 56, 255, 144, 230, 62, 205, 204, 204, 190, 0, 0, 0, 128, 93, 85, 0, 0, 202, 59, 158, 127, 0, 57, 0, 52, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 63, 93, 85, 0, 0, 202, 59, 158, 127, 0, 54, 0, 52, 255, 144, 230, 62, 205, 204, 204, 190, 0, 0, 0, 128, 0, 108, 191, 0, 237, 64, 107, 127, 0, 57, 0, 56, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 191, 0, 108, 191, 0, 202, 59, 98, 127, 0, 54, 0, 56, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 191, 0, 108, 191, 0, 245, 65, 108, 127, 0, 54, 0, 58, 255, 144, 230, 190, 205, 204, 204, 190, 0, 0, 0, 128, 0, 108, 191, 0, 54, 59, 98, 127, 0, 57, 0, 58 ),
"array_index_data": PoolByteArray( 0, 0, 2, 0, 1, 0, 0, 0, 3, 0, 2, 0, 4, 0, 6, 0, 5, 0, 7, 0, 9, 0, 8, 0, 7, 0, 10, 0, 9, 0, 11, 0, 13, 0, 12, 0, 14, 0, 16, 0, 15, 0, 14, 0, 17, 0, 16, 0 ),
"blend_shape_data": [ ],
"format": 97559,
"index_count": 24,
"material": ExtResource( 1 ),
"primitive": 4,
"skeleton_aabb": [ ],
"vertex_count": 18
}
[node name="Roof" type="Spatial"]
[node name="Mesh" type="MeshInstance" parent="."]
transform = Transform( 5, 0, 0, 0, 5, 0, 0, 0, 5, 0, 5, 0 )
mesh = SubResource( 1 )
material/0 = ExtResource( 2 )

View File

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=1] [ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=1]
[ext_resource path="res://Level/Objects/Roof.tscn" type="PackedScene" id=2]
[node name="SmallHouse" type="Spatial"] [node name="SmallHouse" type="Spatial"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 82, 0, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 82, 0, 0 )
@ -19,3 +20,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.52836, 0, 4.64483 )
[node name="Wall7" parent="." instance=ExtResource( 1 )] [node name="Wall7" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 4.80324 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 4.80324 )
[node name="Roof" parent="." instance=ExtResource( 2 )]
transform = Transform( 2.2, 0, 0, 0, 2, 0, 0, 0, 2.2, 0, 6, 0 )

View File

@ -0,0 +1,5 @@
[gd_resource type="SpatialMaterial" format=2]
[resource]
albedo_color = Color( 0.356863, 0.117647, 0.117647, 1 )
metallic = 0.1

BIN
WikiJam/Models/Roof.glb Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff