Browse Source

[IK] Organize FPS into subfolder

Also, removed Wall8 so that you can't get stuck
Aaron Franke 6 years ago
parent
commit
72ff4543c8

+ 29 - 6
3d/ik/fabrik_ik.tscn

@@ -83,10 +83,16 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton")
 bone_name = "Head"
+update_mode = 0
+look_at_axis = 1
+use_our_rotation_x = false
+use_our_rotation_y = false
+use_our_rotation_z = false
+use_negative_our_rot = false
 additional_rotation = Vector3( 90, 0, 0 )
+debug_messages = false
 
 [node name="IK_FABRIK_Left_Arm" type="Spatial" parent="Camera/targets"]
-editor/display_folded = true
 script = ExtResource( 8 )
 __meta__ = {
 "_editor_icon": ExtResource( 9 )
@@ -94,11 +100,13 @@ __meta__ = {
 skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton")
 bones_in_chain = PoolStringArray( "Left_UpperArm", "Left_LowerArm" )
 bones_in_chain_lengths = PoolRealArray( 1.97, 3 )
+update_mode = 0
+chain_iterations = 10
 limit_chain_iterations = false
+reset_iterations_on_update = false
 use_middle_joint_target = true
 
 [node name="target" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm"]
-editor/display_folded = true
 transform = Transform( 0.518503, 0, -0.855076, 0, 1, 0, 0.855076, 0, 0.518503, 1.13159, 0, -0.155596 )
 
 [node name="IK_LookAt_LH" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm/target"]
@@ -109,7 +117,14 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton")
 bone_name = "Left_Hand"
+update_mode = 0
+look_at_axis = 1
+use_our_rotation_x = false
+use_our_rotation_y = false
+use_our_rotation_z = false
+use_negative_our_rot = false
 additional_rotation = Vector3( 0, 0, 90 )
+debug_messages = false
 
 [node name="middle_joint_target" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.16849, 0, -5.31922 )
@@ -121,7 +136,6 @@ transform = Transform( -0.66477, 0.0771345, -0.743055, -2.23517e-08, 0.994655, 0
 transform = Transform( -0.773624, -0.0228999, 0.633231, 2.98023e-08, 0.999347, 0.03614, -0.633645, 0.0279588, -0.773119, 2.94998, 0.10378, -2.37569 )
 
 [node name="IK_FABRIK_Right_Arm" type="Spatial" parent="Camera/targets"]
-editor/display_folded = true
 script = ExtResource( 8 )
 __meta__ = {
 "_editor_icon": ExtResource( 9 )
@@ -129,11 +143,13 @@ __meta__ = {
 skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton")
 bones_in_chain = PoolStringArray( "Right_UpperArm", "Right_LowerArm", "Right_Hand" )
 bones_in_chain_lengths = PoolRealArray( 1.97, 3, 1.2 )
+update_mode = 0
+chain_iterations = 2
 limit_chain_iterations = false
+reset_iterations_on_update = false
 use_middle_joint_target = true
 
 [node name="target" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm"]
-editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.229958, 0, 0.929313 )
 
 [node name="IK_LookAt_RH" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm/target"]
@@ -144,7 +160,14 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton")
 bone_name = "Right_Hand"
+update_mode = 0
+look_at_axis = 1
+use_our_rotation_x = false
+use_our_rotation_y = false
+use_our_rotation_z = false
+use_negative_our_rot = false
 additional_rotation = Vector3( 0, 0, 90 )
+debug_messages = false
 
 [node name="middle_joint_target" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.34515, 0, -3.7843 )
@@ -218,9 +241,9 @@ margin_right = 1019.0
 margin_bottom = 590.0
 text = "Next scene"
 script = ExtResource( 10 )
-scene_to_change_to = "res://fps_example.tscn"
+scene_to_change_to = "res://fps/fps_example.tscn"
 
-[node name="Button_Previous" type="Button" parent="Control"]
+[node name="Button_Prev" type="Button" parent="Control"]
 margin_left = 10.0
 margin_top = 540.0
 margin_right = 129.0

+ 1 - 1
3d/ik/example_player.gd → 3d/ik/fps/example_player.gd

@@ -52,7 +52,7 @@ var current_anim = "Starter"
 # The end of the pistol
 var pistol_end = null
 # The simple bullet rigidbody
-var simple_bullet = preload("res://simple_bullet.tscn")
+var simple_bullet = preload("res://fps/simple_bullet.tscn")
 
 
 func _ready():

+ 35 - 42
3d/ik/fps_example.tscn → 3d/ik/fps/fps_example.tscn

@@ -2,14 +2,14 @@
 
 [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1]
 [ext_resource path="res://button_change_scene.gd" type="Script" id=2]
-[ext_resource path="res://example_player.gd" type="Script" id=3]
+[ext_resource path="res://fps/example_player.gd" type="Script" id=3]
 [ext_resource path="res://addons/sade/ik_look_at.gd" type="Script" id=4]
 [ext_resource path="res://addons/sade/ik_look_at.png" type="Texture" id=5]
 [ext_resource path="res://addons/sade/ik_fabrik.gd" type="Script" id=6]
 [ext_resource path="res://addons/sade/ik_fabrik.png" type="Texture" id=7]
-[ext_resource path="res://weapon_pistol.dae" type="PackedScene" id=8]
-[ext_resource path="res://gun_color.tres" type="Material" id=9]
-[ext_resource path="res://gun_emission.tres" type="Material" id=10]
+[ext_resource path="res://fps/weapon_pistol.dae" type="PackedScene" id=8]
+[ext_resource path="res://fps/gun_color.tres" type="Material" id=9]
+[ext_resource path="res://fps/gun_emission.tres" type="Material" id=10]
 [ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=11]
 [ext_resource path="res://battle_bot_color.tres" type="Material" id=12]
 [ext_resource path="res://battle_bot_emission.tres" type="Material" id=13]
@@ -64,7 +64,6 @@ tonemap_mode = 3
 ss_reflections_max_steps = 32
 ssao_enabled = true
 ssao_light_affect = 1.0
-ssao_quality = 1
 glow_enabled = true
 glow_levels/1 = true
 glow_levels/2 = true
@@ -202,13 +201,11 @@ tracks/2/keys = {
 [node name="Level" type="Spatial" parent="."]
 
 [node name="Floor_plane" type="MeshInstance" parent="Level"]
-editor/display_folded = true
 transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0 )
 mesh = SubResource( 1 )
 material/0 = SubResource( 2 )
 
 [node name="StaticBody" type="StaticBody" parent="Level/Floor_plane"]
-editor/display_folded = true
 
 [node name="CollisionShape" type="CollisionShape" parent="Level/Floor_plane/StaticBody"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.956119, 0 )
@@ -217,7 +214,6 @@ shape = SubResource( 3 )
 [node name="Walls" type="Spatial" parent="Level"]
 
 [node name="LargeWall" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 10, 0, 0, 0, 10, -39.9997, 20.0003, 20.0002 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -228,7 +224,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="LargeWall2" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 10, 0, 0, 0, 10, -39.9997, 20.0003, -19.9998 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -239,7 +234,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="LargeWall3" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -4.37114e-08, 0, -10, 0, 10, 0, 1, 0, -4.37114e-07, -18.9997, 20.0003, -40.9998 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -250,7 +244,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="LargeWall4" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -4.37114e-08, 0, -10, 0, 10, 0, 1, 0, -4.37114e-07, 21.0003, 20.0003, -40.9998 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -261,7 +254,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="LargeWall5" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -1, 0, 8.74228e-07, 0, 10, 0, -8.74228e-08, 0, -10, 41.0003, 20.0003, -19.9998 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -272,7 +264,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="LargeWall6" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -1, 0, 8.74228e-07, 0, 10, 0, -8.74228e-08, 0, -10, 41.0003, 20.0003, 20.0002 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -283,7 +274,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="LargeWall7" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1.31134e-07, 0, 10, 0, 10, 0, -1, 0, 1.31134e-06, 21.0003, 20.0003, 40.0002 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -294,7 +284,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="LargeWall8" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1.31134e-07, 0, 10, 0, 10, 0, -1, 0, 1.31134e-06, -18.9997, 20.0003, 40.0002 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 5 )
@@ -305,7 +294,6 @@ material/0 = SubResource( 5 )
 shape = SubResource( 6 )
 
 [node name="Wall" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 7.54979e-08, 0, 4, 0, 4, 0, -1, 0, 3.01992e-07, -9.9997, 8.00032, 22.0005 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -316,7 +304,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall2" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1, 0, -4.76837e-07, 0, 4, 0, 1.19209e-07, 0, 4, -19.9997, 8.00032, 16.0005 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -327,7 +314,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall3" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1, 0, -3.57627e-07, 0, 4, 0, 1.19209e-07, 0, 3, -19.9997, 8.00032, 2.00049 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -338,7 +324,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall4" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1, 0, -4.76837e-07, 0, 4, 0, 1.19209e-07, 0, 4, -19.9997, 8.00032, -21.9995 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -349,7 +334,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall5" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -1.62921e-07, 0, -4, 0, 4, 0, 1, 0, -6.51683e-07, -9.9997, 8.00032, -27.9995 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -360,7 +344,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall6" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -1, 0, 8.26528e-07, 0, 4, 0, -2.06632e-07, 0, -4, 0.000319004, 8.00032, -21.9995 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -371,7 +354,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall7" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -1.62921e-07, 0, -4, 0, 4, 0, 1, 0, -6.51683e-07, 10.0003, 8.00032, -15.9995 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -381,19 +363,7 @@ material/0 = SubResource( 7 )
 [node name="CollisionShape" type="CollisionShape" parent="Level/Walls/Wall7/StaticBody"]
 shape = SubResource( 6 )
 
-[node name="Wall8" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
-transform = Transform( -1.62921e-07, 0, -4, 0, 4, 0, 1, 0, -6.51683e-07, 31.0003, 8.00032, -15.9995 )
-mesh = SubResource( 4 )
-material/0 = SubResource( 7 )
-
-[node name="StaticBody" type="StaticBody" parent="Level/Walls/Wall8"]
-
-[node name="CollisionShape" type="CollisionShape" parent="Level/Walls/Wall8/StaticBody"]
-shape = SubResource( 6 )
-
 [node name="Wall9" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 1, 0, -4.76837e-07, 0, 4, 0, 1.19209e-07, 0, 4, 25.0003, 8.00032, -25.9995 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -404,7 +374,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall10" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( 0.573577, 0, 3.27661, 0, 4, 0, -0.819152, 0, 2.29431, 23.0003, 8.00032, 3.00049 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -415,7 +384,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall11" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -0.819152, 0, 2.29431, 0, 4, 0, -0.573577, 0, -3.27661, 22.2126, 8.00032, 14.7123 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -426,7 +394,6 @@ material/0 = SubResource( 7 )
 shape = SubResource( 6 )
 
 [node name="Wall12" type="MeshInstance" parent="Level/Walls"]
-editor/display_folded = true
 transform = Transform( -0.627507, 2.10616, 2.29431, 0.642788, 3.06418, 0, -0.439385, 1.47475, -3.27661, 14.8402, 8.00032, 9.55015 )
 mesh = SubResource( 4 )
 material/0 = SubResource( 7 )
@@ -466,7 +433,7 @@ Escape to free/lock mouse cursor"
 align = 1
 valign = 1
 
-[node name="Button_Next" type="Button" parent="Control"]
+[node name="Button_Prev" type="Button" parent="Control"]
 margin_left = 10.0
 margin_top = 540.0
 margin_right = 129.0
@@ -476,7 +443,6 @@ script = ExtResource( 2 )
 scene_to_change_to = "res://fabrik_ik.tscn"
 
 [node name="Crosshair" type="Control" parent="Control"]
-editor/display_folded = true
 modulate = Color( 1, 1, 1, 0.784314 )
 margin_left = 492.0
 margin_top = 280.0
@@ -506,7 +472,6 @@ shape = SubResource( 10 )
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13, 0 )
 
 [node name="Lean_Path" type="Path" parent="KinematicBody/CameraHolder"]
-editor/display_folded = true
 curve = SubResource( 11 )
 
 [node name="PathFollow" type="PathFollow" parent="KinematicBody/CameraHolder/Lean_Path"]
@@ -516,7 +481,6 @@ rotation_mode = 0
 loop = false
 
 [node name="IK_LookAt_Chest" type="Spatial" parent="KinematicBody/CameraHolder/Lean_Path/PathFollow"]
-editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.451559, 0 )
 script = ExtResource( 4 )
 __meta__ = {
@@ -524,8 +488,14 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../BattleBot/Armature/Skeleton")
 bone_name = "Chest"
+update_mode = 0
 look_at_axis = 2
+use_our_rotation_x = false
+use_our_rotation_y = false
+use_our_rotation_z = false
+use_negative_our_rot = false
 additional_rotation = Vector3( -10, 0, 0 )
+debug_messages = false
 
 [node name="Camera" type="Camera" parent="KinematicBody/CameraHolder/Lean_Path/PathFollow/IK_LookAt_Chest"]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 )
@@ -535,7 +505,6 @@ fov = 74.0
 transform = Transform( 0.999391, 0, -0.0348995, 0, 1, 0, 0.0348995, 0, 0.999391, 0.570504, -2.2654, 2.93826 )
 
 [node name="IK_FABRIK" type="Spatial" parent="KinematicBody/CameraHolder/Lean_Path/PathFollow/IK_LookAt_Chest/Aim_pos"]
-editor/display_folded = true
 script = ExtResource( 6 )
 __meta__ = {
 "_editor_icon": ExtResource( 7 )
@@ -543,8 +512,10 @@ __meta__ = {
 skeleton_path = NodePath("../../../../../../BattleBot/Armature/Skeleton")
 bones_in_chain = PoolStringArray( "Left_UpperArm", "Left_LowerArm", "Left_Hand" )
 bones_in_chain_lengths = PoolRealArray( 1.97, 3, 0.1 )
+update_mode = 0
 chain_iterations = 6
 limit_chain_iterations = false
+reset_iterations_on_update = false
 use_middle_joint_target = true
 
 [node name="target" type="Spatial" parent="KinematicBody/CameraHolder/Lean_Path/PathFollow/IK_LookAt_Chest/Aim_pos/IK_FABRIK"]
@@ -558,8 +529,14 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../../../../../BattleBot/Armature/Skeleton")
 bone_name = "Left_Hand"
+update_mode = 0
+look_at_axis = 1
+use_our_rotation_x = false
+use_our_rotation_y = false
+use_our_rotation_z = false
 use_negative_our_rot = true
 additional_rotation = Vector3( 0, 0, 90 )
+debug_messages = false
 
 [node name="middle_joint_target" type="Spatial" parent="KinematicBody/CameraHolder/Lean_Path/PathFollow/IK_LookAt_Chest/Aim_pos/IK_FABRIK"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5.85263, -2.91316, -2.77555 )
@@ -581,8 +558,10 @@ __meta__ = {
 skeleton_path = NodePath("../../../../../../BattleBot/Armature/Skeleton")
 bones_in_chain = PoolStringArray( "Right_UpperArm", "Right_LowerArm", "Right_Hand" )
 bones_in_chain_lengths = PoolRealArray( 1.97, 3, 0.1 )
+update_mode = 0
 chain_iterations = 3
 limit_chain_iterations = false
+reset_iterations_on_update = false
 use_middle_joint_target = true
 
 [node name="target" type="Spatial" parent="KinematicBody/CameraHolder/Lean_Path/PathFollow/IK_LookAt_Chest/Aim_pos/IK_FABRIK_RightArm"]
@@ -596,8 +575,14 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../../../../../BattleBot/Armature/Skeleton")
 bone_name = "Right_Hand"
+update_mode = 0
+look_at_axis = 1
+use_our_rotation_x = false
+use_our_rotation_y = false
+use_our_rotation_z = false
 use_negative_our_rot = true
 additional_rotation = Vector3( 0, 0, 90 )
+debug_messages = false
 
 [node name="middle_joint_target" type="Spatial" parent="KinematicBody/CameraHolder/Lean_Path/PathFollow/IK_LookAt_Chest/Aim_pos/IK_FABRIK_RightArm"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.73318, -2.91316, -2.77555 )
@@ -621,6 +606,14 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../BattleBot/Armature/Skeleton")
 bone_name = "Head"
+update_mode = 0
+look_at_axis = 1
+use_our_rotation_x = false
+use_our_rotation_y = false
+use_our_rotation_z = false
+use_negative_our_rot = false
+additional_rotation = Vector3( 0, 0, 0 )
+debug_messages = false
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="KinematicBody/CameraHolder"]
 autoplay = "Start"

+ 1 - 1
3d/ik/gun_color.tres → 3d/ik/fps/gun_color.tres

@@ -1,6 +1,6 @@
 [gd_resource type="SpatialMaterial" load_steps=2 format=2]
 
-[ext_resource path="res://gun_textures.png" type="Texture" id=1]
+[ext_resource path="res://fps/gun_textures.png" type="Texture" id=1]
 
 [resource]
 albedo_texture = ExtResource( 1 )

+ 0 - 0
3d/ik/gun_emission.tres → 3d/ik/fps/gun_emission.tres


+ 0 - 0
3d/ik/gun_textures.png → 3d/ik/fps/gun_textures.png


+ 4 - 4
3d/ik/gun_textures.png.import → 3d/ik/fps/gun_textures.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.s3tc.stex"
-path.etc2="res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.etc2.stex"
+path.s3tc="res://.import/gun_textures.png-ff36b37294b2a7b89d70248caaea5848.s3tc.stex"
+path.etc2="res://.import/gun_textures.png-ff36b37294b2a7b89d70248caaea5848.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://gun_textures.png"
-dest_files=[ "res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.s3tc.stex", "res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.etc2.stex" ]
+source_file="res://fps/gun_textures.png"
+dest_files=[ "res://.import/gun_textures.png-ff36b37294b2a7b89d70248caaea5848.s3tc.stex", "res://.import/gun_textures.png-ff36b37294b2a7b89d70248caaea5848.etc2.stex" ]
 
 [params]
 

+ 0 - 0
3d/ik/simple_bullet.gd → 3d/ik/fps/simple_bullet.gd


+ 1 - 1
3d/ik/simple_bullet.tscn → 3d/ik/fps/simple_bullet.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://simple_bullet.gd" type="Script" id=1]
+[ext_resource path="res://fps/simple_bullet.gd" type="Script" id=1]
 
 [sub_resource type="PhysicsMaterial" id=1]
 bounce = 0.5

+ 0 - 0
3d/ik/weapon_pistol.dae → 3d/ik/fps/weapon_pistol.dae


+ 3 - 3
3d/ik/weapon_pistol.dae.import → 3d/ik/fps/weapon_pistol.dae.import

@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/weapon_pistol.dae-b8ccfaa12c6b728117e9f797617f9226.scn"
+path="res://.import/weapon_pistol.dae-ed8a2a8a1d486f24880330c98eecbf74.scn"
 
 [deps]
 
-source_file="res://weapon_pistol.dae"
-dest_files=[ "res://.import/weapon_pistol.dae-b8ccfaa12c6b728117e9f797617f9226.scn" ]
+source_file="res://fps/weapon_pistol.dae"
+dest_files=[ "res://.import/weapon_pistol.dae-ed8a2a8a1d486f24880330c98eecbf74.scn" ]
 
 [params]
 

+ 0 - 1
3d/ik/look_at_ik.tscn

@@ -58,7 +58,6 @@ material/0 = ExtResource( 3 )
 material/1 = ExtResource( 4 )
 
 [node name="Camera" type="Camera" parent="."]
-editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.5014, 8.81922 )
 fov = 74.0
 script = ExtResource( 5 )