diff --git a/3d/ik/fabrik_ik.tscn b/3d/ik/fabrik_ik.tscn index f825dec8..f484a708 100644 --- a/3d/ik/fabrik_ik.tscn +++ b/3d/ik/fabrik_ik.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=15 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://battle_bot_color.tres" type="Material" id=3] -[ext_resource path="res://battle_bot_emission.tres" type="Material" id=4] +[ext_resource path="res://model/godot_battle_bot.dae" type="PackedScene" id=2] +[ext_resource path="res://model/battle_bot_color.tres" type="Material" id=3] +[ext_resource path="res://model/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] @@ -36,9 +36,9 @@ material/0 = SubResource( 2 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 ) -[node name="BattleBot" parent="." instance=ExtResource( 2 )] +[node name="GodotBattleBot" parent="." instance=ExtResource( 2 )] -[node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"] +[node name="godot_battle_bot" parent="GodotBattleBot/Armature/Skeleton" index="0"] material/0 = ExtResource( 3 ) material/1 = ExtResource( 4 ) @@ -57,7 +57,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Head" additional_rotation = Vector3( 90, 0, 0 ) @@ -66,7 +66,7 @@ script = ExtResource( 8 ) __meta__ = { "_editor_icon": ExtResource( 9 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Left_UpperArm", "Left_LowerArm" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3 ) chain_iterations = 10 @@ -82,7 +82,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Left_Hand" additional_rotation = Vector3( 0, 0, 90 ) position_using_additional_bone = true @@ -103,7 +103,7 @@ script = ExtResource( 8 ) __meta__ = { "_editor_icon": ExtResource( 9 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Right_UpperArm", "Right_LowerArm", "Right_Hand" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3, 1.2 ) limit_chain_iterations = false @@ -118,7 +118,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Right_Hand" additional_rotation = Vector3( 0, 0, 90 ) @@ -228,4 +228,4 @@ __meta__ = { } scene_to_change_to = "res://look_at_ik.tscn" -[editable path="BattleBot"] +[editable path="GodotBattleBot"] diff --git a/3d/ik/fps/fps_example.tscn b/3d/ik/fps/fps_example.tscn index 9b02ce0b..c510d499 100644 --- a/3d/ik/fps/fps_example.tscn +++ b/3d/ik/fps/fps_example.tscn @@ -10,9 +10,9 @@ [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] +[ext_resource path="res://model/godot_battle_bot.dae" type="PackedScene" id=11] +[ext_resource path="res://model/battle_bot_color.tres" type="Material" id=12] +[ext_resource path="res://model/battle_bot_emission.tres" type="Material" id=13] [sub_resource type="PlaneMesh" id=1] size = Vector2( 40, 40 ) @@ -472,7 +472,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Chest" look_at_axis = 2 additional_rotation = Vector3( -10, 0, 0 ) @@ -489,7 +489,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Left_UpperArm", "Left_LowerArm", "Left_Hand" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3, 0.1 ) limit_chain_iterations = false @@ -504,7 +504,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Left_Hand" use_negative_our_rot = true additional_rotation = Vector3( 0, 0, 90 ) @@ -526,7 +526,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Right_UpperArm", "Right_LowerArm", "Right_Hand" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3, 0.1 ) limit_chain_iterations = false @@ -541,7 +541,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Right_Hand" use_negative_our_rot = true additional_rotation = Vector3( 0, 0, 90 ) @@ -566,7 +566,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Head" [node name="AnimationPlayer" type="AnimationPlayer" parent="KinematicBody/CameraHolder"] @@ -589,12 +589,12 @@ material/1 = ExtResource( 10 ) [node name="PistolEnd" type="Spatial" parent="KinematicBody/CameraHolder/Weapon/Pistol"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0161836, 0.315914, 1.41329 ) -[node name="BattleBot" parent="KinematicBody" instance=ExtResource( 11 )] +[node name="GodotBattleBot" parent="KinematicBody" instance=ExtResource( 11 )] -[node name="godot_battle_bot" parent="KinematicBody/BattleBot/Armature/Skeleton" index="0"] +[node name="godot_battle_bot" parent="KinematicBody/GodotBattleBot/Armature/Skeleton" index="0"] material/0 = ExtResource( 12 ) material/1 = ExtResource( 13 ) [editable path="KinematicBody/CameraHolder/Weapon/Pistol"] -[editable path="KinematicBody/BattleBot"] +[editable path="KinematicBody/GodotBattleBot"] diff --git a/3d/ik/fps/gun_textures.png b/3d/ik/fps/gun_textures.png index 11a735d9..0d591d69 100644 Binary files a/3d/ik/fps/gun_textures.png and b/3d/ik/fps/gun_textures.png differ diff --git a/3d/ik/fps/gun_textures.png.import b/3d/ik/fps/gun_textures.png.import index ed7ceb41..3ef290f9 100644 --- a/3d/ik/fps/gun_textures.png.import +++ b/3d/ik/fps/gun_textures.png.import @@ -22,8 +22,8 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=true -flags/filter=true -flags/mipmaps=true +flags/filter=false +flags/mipmaps=false flags/anisotropic=false flags/srgb=1 process/fix_alpha_border=true diff --git a/3d/ik/godot_battle_bot_colors.png b/3d/ik/godot_battle_bot_colors.png deleted file mode 100644 index 572d0b43..00000000 Binary files a/3d/ik/godot_battle_bot_colors.png and /dev/null differ diff --git a/3d/ik/godot_battle_bot_colors.png.import b/3d/ik/godot_battle_bot_colors.png.import deleted file mode 100644 index e553842b..00000000 --- a/3d/ik/godot_battle_bot_colors.png.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path.s3tc="res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.s3tc.stex" -path.etc2="res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.etc2.stex" -metadata={ -"imported_formats": [ "s3tc", "etc2" ], -"vram_texture": true -} - -[deps] - -source_file="res://godot_battle_bot_colors.png" -dest_files=[ "res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.s3tc.stex", "res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.etc2.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 diff --git a/3d/ik/godot_battle_bot_emission.png b/3d/ik/godot_battle_bot_emission.png deleted file mode 100644 index 336dbd10..00000000 Binary files a/3d/ik/godot_battle_bot_emission.png and /dev/null differ diff --git a/3d/ik/godot_battle_bot_emission.png.import b/3d/ik/godot_battle_bot_emission.png.import deleted file mode 100644 index 8b300305..00000000 --- a/3d/ik/godot_battle_bot_emission.png.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path.s3tc="res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.s3tc.stex" -path.etc2="res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.etc2.stex" -metadata={ -"imported_formats": [ "s3tc", "etc2" ], -"vram_texture": true -} - -[deps] - -source_file="res://godot_battle_bot_emission.png" -dest_files=[ "res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.s3tc.stex", "res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.etc2.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 diff --git a/3d/ik/look_at_ik.tscn b/3d/ik/look_at_ik.tscn index 62df55e6..174da070 100644 --- a/3d/ik/look_at_ik.tscn +++ b/3d/ik/look_at_ik.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=11 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://battle_bot_color.tres" type="Material" id=3] -[ext_resource path="res://battle_bot_emission.tres" type="Material" id=4] +[ext_resource path="res://model/godot_battle_bot.dae" type="PackedScene" id=2] +[ext_resource path="res://model/battle_bot_color.tres" type="Material" id=3] +[ext_resource path="res://model/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] @@ -27,9 +27,9 @@ material/0 = SubResource( 2 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 ) -[node name="BattleBot" parent="." instance=ExtResource( 2 )] +[node name="GodotBattleBot" parent="." instance=ExtResource( 2 )] -[node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"] +[node name="godot_battle_bot" parent="GodotBattleBot/Armature/Skeleton" index="0"] material/0 = ExtResource( 3 ) material/1 = ExtResource( 4 ) @@ -47,7 +47,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Head" additional_rotation = Vector3( 90, 0, 0 ) @@ -56,7 +56,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Left_UpperArm" [node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/Targets"] @@ -64,7 +64,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Right_UpperArm" additional_rotation = Vector3( 0, 0, 180 ) @@ -98,6 +98,9 @@ text = "LookAt IK Move mouse to move IK targets" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="ButtonNext" type="Button" parent="Control"] anchor_left = 1.0 @@ -115,4 +118,4 @@ __meta__ = { } scene_to_change_to = "res://fabrik_ik.tscn" -[editable path="BattleBot"] +[editable path="GodotBattleBot"] diff --git a/3d/ik/model/README.md b/3d/ik/model/README.md new file mode 100644 index 00000000..dbebb4e0 --- /dev/null +++ b/3d/ik/model/README.md @@ -0,0 +1,5 @@ +# Godot Battle Bot + +This folder contains the model and textures/materials for the Godot Battle Bot. + +Yes, the battle bot really is 14.5 meters tall. It is a powerful robot. diff --git a/3d/ik/battle_bot_color.tres b/3d/ik/model/battle_bot_color.tres similarity index 94% rename from 3d/ik/battle_bot_color.tres rename to 3d/ik/model/battle_bot_color.tres index b9915b9f..df93a6a0 100644 --- a/3d/ik/battle_bot_color.tres +++ b/3d/ik/model/battle_bot_color.tres @@ -1,6 +1,6 @@ [gd_resource type="SpatialMaterial" load_steps=2 format=2] -[ext_resource path="res://godot_battle_bot_colors.png" type="Texture" id=1] +[ext_resource path="res://model/godot_battle_bot_colors.png" type="Texture" id=1] [resource] @@ -55,4 +55,3 @@ uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo" ] - diff --git a/3d/ik/battle_bot_emission.tres b/3d/ik/model/battle_bot_emission.tres similarity index 100% rename from 3d/ik/battle_bot_emission.tres rename to 3d/ik/model/battle_bot_emission.tres diff --git a/3d/ik/godot_battle_bot.dae b/3d/ik/model/godot_battle_bot.dae similarity index 100% rename from 3d/ik/godot_battle_bot.dae rename to 3d/ik/model/godot_battle_bot.dae diff --git a/3d/ik/godot_battle_bot.dae.import b/3d/ik/model/godot_battle_bot.dae.import similarity index 99% rename from 3d/ik/godot_battle_bot.dae.import rename to 3d/ik/model/godot_battle_bot.dae.import index 58510161..9459461a 100644 --- a/3d/ik/godot_battle_bot.dae.import +++ b/3d/ik/model/godot_battle_bot.dae.import @@ -2,12 +2,12 @@ importer="scene" type="PackedScene" -path="res://.import/godot_battle_bot.dae-eca9fb346b160636fd03ddf258af136e.scn" +path="res://.import/godot_battle_bot.dae-b816538849caf76e74976d7a086ba5f7.scn" [deps] -source_file="res://godot_battle_bot.dae" -dest_files=[ "res://.import/godot_battle_bot.dae-eca9fb346b160636fd03ddf258af136e.scn" ] +source_file="res://model/godot_battle_bot.dae" +dest_files=[ "res://.import/godot_battle_bot.dae-b816538849caf76e74976d7a086ba5f7.scn" ] [params] diff --git a/3d/ik/model/godot_battle_bot_colors.png b/3d/ik/model/godot_battle_bot_colors.png new file mode 100644 index 00000000..ff4584ce Binary files /dev/null and b/3d/ik/model/godot_battle_bot_colors.png differ diff --git a/3d/ik/model/godot_battle_bot_colors.png.import b/3d/ik/model/godot_battle_bot_colors.png.import new file mode 100644 index 00000000..67b27ed9 --- /dev/null +++ b/3d/ik/model/godot_battle_bot_colors.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/godot_battle_bot_colors.png-db0edfc662d0fffff287aad7600ab21a.s3tc.stex" +path.etc2="res://.import/godot_battle_bot_colors.png-db0edfc662d0fffff287aad7600ab21a.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://model/godot_battle_bot_colors.png" +dest_files=[ "res://.import/godot_battle_bot_colors.png-db0edfc662d0fffff287aad7600ab21a.s3tc.stex", "res://.import/godot_battle_bot_colors.png-db0edfc662d0fffff287aad7600ab21a.etc2.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=false +flags/mipmaps=false +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 diff --git a/3d/ik/model/godot_battle_bot_emission.png b/3d/ik/model/godot_battle_bot_emission.png new file mode 100644 index 00000000..745cde13 Binary files /dev/null and b/3d/ik/model/godot_battle_bot_emission.png differ diff --git a/3d/ik/model/godot_battle_bot_emission.png.import b/3d/ik/model/godot_battle_bot_emission.png.import new file mode 100644 index 00000000..75572dd0 --- /dev/null +++ b/3d/ik/model/godot_battle_bot_emission.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/godot_battle_bot_emission.png-59fd27c1839e5b7c5584f3c2131bce33.s3tc.stex" +path.etc2="res://.import/godot_battle_bot_emission.png-59fd27c1839e5b7c5584f3c2131bce33.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://model/godot_battle_bot_emission.png" +dest_files=[ "res://.import/godot_battle_bot_emission.png-59fd27c1839e5b7c5584f3c2131bce33.s3tc.stex", "res://.import/godot_battle_bot_emission.png-59fd27c1839e5b7c5584f3c2131bce33.etc2.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=false +flags/mipmaps=false +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 diff --git a/3d/ik/skeleton_ik.tscn b/3d/ik/skeleton_ik.tscn index 47c479d5..3888bb09 100644 --- a/3d/ik/skeleton_ik.tscn +++ b/3d/ik/skeleton_ik.tscn @@ -3,10 +3,10 @@ [ext_resource path="res://skeleton_ik_runner.gd" type="Script" id=1] [ext_resource path="res://addons/sade/ik_look_at.png" type="Texture" id=2] [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=3] -[ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=4] +[ext_resource path="res://model/godot_battle_bot.dae" type="PackedScene" id=4] [ext_resource path="res://target_from_mousepos.gd" type="Script" id=5] -[ext_resource path="res://battle_bot_color.tres" type="Material" id=6] -[ext_resource path="res://battle_bot_emission.tres" type="Material" id=7] +[ext_resource path="res://model/battle_bot_color.tres" type="Material" id=6] +[ext_resource path="res://model/battle_bot_emission.tres" type="Material" id=7] [ext_resource path="res://button_change_scene.gd" type="Script" id=8] [ext_resource path="res://addons/sade/ik_look_at.gd" type="Script" id=9]