Parcourir la source

Merge pull request #62 from aaronfranke/reorganize

Reorganize misc parts of the project
Aaron Franke il y a 5 ans
Parent
commit
500970d50a

+ 0 - 40
fx/plasma/plasma.tscn

@@ -1,40 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://fx/plasma/plasma.png" type="Texture" id=1]
-
-[sub_resource type="SpatialMaterial" id=1]
-flags_transparent = true
-flags_unshaded = true
-vertex_color_use_as_albedo = true
-vertex_color_is_srgb = true
-params_blend_mode = 1
-params_billboard_mode = 3
-particles_anim_h_frames = 1
-particles_anim_v_frames = 1
-particles_anim_loop = false
-albedo_color = Color( 0.843137, 0.709804, 0.427451, 1 )
-albedo_texture = ExtResource( 1 )
-proximity_fade_enable = true
-proximity_fade_distance = 0.2
-
-[sub_resource type="QuadMesh" id=2]
-material = SubResource( 1 )
-
-[sub_resource type="Gradient" id=3]
-offsets = PoolRealArray( 0, 0.34749, 0.509652, 1 )
-colors = PoolColorArray( 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 )
-
-[node name="Plasma" type="Spatial"]
-
-[node name="Particles" type="CPUParticles" parent="."]
-amount = 64
-speed_scale = 0.2
-mesh = SubResource( 2 )
-spread = 180.0
-gravity = Vector3( 0, 0, 0 )
-initial_velocity = 0.3
-angular_velocity = 120.0
-angular_velocity_random = 1.0
-angle = 720.0
-angle_random = 1.0
-color_ramp = SubResource( 3 )

BIN
fx/smoke/smoke.png


+ 0 - 35
fx/smoke/smoke.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/smoke.png-75fa6534c262fd5c3a556ed0cb14355b.s3tc.stex"
-metadata={
-"imported_formats": [ "s3tc" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://fx/smoke/smoke.png"
-dest_files=[ "res://.import/smoke.png-75fa6534c262fd5c3a556ed0cb14355b.s3tc.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=1
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0

+ 0 - 46
fx/smoke/smoke.tscn

@@ -1,46 +0,0 @@
-[gd_scene load_steps=6 format=2]
-
-[ext_resource path="res://fx/smoke/smoke.png" type="Texture" id=1]
-[ext_resource path="res://fx/smoke/smoke_n.png" type="Texture" id=2]
-
-[sub_resource type="SpatialMaterial" id=1]
-flags_transparent = true
-vertex_color_use_as_albedo = true
-vertex_color_is_srgb = true
-params_billboard_mode = 3
-particles_anim_h_frames = 1
-particles_anim_v_frames = 1
-particles_anim_loop = false
-albedo_color = Color( 1, 1, 1, 0.654902 )
-albedo_texture = ExtResource( 1 )
-normal_enabled = true
-normal_scale = 1.0
-normal_texture = ExtResource( 2 )
-proximity_fade_enable = true
-proximity_fade_distance = 1.0
-
-[sub_resource type="QuadMesh" id=2]
-material = SubResource( 1 )
-
-[sub_resource type="Gradient" id=3]
-offsets = PoolRealArray( 0, 0.181467, 0.891892, 1 )
-colors = PoolColorArray( 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 )
-
-[node name="Spatial" type="Spatial"]
-
-[node name="Particles" type="CPUParticles" parent="."]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0 )
-amount = 3
-lifetime = 8.0
-speed_scale = 0.3
-mesh = SubResource( 2 )
-emission_shape = 2
-emission_box_extents = Vector3( 1, 1, 1 )
-spread = 0.0
-gravity = Vector3( 0, 0, 0 )
-initial_velocity = 2.0
-angular_velocity = 30.0
-angular_velocity_random = 1.0
-angle = 720.0
-angle_random = 1.0
-color_ramp = SubResource( 3 )

BIN
fx/smoke/smoke_n.png


+ 0 - 35
fx/smoke/smoke_n.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/smoke_n.png-7a6c69884d1ce1241dad357f68ddea48.s3tc.stex"
-metadata={
-"imported_formats": [ "s3tc" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://fx/smoke/smoke_n.png"
-dest_files=[ "res://.import/smoke_n.png-7a6c69884d1ce1241dad357f68ddea48.s3tc.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=1
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0

+ 0 - 0
fx/smoke/dot.png → level/forklift/dot.png


+ 3 - 3
fx/smoke/dot.png.import → level/forklift/dot.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/dot.png-2511a3b5d1ebc1d3866dad5be9470956.s3tc.stex"
+path.s3tc="res://.import/dot.png-b13d3a041fb776c50b0b47383bc5ed3a.s3tc.stex"
 metadata={
 "imported_formats": [ "s3tc" ],
 "vram_texture": true
@@ -10,8 +10,8 @@ metadata={
 
 [deps]
 
-source_file="res://fx/smoke/dot.png"
-dest_files=[ "res://.import/dot.png-2511a3b5d1ebc1d3866dad5be9470956.s3tc.stex" ]
+source_file="res://level/forklift/dot.png"
+dest_files=[ "res://.import/dot.png-b13d3a041fb776c50b0b47383bc5ed3a.s3tc.stex" ]
 
 [params]
 

+ 1 - 1
level/forklift/flying_forklift.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://level/forklift/flying_forklift.glb" type="PackedScene" id=1]
-[ext_resource path="res://fx/smoke/dot.png" type="Texture" id=2]
+[ext_resource path="res://level/forklift/dot.png" type="Texture" id=2]
 [ext_resource path="res://level/forklift/flying_forklift.gd" type="Script" id=3]
 
 [sub_resource type="BoxShape" id=1]

+ 54 - 16
level/geometry/scenes/core.tscn

@@ -1,73 +1,111 @@
-[gd_scene load_steps=12 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://level/geometry/scenes/collision/radial_colliders.tscn" type="PackedScene" id=1]
 [ext_resource path="res://level/geometry/scenes/collision/stair_pillar.tscn" type="PackedScene" id=2]
 [ext_resource path="res://level/geometry/models/core.glb" type="PackedScene" id=3]
 [ext_resource path="res://level/geometry/scenes/collision/radial_player_only.tscn" type="PackedScene" id=4]
+[ext_resource path="res://level/textures/plasma.png" type="Texture" id=5]
+
+
+[sub_resource type="SpatialMaterial" id=1]
+flags_transparent = true
+flags_unshaded = true
+vertex_color_use_as_albedo = true
+vertex_color_is_srgb = true
+params_blend_mode = 1
+params_billboard_mode = 3
+particles_anim_h_frames = 1
+particles_anim_v_frames = 1
+particles_anim_loop = false
+albedo_color = Color( 0.843137, 0.709804, 0.427451, 1 )
+albedo_texture = ExtResource( 5 )
+proximity_fade_enable = true
+proximity_fade_distance = 0.2
+
+[sub_resource type="QuadMesh" id=2]
+material = SubResource( 1 )
+
+[sub_resource type="Gradient" id=3]
+offsets = PoolRealArray( 0, 0.34749, 0.509652, 1 )
+colors = PoolColorArray( 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 )
 
-[sub_resource type="CylinderShape" id=1]
+[sub_resource type="CylinderShape" id=4]
 radius = 10.5
 height = 4.0
 
-[sub_resource type="CylinderShape" id=2]
+[sub_resource type="CylinderShape" id=5]
 radius = 11.0
 height = 3.6
 
-[sub_resource type="CylinderShape" id=3]
+[sub_resource type="CylinderShape" id=6]
 radius = 4.5
 height = 24.0
 
-[sub_resource type="CylinderShape" id=4]
+[sub_resource type="CylinderShape" id=7]
 radius = 10.0
 height = 11.0
 
-[sub_resource type="CylinderShape" id=5]
+[sub_resource type="CylinderShape" id=8]
 radius = 35.0
 height = 5.0
 
-[sub_resource type="BoxShape" id=6]
+[sub_resource type="BoxShape" id=9]
 extents = Vector3( 40, 6, 40 )
 
-[sub_resource type="BoxShape" id=7]
+[sub_resource type="BoxShape" id=10]
 extents = Vector3( 0.6, 0.6, 1.4 )
 
 [node name="Core" type="Spatial"]
 
 [node name="CoreModel" parent="." instance=ExtResource( 3 )]
 
+[node name="Plasma" type="CPUParticles" parent="."]
+transform = Transform( 5, 0, 0, 0, 5, 0, 0, 0, 5, 0, -2.3, 0 )
+amount = 64
+speed_scale = 0.2
+mesh = SubResource( 2 )
+spread = 180.0
+gravity = Vector3( 0, 0, 0 )
+initial_velocity = 0.3
+angular_velocity = 120.0
+angular_velocity_random = 1.0
+angle = 720.0
+angle_random = 1.0
+color_ramp = SubResource( 3 )
+
 [node name="CentralColliders" type="StaticBody" parent="."]
 
 [node name="CentralCylinder1" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -14.3, 0 )
-shape = SubResource( 1 )
+shape = SubResource( 4 )
 
 [node name="CentralCylinder2" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -16, 0 )
-shape = SubResource( 2 )
+shape = SubResource( 5 )
 
 [node name="CentralCylinder3" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0 )
-shape = SubResource( 3 )
+shape = SubResource( 6 )
 
 [node name="CentralCylinder4" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 12, 0 )
-shape = SubResource( 4 )
+shape = SubResource( 7 )
 
 [node name="LowerFloorCylinder" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -18.9, 0 )
-shape = SubResource( 5 )
+shape = SubResource( 8 )
 
 [node name="Ceiling" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 20, 0 )
-shape = SubResource( 6 )
+shape = SubResource( 9 )
 
 [node name="ExtendedCyl1" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( 0.97437, 0, 0.224951, 0, 1, 0, -0.224951, 0, 0.97437, -4.04912, -8.1, -17.5387 )
-shape = SubResource( 7 )
+shape = SubResource( 10 )
 
 [node name="ExtendedCyl2" type="CollisionShape" parent="CentralColliders"]
 transform = Transform( -0.681998, 0, 0.731354, 0, 1, 0, -0.731354, 0, -0.681998, -13.1644, -8.1, 12.276 )
-shape = SubResource( 7 )
+shape = SubResource( 10 )
 
 [node name="RadialColliders1" parent="." instance=ExtResource( 1 )]
 

+ 2 - 16
level/level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://level/level.gd" type="Script" id=1]
 [ext_resource path="res://level/geometry/scenes/props.tscn" type="PackedScene" id=2]
@@ -7,9 +7,7 @@
 [ext_resource path="res://level/geometry/giprobe_data.res" type="GIProbeData" id=5]
 [ext_resource path="res://player/player.tscn" type="PackedScene" id=6]
 [ext_resource path="res://enemies/red_robot/red_robot.tscn" type="PackedScene" id=7]
-[ext_resource path="res://music/music.ogg" type="AudioStream" id=8]
-[ext_resource path="res://fx/smoke/smoke.tscn" type="PackedScene" id=10]
-[ext_resource path="res://fx/plasma/plasma.tscn" type="PackedScene" id=11]
+[ext_resource path="res://level/level_music.ogg" type="AudioStream" id=8]
 [ext_resource path="res://level/forklift/flying_forklift.tscn" type="PackedScene" id=12]
 [ext_resource path="res://level/geometry/scenes/lights.tscn" type="PackedScene" id=13]
 [ext_resource path="res://level/geometry/scenes/core.tscn" type="PackedScene" id=14]
@@ -42,9 +40,6 @@ script = ExtResource( 1 )
 
 [node name="Core" parent="." instance=ExtResource( 14 )]
 
-[node name="Plasma" parent="Core" instance=ExtResource( 11 )]
-transform = Transform( 5, 0, 0, 0, 5, 0, 0, 0, 5, 0, -2.27672, 0.025551 )
-
 [node name="Structure" parent="." instance=ExtResource( 15 )]
 
 [node name="Props" parent="." instance=ExtResource( 2 )]
@@ -106,15 +101,6 @@ shape = SubResource( 1 )
 stream = ExtResource( 8 )
 autoplay = true
 
-[node name="smoke1" parent="." instance=ExtResource( 10 )]
-transform = Transform( 2.81076, 0, 0, 0, 2.81076, 0, 0, 0, 2.81076, -31.0061, -16.8843, 64.9964 )
-
-[node name="smoke3" parent="." instance=ExtResource( 10 )]
-transform = Transform( 2.81076, 0, 0, 0, 2.81076, 0, 0, 0, 2.81076, -57.857, -16.8843, 48.4801 )
-
-[node name="smoke2" parent="." instance=ExtResource( 10 )]
-transform = Transform( 2.81076, 0, 0, 0, 2.81076, 0, 0, 0, 2.81076, 65.1483, -16.8843, -12.7312 )
-
 [node name="FlyingForklifts" type="Spatial" parent="."]
 
 [node name="FlyingForklift1" parent="FlyingForklifts" instance=ExtResource( 12 )]

+ 0 - 0
music/music.ogg → level/level_music.ogg


+ 15 - 0
level/level_music.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/level_music.ogg-4afd12677c88b2d2a03f7bd78697bf1a.oggstr"
+
+[deps]
+
+source_file="res://level/level_music.ogg"
+dest_files=[ "res://.import/level_music.ogg-4afd12677c88b2d2a03f7bd78697bf1a.oggstr" ]
+
+[params]
+
+loop=true
+loop_offset=0

+ 0 - 0
fx/plasma/plasma.png → level/textures/plasma.png


+ 3 - 3
fx/plasma/plasma.png.import → level/textures/plasma.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/plasma.png-e5be8b2f7918caa179df8a2a7d229e6d.s3tc.stex"
+path.s3tc="res://.import/plasma.png-6d59facfec6f6a5fd1f7e9f2f6b90a8f.s3tc.stex"
 metadata={
 "imported_formats": [ "s3tc" ],
 "vram_texture": true
@@ -10,8 +10,8 @@ metadata={
 
 [deps]
 
-source_file="res://fx/plasma/plasma.png"
-dest_files=[ "res://.import/plasma.png-e5be8b2f7918caa179df8a2a7d229e6d.s3tc.stex" ]
+source_file="res://level/textures/plasma.png"
+dest_files=[ "res://.import/plasma.png-6d59facfec6f6a5fd1f7e9f2f6b90a8f.s3tc.stex" ]
 
 [params]
 

+ 1 - 1
menu/menu.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://menu/experiment.hdr" type="Texture" id=2]
 [ext_resource path="res://player/model/player.dae" type="PackedScene" id=3]
 [ext_resource path="res://menu/floor.png" type="Texture" id=4]
-[ext_resource path="res://music/intro.ogg" type="AudioStream" id=5]
+[ext_resource path="res://menu/menu_intro_music.ogg" type="AudioStream" id=5]
 [ext_resource path="res://menu/tps_demo.png" type="Texture" id=6]
 [ext_resource path="res://menu/button_play.png" type="Texture" id=7]
 [ext_resource path="res://menu/button_play_hover.png" type="Texture" id=8]

+ 0 - 0
music/intro.ogg → menu/menu_intro_music.ogg


+ 15 - 0
menu/menu_intro_music.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/menu_intro_music.ogg-790ed16894e4b5a52d74fb71b5f5de88.oggstr"
+
+[deps]
+
+source_file="res://menu/menu_intro_music.ogg"
+dest_files=[ "res://.import/menu_intro_music.ogg-790ed16894e4b5a52d74fb71b5f5de88.oggstr" ]
+
+[params]
+
+loop=true
+loop_offset=0

+ 0 - 15
music/intro.ogg.import

@@ -1,15 +0,0 @@
-[remap]
-
-importer="ogg_vorbis"
-type="AudioStreamOGGVorbis"
-path="res://.import/intro.ogg-4097668e5352cd0def768e1f40c28db6.oggstr"
-
-[deps]
-
-source_file="res://music/intro.ogg"
-dest_files=[ "res://.import/intro.ogg-4097668e5352cd0def768e1f40c28db6.oggstr" ]
-
-[params]
-
-loop=true
-loop_offset=0

+ 0 - 15
music/music.ogg.import

@@ -1,15 +0,0 @@
-[remap]
-
-importer="ogg_vorbis"
-type="AudioStreamOGGVorbis"
-path="res://.import/music.ogg-4e39d6369ac4db9d479436fd6d94c7d1.oggstr"
-
-[deps]
-
-source_file="res://music/music.ogg"
-dest_files=[ "res://.import/music.ogg-4e39d6369ac4db9d479436fd6d94c7d1.oggstr" ]
-
-[params]
-
-loop=true
-loop_offset=0

BIN
testlevel/grid.png


+ 0 - 35
testlevel/grid.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/grid.png-c37eb8e5ce314331b1d0aa19dfc9f195.s3tc.stex"
-metadata={
-"imported_formats": [ "s3tc" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://testlevel/grid.png"
-dest_files=[ "res://.import/grid.png-c37eb8e5ce314331b1d0aa19dfc9f195.s3tc.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=1
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0

+ 0 - 116
testlevel/level.tscn

@@ -1,116 +0,0 @@
-[gd_scene load_steps=8 format=2]
-
-[ext_resource path="res://testlevel/grid.png" type="Texture" id=1]
-[ext_resource path="res://player/player.tscn" type="PackedScene" id=2]
-[ext_resource path="res://enemies/red_robot/red_robot.tscn" type="PackedScene" id=3]
-[ext_resource path="res://door/door.tscn" type="PackedScene" id=4]
-
-[sub_resource type="SpatialMaterial" id=1]
-albedo_texture = ExtResource( 1 )
-roughness = 0.0
-uv1_scale = Vector3( 0.2, 0.2, 0.2 )
-uv1_triplanar = true
-
-[sub_resource type="ProceduralSky" id=2]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-sun_energy = 16.0
-
-[sub_resource type="Environment" id=3]
-background_mode = 2
-background_sky = SubResource( 2 )
-tonemap_mode = 2
-ssao_enabled = true
-glow_enabled = true
-glow_levels/7 = true
-glow_bloom = 0.04
-glow_blend_mode = 1
-glow_bicubic_upscale = true
-
-[node name="TestLevel1" type="Spatial"]
-
-[node name="CSGCombiner" type="CSGCombiner" parent="."]
-use_collision = true
-
-[node name="CSGPolygon" type="CSGPolygon" parent="CSGCombiner"]
-transform = Transform( 2.8171, 0, 0, 0, -4.37114e-08, 1, 0, -1.90739, -8.33745e-08, 0, 0, 0 )
-polygon = PoolVector2Array( -3.50726, -6.94367, -19.5666, -2.21825, -17.5059, 2.75588, -14.2372, 5.95353, -14.699, 11.6382, 3.66969, 13.9121, 10.3137, 10.3947, 13.6535, -2.60907, 3.88286, -8.72014 )
-material = SubResource( 1 )
-
-[node name="CSGBox" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.68174, 0 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox2" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.0119, 2.68174, -7.79963 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox3" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.0119, 2.68174, 0.806358 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox4" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.76559, 2.68174, 2.78063 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox6" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 0.904571, 0, 0.426324, 0, 1, 0, -0.426324, 0, 0.904571, 9.26933, 2.68174, 8.78354 )
-width = 11.8607
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox7" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( -0.418785, 0, 0.908086, 0, 1, 0, -0.908086, 0, -0.418785, -31.1607, 2.68174, -1.20261 )
-width = 11.8607
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox5" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0542326, 2.68174, -5.50623 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource( 3 )
-
-[node name="robot" parent="." instance=ExtResource( 2 )]
-transform = Transform( 0.64733, 0, -0.76221, 0, 1, 0, 0.76221, 0, 0.64733, -21.4203, 0.311327, -15.2592 )
-
-[node name="DirectionalLight" type="DirectionalLight" parent="."]
-transform = Transform( 0.639243, 0.652241, -0.407369, 0, 0.529736, 0.848163, 0.769005, -0.542182, 0.33863, 0, 0, 0 )
-shadow_enabled = true
-shadow_bias = 0.01
-directional_shadow_normal_bias = 0.37
-directional_shadow_bias_split_scale = 0.14
-directional_shadow_max_distance = 50.0
-
-[node name="big_robot" parent="." instance=ExtResource( 3 )]
-transform = Transform( 0.0389917, 0, 0.99924, 0, 1, 0, -0.99924, 0, 0.0389917, -19.625, 0.0937424, -11.9398 )
-
-[node name="big_robot2" parent="." instance=ExtResource( 3 )]
-transform = Transform( 0.17487, 0, 0.984592, 0, 1, 0, -0.984592, 0, 0.17487, -27.0627, 0.0937424, -4.46751 )
-
-[node name="big_robot3" parent="." instance=ExtResource( 3 )]
-transform = Transform( -0.726717, 0, 0.686938, 0, 1, 0, -0.686938, 0, -0.726717, -19.8223, 0.0937424, -0.584061 )
-
-[node name="big_robot4" parent="." instance=ExtResource( 3 )]
-transform = Transform( 0.47869, 0, 0.877984, 0, 1, 0, -0.877984, 0, 0.47869, -27.7045, 0.0937424, -18.273 )
-
-[node name="big_robot5" parent="." instance=ExtResource( 3 )]
-transform = Transform( 0.151595, 0, 0.988443, 0, 1, 0, -0.988443, 0, 0.151595, -27.7045, 0.0937424, -9.71521 )
-
-[node name="door" parent="." instance=ExtResource( 4 )]
-transform = Transform( 0.00977782, 0, -0.999952, 0, 1, 0, 0.999952, 0, 0.00977782, 5.99869, -0.231766, -16.1618 )

+ 0 - 100
testlevel/level2.tscn

@@ -1,100 +0,0 @@
-[gd_scene load_steps=7 format=2]
-
-[ext_resource path="res://testlevel/grid.png" type="Texture" id=1]
-[ext_resource path="res://player/player.tscn" type="PackedScene" id=2]
-[ext_resource path="res://door/door.tscn" type="PackedScene" id=3]
-
-[sub_resource type="SpatialMaterial" id=1]
-albedo_texture = ExtResource( 1 )
-roughness = 0.0
-uv1_scale = Vector3( 0.2, 0.2, 0.2 )
-uv1_triplanar = true
-
-[sub_resource type="ProceduralSky" id=2]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-sun_energy = 16.0
-
-[sub_resource type="Environment" id=3]
-background_mode = 2
-background_sky = SubResource( 2 )
-tonemap_mode = 2
-ssao_enabled = true
-glow_enabled = true
-glow_levels/7 = true
-glow_bloom = 0.04
-glow_blend_mode = 1
-glow_bicubic_upscale = true
-
-[node name="TestLevel2" type="Spatial"]
-
-[node name="CSGCombiner" type="CSGCombiner" parent="."]
-use_collision = true
-
-[node name="CSGPolygon" type="CSGPolygon" parent="CSGCombiner"]
-transform = Transform( 2.8171, 0, 0, 0, -4.37114e-08, 1, 0, -1.90739, -8.33745e-08, 0, 0, 0 )
-polygon = PoolVector2Array( -3.50726, -6.94367, -19.5666, -2.21825, -17.5059, 2.75588, -14.2372, 5.95353, -14.699, 11.6382, 3.66969, 13.9121, 10.3137, 10.3947, 13.6535, -2.60907, 3.88286, -8.72014 )
-material = SubResource( 1 )
-
-[node name="CSGBox" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.68174, 0 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox2" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.0119, 2.68174, -7.79963 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox3" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.0119, 2.68174, 0.806358 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox4" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.76559, 2.68174, 2.78063 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox6" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 0.904571, 0, 0.426324, 0, 1, 0, -0.426324, 0, 0.904571, 9.26933, 2.68174, 8.78354 )
-width = 11.8607
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox7" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( -0.418785, 0, 0.908086, 0, 1, 0, -0.908086, 0, -0.418785, -31.1607, 2.68174, -1.20261 )
-width = 11.8607
-height = 2.73437
-depth = 1.0
-
-[node name="CSGBox5" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0542326, 2.68174, -5.50623 )
-width = 1.0
-height = 2.73437
-depth = 1.0
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource( 3 )
-
-[node name="robot" parent="." instance=ExtResource( 2 )]
-transform = Transform( 0.64733, 0, -0.76221, 0, 1, 0, 0.76221, 0, 0.64733, -21.4203, 0.311327, -15.2592 )
-
-[node name="DirectionalLight" type="DirectionalLight" parent="."]
-transform = Transform( 0.639243, 0.652241, -0.407369, 0, 0.529736, 0.848163, 0.769005, -0.542182, 0.33863, 0, 0, 0 )
-shadow_enabled = true
-shadow_bias = 0.01
-directional_shadow_normal_bias = 0.37
-directional_shadow_bias_split_scale = 0.14
-directional_shadow_max_distance = 50.0
-
-[node name="door" parent="." instance=ExtResource( 3 )]
-transform = Transform( 0.00977782, 0, -0.999952, 0, 1, 0, 0.999952, 0, 0.00977782, 5.99869, -0.231766, -16.1618 )