From 532fbb485847704fd02cd8dc9aa4c90c24836ed6 Mon Sep 17 00:00:00 2001 From: TwistedTwigleg Date: Tue, 1 May 2018 17:21:45 -0400 Subject: [PATCH] Fixed the materials using upper case names in the IK demo --- 3d/ik/GunMaterial.material | Bin 857 -> 0 bytes 3d/ik/Gun_Emission.material | Bin 2282 -> 0 bytes 3d/ik/battle_bot_color.tres | 58 ++++++++++++++++++++++++++++ 3d/ik/battle_bot_colors.material | Bin 935 -> 0 bytes 3d/ik/battle_bot_emission.material | Bin 910 -> 0 bytes 3d/ik/battle_bot_emission.tres | 59 +++++++++++++++++++++++++++++ 3d/ik/fabrik_ik.tscn | 53 +++++++++++++++----------- 3d/ik/fps_example.tscn | 22 +++++++++-- 3d/ik/godot_battle_bot.dae.import | 6 +-- 3d/ik/gun_color.material | Bin 855 -> 0 bytes 3d/ik/gun_color.tres | 56 +++++++++++++++++++++++++++ 3d/ik/gun_emission.material | Bin 907 -> 0 bytes 3d/ik/gun_emission.tres | 57 ++++++++++++++++++++++++++++ 3d/ik/look_at_ik.tscn | 37 ++++++++++-------- 3d/ik/weapon_pistol.dae.import | 6 +-- 15 files changed, 306 insertions(+), 48 deletions(-) delete mode 100644 3d/ik/GunMaterial.material delete mode 100644 3d/ik/Gun_Emission.material create mode 100644 3d/ik/battle_bot_color.tres delete mode 100644 3d/ik/battle_bot_colors.material delete mode 100644 3d/ik/battle_bot_emission.material create mode 100644 3d/ik/battle_bot_emission.tres delete mode 100644 3d/ik/gun_color.material create mode 100644 3d/ik/gun_color.tres delete mode 100644 3d/ik/gun_emission.material create mode 100644 3d/ik/gun_emission.tres diff --git a/3d/ik/GunMaterial.material b/3d/ik/GunMaterial.material deleted file mode 100644 index 289a52f288eb89e4280c983b0460c341cd7ff968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 857 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 diff --git a/3d/ik/battle_bot_emission.material b/3d/ik/battle_bot_emission.material deleted file mode 100644 index 5d5e5d9da0fd613d6b476f1d8d97fd885d7d67ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 910 zcmV;919ALPQ$s@n000005C8xu2><|g0{{RhwJ-f(CXz1Wja`X6%Uq*jL%{?~X- zyNzzCwc4PrP6<7(P#Le->m`eCDcdTt?thd2ApX*=c9wYQI;oleAQ$il{lDWInH}Sm zAL`}FL2*4Cn=yLNMW1dCv=q7r%55d@RczCsz9?k#RZJ=!71Ca@Y4lR1X~;>NZ^C?(+g|N$1nCLKtD%e3Qm#hc0dYw<91e%t{O~eqWl4(q zUT7+pt*u$Eq`TUkjF+?(M-|778Y*r_cF;g)WSjcf?rfRVvnaR-vw@ zFG{EjM#tTs5+blbc;KKx%!&yWDMGCH87xqcprg@ZgW!NlO6Mpi9TFT-YOh9)GXr4vQrst6vi{&=G2vZqP50 zK4S6HdkZGW=eg0A(Jp$jZ5>1_x5voKwUWUVm5F7q-qsM;MaZ6isX)7&WME&281hc$ zE?XZrhGikg!m?%|WLA#Ls^sF&eFAED4lAt9Xa%-#H$OCeGj&Y&*aqb*u|&*u4%vuJ zWDW0RUxGovF#`x5MruNw&t#?IEDE!0qgI=NwpvNV0a5!F(q;aE+>L7v!8WWw-s=E3 z{zYxyrP**EFwY@ieR)a4oQiDu0Eg@+9blrFZ#3xWYgOeStdtVUY-d7wI#mZ@bc>y`WHu6E~Q z_3Xr(i6MqdgxiqYBhU%grn)7ybtx@;Ox-4*ss|f$leEC~MbHG->3bP1MY5W6*(&|F zxbD>dHNKF!Emi>^R#;ZGROSC(E zck&9piM8Z+&i+_3rl0TuWa|^{?s?e;r|$F|faQm**@lqI5jCFkV{l9EfpDzUUDYPG zo^7nB@Ce}-n8_^Su)fufpvhEy#3w6~!^uwoNi3sgok*P$o%&BGAWUWdl5zmr%8EDU zXA6Ey4)o4&Qqd_T#JJg|VSosAufTE$yhT8D__Zm@&uw)nBWC9fMEB+5m#${5!s5Ng|C>BUo$=xAo2;R51ZY4ABU4b>apWbuAi|V6 z$^-7zkxy4>VYq!@SCiWcB|qZqgr%1F;PNE^RG4|W)7D#$*i+~^ib#fzm!Sws2SD0$ hQ#m-lYTvlZUbQm26C})hu;a>Kb28&>#R*bVLqie^pb`K8 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 e280967c3da8ef03320970e5268336dc4fb4e968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 907 zcmV;619bdSQ$s@n000005C8xg2><|d0{{RhwJ-f(8VF4r04An*Jus~V0EF|LJkL*i zp67X38pU)Y}r%Rtw8Rh6mD>Oo z+vt{Bs}1Vvl#t^JmGO$bUb6U>vaKTP{wMhl;xFB5CyAG?lZyH8aRGn*f8!gO9pjY} z^|IujxE_to*m=)&q;BrB6uS4xZ6ohhOw*vg&d27fm{P1QPEq9A;wd*NcDeCI_W$G^ z&vJ|wNPESmotG$0K`zpK6Xv7b_G)kAM@u+f4PB&`auxCpaYZ(p&4${Pc#*Vn6h(b4 zGL_5L)+{&DUF}ZBE82=X6~~Ma6}KZhXrME)O?_-~`*PX{H!{_NabxEy6+@m?sH^Gg zB-90?V|J68T%qKt;y#5iCALbKdoNq3{}NaL^z`3TNge#m|{xus}fq4h9Mhf&(ZgoST$zQch&NNE(n4kq{8h%>SYB z=-}AU$iTQLU_qebAE5F-z&%u$m{u07JS;3OtSJ8hycj93rra|AZ=nokvuoNiTA_B6 z0|kJ^s4-bYG9x1(01zYrZ~_2BRrL~}(kL1L_B<6a}%eVp4yj}IBB9I{{pG=IM=iB>ASl+XmzKthcDSNmqT&mQ)IRu2gPc6 z+!>F>od=7`Lfou$*Hp>wPbmZ1d=4ut!DzK?5pjLAStaiT`q)clHL(iLtgtRQ19BwjZmSs zb{RGthP!jKsLs4tVfErL@yN5`RfjTM%{K(%okk3sHr+z85UL>Xj?99>k5?_JXCjJB z${H@lD@TF71iiY h-pax7EB6gnru>zOJ8?7fFNrIk&9MT9%rR0^LqpQwy08EM 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