Explorar o código

Change Flying Forklift to GLTF

Aaron Franke %!s(int64=5) %!d(string=hai) anos
pai
achega
96a77f95b8
Modificáronse 48 ficheiros con 131 adicións e 90 borrados
  1. 9 9
      enemies/red_robot/red_robot.gd
  2. 0 3
      level/forklift/FlyingForkLift.blend
  3. 0 3
      level/forklift/FlyingForkLift.dae
  4. BIN=BIN
      level/forklift/SciFiFlyingForklift.material
  5. BIN=BIN
      level/forklift/flying_forklift.blend
  6. 15 0
      level/forklift/flying_forklift.gd
  7. BIN=BIN
      level/forklift/flying_forklift.glb
  8. 6 6
      level/forklift/flying_forklift.glb.import
  9. 29 0
      level/forklift/flying_forklift.tres
  10. 33 17
      level/forklift/flying_forklift.tscn
  11. 0 0
      level/forklift/flying_forklift_base_color.png
  12. 3 3
      level/forklift/flying_forklift_base_color.png.import
  13. 0 0
      level/forklift/flying_forklift_emissive.png
  14. 3 3
      level/forklift/flying_forklift_emissive.png.import
  15. 0 0
      level/forklift/flying_forklift_normal.png
  16. 3 3
      level/forklift/flying_forklift_normal.png.import
  17. 0 0
      level/forklift/flying_forklift_orm.png
  18. 3 3
      level/forklift/flying_forklift_orm.png.import
  19. 22 0
      level/forklift/mid_cargo_box.tres
  20. BIN=BIN
      level/forklift/mid_cargobox.material
  21. 0 1
      level/geometry/models/column.tres
  22. 0 2
      level/geometry/models/container2.tres
  23. 0 2
      level/geometry/models/container3.tres
  24. 0 2
      level/geometry/models/container4.tres
  25. 0 2
      level/geometry/models/door.tres
  26. 0 2
      level/geometry/models/door_reactor.tres
  27. 0 1
      level/geometry/models/floor_grate_wholes.tres
  28. 0 2
      level/geometry/models/mid_cargo_box.tres
  29. 0 2
      level/geometry/models/reactor_cylinder.tres
  30. 0 1
      level/geometry/models/reactor_emitter.tres
  31. 0 2
      level/geometry/models/scifi_car.tres
  32. 0 1
      level/geometry/models/set_asphalt.tres
  33. 0 1
      level/geometry/models/tile_anti_slip_metal.tres
  34. 0 1
      level/geometry/models/tile_carbon_fiber.tres
  35. 0 1
      level/geometry/models/tile_default_metal.tres
  36. 0 1
      level/geometry/models/tile_glass.tres
  37. 0 1
      level/geometry/models/tile_metal_pillars.tres
  38. 0 1
      level/geometry/models/tile_painted_gun_metal.tres
  39. 0 1
      level/geometry/models/tile_rivet_panels.tres
  40. 0 1
      level/geometry/models/tile_scifi_floor_panel.tres
  41. 0 1
      level/geometry/models/tile_simple_floor.tres
  42. 0 1
      level/geometry/models/tile_tech_panels.tres
  43. 0 1
      level/geometry/models/tile_tech_panels_color.tres
  44. 0 1
      level/geometry/models/train_texture.tres
  45. 0 1
      level/geometry/models/trim_emission_lights.tres
  46. 0 1
      level/geometry/models/trim_misc_1.tres
  47. 0 1
      level/geometry/models/trim_misc_2.tres
  48. 5 5
      level/level.tscn

+ 9 - 9
enemies/red_robot/red_robot.gd

@@ -93,7 +93,7 @@ func shoot():
 
 
 func _physics_process(delta):
-	if (test_shoot):
+	if test_shoot:
 		shoot()
 		test_shoot = false
 	
@@ -104,10 +104,10 @@ func _physics_process(delta):
 		$AnimationTree["parameters/state/current"] = 0 # Go idle.
 		return
 	
-	if (state == State.APPROACH):
-		if (aim_preparing > 0):
+	if state == State.APPROACH:
+		if aim_preparing > 0:
 			aim_preparing -= delta
-			if (aim_preparing < 0):
+			if aim_preparing < 0:
 				aim_preparing = 0
 			$AnimationTree["parameters/aiming/blend_amount"] = aim_preparing / AIM_PREPARE_TIME
 		
@@ -115,15 +115,15 @@ func _physics_process(delta):
 		# The front of the robot is +Z, and atan2 is zero at +X, so we need to use the Z for the X parameter (second one).
 		var angle_to_player = atan2(to_player_local.x, to_player_local.z)
 		var tolerance = deg2rad(PLAYER_AIM_TOLERANCE_DEGREES)
-		if (angle_to_player > tolerance):
+		if angle_to_player > tolerance:
 			$AnimationTree["parameters/state/current"] = 1
-		elif (angle_to_player < -tolerance):
+		elif angle_to_player < -tolerance:
 			$AnimationTree["parameters/state/current"] = 2
 		else:
 			$AnimationTree["parameters/state/current"] = 3
 			# Facing player, try to shoot.
 			shoot_countdown -= delta
-			if (shoot_countdown < 0):
+			if shoot_countdown < 0:
 				# See if player can be killed because in they're sight.
 				var ray_from = $"Scene Root/Armature/Skeleton/ray_from".global_transform.origin
 				var ray_to = player.global_transform.origin + Vector3.UP # Above middle of player.
@@ -138,9 +138,9 @@ func _physics_process(delta):
 					shoot_countdown = SHOOT_WAIT
 	
 	elif state == State.AIM or state == State.SHOOTING:
-			if (aim_preparing < AIM_PREPARE_TIME):
+			if aim_preparing < AIM_PREPARE_TIME:
 				aim_preparing += delta
-				if (aim_preparing > AIM_PREPARE_TIME):
+				if aim_preparing > AIM_PREPARE_TIME:
 					aim_preparing = AIM_PREPARE_TIME
 			
 			$AnimationTree["parameters/aiming/blend_amount"] = clamp(aim_preparing / AIM_PREPARE_TIME, 0, 1)

+ 0 - 3
level/forklift/FlyingForkLift.blend

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:125b258bcded34335ac2bb2c15e4c3a6637b7b14d2816e6fdb436115c8d4a2e7
-size 8043148

+ 0 - 3
level/forklift/FlyingForkLift.dae

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:270fc59ff8dd2704af08e30ae0e2e13208097cd19ee97bf46ebfecec6e14a094
-size 7310100

BIN=BIN
level/forklift/SciFiFlyingForklift.material


BIN=BIN
level/forklift/flying_forklift.blend


+ 15 - 0
level/forklift/flying_forklift.gd

@@ -0,0 +1,15 @@
+extends Spatial
+
+
+func _ready():
+	# Randomize the forklift model.
+	# We have 3 models, may as well use them.
+	randomize()
+	var children = get_child(0).get_children()
+	var child_count = children.size()
+	var which_enabled = floor(randf() * child_count)
+	for i in range(child_count):
+		children[i].visible = i == which_enabled
+
+
+# TODO: We can maybe implement func hit():

BIN=BIN
level/forklift/flying_forklift.glb


+ 6 - 6
level/forklift/FlyingForkLift.dae.import → level/forklift/flying_forklift.glb.import

@@ -2,22 +2,22 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/FlyingForkLift.dae-4f5fa162c221812c3e925bd030c2beed.scn"
+path="res://.import/flying_forklift.glb-5fc3f6403d54a193b6e3b14c2633d073.scn"
 
 [deps]
 
-source_file="res://level/forklift/FlyingForkLift.dae"
-dest_files=[ "res://.import/FlyingForkLift.dae-4f5fa162c221812c3e925bd030c2beed.scn" ]
+source_file="res://level/forklift/flying_forklift.glb"
+dest_files=[ "res://.import/flying_forklift.glb-5fc3f6403d54a193b6e3b14c2633d073.scn" ]
 
 [params]
 
 nodes/root_type="Spatial"
-nodes/root_name="Scene Root"
+nodes/root_name="FlyingForkliftModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
 materials/location=1
-materials/storage=1
+materials/storage=2
 materials/keep_on_reimport=true
 meshes/compress=true
 meshes/ensure_tangents=true
@@ -26,7 +26,7 @@ meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
 skins/use_named_skins=true
 external_files/store_in_subdir=false
-animation/import=true
+animation/import=false
 animation/fps=15
 animation/filter_script=""
 animation/storage=false

+ 29 - 0
level/forklift/flying_forklift.tres

@@ -0,0 +1,29 @@
+[gd_resource type="SpatialMaterial" load_steps=5 format=2]
+
+[ext_resource path="res://level/forklift/flying_forklift_emissive.png" type="Texture" id=1]
+[ext_resource path="res://level/forklift/flying_forklift_base_color.png" type="Texture" id=2]
+[ext_resource path="res://level/forklift/flying_forklift_orm.png" type="Texture" id=3]
+[ext_resource path="res://level/forklift/flying_forklift_normal.png" type="Texture" id=4]
+
+[resource]
+resource_name = "flying_forklift"
+albedo_texture = ExtResource( 2 )
+metallic = 1.0
+metallic_texture = ExtResource( 3 )
+metallic_texture_channel = 2
+roughness_texture = ExtResource( 3 )
+roughness_texture_channel = 1
+emission_enabled = true
+emission = Color( 0, 0, 0, 1 )
+emission_energy = 1.0
+emission_operator = 0
+emission_on_uv2 = false
+emission_texture = ExtResource( 1 )
+normal_enabled = true
+normal_scale = 1.0
+normal_texture = ExtResource( 4 )
+ao_enabled = true
+ao_light_affect = 0.0
+ao_texture = ExtResource( 3 )
+ao_on_uv2 = false
+ao_texture_channel = 0

+ 33 - 17
level/forklift/forklift.tscn → level/forklift/flying_forklift.tscn

@@ -1,9 +1,13 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://level/forklift/FlyingForkLift.dae" type="PackedScene" id=1]
+[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/flying_forklift.gd" type="Script" id=3]
 
-[sub_resource type="SpatialMaterial" id=1]
+[sub_resource type="BoxShape" id=1]
+extents = Vector3( 2, 1, 4 )
+
+[sub_resource type="SpatialMaterial" id=2]
 flags_transparent = true
 flags_unshaded = true
 vertex_color_use_as_albedo = true
@@ -16,30 +20,40 @@ particles_anim_loop = false
 albedo_color = Color( 1, 1, 1, 0.176471 )
 albedo_texture = ExtResource( 2 )
 
-[sub_resource type="QuadMesh" id=2]
-material = SubResource( 1 )
+[sub_resource type="QuadMesh" id=3]
+material = SubResource( 2 )
 
-[sub_resource type="Gradient" id=3]
+[sub_resource type="Gradient" id=4]
 colors = PoolColorArray( 0, 1, 0.976562, 1, 1, 1, 1, 0 )
 
-[node name="Spatial" type="Spatial"]
+[node name="FlyingForklift" type="KinematicBody"]
+script = ExtResource( 3 )
+
+[node name="FlyingForkliftModel" parent="." instance=ExtResource( 1 )]
+
+[node name="RedFlyingForklift" parent="FlyingForkliftModel" index="0"]
+visible = false
 
-[node name="Scene Root" parent="." instance=ExtResource( 1 )]
+[node name="YellowFlyingForklift" parent="FlyingForkliftModel" index="1"]
+visible = false
 
-[node name="Particles" type="CPUParticles" parent="."]
+[node name="Collider" type="CollisionShape" parent="."]
+shape = SubResource( 1 )
+
+[node name="Particles1" type="CPUParticles" parent="."]
 transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.471727, -0.377269, -3.29514 )
 amount = 16
 lifetime = 0.5
 fixed_fps = 60
 fract_delta = false
-mesh = SubResource( 2 )
+mesh = SubResource( 3 )
 direction = Vector3( 0, 0, 1 )
 spread = 0.0
 gravity = Vector3( 0, 0, 0 )
 initial_velocity = 3.0
 angular_velocity = 360.0
 angular_velocity_random = 1.0
-color_ramp = SubResource( 3 )
+color_ramp = SubResource( 4 )
 
 [node name="Particles2" type="CPUParticles" parent="."]
 transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -0.501376, -0.377269, -3.29514 )
@@ -47,14 +61,14 @@ amount = 16
 lifetime = 0.5
 fixed_fps = 60
 fract_delta = false
-mesh = SubResource( 2 )
+mesh = SubResource( 3 )
 direction = Vector3( 0, 0, 1 )
 spread = 0.0
 gravity = Vector3( 0, 0, 0 )
 initial_velocity = 3.0
 angular_velocity = 360.0
 angular_velocity_random = 1.0
-color_ramp = SubResource( 3 )
+color_ramp = SubResource( 4 )
 
 [node name="Particles3" type="CPUParticles" parent="."]
 transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 1.42691, -0.514244, -2.88934 )
@@ -62,14 +76,14 @@ amount = 16
 lifetime = 0.5
 fixed_fps = 60
 fract_delta = false
-mesh = SubResource( 2 )
+mesh = SubResource( 3 )
 direction = Vector3( 0, 0, 1 )
 spread = 0.0
 gravity = Vector3( 0, 0, 0 )
 initial_velocity = 3.0
 angular_velocity = 360.0
 angular_velocity_random = 1.0
-color_ramp = SubResource( 3 )
+color_ramp = SubResource( 4 )
 
 [node name="Particles4" type="CPUParticles" parent="."]
 transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -1.33273, -0.514244, -2.88934 )
@@ -77,14 +91,14 @@ amount = 16
 lifetime = 0.5
 fixed_fps = 60
 fract_delta = false
-mesh = SubResource( 2 )
+mesh = SubResource( 3 )
 direction = Vector3( 0, 0, 1 )
 spread = 0.0
 gravity = Vector3( 0, 0, 0 )
 initial_velocity = 3.0
 angular_velocity = 360.0
 angular_velocity_random = 1.0
-color_ramp = SubResource( 3 )
+color_ramp = SubResource( 4 )
 
 [node name="SpotLight" type="SpotLight" parent="."]
 transform = Transform( 1, 0, 0, 0, -0.819152, 0.573576, 0, -0.573576, -0.819152, 0, 0.181815, 4.10661 )
@@ -92,3 +106,5 @@ light_bake_mode = 0
 shadow_enabled = true
 spot_range = 7.70138
 spot_angle = 22.7554
+
+[editable path="FlyingForkliftModel"]

+ 0 - 0
level/forklift/flyingforklift_scificarglass_BaseColor.png → level/forklift/flying_forklift_base_color.png


+ 3 - 3
level/forklift/flyingforklift_scificarglass_Emissive.png.import → level/forklift/flying_forklift_base_color.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/flyingforklift_scificarglass_Emissive.png-da48b87ac7a6b15bae000707596d4717.s3tc.stex"
+path.s3tc="res://.import/flying_forklift_base_color.png-ee5a1724f681ebb6a890cbb39c7b1576.s3tc.stex"
 metadata={
 "imported_formats": [ "s3tc" ],
 "vram_texture": true
@@ -10,8 +10,8 @@ metadata={
 
 [deps]
 
-source_file="res://level/forklift/flyingforklift_scificarglass_Emissive.png"
-dest_files=[ "res://.import/flyingforklift_scificarglass_Emissive.png-da48b87ac7a6b15bae000707596d4717.s3tc.stex" ]
+source_file="res://level/forklift/flying_forklift_base_color.png"
+dest_files=[ "res://.import/flying_forklift_base_color.png-ee5a1724f681ebb6a890cbb39c7b1576.s3tc.stex" ]
 
 [params]
 

+ 0 - 0
level/forklift/flyingforklift_scificarglass_Emissive.png → level/forklift/flying_forklift_emissive.png


+ 3 - 3
level/forklift/flyingforklift_scificarglass_BaseColor.png.import → level/forklift/flying_forklift_emissive.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/flyingforklift_scificarglass_BaseColor.png-1949b5cf16b60f898f686099dcde4a3e.s3tc.stex"
+path.s3tc="res://.import/flying_forklift_emissive.png-a15f15afd100191642f5466319bab30c.s3tc.stex"
 metadata={
 "imported_formats": [ "s3tc" ],
 "vram_texture": true
@@ -10,8 +10,8 @@ metadata={
 
 [deps]
 
-source_file="res://level/forklift/flyingforklift_scificarglass_BaseColor.png"
-dest_files=[ "res://.import/flyingforklift_scificarglass_BaseColor.png-1949b5cf16b60f898f686099dcde4a3e.s3tc.stex" ]
+source_file="res://level/forklift/flying_forklift_emissive.png"
+dest_files=[ "res://.import/flying_forklift_emissive.png-a15f15afd100191642f5466319bab30c.s3tc.stex" ]
 
 [params]
 

+ 0 - 0
level/forklift/flyingforklift_scificarglass_Normal.png → level/forklift/flying_forklift_normal.png


+ 3 - 3
level/forklift/flyingforklift_scificarglass_Normal.png.import → level/forklift/flying_forklift_normal.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/flyingforklift_scificarglass_Normal.png-5c362f4ebb539fbb1aac9ee577b8945f.s3tc.stex"
+path.s3tc="res://.import/flying_forklift_normal.png-8678bac746720ee9d56e90fba91f5e6c.s3tc.stex"
 metadata={
 "imported_formats": [ "s3tc" ],
 "vram_texture": true
@@ -10,8 +10,8 @@ metadata={
 
 [deps]
 
-source_file="res://level/forklift/flyingforklift_scificarglass_Normal.png"
-dest_files=[ "res://.import/flyingforklift_scificarglass_Normal.png-5c362f4ebb539fbb1aac9ee577b8945f.s3tc.stex" ]
+source_file="res://level/forklift/flying_forklift_normal.png"
+dest_files=[ "res://.import/flying_forklift_normal.png-8678bac746720ee9d56e90fba91f5e6c.s3tc.stex" ]
 
 [params]
 

+ 0 - 0
level/forklift/flyingforklift_scificarglass_OcclusionRoughnessMetallic.png → level/forklift/flying_forklift_orm.png


+ 3 - 3
level/forklift/flyingforklift_scificarglass_OcclusionRoughnessMetallic.png.import → level/forklift/flying_forklift_orm.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/flyingforklift_scificarglass_OcclusionRoughnessMetallic.png-b776512801a6ce5c87227c5888944895.s3tc.stex"
+path.s3tc="res://.import/flying_forklift_orm.png-64c7dffdd98328891e2d69e4fd5c8b77.s3tc.stex"
 metadata={
 "imported_formats": [ "s3tc" ],
 "vram_texture": true
@@ -10,8 +10,8 @@ metadata={
 
 [deps]
 
-source_file="res://level/forklift/flyingforklift_scificarglass_OcclusionRoughnessMetallic.png"
-dest_files=[ "res://.import/flyingforklift_scificarglass_OcclusionRoughnessMetallic.png-b776512801a6ce5c87227c5888944895.s3tc.stex" ]
+source_file="res://level/forklift/flying_forklift_orm.png"
+dest_files=[ "res://.import/flying_forklift_orm.png-64c7dffdd98328891e2d69e4fd5c8b77.s3tc.stex" ]
 
 [params]
 

+ 22 - 0
level/forklift/mid_cargo_box.tres

@@ -0,0 +1,22 @@
+[gd_resource type="SpatialMaterial" load_steps=4 format=2]
+
+[ext_resource path="res://level/textures/props/propsmisc_n.png" type="Texture" id=1]
+[ext_resource path="res://level/textures/props/propsmisc_d.png" type="Texture" id=2]
+[ext_resource path="res://level/textures/props/propsmisc_orm.png" type="Texture" id=3]
+
+[resource]
+resource_name = "mid_cargo_box"
+albedo_texture = ExtResource( 2 )
+metallic = 1.0
+metallic_texture = ExtResource( 3 )
+metallic_texture_channel = 2
+roughness_texture = ExtResource( 3 )
+roughness_texture_channel = 1
+normal_enabled = true
+normal_scale = 1.0
+normal_texture = ExtResource( 1 )
+ao_enabled = true
+ao_light_affect = 0.0
+ao_texture = ExtResource( 3 )
+ao_on_uv2 = false
+ao_texture_channel = 0

BIN=BIN
level/forklift/mid_cargobox.material


+ 0 - 1
level/geometry/models/column.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/column_n.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/column_d.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "column"
 albedo_texture = ExtResource( 3 )

+ 0 - 2
level/geometry/models/container2.tres

@@ -4,8 +4,6 @@
 [ext_resource path="res://level/textures/props/container2_n.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/props/container2_d.png" type="Texture" id=3]
 
-
-
 [resource]
 resource_name = "container2"
 albedo_texture = ExtResource( 3 )

+ 0 - 2
level/geometry/models/container3.tres

@@ -4,8 +4,6 @@
 [ext_resource path="res://level/textures/props/container3_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/props/container3_d.png" type="Texture" id=3]
 
-
-
 [resource]
 resource_name = "container3"
 albedo_texture = ExtResource( 3 )

+ 0 - 2
level/geometry/models/container4.tres

@@ -4,8 +4,6 @@
 [ext_resource path="res://level/textures/props/container4_d.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/props/container4_n.png" type="Texture" id=3]
 
-
-
 [resource]
 resource_name = "container4"
 flags_transparent = true

+ 0 - 2
level/geometry/models/door.tres

@@ -5,8 +5,6 @@
 [ext_resource path="res://level/textures/props/doorsimple_e.png" type="Texture" id=3]
 [ext_resource path="res://level/textures/props/doorsimple_d.png" type="Texture" id=4]
 
-
-
 [resource]
 resource_name = "door"
 albedo_texture = ExtResource( 4 )

+ 0 - 2
level/geometry/models/door_reactor.tres

@@ -5,8 +5,6 @@
 [ext_resource path="res://level/textures/props/doorreactor_n.png" type="Texture" id=3]
 [ext_resource path="res://level/textures/props/doorreactor_orm.png" type="Texture" id=4]
 
-
-
 [resource]
 resource_name = "door_reactor"
 albedo_texture = ExtResource( 2 )

+ 0 - 1
level/geometry/models/floor_grate_wholes.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/floor_grate_wholes_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/floor_grate_wholes_d.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "floor_grate_wholes"
 flags_transparent = true

+ 0 - 2
level/geometry/models/mid_cargo_box.tres

@@ -4,8 +4,6 @@
 [ext_resource path="res://level/textures/props/propsmisc_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/props/propsmisc_n.png" type="Texture" id=3]
 
-
-
 [resource]
 resource_name = "mid_cargo_box"
 albedo_texture = ExtResource( 1 )

+ 0 - 2
level/geometry/models/reactor_cylinder.tres

@@ -5,8 +5,6 @@
 [ext_resource path="res://level/textures/props/reactorcorecylinder_reactor_cilinder_BaseColor.png" type="Texture" id=3]
 [ext_resource path="res://level/textures/props/reactorcorecylinder_reactor_cilinder_OcclusionRoughnessMetallic.png" type="Texture" id=4]
 
-
-
 [resource]
 resource_name = "reactor_cylinder"
 albedo_texture = ExtResource( 3 )

+ 0 - 1
level/geometry/models/reactor_emitter.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/reactoremitter_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/reactoremitter_n.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "reactor_emitter"
 albedo_texture = ExtResource( 1 )

+ 0 - 2
level/geometry/models/scifi_car.tres

@@ -5,8 +5,6 @@
 [ext_resource path="res://level/textures/car/scificar_emissive.png" type="Texture" id=3]
 [ext_resource path="res://level/textures/car/scificar_roughnessocclusionmetallic.png" type="Texture" id=4]
 
-
-
 [resource]
 resource_name = "scifi_car"
 albedo_texture = ExtResource( 1 )

+ 0 - 1
level/geometry/models/set_asphalt.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/set_asphalt_n.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/set_asphalt_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "set_asphalt"
 albedo_texture = ExtResource( 1 )

+ 0 - 1
level/geometry/models/tile_anti_slip_metal.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_antislip_n.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_antislip_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_anti_slip_metal"
 albedo_texture = ExtResource( 1 )

+ 0 - 1
level/geometry/models/tile_carbon_fiber.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_carbonfiber_d.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_carbonfiber_n.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_carbon_fiber"
 albedo_texture = ExtResource( 2 )

+ 0 - 1
level/geometry/models/tile_default_metal.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_defaultmetal_d.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_defaultmetal_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_default_metal"
 albedo_texture = ExtResource( 2 )

+ 0 - 1
level/geometry/models/tile_glass.tres

@@ -5,7 +5,6 @@
 [ext_resource path="res://level/textures/structure/tile_glass_orm.png" type="Texture" id=3]
 [ext_resource path="res://level/textures/structure/tile_glass_e.png" type="Texture" id=4]
 
-
 [resource]
 resource_name = "tile_glass"
 flags_transparent = true

+ 0 - 1
level/geometry/models/tile_metal_pillars.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_metalpillar_n.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_metalpillar_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "Tile_metal_pillars"
 albedo_texture = ExtResource( 1 )

+ 0 - 1
level/geometry/models/tile_painted_gun_metal.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_paintedgunmetal_d.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_paintedgunmetal_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_painted_gun_metal"
 albedo_texture = ExtResource( 2 )

+ 0 - 1
level/geometry/models/tile_rivet_panels.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_rivetpanels_n.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_rivetpanels_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_rivet_panels"
 albedo_texture = ExtResource( 1 )

+ 0 - 1
level/geometry/models/tile_scifi_floor_panel.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_scififloorpanel_n.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_scififloorpanel_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_scifi_floor_panel"
 albedo_texture = ExtResource( 1 )

+ 0 - 1
level/geometry/models/tile_simple_floor.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_simplefloor_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_simplefloor_n.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_simple_floor"
 albedo_texture = ExtResource( 1 )

+ 0 - 1
level/geometry/models/tile_tech_panels.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_techpanels2_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_techpanels2_d.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_tech_panels"
 albedo_texture = ExtResource( 3 )

+ 0 - 1
level/geometry/models/tile_tech_panels_color.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/tile_techpanels2color_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/tile_techpanels2color_d_.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "tile_tech_panels_color"
 albedo_texture = ExtResource( 3 )

+ 0 - 1
level/geometry/models/train_texture.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/TrainTexture_orm.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/TrainTexture_d.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "train_texture"
 albedo_texture = ExtResource( 3 )

+ 0 - 1
level/geometry/models/trim_emission_lights.tres

@@ -5,7 +5,6 @@
 [ext_resource path="res://level/textures/structure/trim_emissionlights_n.png" type="Texture" id=3]
 [ext_resource path="res://level/textures/structure/trim_emissionlights_e.png" type="Texture" id=4]
 
-
 [resource]
 resource_name = "trim_emission_lights"
 albedo_texture = ExtResource( 2 )

+ 0 - 1
level/geometry/models/trim_misc_1.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/trim_misctrims1_d.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/trim_misctrims1_orm.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "trim_misc_1"
 albedo_texture = ExtResource( 2 )

+ 0 - 1
level/geometry/models/trim_misc_2.tres

@@ -4,7 +4,6 @@
 [ext_resource path="res://level/textures/structure/trim_misctrims2_d.png" type="Texture" id=2]
 [ext_resource path="res://level/textures/structure/trim_misctrims2_n.png" type="Texture" id=3]
 
-
 [resource]
 resource_name = "trim_misc_2"
 albedo_texture = ExtResource( 2 )

+ 5 - 5
level/level.tscn

@@ -10,7 +10,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/forklift/forklift.tscn" type="PackedScene" id=12]
+[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]
 [ext_resource path="res://level/geometry/scenes/structure.tscn" type="PackedScene" id=15]
@@ -115,14 +115,14 @@ transform = Transform( 2.81076, 0, 0, 0, 2.81076, 0, 0, 0, 2.81076, -57.857, -16
 [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="forklifts_a" type="Spatial" parent="."]
+[node name="FlyingForklifts" type="Spatial" parent="."]
 
-[node name="Spatial" parent="forklifts_a" instance=ExtResource( 12 )]
+[node name="FlyingForklift1" parent="FlyingForklifts" instance=ExtResource( 12 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 67.8049, 2.27771, 0 )
 
-[node name="Spatial2" parent="forklifts_a" instance=ExtResource( 12 )]
+[node name="FlyingForklift2" parent="FlyingForklifts" instance=ExtResource( 12 )]
 transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -68.2496, 2.27771, 0 )
 
-[node name="AnimationPlayer" type="AnimationPlayer" parent="forklifts_a"]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="FlyingForklifts"]
 autoplay = "mawaru"
 anims/mawaru = SubResource( 2 )