diff --git a/HEADS b/HEADS index dff287d8..4619b1c6 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "8e91d2746d28d1f84f872ef535b55807e1ac3535", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "b1efeb662a5f09345034c45d6cfba6d8f7b5bdaa"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "703acd1b56bc10b1bde4afbefbd379974fa613db"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} \ No newline at end of file +{"engine": {"3.2": "8e91d2746d28d1f84f872ef535b55807e1ac3535", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "fa33d5d57e250a5434554286a386913fe1ea4839"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "703acd1b56bc10b1bde4afbefbd379974fa613db"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} \ No newline at end of file diff --git a/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres b/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres index b73e4d20..9a8402b0 100644 --- a/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres +++ b/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres @@ -1,6 +1,6 @@ [gd_resource type="ItemTemplate" load_steps=5 format=2] -[ext_resource path="res://modules/core/item_visuals/1_chest_of_the_infinite_wisdom.tres" type="ItemVisual" id=1] +[ext_resource path="res://modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres" type="ModelVisual" id=1] [ext_resource path="res://modules/icons/4_chest_of_the_infinite_wisdom.tres" type="Texture" id=2] [ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=3] [ext_resource path="res://modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=4] @@ -13,7 +13,7 @@ item_type = 1 rarity = 6 armor_type = 1 equip_slot = 3 -item_visual = ExtResource( 1 ) +model_visual = ExtResource( 1 ) icon = ExtResource( 2 ) use_spell = ExtResource( 4 ) text_name = "Chest of the Infinite Wisdom" diff --git a/game/modules/core/item_visuals/1_chest_of_the_infinite_wisdom.tres b/game/modules/core/item_visuals/1_chest_of_the_infinite_wisdom.tres index 6315a44c..65d3735f 100644 --- a/game/modules/core/item_visuals/1_chest_of_the_infinite_wisdom.tres +++ b/game/modules/core/item_visuals/1_chest_of_the_infinite_wisdom.tres @@ -1,12 +1,12 @@ -[gd_resource type="ItemVisual" load_steps=4 format=2] +[gd_resource type="ModelVisual" load_steps=4 format=2] [ext_resource path="res://modules/species/Human/Female/character_textures/armor_green_scarf.png" type="Texture" id=1] -[sub_resource type="ItemVisualEntry" id=1] +[sub_resource type="ModelVisualEntry" id=1] texture_male = ExtResource( 1 ) texture_female = ExtResource( 1 ) -[sub_resource type="ItemVisualEntry" id=2] +[sub_resource type="ModelVisualEntry" id=2] texture_male = ExtResource( 1 ) texture_female = ExtResource( 1 ) diff --git a/game/modules/core/item_visuals/test_base_v2.tres b/game/modules/core/item_visuals/test_base_v2.tres index 922d2497..dac8395f 100644 --- a/game/modules/core/item_visuals/test_base_v2.tres +++ b/game/modules/core/item_visuals/test_base_v2.tres @@ -1,4 +1,4 @@ -[gd_resource type="ItemVisual" load_steps=46 format=2] +[gd_resource type="ModelVisual" load_steps=46 format=2] [ext_resource path="res://modules/species/Human/Female/character_models/neck.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=2] @@ -26,151 +26,151 @@ -[sub_resource type="ItemVisualEntry" id=1] +[sub_resource type="ModelVisualEntry" id=1] mesh_male = ExtResource( 11 ) mesh_female = ExtResource( 11 ) texture_male = ExtResource( 8 ) texture_female = ExtResource( 8 ) -[sub_resource type="ItemVisualEntry" id=2] +[sub_resource type="ModelVisualEntry" id=2] mesh_male = ExtResource( 2 ) mesh_female = ExtResource( 2 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=3] +[sub_resource type="ModelVisualEntry" id=3] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=4] +[sub_resource type="ModelVisualEntry" id=4] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=5] +[sub_resource type="ModelVisualEntry" id=5] mesh_male = ExtResource( 9 ) mesh_female = ExtResource( 9 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=6] +[sub_resource type="ModelVisualEntry" id=6] mesh_male = ExtResource( 5 ) mesh_female = ExtResource( 5 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=7] +[sub_resource type="ModelVisualEntry" id=7] mesh_male = ExtResource( 17 ) mesh_female = ExtResource( 17 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=8] +[sub_resource type="ModelVisualEntry" id=8] mesh_male = ExtResource( 3 ) mesh_female = ExtResource( 3 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=9] +[sub_resource type="ModelVisualEntry" id=9] mesh_male = ExtResource( 13 ) mesh_female = ExtResource( 13 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=10] +[sub_resource type="ModelVisualEntry" id=10] mesh_male = ExtResource( 13 ) mesh_female = ExtResource( 13 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=11] +[sub_resource type="ModelVisualEntry" id=11] mesh_male = ExtResource( 16 ) mesh_female = ExtResource( 16 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=12] +[sub_resource type="ModelVisualEntry" id=12] mesh_male = ExtResource( 1 ) mesh_female = ExtResource( 1 ) texture_male = ExtResource( 20 ) texture_female = ExtResource( 20 ) -[sub_resource type="ItemVisualEntry" id=13] +[sub_resource type="ModelVisualEntry" id=13] mesh_male = ExtResource( 4 ) mesh_female = ExtResource( 4 ) texture_male = ExtResource( 20 ) texture_female = ExtResource( 20 ) -[sub_resource type="ItemVisualEntry" id=14] +[sub_resource type="ModelVisualEntry" id=14] mesh_male = ExtResource( 2 ) mesh_female = ExtResource( 2 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=15] +[sub_resource type="ModelVisualEntry" id=15] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=16] +[sub_resource type="ModelVisualEntry" id=16] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=17] +[sub_resource type="ModelVisualEntry" id=17] mesh_male = ExtResource( 9 ) mesh_female = ExtResource( 9 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=18] +[sub_resource type="ModelVisualEntry" id=18] mesh_male = ExtResource( 5 ) mesh_female = ExtResource( 5 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=19] +[sub_resource type="ModelVisualEntry" id=19] mesh_male = ExtResource( 18 ) mesh_female = ExtResource( 18 ) texture_male = ExtResource( 20 ) texture_female = ExtResource( 20 ) -[sub_resource type="ItemVisualEntry" id=20] +[sub_resource type="ModelVisualEntry" id=20] mesh_male = ExtResource( 3 ) mesh_female = ExtResource( 3 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=21] +[sub_resource type="ModelVisualEntry" id=21] mesh_male = ExtResource( 13 ) mesh_female = ExtResource( 13 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=22] +[sub_resource type="ModelVisualEntry" id=22] mesh_male = ExtResource( 13 ) mesh_female = ExtResource( 13 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=23] +[sub_resource type="ModelVisualEntry" id=23] mesh_male = ExtResource( 16 ) mesh_female = ExtResource( 16 ) texture_male = ExtResource( 12 ) texture_female = ExtResource( 12 ) -[sub_resource type="ItemVisualEntry" id=24] +[sub_resource type="ModelVisualEntry" id=24] mesh_male = ExtResource( 14 ) mesh_female = ExtResource( 14 ) texture_male = ExtResource( 6 ) texture_female = ExtResource( 6 ) -[sub_resource type="ItemVisualEntry" id=25] +[sub_resource type="ModelVisualEntry" id=25] mesh_male = ExtResource( 7 ) mesh_female = ExtResource( 7 ) texture_male = ExtResource( 6 ) diff --git a/game/modules/core/item_visuals/test_base_v3.tres b/game/modules/core/item_visuals/test_base_v3.tres index a567d9ab..55791388 100644 --- a/game/modules/core/item_visuals/test_base_v3.tres +++ b/game/modules/core/item_visuals/test_base_v3.tres @@ -1,4 +1,4 @@ -[gd_resource type="ItemVisual" load_steps=48 format=2] +[gd_resource type="ModelVisual" load_steps=48 format=2] [ext_resource path="res://modules/species/Human/Female/character_models/huf_pelvis.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_thigh_left.gltf" type="MeshDataResource" id=2] @@ -23,151 +23,151 @@ [ext_resource path="res://modules/species/Human/Female/character_models/huf_finger.gltf" type="MeshDataResource" id=23] [ext_resource path="res://modules/species/Human/Female/character_models/huf_fingers.gltf" type="MeshDataResource" id=24] -[sub_resource type="ItemVisualEntry" id=1] +[sub_resource type="ModelVisualEntry" id=1] mesh_male = ExtResource( 17 ) mesh_female = ExtResource( 17 ) texture_male = ExtResource( 6 ) texture_female = ExtResource( 6 ) -[sub_resource type="ItemVisualEntry" id=2] +[sub_resource type="ModelVisualEntry" id=2] mesh_male = ExtResource( 4 ) mesh_female = ExtResource( 4 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=3] +[sub_resource type="ModelVisualEntry" id=3] mesh_male = ExtResource( 24 ) mesh_female = ExtResource( 24 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=4] +[sub_resource type="ModelVisualEntry" id=4] mesh_male = ExtResource( 24 ) mesh_female = ExtResource( 24 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=5] +[sub_resource type="ModelVisualEntry" id=5] mesh_male = ExtResource( 9 ) mesh_female = ExtResource( 9 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=6] +[sub_resource type="ModelVisualEntry" id=6] mesh_male = ExtResource( 22 ) mesh_female = ExtResource( 22 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=7] +[sub_resource type="ModelVisualEntry" id=7] mesh_male = ExtResource( 13 ) mesh_female = ExtResource( 13 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=8] +[sub_resource type="ModelVisualEntry" id=8] mesh_male = ExtResource( 2 ) mesh_female = ExtResource( 2 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=9] +[sub_resource type="ModelVisualEntry" id=9] mesh_male = ExtResource( 23 ) mesh_female = ExtResource( 23 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=10] +[sub_resource type="ModelVisualEntry" id=10] mesh_male = ExtResource( 23 ) mesh_female = ExtResource( 23 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=11] +[sub_resource type="ModelVisualEntry" id=11] mesh_male = ExtResource( 21 ) mesh_female = ExtResource( 21 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=12] +[sub_resource type="ModelVisualEntry" id=12] mesh_male = ExtResource( 14 ) mesh_female = ExtResource( 14 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=13] +[sub_resource type="ModelVisualEntry" id=13] mesh_male = ExtResource( 1 ) mesh_female = ExtResource( 1 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=14] +[sub_resource type="ModelVisualEntry" id=14] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=15] +[sub_resource type="ModelVisualEntry" id=15] mesh_male = ExtResource( 24 ) mesh_female = ExtResource( 24 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=16] +[sub_resource type="ModelVisualEntry" id=16] mesh_male = ExtResource( 24 ) mesh_female = ExtResource( 24 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=17] +[sub_resource type="ModelVisualEntry" id=17] mesh_male = ExtResource( 11 ) mesh_female = ExtResource( 11 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=18] +[sub_resource type="ModelVisualEntry" id=18] mesh_male = ExtResource( 22 ) mesh_female = ExtResource( 22 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=19] +[sub_resource type="ModelVisualEntry" id=19] mesh_male = ExtResource( 7 ) mesh_female = ExtResource( 7 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=20] +[sub_resource type="ModelVisualEntry" id=20] mesh_male = ExtResource( 8 ) mesh_female = ExtResource( 8 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=21] +[sub_resource type="ModelVisualEntry" id=21] mesh_male = ExtResource( 23 ) mesh_female = ExtResource( 23 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=22] +[sub_resource type="ModelVisualEntry" id=22] mesh_male = ExtResource( 23 ) mesh_female = ExtResource( 23 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=23] +[sub_resource type="ModelVisualEntry" id=23] mesh_male = ExtResource( 21 ) mesh_female = ExtResource( 21 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=24] +[sub_resource type="ModelVisualEntry" id=24] mesh_male = ExtResource( 20 ) mesh_female = ExtResource( 20 ) texture_male = ExtResource( 3 ) texture_female = ExtResource( 3 ) -[sub_resource type="ItemVisualEntry" id=25] +[sub_resource type="ModelVisualEntry" id=25] mesh_male = ExtResource( 5 ) mesh_female = ExtResource( 5 ) texture_male = ExtResource( 3 ) diff --git a/game/modules/core/item_visuals/test_vis1.tres b/game/modules/core/item_visuals/test_vis1.tres index 0fb97904..9f334d10 100644 --- a/game/modules/core/item_visuals/test_vis1.tres +++ b/game/modules/core/item_visuals/test_vis1.tres @@ -1,4 +1,4 @@ -[gd_resource type="ItemVisual" load_steps=45 format=2] +[gd_resource type="ModelVisual" load_steps=45 format=2] [ext_resource path="res://modules/species/Human/Female/character_models/pelvis.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_head.gltf" type="MeshDataResource" id=2] @@ -25,151 +25,151 @@ -[sub_resource type="ItemVisualEntry" id=1] +[sub_resource type="ModelVisualEntry" id=1] mesh_male = ExtResource( 2 ) mesh_female = ExtResource( 2 ) texture_male = ExtResource( 17 ) texture_female = ExtResource( 17 ) -[sub_resource type="ItemVisualEntry" id=2] +[sub_resource type="ModelVisualEntry" id=2] mesh_male = ExtResource( 12 ) mesh_female = ExtResource( 12 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=3] +[sub_resource type="ModelVisualEntry" id=3] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=4] +[sub_resource type="ModelVisualEntry" id=4] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=5] +[sub_resource type="ModelVisualEntry" id=5] mesh_male = ExtResource( 13 ) mesh_female = ExtResource( 13 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=6] +[sub_resource type="ModelVisualEntry" id=6] mesh_male = ExtResource( 3 ) mesh_female = ExtResource( 3 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=7] +[sub_resource type="ModelVisualEntry" id=7] mesh_male = ExtResource( 8 ) mesh_female = ExtResource( 8 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=8] +[sub_resource type="ModelVisualEntry" id=8] mesh_male = ExtResource( 14 ) mesh_female = ExtResource( 14 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=9] +[sub_resource type="ModelVisualEntry" id=9] mesh_male = ExtResource( 9 ) mesh_female = ExtResource( 9 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=10] +[sub_resource type="ModelVisualEntry" id=10] mesh_male = ExtResource( 9 ) mesh_female = ExtResource( 9 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=11] +[sub_resource type="ModelVisualEntry" id=11] mesh_male = ExtResource( 5 ) mesh_female = ExtResource( 5 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=12] +[sub_resource type="ModelVisualEntry" id=12] mesh_male = ExtResource( 4 ) mesh_female = ExtResource( 4 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=13] +[sub_resource type="ModelVisualEntry" id=13] mesh_male = ExtResource( 1 ) mesh_female = ExtResource( 1 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=14] +[sub_resource type="ModelVisualEntry" id=14] mesh_male = ExtResource( 12 ) mesh_female = ExtResource( 12 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=15] +[sub_resource type="ModelVisualEntry" id=15] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=16] +[sub_resource type="ModelVisualEntry" id=16] mesh_male = ExtResource( 10 ) mesh_female = ExtResource( 10 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=17] +[sub_resource type="ModelVisualEntry" id=17] mesh_male = ExtResource( 13 ) mesh_female = ExtResource( 13 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=18] +[sub_resource type="ModelVisualEntry" id=18] mesh_male = ExtResource( 3 ) mesh_female = ExtResource( 3 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=19] +[sub_resource type="ModelVisualEntry" id=19] mesh_male = ExtResource( 11 ) mesh_female = ExtResource( 11 ) texture_male = ExtResource( 18 ) texture_female = ExtResource( 18 ) -[sub_resource type="ItemVisualEntry" id=20] +[sub_resource type="ModelVisualEntry" id=20] mesh_male = ExtResource( 14 ) mesh_female = ExtResource( 14 ) texture_male = ExtResource( 16 ) texture_female = ExtResource( 16 ) -[sub_resource type="ItemVisualEntry" id=21] +[sub_resource type="ModelVisualEntry" id=21] mesh_male = ExtResource( 9 ) mesh_female = ExtResource( 9 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=22] +[sub_resource type="ModelVisualEntry" id=22] mesh_male = ExtResource( 9 ) mesh_female = ExtResource( 9 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=23] +[sub_resource type="ModelVisualEntry" id=23] mesh_male = ExtResource( 5 ) mesh_female = ExtResource( 5 ) texture_male = ExtResource( 15 ) texture_female = ExtResource( 15 ) -[sub_resource type="ItemVisualEntry" id=24] +[sub_resource type="ModelVisualEntry" id=24] mesh_male = ExtResource( 6 ) mesh_female = ExtResource( 6 ) texture_male = ExtResource( 19 ) texture_female = ExtResource( 19 ) -[sub_resource type="ItemVisualEntry" id=25] +[sub_resource type="ModelVisualEntry" id=25] mesh_male = ExtResource( 7 ) mesh_female = ExtResource( 7 ) texture_male = ExtResource( 19 ) diff --git a/game/modules/species/Human/models/armature_huf.tscn b/game/modules/species/Human/models/armature_huf.tscn index fc660a24..44e3c162 100644 --- a/game/modules/species/Human/models/armature_huf.tscn +++ b/game/modules/species/Human/models/armature_huf.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=47 format=2] -[ext_resource path="res://modules/core/item_visuals/test_base_v3.tres" type="ItemVisual" id=1] +[ext_resource path="res://modules/core/model_visuals/test_base_v3.tres" type="ModelVisual" id=1] [ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=2] [ext_resource path="res://modules/core/materials/3_standard_character_material.tres" type="Material" id=3] [ext_resource path="res://test_weapons/shield_d.mesh" type="ArrayMesh" id=4] diff --git a/game/player/CharacterSkeletonGD.gd b/game/player/CharacterSkeletonGD.gd index 3cfc0655..be1ab560 100644 --- a/game/player/CharacterSkeletonGD.gd +++ b/game/player/CharacterSkeletonGD.gd @@ -48,7 +48,7 @@ var torso_attach_point : CharacterSkeketonAttachPoint export (NodePath) var root_attach_point_path : NodePath var root_attach_point : CharacterSkeketonAttachPoint -export(Array, ItemVisual) var viss : Array +export(Array, ModelVisual) var viss : Array var meshes : Array @@ -131,7 +131,7 @@ func _enter_tree(): # if not Engine.is_editor_hint(): for iv in viss: - add_item_visual(iv as ItemVisual) + add_model_visual(iv as ModelVisual) func _exit_tree(): if _thread != null: