diff --git a/proyecto_4/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn b/proyecto_4/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn index 21b0c3ba5e3c49801d3ad9f45eba36258484dac4..3debde56cf655cd31c7b4cdd59a949cab6919444 100644 --- a/proyecto_4/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn +++ b/proyecto_4/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn @@ -1,43 +1,117 @@ -[gd_scene load_steps=14 format=3 uid="uid://kcqomcjq52np"] +[gd_scene load_steps=50 format=3 uid="uid://kcqomcjq52np"] [ext_resource type="PackedScene" uid="uid://bxipj7hyjwy6f" path="res://addons/godot-xr-tools/hands/animations/right/AnimationPlayer.tscn" id="1"] -[ext_resource type="PackedScene" uid="uid://c6s5nvekg0isa" path="res://addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf" id="2"] +[ext_resource type="PackedScene" uid="uid://b1fg6cv0uujak" path="res://addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf" id="2"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_gqplw"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] [ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="7"] - -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_y3mf2"] +[ext_resource type="Animation" uid="uid://do01jton6rk42" path="res://addons/godot-xr-tools/hands/animations/right/Cup.res" id="8_2c3qr"] +[ext_resource type="Animation" uid="uid://ky28birj4su6" path="res://addons/godot-xr-tools/hands/animations/right/Default pose.res" id="9_x7dsv"] +[ext_resource type="Animation" uid="uid://ccds2u22gbxn7" path="res://addons/godot-xr-tools/hands/animations/right/Grip.res" id="10_80dnj"] +[ext_resource type="Animation" uid="uid://daqddcrbpam0c" path="res://addons/godot-xr-tools/hands/animations/right/Grip 1.res" id="11_g44gk"] +[ext_resource type="Animation" uid="uid://r8hleealhrqt" path="res://addons/godot-xr-tools/hands/animations/right/Grip 2.res" id="12_00y24"] +[ext_resource type="Animation" uid="uid://rs7vpclot07o" path="res://addons/godot-xr-tools/hands/animations/right/Grip 3.res" id="13_gn5xt"] +[ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="14_osvfi"] +[ext_resource type="Animation" uid="uid://s1vqcxyqcvea" path="res://addons/godot-xr-tools/hands/animations/right/Grip 5.res" id="15_ndek1"] +[ext_resource type="Animation" uid="uid://c8dghcftg1thx" path="res://addons/godot-xr-tools/hands/animations/right/Grip Shaft.res" id="16_2hq3y"] +[ext_resource type="Animation" uid="uid://bv5tuc1kjv0k5" path="res://addons/godot-xr-tools/hands/animations/right/Hold.res" id="17_jsyqh"] +[ext_resource type="Animation" uid="uid://cdjfhqnr4n2mr" path="res://addons/godot-xr-tools/hands/animations/right/Horns.res" id="18_sce23"] +[ext_resource type="Animation" uid="uid://b1kqsodcr1til" path="res://addons/godot-xr-tools/hands/animations/right/Metal.res" id="19_51gp7"] +[ext_resource type="Animation" uid="uid://cg6fsqb2iuuih" path="res://addons/godot-xr-tools/hands/animations/right/Middle.res" id="20_elwto"] +[ext_resource type="Animation" uid="uid://c3isimdlxg54a" path="res://addons/godot-xr-tools/hands/animations/right/OK.res" id="21_a1sox"] +[ext_resource type="Animation" uid="uid://bxmc3vlfih764" path="res://addons/godot-xr-tools/hands/animations/right/Peace.res" id="22_08s11"] +[ext_resource type="Animation" uid="uid://dg4v7rqiaje2h" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Flat.res" id="23_7eq1h"] +[ext_resource type="Animation" uid="uid://cuwwpxi44vwpm" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Large.res" id="24_5ci11"] +[ext_resource type="Animation" uid="uid://c6vghurk7t5yb" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Middle.res" id="25_yutfk"] +[ext_resource type="Animation" uid="uid://mjotm5uukoo3" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Ring.res" id="26_2pn3u"] +[ext_resource type="Animation" uid="uid://ca21ej1p3g2yt" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Tight.res" id="27_o5now"] +[ext_resource type="Animation" uid="uid://cseojxi8rrqc" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Up.res" id="28_sccn8"] +[ext_resource type="Animation" uid="uid://c8hn123uon74u" path="res://addons/godot-xr-tools/hands/animations/right/PingPong.res" id="29_tw08o"] +[ext_resource type="Animation" uid="uid://b6ra3rqia1gvb" path="res://addons/godot-xr-tools/hands/animations/right/Pinky.res" id="30_f3hp1"] +[ext_resource type="Animation" uid="uid://csp3fdknowmi5" path="res://addons/godot-xr-tools/hands/animations/right/Pistol.res" id="31_cyfxe"] +[ext_resource type="Animation" uid="uid://2ttepgvf634h" path="res://addons/godot-xr-tools/hands/animations/right/Ring.res" id="32_6pwvd"] +[ext_resource type="Animation" uid="uid://wcwa3p1qrhwr" path="res://addons/godot-xr-tools/hands/animations/right/Rounded.res" id="33_gjpp0"] +[ext_resource type="Animation" uid="uid://bcwx6a6mhsoj2" path="res://addons/godot-xr-tools/hands/animations/right/Sign 1.res" id="34_rusbn"] +[ext_resource type="Animation" uid="uid://btnsp36fjkldf" path="res://addons/godot-xr-tools/hands/animations/right/Sign 2.res" id="35_maosw"] +[ext_resource type="Animation" uid="uid://c35i6glt1ov2m" path="res://addons/godot-xr-tools/hands/animations/right/Sign 3.res" id="36_n1nus"] +[ext_resource type="Animation" uid="uid://b8mmk2ufmlyf" path="res://addons/godot-xr-tools/hands/animations/right/Sign 4.res" id="37_obila"] +[ext_resource type="Animation" uid="uid://ddgl3lsnlfiny" path="res://addons/godot-xr-tools/hands/animations/right/Sign 5.res" id="38_38kw8"] +[ext_resource type="Animation" uid="uid://ccy3e7a0hvxyl" path="res://addons/godot-xr-tools/hands/animations/right/Sign_Point.res" id="39_gp47l"] +[ext_resource type="Animation" uid="uid://d3h36bkauutoq" path="res://addons/godot-xr-tools/hands/animations/right/Straight.res" id="40_lg2b6"] +[ext_resource type="Animation" uid="uid://bq7cjxdn28jcv" path="res://addons/godot-xr-tools/hands/animations/right/Surfer.res" id="41_o2aoi"] +[ext_resource type="Animation" uid="uid://d2ukhr3n2r1u8" path="res://addons/godot-xr-tools/hands/animations/right/Thumb.res" id="42_8h5yp"] + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_reqae"] +_data = { +"Cup": ExtResource("8_2c3qr"), +"Default pose": ExtResource("9_x7dsv"), +"Grip": ExtResource("10_80dnj"), +"Grip 1": ExtResource("11_g44gk"), +"Grip 2": ExtResource("12_00y24"), +"Grip 3": ExtResource("13_gn5xt"), +"Grip 4": ExtResource("14_osvfi"), +"Grip 5": ExtResource("15_ndek1"), +"Grip Shaft": ExtResource("16_2hq3y"), +"Hold": ExtResource("17_jsyqh"), +"Horns": ExtResource("18_sce23"), +"Metal": ExtResource("19_51gp7"), +"Middle": ExtResource("20_elwto"), +"OK": ExtResource("21_a1sox"), +"Peace": ExtResource("22_08s11"), +"Pinch Flat": ExtResource("23_7eq1h"), +"Pinch Large": ExtResource("24_5ci11"), +"Pinch Middle": ExtResource("25_yutfk"), +"Pinch Ring": ExtResource("26_2pn3u"), +"Pinch Tight": ExtResource("27_o5now"), +"Pinch Up": ExtResource("28_sccn8"), +"PingPong": ExtResource("29_tw08o"), +"Pinky": ExtResource("30_f3hp1"), +"Pistol": ExtResource("31_cyfxe"), +"Ring": ExtResource("32_6pwvd"), +"Rounded": ExtResource("33_gjpp0"), +"Sign 1": ExtResource("34_rusbn"), +"Sign 2": ExtResource("35_maosw"), +"Sign 3": ExtResource("36_n1nus"), +"Sign 4": ExtResource("37_obila"), +"Sign 5": ExtResource("38_38kw8"), +"Sign_Point": ExtResource("39_gp47l"), +"Straight": ExtResource("40_lg2b6"), +"Surfer": ExtResource("41_o2aoi"), +"Thumb": ExtResource("42_8h5yp") +} + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_khyky"] animation = &"Grip" -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8ifub"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lpbtp"] animation = &"Grip" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_jh66p"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_bunf2"] filter_enabled = true filters = ["Armature/Skeleton3D:Little_Distal_R", "Armature/Skeleton3D:Little_Intermediate_R", "Armature/Skeleton3D:Little_Metacarpal_R", "Armature/Skeleton3D:Little_Proximal_R", "Armature/Skeleton3D:Middle_Distal_R", "Armature/Skeleton3D:Middle_Intermediate_R", "Armature/Skeleton3D:Middle_Metacarpal_R", "Armature/Skeleton3D:Middle_Proximal_R", "Armature/Skeleton3D:Ring_Distal_R", "Armature/Skeleton3D:Ring_Intermediate_R", "Armature/Skeleton3D:Ring_Metacarpal_R", "Armature/Skeleton3D:Ring_Proximal_R", "Armature/Skeleton3D:Thumb_Distal_R", "Armature/Skeleton3D:Thumb_Metacarpal_R", "Armature/Skeleton3D:Thumb_Proximal_R", "Armature/Skeleton:Little_Distal_R", "Armature/Skeleton:Little_Intermediate_R", "Armature/Skeleton:Little_Proximal_R", "Armature/Skeleton:Middle_Distal_R", "Armature/Skeleton:Middle_Intermediate_R", "Armature/Skeleton:Middle_Proximal_R", "Armature/Skeleton:Ring_Distal_R", "Armature/Skeleton:Ring_Intermediate_R", "Armature/Skeleton:Ring_Proximal_R", "Armature/Skeleton:Thumb_Distal_R", "Armature/Skeleton:Thumb_Proximal_R"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_4bb4h"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_6kpwo"] animation = &"Grip 5" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_b8ks0"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_5re6i"] filter_enabled = true filters = ["Armature/Skeleton3D:Index_Distal_R", "Armature/Skeleton3D:Index_Intermediate_R", "Armature/Skeleton3D:Index_Metacarpal_R", "Armature/Skeleton3D:Index_Proximal_R", "Armature/Skeleton:Index_Distal_R", "Armature/Skeleton:Index_Intermediate_R", "Armature/Skeleton:Index_Proximal_R"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_xm2bm"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_1fp2j"] graph_offset = Vector2(-552.664, 107.301) -nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_y3mf2") +nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_khyky") nodes/ClosedHand1/position = Vector2(-600, 300) -nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_8ifub") +nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_lpbtp") nodes/ClosedHand2/position = Vector2(-360, 300) -nodes/Grip/node = SubResource("AnimationNodeBlend2_jh66p") +nodes/Grip/node = SubResource("AnimationNodeBlend2_bunf2") nodes/Grip/position = Vector2(0, 40) -nodes/OpenHand/node = SubResource("AnimationNodeAnimation_4bb4h") +nodes/OpenHand/node = SubResource("AnimationNodeAnimation_6kpwo") nodes/OpenHand/position = Vector2(-600, 100) -nodes/Trigger/node = SubResource("AnimationNodeBlend2_b8ks0") +nodes/Trigger/node = SubResource("AnimationNodeBlend2_5re6i") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] +node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] [node name="RightPhysicsHand" type="Node3D"] script = ExtResource("3") @@ -218,9 +292,12 @@ length = 0.015 [node name="AnimationPlayer" parent="Hand_Nails_R" instance=ExtResource("1")] [node name="AnimationTree" type="AnimationTree" parent="."] -tree_root = SubResource("AnimationNodeBlendTree_xm2bm") +root_node = NodePath("../Hand_Nails_R") +libraries = { +"": SubResource("AnimationLibrary_reqae") +} +tree_root = SubResource("AnimationNodeBlendTree_1fp2j") anim_player = NodePath("../Hand_Nails_R/AnimationPlayer") -active = true parameters/Grip/blend_amount = 0.0 parameters/Trigger/blend_amount = 0.0 diff --git a/proyecto_4/config.gd b/proyecto_4/config.gd index 06d4ecfd56f1743042ea0215876115b88a11b3fa..c31ed3057d8b2353a9a0a4fa995fd7f6d4838f7c 100644 --- a/proyecto_4/config.gd +++ b/proyecto_4/config.gd @@ -107,7 +107,4 @@ func accept_join(join_1: String, join_2: String) ->bool: var option1 = join_1 + "/" + join_2 var option2 = join_2 + "/" + join_1 - print (option1) - print (option2) - return tower_joins.has(option1) or tower_joins.has(option2) diff --git a/proyecto_4/content/CfeVr/Letreros/HaciaObraCivil.png.import b/proyecto_4/content/CfeVr/Letreros/HaciaObraCivil.png.import new file mode 100644 index 0000000000000000000000000000000000000000..e56888d96106b65cff74346d65154b2a927ad84e --- /dev/null +++ b/proyecto_4/content/CfeVr/Letreros/HaciaObraCivil.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbccv5dgcc18w" +path="res://.godot/imported/HaciaObraCivil.png-140ff3b3f563512838a4fa2b0fb89431.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://content/CfeVr/Letreros/HaciaObraCivil.png" +dest_files=["res://.godot/imported/HaciaObraCivil.png-140ff3b3f563512838a4fa2b0fb89431.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaHaciaObraCivil.svg.import b/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaHaciaObraCivil.svg.import new file mode 100644 index 0000000000000000000000000000000000000000..f64d49137d0b32d302e7f89248d39c45cc371352 --- /dev/null +++ b/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaHaciaObraCivil.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://duxaip4skflv3" +path="res://.godot/imported/SESantaFeGuiaHaciaObraCivil.svg-26500f5186dc1465dea265770f7478fd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://content/CfeVr/Letreros/SESantaFeGuiaHaciaObraCivil.svg" +dest_files=["res://.godot/imported/SESantaFeGuiaHaciaObraCivil.svg-26500f5186dc1465dea265770f7478fd.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaHaciaObraElectromecanica.svg.import b/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaHaciaObraElectromecanica.svg.import new file mode 100644 index 0000000000000000000000000000000000000000..4786cf0185b69c589cfac58f73e10427c3eb3976 --- /dev/null +++ b/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaHaciaObraElectromecanica.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bxntkcfutmyxr" +path="res://.godot/imported/SESantaFeGuiaHaciaObraElectromecanica.svg-6e49f6d22a568bf83aa71cda74bc0724.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://content/CfeVr/Letreros/SESantaFeGuiaHaciaObraElectromecanica.svg" +dest_files=["res://.godot/imported/SESantaFeGuiaHaciaObraElectromecanica.svg-6e49f6d22a568bf83aa71cda74bc0724.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaInicial.svg.import b/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaInicial.svg.import new file mode 100644 index 0000000000000000000000000000000000000000..42695eae368542ef19f39818d0a1de7f07d88645 --- /dev/null +++ b/proyecto_4/content/CfeVr/Letreros/SESantaFeGuiaInicial.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b0hw1kok71al6" +path="res://.godot/imported/SESantaFeGuiaInicial.svg-9c6caf73c8b019ae72565b4b737754f1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://content/CfeVr/Letreros/SESantaFeGuiaInicial.svg" +dest_files=["res://.godot/imported/SESantaFeGuiaInicial.svg-9c6caf73c8b019ae72565b4b737754f1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/proyecto_4/content/CfeVr/Letreros/VistaObraElectromecanica.png.import b/proyecto_4/content/CfeVr/Letreros/VistaObraElectromecanica.png.import new file mode 100644 index 0000000000000000000000000000000000000000..b4c07ec41f2b43508a2f52cc1ee296eb61d202e7 --- /dev/null +++ b/proyecto_4/content/CfeVr/Letreros/VistaObraElectromecanica.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bopan3o8qjbbn" +path="res://.godot/imported/VistaObraElectromecanica.png-2f5b1a526cea0e588117545a268c7cb4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://content/CfeVr/Letreros/VistaObraElectromecanica.png" +dest_files=["res://.godot/imported/VistaObraElectromecanica.png-2f5b1a526cea0e588117545a268c7cb4.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/proyecto_4/content/CfeVr/Maps/ArmarTorre/level_1.gd b/proyecto_4/content/CfeVr/Maps/ArmarTorre/level_1.gd index 732bf1ece4f5a5f154d1c01e6565c146438cb520..8828ed682d69285c3ad23a3b3c5ce8b8e1660152 100644 --- a/proyecto_4/content/CfeVr/Maps/ArmarTorre/level_1.gd +++ b/proyecto_4/content/CfeVr/Maps/ArmarTorre/level_1.gd @@ -7,7 +7,6 @@ func _ready(): func _on_settings_ui_option1_pressed(): - print ("Option1 Presionada") var scene_base : XRToolsSceneBase = XRTools.find_xr_ancestor(self, "*", "XRToolsSceneBase") if not scene_base: return diff --git a/proyecto_4/content/CfeVr/Maps/Level0/level_0.tscn b/proyecto_4/content/CfeVr/Maps/Level0/level_0.tscn index 16d3eade9b9ee551027a3b4d7c48f4bda064b7cc..19344e9a679f7f4199dbdc5778581e148e417895 100644 --- a/proyecto_4/content/CfeVr/Maps/Level0/level_0.tscn +++ b/proyecto_4/content/CfeVr/Maps/Level0/level_0.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=102 format=3 uid="uid://hpj6oaov272i"] +[gd_scene load_steps=66 format=3 uid="uid://hpj6oaov272i"] [ext_resource type="PackedScene" uid="uid://qbmx03iibuuu" path="res://addons/godot-xr-tools/staging/scene_base.tscn" id="1_15pbl"] [ext_resource type="PackedScene" uid="uid://cy03d57iyrci" path="res://addons/godot-xr-tools/hands/scenes/highpoly/left_physics_hand.tscn" id="2_2uriv"] @@ -45,41 +45,6 @@ [ext_resource type="PackedScene" uid="uid://c8bglf4xdhuwj" path="res://content/CfeVr/Others/ControlPad/control_pad_location_left.tscn" id="41_q1dvf"] [ext_resource type="PackedScene" uid="uid://kcqomcjq52np" path="res://addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn" id="42_of4ny"] [ext_resource type="PackedScene" uid="uid://diyu06cw06syv" path="res://addons/godot-xr-tools/player/player_body.tscn" id="42_smfo0"] -[ext_resource type="Animation" uid="uid://do01jton6rk42" path="res://addons/godot-xr-tools/hands/animations/right/Cup.res" id="43_bsauy"] -[ext_resource type="Animation" uid="uid://ky28birj4su6" path="res://addons/godot-xr-tools/hands/animations/right/Default pose.res" id="44_1poqk"] -[ext_resource type="Animation" uid="uid://ccds2u22gbxn7" path="res://addons/godot-xr-tools/hands/animations/right/Grip.res" id="45_tjtaw"] -[ext_resource type="Animation" uid="uid://daqddcrbpam0c" path="res://addons/godot-xr-tools/hands/animations/right/Grip 1.res" id="46_eds4k"] -[ext_resource type="Animation" uid="uid://r8hleealhrqt" path="res://addons/godot-xr-tools/hands/animations/right/Grip 2.res" id="47_o470o"] -[ext_resource type="Animation" uid="uid://rs7vpclot07o" path="res://addons/godot-xr-tools/hands/animations/right/Grip 3.res" id="48_qibbp"] -[ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="49_k60is"] -[ext_resource type="Animation" uid="uid://s1vqcxyqcvea" path="res://addons/godot-xr-tools/hands/animations/right/Grip 5.res" id="50_v36yl"] -[ext_resource type="Animation" uid="uid://c8dghcftg1thx" path="res://addons/godot-xr-tools/hands/animations/right/Grip Shaft.res" id="51_p2s6t"] -[ext_resource type="Animation" uid="uid://bv5tuc1kjv0k5" path="res://addons/godot-xr-tools/hands/animations/right/Hold.res" id="52_nlx1g"] -[ext_resource type="Animation" uid="uid://cdjfhqnr4n2mr" path="res://addons/godot-xr-tools/hands/animations/right/Horns.res" id="53_0gxh7"] -[ext_resource type="Animation" uid="uid://b1kqsodcr1til" path="res://addons/godot-xr-tools/hands/animations/right/Metal.res" id="54_jokct"] -[ext_resource type="Animation" uid="uid://cg6fsqb2iuuih" path="res://addons/godot-xr-tools/hands/animations/right/Middle.res" id="55_trgki"] -[ext_resource type="Animation" uid="uid://c3isimdlxg54a" path="res://addons/godot-xr-tools/hands/animations/right/OK.res" id="56_unota"] -[ext_resource type="Animation" uid="uid://bxmc3vlfih764" path="res://addons/godot-xr-tools/hands/animations/right/Peace.res" id="57_6e4ub"] -[ext_resource type="Animation" uid="uid://dg4v7rqiaje2h" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Flat.res" id="58_mot6j"] -[ext_resource type="Animation" uid="uid://cuwwpxi44vwpm" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Large.res" id="59_vlk61"] -[ext_resource type="Animation" uid="uid://c6vghurk7t5yb" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Middle.res" id="60_svgw5"] -[ext_resource type="Animation" uid="uid://mjotm5uukoo3" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Ring.res" id="61_n4ojw"] -[ext_resource type="Animation" uid="uid://ca21ej1p3g2yt" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Tight.res" id="62_sai7j"] -[ext_resource type="Animation" uid="uid://cseojxi8rrqc" path="res://addons/godot-xr-tools/hands/animations/right/Pinch Up.res" id="63_u0hwt"] -[ext_resource type="Animation" uid="uid://c8hn123uon74u" path="res://addons/godot-xr-tools/hands/animations/right/PingPong.res" id="64_tsw6k"] -[ext_resource type="Animation" uid="uid://b6ra3rqia1gvb" path="res://addons/godot-xr-tools/hands/animations/right/Pinky.res" id="65_xfy0i"] -[ext_resource type="Animation" uid="uid://csp3fdknowmi5" path="res://addons/godot-xr-tools/hands/animations/right/Pistol.res" id="66_u8038"] -[ext_resource type="Animation" uid="uid://2ttepgvf634h" path="res://addons/godot-xr-tools/hands/animations/right/Ring.res" id="67_uom4u"] -[ext_resource type="Animation" uid="uid://wcwa3p1qrhwr" path="res://addons/godot-xr-tools/hands/animations/right/Rounded.res" id="68_topn8"] -[ext_resource type="Animation" uid="uid://bcwx6a6mhsoj2" path="res://addons/godot-xr-tools/hands/animations/right/Sign 1.res" id="69_fax7y"] -[ext_resource type="Animation" uid="uid://btnsp36fjkldf" path="res://addons/godot-xr-tools/hands/animations/right/Sign 2.res" id="70_au04h"] -[ext_resource type="Animation" uid="uid://c35i6glt1ov2m" path="res://addons/godot-xr-tools/hands/animations/right/Sign 3.res" id="71_54q4d"] -[ext_resource type="Animation" uid="uid://b8mmk2ufmlyf" path="res://addons/godot-xr-tools/hands/animations/right/Sign 4.res" id="72_i3bq3"] -[ext_resource type="Animation" uid="uid://ddgl3lsnlfiny" path="res://addons/godot-xr-tools/hands/animations/right/Sign 5.res" id="73_df8vj"] -[ext_resource type="Animation" uid="uid://ccy3e7a0hvxyl" path="res://addons/godot-xr-tools/hands/animations/right/Sign_Point.res" id="74_4gdtk"] -[ext_resource type="Animation" uid="uid://d3h36bkauutoq" path="res://addons/godot-xr-tools/hands/animations/right/Straight.res" id="75_cnurt"] -[ext_resource type="Animation" uid="uid://bq7cjxdn28jcv" path="res://addons/godot-xr-tools/hands/animations/right/Surfer.res" id="76_k7ocl"] -[ext_resource type="Animation" uid="uid://d2ukhr3n2r1u8" path="res://addons/godot-xr-tools/hands/animations/right/Thumb.res" id="77_1l4f4"] [ext_resource type="PackedScene" uid="uid://b6bk2pj8vbj28" path="res://addons/godot-xr-tools/functions/movement_turn.tscn" id="78_04we2"] [ext_resource type="PackedScene" uid="uid://bmys2rbg8wk5j" path="res://content/CfeVr/Others/ControlPad/control_pad_location_right.tscn" id="78_nj2l7"] [ext_resource type="PackedScene" uid="uid://uyqgjcl50ebh" path="res://content/CfeVr/Others/ControlPad/control_pad.tscn" id="80_m3ulm"] @@ -124,104 +89,65 @@ _data = { "Thumb": ExtResource("38_0m1rs") } -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_fwcnq"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_33gjt"] animation = &"Grip" -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_hnp5b"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_p8pbf"] animation = &"Grip" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_e2xue"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_75sqa"] filter_enabled = true filters = ["Armature/Skeleton3D:Little_Distal_L", "Armature/Skeleton3D:Little_Intermediate_L", "Armature/Skeleton3D:Little_Metacarpal_L", "Armature/Skeleton3D:Little_Proximal_L", "Armature/Skeleton3D:Middle_Distal_L", "Armature/Skeleton3D:Middle_Intermediate_L", "Armature/Skeleton3D:Middle_Metacarpal_L", "Armature/Skeleton3D:Middle_Proximal_L", "Armature/Skeleton3D:Ring_Distal_L", "Armature/Skeleton3D:Ring_Intermediate_L", "Armature/Skeleton3D:Ring_Metacarpal_L", "Armature/Skeleton3D:Ring_Proximal_L", "Armature/Skeleton3D:Thumb_Distal_L", "Armature/Skeleton3D:Thumb_Metacarpal_L", "Armature/Skeleton3D:Thumb_Proximal_L", "Armature/Skeleton:Little_Distal_L", "Armature/Skeleton:Little_Intermediate_L", "Armature/Skeleton:Little_Proximal_L", "Armature/Skeleton:Middle_Distal_L", "Armature/Skeleton:Middle_Intermediate_L", "Armature/Skeleton:Middle_Proximal_L", "Armature/Skeleton:Ring_Distal_L", "Armature/Skeleton:Ring_Intermediate_L", "Armature/Skeleton:Ring_Proximal_L", "Armature/Skeleton:Thumb_Distal_L", "Armature/Skeleton:Thumb_Proximal_L"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8nygk"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_w8pvq"] animation = &"Grip 5" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_dgund"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_556b6"] filter_enabled = true filters = ["Armature/Skeleton3D:Index_Distal_L", "Armature/Skeleton3D:Index_Intermediate_L", "Armature/Skeleton3D:Index_Metacarpal_L", "Armature/Skeleton3D:Index_Proximal_L", "Armature/Skeleton:Index_Distal_L", "Armature/Skeleton:Index_Intermediate_L", "Armature/Skeleton:Index_Proximal_L"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_vdkya"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_aip4x"] graph_offset = Vector2(-536, 11) -nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_fwcnq") +nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_33gjt") nodes/ClosedHand1/position = Vector2(-600, 300) -nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_hnp5b") +nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_p8pbf") nodes/ClosedHand2/position = Vector2(-360, 300) -nodes/Grip/node = SubResource("AnimationNodeBlend2_e2xue") +nodes/Grip/node = SubResource("AnimationNodeBlend2_75sqa") nodes/Grip/position = Vector2(0, 20) -nodes/OpenHand/node = SubResource("AnimationNodeAnimation_8nygk") +nodes/OpenHand/node = SubResource("AnimationNodeAnimation_w8pvq") nodes/OpenHand/position = Vector2(-600, 100) -nodes/Trigger/node = SubResource("AnimationNodeBlend2_dgund") +nodes/Trigger/node = SubResource("AnimationNodeBlend2_556b6") nodes/Trigger/position = Vector2(-360, 20) node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] -[sub_resource type="AnimationLibrary" id="AnimationLibrary_reqae"] -_data = { -"Cup": ExtResource("43_bsauy"), -"Default pose": ExtResource("44_1poqk"), -"Grip": ExtResource("45_tjtaw"), -"Grip 1": ExtResource("46_eds4k"), -"Grip 2": ExtResource("47_o470o"), -"Grip 3": ExtResource("48_qibbp"), -"Grip 4": ExtResource("49_k60is"), -"Grip 5": ExtResource("50_v36yl"), -"Grip Shaft": ExtResource("51_p2s6t"), -"Hold": ExtResource("52_nlx1g"), -"Horns": ExtResource("53_0gxh7"), -"Metal": ExtResource("54_jokct"), -"Middle": ExtResource("55_trgki"), -"OK": ExtResource("56_unota"), -"Peace": ExtResource("57_6e4ub"), -"Pinch Flat": ExtResource("58_mot6j"), -"Pinch Large": ExtResource("59_vlk61"), -"Pinch Middle": ExtResource("60_svgw5"), -"Pinch Ring": ExtResource("61_n4ojw"), -"Pinch Tight": ExtResource("62_sai7j"), -"Pinch Up": ExtResource("63_u0hwt"), -"PingPong": ExtResource("64_tsw6k"), -"Pinky": ExtResource("65_xfy0i"), -"Pistol": ExtResource("66_u8038"), -"Ring": ExtResource("67_uom4u"), -"Rounded": ExtResource("68_topn8"), -"Sign 1": ExtResource("69_fax7y"), -"Sign 2": ExtResource("70_au04h"), -"Sign 3": ExtResource("71_54q4d"), -"Sign 4": ExtResource("72_i3bq3"), -"Sign 5": ExtResource("73_df8vj"), -"Sign_Point": ExtResource("74_4gdtk"), -"Straight": ExtResource("75_cnurt"), -"Surfer": ExtResource("76_k7ocl"), -"Thumb": ExtResource("77_1l4f4") -} - -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ci6lr"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_amrq0"] animation = &"Grip" -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_4fu25"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_j0qb6"] animation = &"Grip" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_twurn"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_s6mej"] filter_enabled = true filters = ["Armature/Skeleton3D:Little_Distal_R", "Armature/Skeleton3D:Little_Intermediate_R", "Armature/Skeleton3D:Little_Metacarpal_R", "Armature/Skeleton3D:Little_Proximal_R", "Armature/Skeleton3D:Middle_Distal_R", "Armature/Skeleton3D:Middle_Intermediate_R", "Armature/Skeleton3D:Middle_Metacarpal_R", "Armature/Skeleton3D:Middle_Proximal_R", "Armature/Skeleton3D:Ring_Distal_R", "Armature/Skeleton3D:Ring_Intermediate_R", "Armature/Skeleton3D:Ring_Metacarpal_R", "Armature/Skeleton3D:Ring_Proximal_R", "Armature/Skeleton3D:Thumb_Distal_R", "Armature/Skeleton3D:Thumb_Metacarpal_R", "Armature/Skeleton3D:Thumb_Proximal_R", "Armature/Skeleton:Little_Distal_R", "Armature/Skeleton:Little_Intermediate_R", "Armature/Skeleton:Little_Proximal_R", "Armature/Skeleton:Middle_Distal_R", "Armature/Skeleton:Middle_Intermediate_R", "Armature/Skeleton:Middle_Proximal_R", "Armature/Skeleton:Ring_Distal_R", "Armature/Skeleton:Ring_Intermediate_R", "Armature/Skeleton:Ring_Proximal_R", "Armature/Skeleton:Thumb_Distal_R", "Armature/Skeleton:Thumb_Proximal_R"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_v7m3d"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_0scu6"] animation = &"Grip 5" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_0xfgk"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_0wfb4"] filter_enabled = true filters = ["Armature/Skeleton3D:Index_Distal_R", "Armature/Skeleton3D:Index_Intermediate_R", "Armature/Skeleton3D:Index_Metacarpal_R", "Armature/Skeleton3D:Index_Proximal_R", "Armature/Skeleton:Index_Distal_R", "Armature/Skeleton:Index_Intermediate_R", "Armature/Skeleton:Index_Proximal_R"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_l52cg"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_i63k0"] graph_offset = Vector2(-552.664, 107.301) -nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_ci6lr") +nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_amrq0") nodes/ClosedHand1/position = Vector2(-600, 300) -nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_4fu25") +nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_j0qb6") nodes/ClosedHand2/position = Vector2(-360, 300) -nodes/Grip/node = SubResource("AnimationNodeBlend2_twurn") +nodes/Grip/node = SubResource("AnimationNodeBlend2_s6mej") nodes/Grip/position = Vector2(0, 40) -nodes/OpenHand/node = SubResource("AnimationNodeAnimation_v7m3d") +nodes/OpenHand/node = SubResource("AnimationNodeAnimation_0scu6") nodes/OpenHand/position = Vector2(-600, 100) -nodes/Trigger/node = SubResource("AnimationNodeBlend2_0xfgk") +nodes/Trigger/node = SubResource("AnimationNodeBlend2_0wfb4") nodes/Trigger/position = Vector2(-360, 40) node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] @@ -245,68 +171,89 @@ script = ExtResource("2_dbhuh") [node name="LeftPhysicsHand" parent="XROrigin3D/LeftHand" index="0" instance=ExtResource("2_2uriv")] +[node name="Skeleton3D" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature" index="0"] +bones/1/rotation = Quaternion(0.323537, -2.56577e-05, -0.0272204, 0.945824) +bones/2/rotation = Quaternion(-0.0904441, -0.0415175, -0.166293, 0.981042) +bones/3/rotation = Quaternion(-0.0466199, 0.020971, 0.0103276, 0.998639) +bones/5/rotation = Quaternion(-0.00128455, -0.0116081, -0.0168259, 0.99979) +bones/6/rotation = Quaternion(0.102925, -0.00993208, -0.00794417, 0.994608) +bones/7/rotation = Quaternion(-0.012859, -0.0236108, -0.323258, 0.945929) +bones/8/rotation = Quaternion(0.0120575, -0.00929194, -0.247472, 0.968775) +bones/10/rotation = Quaternion(-0.0357539, -0.000400032, 0.00636764, 0.99934) +bones/11/rotation = Quaternion(-0.00264964, -0.00114471, -0.125992, 0.992027) +bones/12/rotation = Quaternion(0.0394225, 0.00193393, -0.228074, 0.972843) +bones/13/rotation = Quaternion(-0.0123395, -0.00881294, -0.280669, 0.959685) +bones/15/rotation = Quaternion(-0.0702656, 0.0101908, -0.0243307, 0.99718) +bones/16/rotation = Quaternion(-0.0320634, -0.00223624, -0.0686366, 0.997124) +bones/17/rotation = Quaternion(0.0253452, 0.00812462, -0.249005, 0.968136) +bones/18/rotation = Quaternion(0.00252232, 0.00788073, -0.243204, 0.96994) +bones/20/rotation = Quaternion(-0.0917369, 0.0203027, -0.010183, 0.995524) +bones/21/rotation = Quaternion(-0.0625182, -0.00022572, -0.115393, 0.991351) +bones/22/rotation = Quaternion(0.0585786, 0.0216483, -0.269905, 0.96086) +bones/23/rotation = Quaternion(0.00687177, -0.00357275, -0.211953, 0.977249) + [node name="BoneRoot" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="1"] transform = Transform3D(1, -1.83077e-05, 1.52659e-08, 1.52668e-08, 0.00166774, 0.999999, -1.83077e-05, -0.999999, 0.00166774, 3.86425e-08, -1.86975e-05, 0.0271756) [node name="BoneThumbMetacarpal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="2"] -transform = Transform3D(0.998519, 0.0514604, -0.0176509, -0.0176509, 0.613334, 0.789626, 0.0514604, -0.788145, 0.613334, 0.00999954, 0.0200266, 3.59323e-05) +transform = Transform3D(0.998519, 0.0514604, -0.0176509, -0.017651, 0.613335, 0.789626, 0.0514604, -0.788145, 0.613335, 0.00999954, 0.0200266, 3.59323e-05) [node name="BoneThumbProximal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="3"] -transform = Transform3D(0.921479, 0.383957, -0.0587629, -0.124051, 0.434264, 0.892203, 0.368086, -0.814857, 0.447796, 0.012311, 0.0475754, -0.0353648) +transform = Transform3D(0.921479, 0.383958, -0.0587628, -0.124052, 0.434264, 0.892203, 0.368087, -0.814856, 0.447796, 0.012311, 0.0475754, -0.0353648) [node name="BoneThumbDistal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="4"] -transform = Transform3D(0.930159, 0.366843, 0.0151707, -0.154036, 0.352396, 0.923087, 0.333282, -0.860954, 0.384292, 0.0284939, 0.0658787, -0.0697092) +transform = Transform3D(0.930159, 0.366844, 0.0151708, -0.154037, 0.352396, 0.923087, 0.333283, -0.860954, 0.384292, 0.028494, 0.0658787, -0.0697092) [node name="BoneIndexMetacarpal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="5"] -transform = Transform3D(0.999165, 0.0336563, -0.0231681, 0.0231985, -0.000511136, 0.999731, 0.0336354, -0.999433, -0.00129148, -0.0100005, 0.0224317, 3.59286e-05) +transform = Transform3D(0.999165, 0.0336562, -0.0231681, 0.0231985, -0.00051113, 0.999731, 0.0336353, -0.999433, -0.00129147, -0.0100005, 0.0224317, 3.59286e-05) [node name="BoneIndexProximal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="6"] -transform = Transform3D(0.997821, 0.0419385, -0.0509327, 0.041317, 0.204662, 0.97796, 0.0514381, -0.977934, 0.202483, -0.00729559, 0.0223907, -0.0802861) +transform = Transform3D(0.997821, 0.0419384, -0.0509326, 0.0413169, 0.204661, 0.97796, 0.0514381, -0.977934, 0.202483, -0.00729559, 0.0223907, -0.0802861) [node name="BoneIndexMiddle" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="7"] -transform = Transform3D(0.759852, 0.644453, -0.0854741, -0.040588, 0.178251, 0.983147, 0.648828, -0.743577, 0.161602, -0.00569704, 0.0301916, -0.117561) +transform = Transform3D(0.759851, 0.644453, -0.0854741, -0.040588, 0.178251, 0.983148, 0.648829, -0.743577, 0.161601, -0.00569705, 0.0301916, -0.117561) [node name="BoneIndexDistal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="8"] transform = Transform3D(0.356468, 0.927111, -0.115741, -0.109286, 0.164404, 0.98032, 0.927894, -0.336804, 0.159925, 0.0145038, 0.035779, -0.140869) [node name="BoneMiddleMetacarpal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="9"] -transform = Transform3D(0.999918, -0.0127165, -0.00125617, 0.000365488, -0.0698023, 0.997561, -0.0127732, -0.99748, -0.069792, -0.0100005, 0.00355416, 3.59286e-05) +transform = Transform3D(0.999918, -0.0127165, -0.00125617, 0.000365489, -0.0698022, 0.997561, -0.0127732, -0.99748, -0.0697919, -0.0100005, 0.00355416, 3.59286e-05) [node name="BoneMiddleProximal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="10"] -transform = Transform3D(0.971345, 0.237654, -0.00293003, 0.020734, -0.0724503, 0.997156, 0.236766, -0.968644, -0.0753018, -0.0110237, -0.00206236, -0.0802245) +transform = Transform3D(0.971345, 0.237654, -0.00293004, 0.0207339, -0.0724503, 0.997156, 0.236766, -0.968644, -0.0753018, -0.0110237, -0.00206236, -0.0802245) [node name="BoneMiddleMiddle" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="11"] -transform = Transform3D(0.764922, 0.643162, -0.0351718, 0.0290328, 0.0201225, 0.999376, 0.643468, -0.765466, -0.00328068, -0.000328436, -0.00532287, -0.123817) +transform = Transform3D(0.764922, 0.643161, -0.0351718, 0.0290327, 0.0201225, 0.999376, 0.643468, -0.765466, -0.00328059, -0.000328456, -0.00532286, -0.123817) [node name="BoneMiddleDistal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="12"] -transform = Transform3D(0.297115, 0.954531, -0.0243817, 0.0374455, 0.0138672, 0.999202, 0.954107, -0.297791, -0.0316227, 0.0205207, -0.00467056, -0.148631) +transform = Transform3D(0.297115, 0.95453, -0.0243818, 0.0374454, 0.0138673, 0.999202, 0.954107, -0.297791, -0.0316226, 0.0205207, -0.00467056, -0.148631) [node name="BoneRingMetacarpal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="13"] -transform = Transform3D(0.998609, 0.0470739, 0.0237408, -0.0169882, -0.138981, 0.990149, 0.0499097, -0.989175, -0.137988, -0.0100005, -0.0130734, 3.59304e-05) +transform = Transform3D(0.998609, 0.047074, 0.0237409, -0.0169882, -0.138981, 0.990149, 0.0499098, -0.989175, -0.137988, -0.0100005, -0.0130734, 3.59304e-05) [node name="BoneRingProximal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="14"] -transform = Transform3D(0.982964, 0.181854, 0.0266581, 0.0109494, -0.202722, 0.979175, 0.183471, -0.962202, -0.20126, -0.00651963, -0.0233502, -0.0731075) +transform = Transform3D(0.982964, 0.181854, 0.0266582, 0.0109494, -0.202722, 0.979175, 0.183471, -0.962202, -0.20126, -0.00651963, -0.0233502, -0.0731075) [node name="BoneRingMiddle" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="15"] -transform = Transform3D(0.772579, 0.634602, 0.0200163, 0.0794843, -0.127948, 0.98859, 0.629923, -0.762174, -0.149291, 0.000778387, -0.0314857, -0.111722) +transform = Transform3D(0.772579, 0.634603, 0.0200164, 0.0794845, -0.127948, 0.98859, 0.629924, -0.762173, -0.149291, 0.000778393, -0.0314857, -0.111722) [node name="BoneRingDistal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="16"] -transform = Transform3D(0.381388, 0.924068, 0.025339, 0.114105, -0.0742598, 0.990689, 0.917346, -0.374946, -0.133762, 0.0184188, -0.0350424, -0.132908) +transform = Transform3D(0.381387, 0.924068, 0.025339, 0.114105, -0.0742599, 0.990689, 0.917346, -0.374945, -0.133762, 0.0184188, -0.0350424, -0.132908) [node name="BonePinkyMetacarpal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="17"] -transform = Transform3D(0.998969, 0.0165318, 0.0422887, -0.0385953, -0.181427, 0.982647, 0.0239172, -0.983265, -0.180601, -4.58211e-07, -0.0299734, 3.59304e-05) +transform = Transform3D(0.998969, 0.0165318, 0.0422887, -0.0385953, -0.181426, 0.982647, 0.0239172, -0.983265, -0.180601, -4.58211e-07, -0.0299734, 3.59304e-05) [node name="BonePinkyProximal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="18"] -transform = Transform3D(0.969212, 0.239305, 0.0579745, 0.0185536, -0.305761, 0.951928, 0.245527, -0.921544, -0.300787, 0.00108587, -0.0418952, -0.0645756) +transform = Transform3D(0.969212, 0.239304, 0.0579745, 0.0185535, -0.305761, 0.951928, 0.245527, -0.921544, -0.300787, 0.00108587, -0.0418952, -0.0645756) [node name="BonePinkyMiddle" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="19"] -transform = Transform3D(0.699331, 0.713815, 0.0374603, 0.103947, -0.153407, 0.982681, 0.707199, -0.683325, -0.181481, 0.00901248, -0.0520231, -0.0951004) +transform = Transform3D(0.699331, 0.713816, 0.0374602, 0.103947, -0.153407, 0.982681, 0.707199, -0.683325, -0.181481, 0.00901247, -0.0520231, -0.0951004) [node name="BonePinkyDistal" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="20"] -transform = Transform3D(0.34089, 0.939845, 0.0220292, 0.162162, -0.081867, 0.983362, 0.926011, -0.331646, -0.180315, 0.0218786, -0.0547881, -0.107417) +transform = Transform3D(0.340891, 0.939844, 0.0220291, 0.162162, -0.081867, 0.983362, 0.926011, -0.331647, -0.180315, 0.0218786, -0.0547881, -0.107417) [node name="BoneAttachment3D" type="BoneAttachment3D" parent="XROrigin3D/LeftHand/LeftPhysicsHand/Hand_Nails_L/Armature/Skeleton3D" index="21"] -transform = Transform3D(0.54083, 0.840812, -0.0231736, -0.0826267, 0.0805244, 0.993322, 0.837063, -0.535304, 0.113024, 0.0399019, 0.0402829, -0.150096) +transform = Transform3D(0.54083, 0.840813, -0.0231736, -0.0826267, 0.0805243, 0.993322, 0.837064, -0.535303, 0.113023, 0.039902, 0.0402828, -0.150096) bone_name = "Index_Tip_L" bone_idx = 9 @@ -317,7 +264,7 @@ root_node = NodePath("../Hand_Nails_L") libraries = { "": SubResource("AnimationLibrary_kw48d") } -tree_root = SubResource("AnimationNodeBlendTree_vdkya") +tree_root = SubResource("AnimationNodeBlendTree_aip4x") [node name="FunctionPickup" parent="XROrigin3D/LeftHand/LeftPhysicsHand" index="2" instance=ExtResource("39_s4wtl")] @@ -330,79 +277,15 @@ strafe = true [node name="RightPhysicsHand" parent="XROrigin3D/RightHand" index="0" instance=ExtResource("42_of4ny")] -[node name="BoneRoot" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="1"] -transform = Transform3D(1, 1.83077e-05, -1.52659e-08, -1.52668e-08, 0.00166774, 0.999999, 1.83077e-05, -0.999999, 0.00166774, -3.86425e-08, -1.86975e-05, 0.0271756) - -[node name="BoneThumbMetacarpal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="2"] -transform = Transform3D(0.998519, -0.0514604, 0.0176509, 0.0176509, 0.613334, 0.789626, -0.0514604, -0.788145, 0.613334, -0.00999954, 0.0200266, 3.59323e-05) - -[node name="BoneThumbProximal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="3"] -transform = Transform3D(0.921479, -0.383957, 0.0587629, 0.124051, 0.434264, 0.892203, -0.368086, -0.814857, 0.447796, -0.012311, 0.0475754, -0.0353648) - -[node name="BoneThumbDistal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="4"] -transform = Transform3D(0.930159, -0.366843, -0.0151707, 0.154036, 0.352396, 0.923087, -0.333282, -0.860954, 0.384292, -0.0284939, 0.0658787, -0.0697092) - -[node name="BoneIndexMetacarpal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="5"] -transform = Transform3D(0.999165, -0.0336563, 0.0231681, -0.0231985, -0.000511136, 0.999731, -0.0336354, -0.999433, -0.00129148, 0.0100005, 0.0224317, 3.59286e-05) - -[node name="BoneIndexProximal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="6"] -transform = Transform3D(0.997821, -0.0419385, 0.0509327, -0.041317, 0.204662, 0.97796, -0.0514382, -0.977934, 0.202483, 0.00729559, 0.0223907, -0.0802861) - -[node name="BoneIndexMiddle" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="7"] -transform = Transform3D(0.759852, -0.644453, 0.0854741, 0.040588, 0.178251, 0.983147, -0.648828, -0.743577, 0.161602, 0.00569704, 0.0301916, -0.117561) - -[node name="BoneIndexDistal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="8"] -transform = Transform3D(0.356468, -0.927111, 0.115741, 0.109286, 0.164404, 0.98032, -0.927894, -0.336804, 0.159925, -0.0145038, 0.035779, -0.140869) - -[node name="BoneMiddleMetacarpal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="9"] -transform = Transform3D(0.999918, 0.0127165, 0.00125616, -0.000365489, -0.0698023, 0.997561, 0.0127732, -0.99748, -0.069792, 0.0100005, 0.00355416, 3.59286e-05) - -[node name="BoneMiddleProximal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="10"] -transform = Transform3D(0.971345, -0.237654, 0.00293003, -0.020734, -0.0724503, 0.997156, -0.236766, -0.968644, -0.0753018, 0.0110237, -0.00206236, -0.0802245) - -[node name="BoneMiddleMiddle" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="11"] -transform = Transform3D(0.764922, -0.643162, 0.0351718, -0.0290328, 0.0201225, 0.999376, -0.643468, -0.765466, -0.00328068, 0.000328433, -0.00532287, -0.123817) - -[node name="BoneMiddleDistal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="12"] -transform = Transform3D(0.297115, -0.95453, 0.0243817, -0.0374455, 0.0138672, 0.999202, -0.954107, -0.297791, -0.0316227, -0.0205208, -0.00467056, -0.148631) - -[node name="BoneRingMetacarpal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="13"] -transform = Transform3D(0.998609, -0.0470739, -0.0237408, 0.0169882, -0.138981, 0.990149, -0.0499097, -0.989175, -0.137988, 0.0100005, -0.0130734, 3.59304e-05) - -[node name="BoneRingProximal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="14"] -transform = Transform3D(0.982964, -0.181854, -0.0266581, -0.0109494, -0.202722, 0.979175, -0.183471, -0.962202, -0.20126, 0.00651963, -0.0233502, -0.0731075) - -[node name="BoneRingMiddle" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="15"] -transform = Transform3D(0.772579, -0.634602, -0.0200163, -0.0794843, -0.127948, 0.98859, -0.629923, -0.762174, -0.149291, -0.000778387, -0.0314857, -0.111722) - -[node name="BoneRingDistal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="16"] -transform = Transform3D(0.381388, -0.924068, -0.025339, -0.114105, -0.0742598, 0.990689, -0.917346, -0.374946, -0.133762, -0.0184188, -0.0350424, -0.132908) - -[node name="BonePinkyMetacarpal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="17"] -transform = Transform3D(0.998969, -0.0165318, -0.0422887, 0.0385953, -0.181427, 0.982647, -0.0239172, -0.983265, -0.180601, 4.58211e-07, -0.0299734, 3.59304e-05) - -[node name="BonePinkyProximal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="18"] -transform = Transform3D(0.969212, -0.239305, -0.0579745, -0.0185536, -0.305761, 0.951928, -0.245527, -0.921544, -0.300787, -0.00108587, -0.0418952, -0.0645756) - -[node name="BonePinkyMiddle" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="19"] -transform = Transform3D(0.699331, -0.713815, -0.0374603, -0.103947, -0.153407, 0.982681, -0.707199, -0.683325, -0.181481, -0.00901248, -0.0520231, -0.0951004) - -[node name="BonePinkyDistal" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="20"] -transform = Transform3D(0.34089, -0.939845, -0.0220292, -0.162162, -0.081867, 0.983362, -0.926011, -0.331646, -0.180315, -0.0218786, -0.0547881, -0.107417) - [node name="BoneAttachment3D" type="BoneAttachment3D" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D" index="21"] -transform = Transform3D(0.54083, -0.840812, 0.0231736, 0.0826267, 0.0805244, 0.993322, -0.837063, -0.535304, 0.113024, -0.0399019, 0.0402829, -0.150096) +transform = Transform3D(0.540829, -0.840813, 0.0231736, 0.0826268, 0.0805242, 0.993322, -0.837064, -0.535303, 0.113024, -0.039902, 0.0402828, -0.150096) bone_name = "Index_Tip_R" bone_idx = 9 [node name="Poke" parent="XROrigin3D/RightHand/RightPhysicsHand/Hand_Nails_R/Armature/Skeleton3D/BoneAttachment3D" index="0" instance=ExtResource("3_i2j42")] [node name="AnimationTree" parent="XROrigin3D/RightHand/RightPhysicsHand" index="1"] -root_node = NodePath("../Hand_Nails_R") -libraries = { -"": SubResource("AnimationLibrary_reqae") -} -tree_root = SubResource("AnimationNodeBlendTree_l52cg") +tree_root = SubResource("AnimationNodeBlendTree_i63k0") [node name="FunctionPickup" parent="XROrigin3D/RightHand/RightPhysicsHand" index="2" instance=ExtResource("39_s4wtl")] diff --git a/proyecto_4/content/CfeVr/Maps/Level1/level_1.tscn b/proyecto_4/content/CfeVr/Maps/Level1/level_1.tscn index 651f362e30274e32151865c2c2aa7a2b8e9dcd82..c40ec4c80465a79987aca201d89831f5ee984584 100644 --- a/proyecto_4/content/CfeVr/Maps/Level1/level_1.tscn +++ b/proyecto_4/content/CfeVr/Maps/Level1/level_1.tscn @@ -164,65 +164,65 @@ render_priority = 0 shader = SubResource("22") shader_parameter/beam_color = Color(0.137255, 0.458824, 0.290196, 1) -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_a8nmr"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_y6t87"] animation = &"Grip" -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_5onrq"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_c2kme"] animation = &"Grip" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_5xupp"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_6oucl"] filter_enabled = true filters = ["Armature/Skeleton3D:Little_Distal_L", "Armature/Skeleton3D:Little_Intermediate_L", "Armature/Skeleton3D:Little_Metacarpal_L", "Armature/Skeleton3D:Little_Proximal_L", "Armature/Skeleton3D:Middle_Distal_L", "Armature/Skeleton3D:Middle_Intermediate_L", "Armature/Skeleton3D:Middle_Metacarpal_L", "Armature/Skeleton3D:Middle_Proximal_L", "Armature/Skeleton3D:Ring_Distal_L", "Armature/Skeleton3D:Ring_Intermediate_L", "Armature/Skeleton3D:Ring_Metacarpal_L", "Armature/Skeleton3D:Ring_Proximal_L", "Armature/Skeleton3D:Thumb_Distal_L", "Armature/Skeleton3D:Thumb_Metacarpal_L", "Armature/Skeleton3D:Thumb_Proximal_L", "Armature/Skeleton:Little_Distal_L", "Armature/Skeleton:Little_Intermediate_L", "Armature/Skeleton:Little_Proximal_L", "Armature/Skeleton:Middle_Distal_L", "Armature/Skeleton:Middle_Intermediate_L", "Armature/Skeleton:Middle_Proximal_L", "Armature/Skeleton:Ring_Distal_L", "Armature/Skeleton:Ring_Intermediate_L", "Armature/Skeleton:Ring_Proximal_L", "Armature/Skeleton:Thumb_Distal_L", "Armature/Skeleton:Thumb_Proximal_L"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_yavq5"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pbver"] animation = &"Grip 5" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_abmix"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_lto2d"] filter_enabled = true filters = ["Armature/Skeleton3D:Index_Distal_L", "Armature/Skeleton3D:Index_Intermediate_L", "Armature/Skeleton3D:Index_Metacarpal_L", "Armature/Skeleton3D:Index_Proximal_L", "Armature/Skeleton:Index_Distal_L", "Armature/Skeleton:Index_Intermediate_L", "Armature/Skeleton:Index_Proximal_L"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_8ybic"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_1sbui"] graph_offset = Vector2(-536, 11) -nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_a8nmr") +nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_y6t87") nodes/ClosedHand1/position = Vector2(-600, 300) -nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_5onrq") +nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_c2kme") nodes/ClosedHand2/position = Vector2(-360, 300) -nodes/Grip/node = SubResource("AnimationNodeBlend2_5xupp") +nodes/Grip/node = SubResource("AnimationNodeBlend2_6oucl") nodes/Grip/position = Vector2(0, 20) -nodes/OpenHand/node = SubResource("AnimationNodeAnimation_yavq5") +nodes/OpenHand/node = SubResource("AnimationNodeAnimation_pbver") nodes/OpenHand/position = Vector2(-600, 100) -nodes/Trigger/node = SubResource("AnimationNodeBlend2_abmix") +nodes/Trigger/node = SubResource("AnimationNodeBlend2_lto2d") nodes/Trigger/position = Vector2(-360, 20) node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_cjdv6"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_gdsby"] animation = &"Grip" -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_041a0"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_aqrkn"] animation = &"Grip" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_yn1nv"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_odyhi"] filter_enabled = true filters = ["Armature/Skeleton3D:Little_Distal_R", "Armature/Skeleton3D:Little_Intermediate_R", "Armature/Skeleton3D:Little_Metacarpal_R", "Armature/Skeleton3D:Little_Proximal_R", "Armature/Skeleton3D:Middle_Distal_R", "Armature/Skeleton3D:Middle_Intermediate_R", "Armature/Skeleton3D:Middle_Metacarpal_R", "Armature/Skeleton3D:Middle_Proximal_R", "Armature/Skeleton3D:Ring_Distal_R", "Armature/Skeleton3D:Ring_Intermediate_R", "Armature/Skeleton3D:Ring_Metacarpal_R", "Armature/Skeleton3D:Ring_Proximal_R", "Armature/Skeleton3D:Thumb_Distal_R", "Armature/Skeleton3D:Thumb_Metacarpal_R", "Armature/Skeleton3D:Thumb_Proximal_R", "Armature/Skeleton:Little_Distal_R", "Armature/Skeleton:Little_Intermediate_R", "Armature/Skeleton:Little_Proximal_R", "Armature/Skeleton:Middle_Distal_R", "Armature/Skeleton:Middle_Intermediate_R", "Armature/Skeleton:Middle_Proximal_R", "Armature/Skeleton:Ring_Distal_R", "Armature/Skeleton:Ring_Intermediate_R", "Armature/Skeleton:Ring_Proximal_R", "Armature/Skeleton:Thumb_Distal_R", "Armature/Skeleton:Thumb_Proximal_R"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_p1dwp"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_k7l21"] animation = &"Grip 5" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_q7inw"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_lorm4"] filter_enabled = true filters = ["Armature/Skeleton3D:Index_Distal_R", "Armature/Skeleton3D:Index_Intermediate_R", "Armature/Skeleton3D:Index_Metacarpal_R", "Armature/Skeleton3D:Index_Proximal_R", "Armature/Skeleton:Index_Distal_R", "Armature/Skeleton:Index_Intermediate_R", "Armature/Skeleton:Index_Proximal_R"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_v3os2"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_pw1ey"] graph_offset = Vector2(-552.664, 107.301) -nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_cjdv6") +nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_gdsby") nodes/ClosedHand1/position = Vector2(-600, 300) -nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_041a0") +nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_aqrkn") nodes/ClosedHand2/position = Vector2(-360, 300) -nodes/Grip/node = SubResource("AnimationNodeBlend2_yn1nv") +nodes/Grip/node = SubResource("AnimationNodeBlend2_odyhi") nodes/Grip/position = Vector2(0, 40) -nodes/OpenHand/node = SubResource("AnimationNodeAnimation_p1dwp") +nodes/OpenHand/node = SubResource("AnimationNodeAnimation_k7l21") nodes/OpenHand/position = Vector2(-600, 100) -nodes/Trigger/node = SubResource("AnimationNodeBlend2_q7inw") +nodes/Trigger/node = SubResource("AnimationNodeBlend2_lorm4") nodes/Trigger/position = Vector2(-360, 40) node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] @@ -230,20 +230,19 @@ node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigge script = ExtResource("2_kcuin") [node name="TowerGalleryMenu" parent="." index="0" instance=ExtResource("5_sjyn7")] -transform = Transform3D(0.6, 0, 0, 0, 0.475738, 0.365614, 0, -0.365614, 0.475738, -1.19781, 2.04226, -1.44606) +transform = Transform3D(0.6, 0, 0, 0, 0.475738, 0.365614, 0, -0.365614, 0.475738, -1.19781, 2.04226, -1.07485) [node name="BasicTable" parent="." index="1" instance=ExtResource("4_6d5nk")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6442, -1.51849) [node name="TowerContainer" parent="." index="2" node_paths=PackedStringArray("receiver") instance=ExtResource("5_y88b8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.93475, -1.51849) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.93475, -1.34356) surface_material_override/0 = SubResource("ShaderMaterial_u6mj4") receiver = NodePath("../BasicTable") -[node name="SectionManager" type="Node" parent="." index="3" node_paths=PackedStringArray("position_target", "container")] +[node name="SectionManager" type="Node" parent="." index="3" node_paths=PackedStringArray("container")] script = ExtResource("5_68e1g") enable_delay = false -position_target = NodePath("../BasicTable") container = NodePath("../TowerContainer") [node name="XRCamera3D" parent="XROrigin3D" index="0"] @@ -253,13 +252,19 @@ current = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.50528, 1.81823, -0.5) [node name="AnimationTree" parent="XROrigin3D/LeftHand/LeftPhysicsHand" index="1"] -tree_root = SubResource("AnimationNodeBlendTree_8ybic") +tree_root = SubResource("AnimationNodeBlendTree_1sbui") + +[node name="FunctionPickup" parent="XROrigin3D/LeftHand/LeftPhysicsHand" index="2"] +grab_distance = 0.08 [node name="RightHand" parent="XROrigin3D" index="2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.67812, -0.5) [node name="AnimationTree" parent="XROrigin3D/RightHand/RightPhysicsHand" index="1"] -tree_root = SubResource("AnimationNodeBlendTree_v3os2") +tree_root = SubResource("AnimationNodeBlendTree_pw1ey") + +[node name="FunctionPickup" parent="XROrigin3D/RightHand/RightPhysicsHand" index="2"] +grab_distance = 0.08 [connection signal="tower_created" from="TowerGalleryMenu" to="SectionManager" method="_on_tower_created"] diff --git a/proyecto_4/content/CfeVr/Placeables/BasicTable/BasicTable.tscn b/proyecto_4/content/CfeVr/Placeables/BasicTable/BasicTable.tscn index 5e713d5968861a49e3d9d0547ef1ac2a9d4c5066..22f6a863863887c8f7f295fc14c07c7f298d9150 100644 --- a/proyecto_4/content/CfeVr/Placeables/BasicTable/BasicTable.tscn +++ b/proyecto_4/content/CfeVr/Placeables/BasicTable/BasicTable.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=3 format=3 uid="uid://bsygqv65mnrok"] [sub_resource type="BoxMesh" id="BoxMesh_r3laf"] -size = Vector3(4, 0.1, 1.1) +size = Vector3(4, 0.1, 0.8) -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_1rr3m"] -data = PackedVector3Array(-2, 0.05, 0.55, 2, 0.05, 0.55, -2, -0.05, 0.55, 2, 0.05, 0.55, 2, -0.05, 0.55, -2, -0.05, 0.55, 2, 0.05, -0.55, -2, 0.05, -0.55, 2, -0.05, -0.55, -2, 0.05, -0.55, -2, -0.05, -0.55, 2, -0.05, -0.55, 2, 0.05, 0.55, 2, 0.05, -0.55, 2, -0.05, 0.55, 2, 0.05, -0.55, 2, -0.05, -0.55, 2, -0.05, 0.55, -2, 0.05, -0.55, -2, 0.05, 0.55, -2, -0.05, -0.55, -2, 0.05, 0.55, -2, -0.05, 0.55, -2, -0.05, -0.55, 2, 0.05, 0.55, -2, 0.05, 0.55, 2, 0.05, -0.55, -2, 0.05, 0.55, -2, 0.05, -0.55, 2, 0.05, -0.55, -2, -0.05, 0.55, 2, -0.05, 0.55, -2, -0.05, -0.55, 2, -0.05, 0.55, 2, -0.05, -0.55, -2, -0.05, -0.55) +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_lhlrj"] +data = PackedVector3Array(-2, 0.05, 0.4, 2, 0.05, 0.4, -2, -0.05, 0.4, 2, 0.05, 0.4, 2, -0.05, 0.4, -2, -0.05, 0.4, 2, 0.05, -0.4, -2, 0.05, -0.4, 2, -0.05, -0.4, -2, 0.05, -0.4, -2, -0.05, -0.4, 2, -0.05, -0.4, 2, 0.05, 0.4, 2, 0.05, -0.4, 2, -0.05, 0.4, 2, 0.05, -0.4, 2, -0.05, -0.4, 2, -0.05, 0.4, -2, 0.05, -0.4, -2, 0.05, 0.4, -2, -0.05, -0.4, -2, 0.05, 0.4, -2, -0.05, 0.4, -2, -0.05, -0.4, 2, 0.05, 0.4, -2, 0.05, 0.4, 2, 0.05, -0.4, -2, 0.05, 0.4, -2, 0.05, -0.4, 2, 0.05, -0.4, -2, -0.05, 0.4, 2, -0.05, 0.4, -2, -0.05, -0.4, 2, -0.05, 0.4, 2, -0.05, -0.4, -2, -0.05, -0.4) [node name="BasicTable" type="Node3D"] @@ -14,4 +14,4 @@ mesh = SubResource("BoxMesh_r3laf") [node name="StaticBody3D" type="StaticBody3D" parent="Table"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Table/StaticBody3D"] -shape = SubResource("ConcavePolygonShape3D_1rr3m") +shape = SubResource("ConcavePolygonShape3D_lhlrj") diff --git a/proyecto_4/content/CfeVr/Towers/Torre400/Inferior/Torre400_Inferior.tscn b/proyecto_4/content/CfeVr/Towers/Torre400/Inferior/Torre400_Inferior.tscn index 0fff988c25ceb6293f467401d2bf5173578b449f..006446e6323ccd4f9b2cefe76c61dd3867a536ab 100644 --- a/proyecto_4/content/CfeVr/Towers/Torre400/Inferior/Torre400_Inferior.tscn +++ b/proyecto_4/content/CfeVr/Towers/Torre400/Inferior/Torre400_Inferior.tscn @@ -60,7 +60,8 @@ shadow_mesh = SubResource("ArrayMesh_qtqwn") [sub_resource type="BoxShape3D" id="BoxShape3D_qvx25"] size = Vector3(0.167478, 0.0768774, 0.136581) -[node name="Torre400_Inferior" node_paths=PackedStringArray("top") instance=ExtResource("1_67rw8")] +[node name="Torre400_Inferior" node_paths=PackedStringArray("mesh_instance", "top") instance=ExtResource("1_67rw8")] +mesh_instance = NodePath("Torre400_Inferior") top = NodePath("TopArea") [node name="CollisionShape3D" type="CollisionShape3D" parent="." index="0"] diff --git a/proyecto_4/content/CfeVr/Towers/Torre400/Superior/Torre400_Superior.tscn b/proyecto_4/content/CfeVr/Towers/Torre400/Superior/Torre400_Superior.tscn index 9097873c8a0cae324afab495dafddbdae5d9bca9..9f93595a61d624ff1f327fbf3b779380ff68fbce 100644 --- a/proyecto_4/content/CfeVr/Towers/Torre400/Superior/Torre400_Superior.tscn +++ b/proyecto_4/content/CfeVr/Towers/Torre400/Superior/Torre400_Superior.tscn @@ -46,7 +46,8 @@ shadow_mesh = SubResource("ArrayMesh_wk7r6") [sub_resource type="BoxShape3D" id="BoxShape3D_7whfe"] size = Vector3(0.167478, 0.0768774, 0.136581) -[node name="Torre400_Superior" node_paths=PackedStringArray("bottom") instance=ExtResource("1_8ktc4")] +[node name="Torre400_Superior" node_paths=PackedStringArray("mesh_instance", "bottom") instance=ExtResource("1_8ktc4")] +mesh_instance = NodePath("Torre400_Superior") bottom = NodePath("BottomArea") [node name="CollisionShape3D" type="CollisionShape3D" parent="." index="0"] @@ -57,7 +58,7 @@ mesh = SubResource("ArrayMesh_uwymg") skeleton = NodePath("") [node name="BottomArea" type="Area3D" parent="." index="2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.417653, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.405, 0) [node name="CollisionShape3D" type="CollisionShape3D" parent="BottomArea" index="0"] shape = SubResource("BoxShape3D_7whfe") diff --git a/proyecto_4/content/CfeVr/Towers/section_join.gd b/proyecto_4/content/CfeVr/Towers/section_join.gd index d68367f4315c385ffb66a81df2dc77ef5f056a99..ff8907275c80e5a052973dd4431eebd209d05db7 100644 --- a/proyecto_4/content/CfeVr/Towers/section_join.gd +++ b/proyecto_4/content/CfeVr/Towers/section_join.gd @@ -34,7 +34,7 @@ func join(): # Sum the offset to the position of the face. var position_b = Vector3( _section2.global_position.x + position_t.x, - _section2.global_position.y + position_t.y, + _section2.global_position.y + position_t.y + 0.1, _section2.global_position.z + position_t.z) # Move the _section2 diff --git a/proyecto_4/content/CfeVr/Towers/section_manager.gd b/proyecto_4/content/CfeVr/Towers/section_manager.gd index 31d4beaa1fefae2e6c2e5d2d5fe7a2f250b3e774..398aa69ded6bfdc8458786886632b13881e8cfa5 100644 --- a/proyecto_4/content/CfeVr/Towers/section_manager.gd +++ b/proyecto_4/content/CfeVr/Towers/section_manager.gd @@ -19,6 +19,7 @@ func _init(): func _ready(): pass + # Listen when users wants to create a new tower. func _on_tower_created(tower_type: String): # Check if is creating a new node... @@ -46,9 +47,3 @@ func _on_tower_created(tower_type: String): is_creating = false - -## Listen when a tower section is dropped over other tower section. -func _on_done(_source: TowerSection, _target: TowerSection): - var sectionJoin = SectionJoin.new(_target, _source) - - sectionJoin.join() diff --git a/proyecto_4/content/CfeVr/Towers/tower_container.gd b/proyecto_4/content/CfeVr/Towers/tower_container.gd index 43789f5be4636263d72aad596d3d636740c3776f..47af7fe33923f846384d021c2fb5f8b76a538202 100644 --- a/proyecto_4/content/CfeVr/Towers/tower_container.gd +++ b/proyecto_4/content/CfeVr/Towers/tower_container.gd @@ -44,12 +44,11 @@ func _process(delta: float) -> void: # Send the part to the receiver. active_node.reparent(receiver) - ## Returns a value indicating if the child is inside this node. func is_inside(child: TowerSection) -> bool: # Get the area of this node. var aabb = global_transform * get_aabb() - + # Get the area of the node. var child_aabb = child.get_global_aabb() @@ -60,6 +59,7 @@ func is_inside(child: TowerSection) -> bool: func add_part(part: String) -> void: queue.append(part) + ## The container has no children or more parts in the queue. func is_empty() -> bool: return queue.size() == 0 && get_child_count() - skip_nodes == 0 @@ -76,12 +76,19 @@ func get_active_node() -> TowerSection: func _dequeue() -> void: # Empty paths mean no more parts to add. var path = _dequeue_path() + if path == "": return # Load the scene and add it to the scene stack. - var node = load(path).instantiate() + var node = load(path).instantiate() as TowerSection + if node == null: + return + + # Get the file name of the path without the extension ".tscn", path is a string. + node.set_tower_name(path.get_file().get_basename()) + node.done.connect(_on_done) add_child(node) ## Get the first part in the scene queue. @@ -94,6 +101,12 @@ func _dequeue_path() -> String: return part +## Listen when a tower section is dropped over other tower section. +func _on_done(_source: TowerSection, _target: TowerSection): + var sectionJoin = SectionJoin.new(_target, _source) + + sectionJoin.join() + func _get_configuration_warnings() -> PackedStringArray: var warnings := PackedStringArray() diff --git a/proyecto_4/content/CfeVr/Towers/tower_highlight.gd b/proyecto_4/content/CfeVr/Towers/tower_highlight.gd index 043d1d4c0b64dc1b5b80e65efdd976640fd125af..a81f169c6c59035ff9a54bbcc1507c020b1f46a5 100644 --- a/proyecto_4/content/CfeVr/Towers/tower_highlight.gd +++ b/proyecto_4/content/CfeVr/Towers/tower_highlight.gd @@ -14,7 +14,6 @@ func _ready(): parent.done.connect(_on_done) func _on_tower_entered(face: String, tower: TowerSection): - print ("TOWER ENTERED") # Tower entered: TowerHighlight -> Torre400_InferiorFace source: bottom, Face target: top visible = true diff --git a/proyecto_4/content/CfeVr/Towers/tower_section.gd b/proyecto_4/content/CfeVr/Towers/tower_section.gd index 116217ba20432896606d1fc96c208d8d1926d77c..35dbf0848ccb5c67e83f9099848bd4ba4b35de30 100644 --- a/proyecto_4/content/CfeVr/Towers/tower_section.gd +++ b/proyecto_4/content/CfeVr/Towers/tower_section.gd @@ -46,6 +46,9 @@ signal tower_exited(face: String, target: TowerSection) var active_area: Area3D var active_face: String = "" +## Name of the tower section. +var tower_name: String + ## Target if user drop the section. var current_target: TowerSection @@ -96,13 +99,6 @@ func get_first_mesh_instance() -> MeshInstance3D: return null -func activate_area_test() -> void: - # Get the first Area3D in the _face dictionary - for key in _faces: - if _faces[key][0] is Area3D: - set_active_area(_faces[key][0], key) - return - ## Subscribe to Area3D signals when this tower enter or exit in other Area3D func connectSignals(face: String, area: Area3D) -> void: if is_instance_valid(area) and area is Area3D: @@ -110,6 +106,7 @@ func connectSignals(face: String, area: Area3D) -> void: area.area_entered.connect(_on_area_entered.bind(face)) area.area_exited.connect(_on_area_exited.bind(face)) + # Update position if collisiong tower func _on_dropped(t) -> void: if not current_target: @@ -124,25 +121,15 @@ func _on_area_entered(area: Area3D, face: String): # Get information about tower var tower = get_tower(area) - if tower == null: + if tower == null or not _accept(face, tower): return - - print ("IS A TOWERSECTION") - - - #if not _accept(face, tower): - #print ("Can't be accepted") - #return - - print ("accepted tower section") - + # Configure source Area3D set_active_area(_faces[face][0], face) # Configure current target. current_target = tower - print ("Emitting signal tower_entered") - emit_signal("tower_0entered", face, tower) + emit_signal("tower_entered", face, tower) func _on_area_exited(area: Area3D, face: String): if not is_picked_up(): @@ -150,10 +137,8 @@ func _on_area_exited(area: Area3D, face: String): var tower = get_tower(area) - if tower == null: + if tower == null or not _accept(face, tower): return - #if not _accept(face, tower): - #return _clear() emit_signal("tower_exited", face, tower) @@ -161,11 +146,8 @@ func _on_area_exited(area: Area3D, face: String): func _accept(face: String, tower: TowerSection) -> bool: # Validate if tower accepts this tower var face_entered = tower.get_active_face() - var join_1: String = get_name() + ":" + face - var join_2: String = tower.get_name() + ":" + face_entered - - print ("Join1=>"+join_1) - print ("Join2=>"+join_2) + var join_1: String = get_tower_name() + ":" + face + var join_2: String = tower.get_tower_name() + ":" + face_entered return Config.accept_join(join_1, join_2) @@ -202,14 +184,8 @@ func get_active_area() -> Area3D: ## Return a tower section if Area3D belongs to another TowerSection func get_tower(area: Area3D) -> TowerSection: var tower = area.get_parent() - - if tower == null: - return null - - print ("Area's parent name"+tower.name) if tower is TowerSection: - print ("Is a Tower Section") tower.set_active_area(area) return tower @@ -236,7 +212,7 @@ func _updateFaces() -> void: _faces["bottom"] = [bottom, bottom.get_name()] -## Check if scene_file_path conforms conventions: res://content/CfeVr/Towers/Type/Section/Type_Section.tscn +## Check if scene_file_path conforms conventions func is_scene_file_path_valid() -> bool: var path = get_scene_file_path() @@ -252,10 +228,20 @@ func create_expected_scene_file_path() -> String: return Config._create_scene_path(tower_type, tower_section) + +func set_tower_name(name1: String) -> void: + tower_name = name1 + +func get_tower_name() -> String: + if tower_name == "": + tower_name = "foo_bar" + + return tower_name + func get_tower_type() -> String: # The node name define its type and section name, separated by a underscore. # Example: TowerSection_1 - var parts = get_name().split("_") + var parts = get_tower_name().split("_") if parts.size() > 1: return parts[0] @@ -265,7 +251,7 @@ func get_tower_type() -> String: func get_tower_section() -> String: # The node name define its type and section name, separated by a underscore. # Example: TowerSection_1 - var parts = get_name().split("_") + var parts = get_tower_name().split("_") if parts.size() > 1: return parts[1] diff --git a/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador.glb.import b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador.glb.import new file mode 100644 index 0000000000000000000000000000000000000000..71603f7674d7e3f391fa21cf59d35113cce4fb5c --- /dev/null +++ b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador.glb.import @@ -0,0 +1,34 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://brugm3uymvpvm" +path="res://.godot/imported/SESantaFeConEdificiosTransformador.glb-654b5eec6a61839f4a43a4abe32c7de7.scn" + +[deps] + +source_file="res://content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador.glb" +dest_files=["res://.godot/imported/SESantaFeConEdificiosTransformador.glb-654b5eec6a61839f4a43a4abe32c7de7.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_HaciaObraCivil.png.import b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_HaciaObraCivil.png.import new file mode 100644 index 0000000000000000000000000000000000000000..36971a38a1b12a7ae1eae767aedf8d1f3081d968 --- /dev/null +++ b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_HaciaObraCivil.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bagmyj0s3mh3x" +path="res://.godot/imported/SESantaFeConEdificiosTransformador_HaciaObraCivil.png-5eb34e6c22c2ad4368c78def519a0728.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_HaciaObraCivil.png" +dest_files=["res://.godot/imported/SESantaFeConEdificiosTransformador_HaciaObraCivil.png-5eb34e6c22c2ad4368c78def519a0728.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg.import b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg.import new file mode 100644 index 0000000000000000000000000000000000000000..395f0105700fbe63dde1efd4d2926c99abfbf8d7 --- /dev/null +++ b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://nt8g7dg2tt76" +path.s3tc="res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg-f1f4dbacd6e689fda9e8d44288544c2e.s3tc.ctex" +path.etc2="res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg-f1f4dbacd6e689fda9e8d44288544c2e.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg" +dest_files=["res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg-f1f4dbacd6e689fda9e8d44288544c2e.s3tc.ctex", "res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_OcclusionRoughnessMetallic.jpg-f1f4dbacd6e689fda9e8d44288544c2e.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg.import b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg.import new file mode 100644 index 0000000000000000000000000000000000000000..adfcc941fec62c8f03b30fd15fefe77697b1a301 --- /dev/null +++ b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://x3m5bhfen35n" +path.s3tc="res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg-8bbf4d3f79178c883fdf0585ddfc41ff.s3tc.ctex" +path.etc2="res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg-8bbf4d3f79178c883fdf0585ddfc41ff.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg" +dest_files=["res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg-8bbf4d3f79178c883fdf0585ddfc41ff.s3tc.ctex", "res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_basecolor.jpg-8bbf4d3f79178c883fdf0585ddfc41ff.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg.import b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg.import new file mode 100644 index 0000000000000000000000000000000000000000..074ee27452d04c565ac5a3418424c2c858f00e40 --- /dev/null +++ b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pd2frfgoo3uc" +path.s3tc="res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg-fd343d5e18225bee3e06afcd2ee02d15.s3tc.ctex" +path.etc2="res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg-fd343d5e18225bee3e06afcd2ee02d15.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg" +dest_files=["res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg-fd343d5e18225bee3e06afcd2ee02d15.s3tc.ctex", "res://.godot/imported/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg-fd343d5e18225bee3e06afcd2ee02d15.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_T_Set_Stairs_Concrete_2_normal.jpg" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_VistaObraElectromecanica.png.import b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_VistaObraElectromecanica.png.import new file mode 100644 index 0000000000000000000000000000000000000000..16fc480b291f219ae9c1f48839a4c894248941be --- /dev/null +++ b/proyecto_4/content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_VistaObraElectromecanica.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://qiavtw8duccj" +path="res://.godot/imported/SESantaFeConEdificiosTransformador_VistaObraElectromecanica.png-baf751b628fea1f66c3e4ed773ff0e35.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://content/CfeVr/substations/SESantaFe/SESantaFeConEdificiosTransformador_VistaObraElectromecanica.png" +dest_files=["res://.godot/imported/SESantaFeConEdificiosTransformador_VistaObraElectromecanica.png-baf751b628fea1f66c3e4ed773ff0e35.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/proyecto_4/export_presets.cfg b/proyecto_4/export_presets.cfg index 9ca692ce1e5963d648e310eac2d055e53ab840c9..5f3ca6fc338377e5d5b2525bfe14bb0df34c14fd 100644 --- a/proyecto_4/export_presets.cfg +++ b/proyecto_4/export_presets.cfg @@ -6,7 +6,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="" +include_filter="config.cfg" exclude_filter="" export_path="bin/cpttvr.apk" encryption_include_filters="" diff --git a/proyecto_4/icon.svg.import b/proyecto_4/icon.svg.import new file mode 100644 index 0000000000000000000000000000000000000000..3f9e7092cc9216dddde46ba5d5db34f44ec5ac92 --- /dev/null +++ b/proyecto_4/icon.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btdvnak55hpt2" +path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon.svg" +dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false