diff --git a/3d/ik/GunMaterial.material b/3d/ik/GunMaterial.material deleted file mode 100644 index 289a52f2..00000000 Binary files a/3d/ik/GunMaterial.material and /dev/null differ diff --git a/3d/ik/Gun_Emission.material b/3d/ik/Gun_Emission.material deleted file mode 100644 index 153f028b..00000000 Binary files a/3d/ik/Gun_Emission.material and /dev/null differ diff --git a/3d/ik/battle_bot_color.tres b/3d/ik/battle_bot_color.tres new file mode 100644 index 00000000..b9915b9f --- /dev/null +++ b/3d/ik/battle_bot_color.tres @@ -0,0 +1,58 @@ +[gd_resource type="SpatialMaterial" load_steps=2 format=2] + +[ext_resource path="res://godot_battle_bot_colors.png" type="Texture" id=1] + +[resource] + +resource_name = "battle_bot_colors" +render_priority = 0 +flags_transparent = false +flags_unshaded = false +flags_vertex_lighting = false +flags_no_depth_test = false +flags_use_point_size = false +flags_world_triplanar = false +flags_fixed_size = false +flags_albedo_tex_force_srgb = false +vertex_color_use_as_albedo = false +vertex_color_is_srgb = false +params_diffuse_mode = 0 +params_specular_mode = 0 +params_blend_mode = 0 +params_cull_mode = 0 +params_depth_draw_mode = 0 +params_line_width = 1.0 +params_point_size = 1.0 +params_billboard_mode = 0 +params_grow = false +params_use_alpha_scissor = false +albedo_color = Color( 1, 1, 1, 1 ) +albedo_texture = ExtResource( 1 ) +metallic = 0.5 +metallic_specular = 0.5 +metallic_texture_channel = 0 +roughness = 0.542695 +roughness_texture_channel = 0 +emission_enabled = false +normal_enabled = false +rim_enabled = false +clearcoat_enabled = false +anisotropy_enabled = false +ao_enabled = false +depth_enabled = false +subsurf_scatter_enabled = false +transmission_enabled = false +refraction_enabled = false +detail_enabled = false +uv1_scale = Vector3( 1, 1, 1 ) +uv1_offset = Vector3( 0, 0, 0 ) +uv1_triplanar = false +uv1_triplanar_sharpness = 1.0 +uv2_scale = Vector3( 1, 1, 1 ) +uv2_offset = Vector3( 0, 0, 0 ) +uv2_triplanar = false +uv2_triplanar_sharpness = 1.0 +proximity_fade_enable = false +distance_fade_enable = false +_sections_unfolded = [ "Albedo" ] + diff --git a/3d/ik/battle_bot_colors.material b/3d/ik/battle_bot_colors.material deleted file mode 100644 index f7b1a05f..00000000 Binary files a/3d/ik/battle_bot_colors.material and /dev/null differ diff --git a/3d/ik/battle_bot_emission.material b/3d/ik/battle_bot_emission.material deleted file mode 100644 index 5d5e5d9d..00000000 Binary files a/3d/ik/battle_bot_emission.material and /dev/null differ diff --git a/3d/ik/battle_bot_emission.tres b/3d/ik/battle_bot_emission.tres new file mode 100644 index 00000000..6c0f288c --- /dev/null +++ b/3d/ik/battle_bot_emission.tres @@ -0,0 +1,59 @@ +[gd_resource type="SpatialMaterial" format=2] + +[resource] + +resource_name = "battle_bot_emission" +render_priority = 0 +flags_transparent = false +flags_unshaded = false +flags_vertex_lighting = false +flags_no_depth_test = false +flags_use_point_size = false +flags_world_triplanar = false +flags_fixed_size = false +flags_albedo_tex_force_srgb = false +vertex_color_use_as_albedo = false +vertex_color_is_srgb = false +params_diffuse_mode = 0 +params_specular_mode = 0 +params_blend_mode = 0 +params_cull_mode = 0 +params_depth_draw_mode = 0 +params_line_width = 1.0 +params_point_size = 1.0 +params_billboard_mode = 0 +params_grow = false +params_use_alpha_scissor = false +albedo_color = Color( 0.0735168, 0.6919, 0.855469, 1 ) +metallic = 0.5 +metallic_specular = 0.5 +metallic_texture_channel = 0 +roughness = 0.542695 +roughness_texture_channel = 0 +emission_enabled = true +emission = Color( 0.523438, 0.900313, 1, 1 ) +emission_energy = 1.0 +emission_operator = 0 +emission_on_uv2 = false +normal_enabled = false +rim_enabled = false +clearcoat_enabled = false +anisotropy_enabled = false +ao_enabled = false +depth_enabled = false +subsurf_scatter_enabled = false +transmission_enabled = false +refraction_enabled = false +detail_enabled = false +uv1_scale = Vector3( 1, 1, 1 ) +uv1_offset = Vector3( 0, 0, 0 ) +uv1_triplanar = false +uv1_triplanar_sharpness = 1.0 +uv2_scale = Vector3( 1, 1, 1 ) +uv2_offset = Vector3( 0, 0, 0 ) +uv2_triplanar = false +uv2_triplanar_sharpness = 1.0 +proximity_fade_enable = false +distance_fade_enable = false +_sections_unfolded = [ "Albedo" ] + diff --git a/3d/ik/fabrik_ik.tscn b/3d/ik/fabrik_ik.tscn index 9bdf886f..36c515cf 100644 --- a/3d/ik/fabrik_ik.tscn +++ b/3d/ik/fabrik_ik.tscn @@ -1,13 +1,15 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1] [ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=2] -[ext_resource path="res://target_from_mousepos.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://button_change_scene.gd" type="Script" id=8] +[ext_resource path="res://battle_bot_color.tres" type="Material" id=3] +[ext_resource path="res://battle_bot_emission.tres" type="Material" id=4] +[ext_resource path="res://target_from_mousepos.gd" type="Script" id=5] +[ext_resource path="res://addons/sade/ik_look_at.gd" type="Script" id=6] +[ext_resource path="res://addons/sade/ik_look_at.png" type="Texture" id=7] +[ext_resource path="res://addons/sade/ik_fabrik.gd" type="Script" id=8] +[ext_resource path="res://addons/sade/ik_fabrik.png" type="Texture" id=9] +[ext_resource path="res://button_change_scene.gd" type="Script" id=10] [sub_resource type="PlaneMesh" id=1] @@ -227,7 +229,7 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo" ] -[node name="FABRIK_IK" type="Spatial"] +[node name="FABRIK_IK" type="Spatial" index="0"] [node name="Floor_plane" type="MeshInstance" parent="." index="0"] @@ -278,10 +280,15 @@ environment = SubResource( 4 ) [node name="BattleBot" parent="." index="3" instance=ExtResource( 2 )] -editor/display_folded = true +[node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"] + +material/0 = ExtResource( 3 ) +material/1 = ExtResource( 4 ) +_sections_unfolded = [ "material" ] [node name="Camera" type="Camera" parent="." index="4"] +editor/display_folded = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.5014, 8.81922 ) keep_aspect = 1 cull_mask = 1048575 @@ -295,7 +302,7 @@ fov = 70.0 size = 1.0 near = 0.05 far = 100.0 -script = ExtResource( 3 ) +script = ExtResource( 5 ) MOVEMENT_SPEED = -6.0 flip_axis = true @@ -305,10 +312,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5.41814 ) [node name="IK_LookAt_Head" type="Spatial" parent="Camera/targets" index="0"] -script = ExtResource( 4 ) +script = ExtResource( 6 ) _sections_unfolded = [ "Transform" ] __meta__ = { -"_editor_icon": ExtResource( 5 ) +"_editor_icon": ExtResource( 7 ) } skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") bone_name = "Head" @@ -324,9 +331,9 @@ debug_messages = false [node name="IK_FABRIK_Left_Arm" type="Spatial" parent="Camera/targets" index="1"] editor/display_folded = true -script = ExtResource( 6 ) +script = ExtResource( 8 ) __meta__ = { -"_editor_icon": ExtResource( 7 ) +"_editor_icon": ExtResource( 9 ) } skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Left_UpperArm", "Left_LowerArm" ) @@ -345,9 +352,9 @@ transform = Transform( 0.518503, 0, -0.855076, 0, 1, 0, 0.855076, 0, 0.518503, 1 [node name="IK_LookAt_LH" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm/target" index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.343393, -0.133381, 0.836605 ) -script = ExtResource( 4 ) +script = ExtResource( 6 ) __meta__ = { -"_editor_icon": ExtResource( 5 ) +"_editor_icon": ExtResource( 7 ) } skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton") bone_name = "Left_Hand" @@ -375,9 +382,9 @@ transform = Transform( -0.773622, -0.022882, 0.633234, 1.49012e-08, 0.999348, 0. [node name="IK_FABRIK_Right_Arm" type="Spatial" parent="Camera/targets" index="2"] editor/display_folded = true -script = ExtResource( 6 ) +script = ExtResource( 8 ) __meta__ = { -"_editor_icon": ExtResource( 7 ) +"_editor_icon": ExtResource( 9 ) } skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Right_UpperArm", "Right_LowerArm", "Right_Hand" ) @@ -396,9 +403,9 @@ 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" index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0544824, -0.133381, 0.332403 ) -script = ExtResource( 4 ) +script = ExtResource( 6 ) __meta__ = { -"_editor_icon": ExtResource( 5 ) +"_editor_icon": ExtResource( 7 ) } skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton") bone_name = "Right_Hand" @@ -425,7 +432,7 @@ transform = Transform( -0.792023, 0.0165762, -0.610266, 0, 0.999631, 0.0271522, [node name="Right_Hand" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm" index="4"] -transform = Transform( -0.678313, 0.00695222, -0.73474, 9.31323e-10, 0.999955, 0.00946173, 0.734773, 0.00641802, -0.678282, -1.0791, 0.0200329, 0.0379918 ) +transform = Transform( -0.678334, 0.00700453, -0.73472, 1.39698e-09, 0.999955, 0.00953316, 0.734753, 0.00646667, -0.678303, -1.07909, 0.0201073, 0.0379558 ) [node name="MeshInstance" type="MeshInstance" parent="Camera/targets" index="3"] @@ -595,7 +602,7 @@ group = null text = "Next scene" flat = false align = 1 -script = ExtResource( 8 ) +script = ExtResource( 10 ) scene_to_change_to = "res://fps_example.tscn" [node name="Button_Previous" type="Button" parent="Control" index="2"] @@ -622,7 +629,7 @@ group = null text = "Previous scene" flat = false align = 1 -script = ExtResource( 8 ) +script = ExtResource( 10 ) scene_to_change_to = "res://look_at_ik.tscn" diff --git a/3d/ik/fps_example.tscn b/3d/ik/fps_example.tscn index 2019dfcf..725f499e 100644 --- a/3d/ik/fps_example.tscn +++ b/3d/ik/fps_example.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=28 format=2] [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] @@ -8,7 +8,11 @@ [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://godot_battle_bot.dae" type="PackedScene" id=9] +[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://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] [sub_resource type="PlaneMesh" id=1] @@ -1586,13 +1590,23 @@ transform = Transform( 0.999391, 0, -0.0348995, 0, 1, 0, 0.0348995, 0, 0.999391, [node name="Pistol_textured" parent="KinematicBody/CameraHolder/Weapon/Pistol" index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) -_sections_unfolded = [ "Transform" ] +material/0 = ExtResource( 9 ) +material/1 = ExtResource( 10 ) +_sections_unfolded = [ "Transform", "material" ] [node name="Pistol_end" type="Spatial" parent="KinematicBody/CameraHolder/Weapon/Pistol" index="1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0161836, 0.315914, 1.41329 ) -[node name="BattleBot" parent="KinematicBody" index="2" instance=ExtResource( 9 )] +[node name="BattleBot" parent="KinematicBody" index="2" instance=ExtResource( 11 )] + +editor/display_folded = true + +[node name="godot_battle_bot" parent="KinematicBody/BattleBot/Armature/Skeleton" index="0"] + +material/0 = ExtResource( 12 ) +material/1 = ExtResource( 13 ) +_sections_unfolded = [ "material" ] [editable path="KinematicBody/CameraHolder/Weapon/Pistol"] diff --git a/3d/ik/godot_battle_bot.dae.import b/3d/ik/godot_battle_bot.dae.import index 946c5217..4ac28520 100644 --- a/3d/ik/godot_battle_bot.dae.import +++ b/3d/ik/godot_battle_bot.dae.import @@ -10,7 +10,7 @@ source_file="res://godot_battle_bot.dae" source_md5="6921b921d8668c6bb39ab8c5745b70fa" dest_files=[ "res://.import/godot_battle_bot.dae-eca9fb346b160636fd03ddf258af136e.scn" ] -dest_md5="d92ca022336b0f6d352865a05d12af5a" +dest_md5="6b801deb70bc8b910f2dacf8ff26eb26" [params] @@ -19,8 +19,8 @@ nodes/root_name="Scene Root" nodes/root_scale=1.0 nodes/custom_script="" nodes/storage=0 -materials/location=1 -materials/storage=1 +materials/location=0 +materials/storage=0 materials/keep_on_reimport=true meshes/compress=true meshes/ensure_tangents=true diff --git a/3d/ik/gun_color.material b/3d/ik/gun_color.material deleted file mode 100644 index 43d0903e..00000000 Binary files a/3d/ik/gun_color.material and /dev/null differ diff --git a/3d/ik/gun_color.tres b/3d/ik/gun_color.tres new file mode 100644 index 00000000..076f73b2 --- /dev/null +++ b/3d/ik/gun_color.tres @@ -0,0 +1,56 @@ +[gd_resource type="SpatialMaterial" load_steps=2 format=2] + +[ext_resource path="res://gun_textures.png" type="Texture" id=1] + +[resource] + +render_priority = 0 +flags_transparent = false +flags_unshaded = false +flags_vertex_lighting = false +flags_no_depth_test = false +flags_use_point_size = false +flags_world_triplanar = false +flags_fixed_size = false +flags_albedo_tex_force_srgb = false +vertex_color_use_as_albedo = false +vertex_color_is_srgb = false +params_diffuse_mode = 0 +params_specular_mode = 0 +params_blend_mode = 0 +params_cull_mode = 0 +params_depth_draw_mode = 0 +params_line_width = 1.0 +params_point_size = 1.0 +params_billboard_mode = 0 +params_grow = false +params_use_alpha_scissor = false +albedo_color = Color( 1, 1, 1, 1 ) +albedo_texture = ExtResource( 1 ) +metallic = 0.0 +metallic_specular = 0.5 +metallic_texture_channel = 0 +roughness = 0.0 +roughness_texture_channel = 0 +emission_enabled = false +normal_enabled = false +rim_enabled = false +clearcoat_enabled = false +anisotropy_enabled = false +ao_enabled = false +depth_enabled = false +subsurf_scatter_enabled = false +transmission_enabled = false +refraction_enabled = false +detail_enabled = false +uv1_scale = Vector3( 1, 1, 1 ) +uv1_offset = Vector3( 0, 0, 0 ) +uv1_triplanar = false +uv1_triplanar_sharpness = 1.0 +uv2_scale = Vector3( 1, 1, 1 ) +uv2_offset = Vector3( 0, 0, 0 ) +uv2_triplanar = false +uv2_triplanar_sharpness = 1.0 +proximity_fade_enable = false +distance_fade_enable = false + diff --git a/3d/ik/gun_emission.material b/3d/ik/gun_emission.material deleted file mode 100644 index e280967c..00000000 Binary files a/3d/ik/gun_emission.material and /dev/null differ diff --git a/3d/ik/gun_emission.tres b/3d/ik/gun_emission.tres new file mode 100644 index 00000000..89e6d816 --- /dev/null +++ b/3d/ik/gun_emission.tres @@ -0,0 +1,57 @@ +[gd_resource type="SpatialMaterial" format=2] + +[resource] + +render_priority = 0 +flags_transparent = false +flags_unshaded = false +flags_vertex_lighting = false +flags_no_depth_test = false +flags_use_point_size = false +flags_world_triplanar = false +flags_fixed_size = false +flags_albedo_tex_force_srgb = false +vertex_color_use_as_albedo = false +vertex_color_is_srgb = false +params_diffuse_mode = 0 +params_specular_mode = 0 +params_blend_mode = 0 +params_cull_mode = 0 +params_depth_draw_mode = 0 +params_line_width = 1.0 +params_point_size = 1.0 +params_billboard_mode = 0 +params_grow = false +params_use_alpha_scissor = false +albedo_color = Color( 1, 1, 1, 1 ) +metallic = 0.0 +metallic_specular = 0.5 +metallic_texture_channel = 0 +roughness = 0.0 +roughness_texture_channel = 0 +emission_enabled = true +emission = Color( 1, 0, 0, 1 ) +emission_energy = 1.0 +emission_operator = 0 +emission_on_uv2 = false +normal_enabled = false +rim_enabled = false +clearcoat_enabled = false +anisotropy_enabled = false +ao_enabled = false +depth_enabled = false +subsurf_scatter_enabled = false +transmission_enabled = false +refraction_enabled = false +detail_enabled = false +uv1_scale = Vector3( 1, 1, 1 ) +uv1_offset = Vector3( 0, 0, 0 ) +uv1_triplanar = false +uv1_triplanar_sharpness = 1.0 +uv2_scale = Vector3( 1, 1, 1 ) +uv2_offset = Vector3( 0, 0, 0 ) +uv2_triplanar = false +uv2_triplanar_sharpness = 1.0 +proximity_fade_enable = false +distance_fade_enable = false + diff --git a/3d/ik/look_at_ik.tscn b/3d/ik/look_at_ik.tscn index cc496779..e5171e94 100644 --- a/3d/ik/look_at_ik.tscn +++ b/3d/ik/look_at_ik.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1] [ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=2] -[ext_resource path="res://target_from_mousepos.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://button_change_scene.gd" type="Script" id=6] +[ext_resource path="res://battle_bot_color.tres" type="Material" id=3] +[ext_resource path="res://battle_bot_emission.tres" type="Material" id=4] +[ext_resource path="res://target_from_mousepos.gd" type="Script" id=5] +[ext_resource path="res://addons/sade/ik_look_at.gd" type="Script" id=6] +[ext_resource path="res://addons/sade/ik_look_at.png" type="Texture" id=7] +[ext_resource path="res://button_change_scene.gd" type="Script" id=8] [sub_resource type="PlaneMesh" id=1] @@ -166,7 +168,7 @@ adjustment_contrast = 1.0 adjustment_saturation = 1.0 _sections_unfolded = [ "Glow", "Glow/levels" ] -[node name="LookAt_IK" type="Spatial" index="0"] +[node name="LookAt_IK" type="Spatial"] [node name="Floor_plane" type="MeshInstance" parent="." index="0"] @@ -217,10 +219,15 @@ environment = SubResource( 4 ) [node name="BattleBot" parent="." index="3" instance=ExtResource( 2 )] -editor/display_folded = true +[node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"] + +material/0 = ExtResource( 3 ) +material/1 = ExtResource( 4 ) +_sections_unfolded = [ "material" ] [node name="Camera" type="Camera" parent="." index="4"] +editor/display_folded = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.5014, 8.81922 ) keep_aspect = 1 cull_mask = 1048575 @@ -234,7 +241,7 @@ fov = 70.0 size = 1.0 near = 0.05 far = 100.0 -script = ExtResource( 3 ) +script = ExtResource( 5 ) MOVEMENT_SPEED = -2.0 flip_axis = true @@ -242,10 +249,10 @@ flip_axis = true [node name="IK_LookAt_Head" type="Spatial" parent="Camera/targets" index="0"] -script = ExtResource( 4 ) +script = ExtResource( 6 ) _sections_unfolded = [ "Transform" ] __meta__ = { -"_editor_icon": ExtResource( 5 ) +"_editor_icon": ExtResource( 7 ) } skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") bone_name = "Head" @@ -260,10 +267,10 @@ debug_messages = false [node name="IK_LookAt_LeftArm" type="Spatial" parent="Camera/targets" index="1"] -script = ExtResource( 4 ) +script = ExtResource( 6 ) _sections_unfolded = [ "Transform" ] __meta__ = { -"_editor_icon": ExtResource( 5 ) +"_editor_icon": ExtResource( 7 ) } skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") bone_name = "Left_UpperArm" @@ -278,10 +285,10 @@ debug_messages = false [node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/targets" index="2"] -script = ExtResource( 4 ) +script = ExtResource( 6 ) _sections_unfolded = [ "Transform" ] __meta__ = { -"_editor_icon": ExtResource( 5 ) +"_editor_icon": ExtResource( 7 ) } skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") bone_name = "Right_UpperArm" @@ -376,7 +383,7 @@ group = null text = "Next scene" flat = false align = 1 -script = ExtResource( 6 ) +script = ExtResource( 8 ) scene_to_change_to = "res://fabrik_ik.tscn" diff --git a/3d/ik/weapon_pistol.dae.import b/3d/ik/weapon_pistol.dae.import index 622b2904..1567f04e 100644 --- a/3d/ik/weapon_pistol.dae.import +++ b/3d/ik/weapon_pistol.dae.import @@ -10,7 +10,7 @@ source_file="res://weapon_pistol.dae" source_md5="5070f29403355abe514cc6a266bd148e" dest_files=[ "res://.import/weapon_pistol.dae-b8ccfaa12c6b728117e9f797617f9226.scn" ] -dest_md5="c812d9a4944bb42985cf5cfd81d0678c" +dest_md5="ab927a59008424dee9aa13cbf2e81b2b" [params] @@ -19,8 +19,8 @@ nodes/root_name="Scene Root" nodes/root_scale=1.0 nodes/custom_script="" nodes/storage=0 -materials/location=1 -materials/storage=1 +materials/location=0 +materials/storage=0 materials/keep_on_reimport=true meshes/compress=true meshes/ensure_tangents=true