Work on the style.

This commit is contained in:
Relintai 2019-12-07 15:54:46 +01:00
parent 3e0b247251
commit ad8c9fb653
28 changed files with 721 additions and 35 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/armor_green_scarf_v3.png-9263c51f91afe4c6793ecac531efd89e.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/character_textures/armor_green_scarf_v3.png"
dest_files=[ "res://.import/armor_green_scarf_v3.png-9263c51f91afe4c6793ecac531efd89e.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/armor_green_scarfv2.png-da6c3218412c8c7bea7413ee37eecba0.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/character_textures/armor_green_scarfv2.png"
dest_files=[ "res://.import/armor_green_scarfv2.png-da6c3218412c8c7bea7413ee37eecba0.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/armor_red_scarf_v3.png-84f6e5c6eebd8df51d803efd5c0e7eec.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/character_textures/armor_red_scarf_v3.png"
dest_files=[ "res://.import/armor_red_scarf_v3.png-84f6e5c6eebd8df51d803efd5c0e7eec.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/armor_simple_v2.png-e6c6a4af172ff9999d28acc160335f0f.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/character_textures/armor_simple_v2.png"
dest_files=[ "res://.import/armor_simple_v2.png-e6c6a4af172ff9999d28acc160335f0f.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/armor_simple_v3.png-7313eb8f1cdabed8b1dcd846aba07b51.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/character_textures/armor_simple_v3.png"
dest_files=[ "res://.import/armor_simple_v3.png-7313eb8f1cdabed8b1dcd846aba07b51.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/head_v3.png-3cfa65b7d1e8ea93eff683ca99ce190b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/character_textures/head_v3.png"
dest_files=[ "res://.import/head_v3.png-3cfa65b7d1e8ea93eff683ca99ce190b.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/skin_v3.png-37de1c9eacee490957ed0a72b21951e3.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/character_textures/skin_v3.png"
dest_files=[ "res://.import/skin_v3.png-37de1c9eacee490957ed0a72b21951e3.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

View File

@ -0,0 +1,200 @@
[gd_resource type="ItemVisual" load_steps=46 format=2]
[ext_resource path="res://data/character_models/neck.dae" type="MeshDataResource" id=1]
[ext_resource path="res://data/character_models/huf_calf.dae" type="MeshDataResource" id=2]
[ext_resource path="res://data/character_models/thigh.dae" type="MeshDataResource" id=3]
[ext_resource path="res://data/character_models/pelvis.dae" type="MeshDataResource" id=4]
[ext_resource path="res://data/character_models/huf_forearm.dae" type="MeshDataResource" id=5]
[ext_resource path="res://data/character_textures/armor_red_scarf.png" type="Texture" id=6]
[ext_resource path="res://data/character_models/spine2.dae" type="MeshDataResource" id=7]
[ext_resource path="res://data/character_textures/head.png" type="Texture" id=8]
[ext_resource path="res://data/character_models/huf_foot.dae" type="MeshDataResource" id=9]
[ext_resource path="res://data/character_models/huf_fingers.dae" type="MeshDataResource" id=10]
[ext_resource path="res://data/character_models/huf_head.dae" type="MeshDataResource" id=11]
[ext_resource path="res://data/character_textures/skin.png" type="Texture" id=12]
[ext_resource path="res://data/character_models/huf_finger.dae" type="MeshDataResource" id=13]
[ext_resource path="res://data/character_models/spine1.dae" type="MeshDataResource" id=14]
[ext_resource path="res://data/character_textures/armor_green_scarf.png" type="Texture" id=15]
[ext_resource path="res://data/character_models/upperarm.dae" type="MeshDataResource" id=16]
[ext_resource path="res://data/character_models/huf_handl.dae" type="MeshDataResource" id=17]
[ext_resource path="res://data/character_models/huf_hand.dae" type="MeshDataResource" id=18]
[ext_resource path="res://data/character_textures/armor_simple_v2.png" type="Texture" id=19]
[ext_resource path="res://data/character_textures/armor_green_scarfv2.png" type="Texture" id=20]
[sub_resource type="ItemVisualEntry" id=1]
mesh_male = ExtResource( 11 )
mesh_female = ExtResource( 11 )
texture_male = ExtResource( 8 )
texture_female = ExtResource( 8 )
[sub_resource type="ItemVisualEntry" id=2]
mesh_male = ExtResource( 2 )
mesh_female = ExtResource( 2 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=3]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=4]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=5]
mesh_male = ExtResource( 9 )
mesh_female = ExtResource( 9 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=6]
mesh_male = ExtResource( 5 )
mesh_female = ExtResource( 5 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=7]
mesh_male = ExtResource( 17 )
mesh_female = ExtResource( 17 )
texture_male = ExtResource( 15 )
texture_female = ExtResource( 15 )
[sub_resource type="ItemVisualEntry" id=8]
mesh_male = ExtResource( 3 )
mesh_female = ExtResource( 3 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=9]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=10]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=11]
mesh_male = ExtResource( 16 )
mesh_female = ExtResource( 16 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=12]
mesh_male = ExtResource( 1 )
mesh_female = ExtResource( 1 )
texture_male = ExtResource( 20 )
texture_female = ExtResource( 20 )
[sub_resource type="ItemVisualEntry" id=13]
mesh_male = ExtResource( 4 )
mesh_female = ExtResource( 4 )
texture_male = ExtResource( 20 )
texture_female = ExtResource( 20 )
[sub_resource type="ItemVisualEntry" id=14]
mesh_male = ExtResource( 2 )
mesh_female = ExtResource( 2 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=15]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=16]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=17]
mesh_male = ExtResource( 9 )
mesh_female = ExtResource( 9 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=18]
mesh_male = ExtResource( 5 )
mesh_female = ExtResource( 5 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=19]
mesh_male = ExtResource( 18 )
mesh_female = ExtResource( 18 )
texture_male = ExtResource( 20 )
texture_female = ExtResource( 20 )
[sub_resource type="ItemVisualEntry" id=20]
mesh_male = ExtResource( 3 )
mesh_female = ExtResource( 3 )
texture_male = ExtResource( 19 )
texture_female = ExtResource( 19 )
[sub_resource type="ItemVisualEntry" id=21]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=22]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=23]
mesh_male = ExtResource( 16 )
mesh_female = ExtResource( 16 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=24]
mesh_male = ExtResource( 14 )
mesh_female = ExtResource( 14 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=25]
mesh_male = ExtResource( 7 )
mesh_female = ExtResource( 7 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[resource]
layer = 1
visual_pelvis = SubResource( 13 )
visual_spine_1 = SubResource( 24 )
visual_spine_2 = SubResource( 25 )
visual_neck = SubResource( 12 )
visual_head = SubResource( 1 )
visual_left_upper_arm = SubResource( 11 )
visual_left_forearm = SubResource( 6 )
visual_left_hand = SubResource( 7 )
visual_left_thumb_base = SubResource( 9 )
visual_left_thumb_end = SubResource( 10 )
visual_left_fingers_base = SubResource( 3 )
visual_left_fingers_end = SubResource( 4 )
visual_right_upper_arm = SubResource( 23 )
visual_right_forearm = SubResource( 18 )
visual_right_hand = SubResource( 19 )
visual_right_thumb_base = SubResource( 21 )
visual_right_thumb_end = SubResource( 22 )
visual_right_fingers_base = SubResource( 15 )
visual_right_fingers_end = SubResource( 16 )
visual_left_thigh = SubResource( 8 )
visual_left_calf = SubResource( 2 )
visual_left_foot = SubResource( 5 )
visual_right_thigh = SubResource( 20 )
visual_right_calf = SubResource( 14 )
visual_right_foot = SubResource( 17 )

View File

@ -0,0 +1,199 @@
[gd_resource type="ItemVisual" load_steps=45 format=2]
[ext_resource path="res://data/character_models/neck.dae" type="MeshDataResource" id=1]
[ext_resource path="res://data/character_models/huf_calf.dae" type="MeshDataResource" id=2]
[ext_resource path="res://data/character_models/thigh.dae" type="MeshDataResource" id=3]
[ext_resource path="res://data/character_models/pelvis.dae" type="MeshDataResource" id=4]
[ext_resource path="res://data/character_models/huf_forearm.dae" type="MeshDataResource" id=5]
[ext_resource path="res://data/character_textures/armor_simple_v3.png" type="Texture" id=6]
[ext_resource path="res://data/character_models/spine2.dae" type="MeshDataResource" id=7]
[ext_resource path="res://data/character_textures/head_v3.png" type="Texture" id=8]
[ext_resource path="res://data/character_models/huf_foot.dae" type="MeshDataResource" id=9]
[ext_resource path="res://data/character_models/huf_fingers.dae" type="MeshDataResource" id=10]
[ext_resource path="res://data/character_models/huf_head.dae" type="MeshDataResource" id=11]
[ext_resource path="res://data/character_textures/skin_v3.png" type="Texture" id=12]
[ext_resource path="res://data/character_models/huf_finger.dae" type="MeshDataResource" id=13]
[ext_resource path="res://data/character_models/spine1.dae" type="MeshDataResource" id=14]
[ext_resource path="res://data/character_models/upperarm.dae" type="MeshDataResource" id=16]
[ext_resource path="res://data/character_models/huf_handl.dae" type="MeshDataResource" id=17]
[ext_resource path="res://data/character_models/huf_hand.dae" type="MeshDataResource" id=18]
[ext_resource path="res://data/character_textures/armor_green_scarf_v3.png" type="Texture" id=21]
[ext_resource path="res://data/character_textures/armor_red_scarf_v3.png" type="Texture" id=22]
[sub_resource type="ItemVisualEntry" id=1]
mesh_male = ExtResource( 11 )
mesh_female = ExtResource( 11 )
texture_male = ExtResource( 8 )
texture_female = ExtResource( 8 )
[sub_resource type="ItemVisualEntry" id=2]
mesh_male = ExtResource( 2 )
mesh_female = ExtResource( 2 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=3]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=4]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=5]
mesh_male = ExtResource( 9 )
mesh_female = ExtResource( 9 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=6]
mesh_male = ExtResource( 5 )
mesh_female = ExtResource( 5 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=7]
mesh_male = ExtResource( 17 )
mesh_female = ExtResource( 17 )
texture_male = ExtResource( 21 )
texture_female = ExtResource( 21 )
[sub_resource type="ItemVisualEntry" id=8]
mesh_male = ExtResource( 3 )
mesh_female = ExtResource( 3 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=9]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=10]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=11]
mesh_male = ExtResource( 16 )
mesh_female = ExtResource( 16 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=12]
mesh_male = ExtResource( 1 )
mesh_female = ExtResource( 1 )
texture_male = ExtResource( 21 )
texture_female = ExtResource( 21 )
[sub_resource type="ItemVisualEntry" id=13]
mesh_male = ExtResource( 4 )
mesh_female = ExtResource( 4 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=14]
mesh_male = ExtResource( 2 )
mesh_female = ExtResource( 2 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=15]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=16]
mesh_male = ExtResource( 10 )
mesh_female = ExtResource( 10 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=17]
mesh_male = ExtResource( 9 )
mesh_female = ExtResource( 9 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=18]
mesh_male = ExtResource( 5 )
mesh_female = ExtResource( 5 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=19]
mesh_male = ExtResource( 18 )
mesh_female = ExtResource( 18 )
texture_male = ExtResource( 21 )
texture_female = ExtResource( 21 )
[sub_resource type="ItemVisualEntry" id=20]
mesh_male = ExtResource( 3 )
mesh_female = ExtResource( 3 )
texture_male = ExtResource( 6 )
texture_female = ExtResource( 6 )
[sub_resource type="ItemVisualEntry" id=21]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=22]
mesh_male = ExtResource( 13 )
mesh_female = ExtResource( 13 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=23]
mesh_male = ExtResource( 16 )
mesh_female = ExtResource( 16 )
texture_male = ExtResource( 12 )
texture_female = ExtResource( 12 )
[sub_resource type="ItemVisualEntry" id=24]
mesh_male = ExtResource( 14 )
mesh_female = ExtResource( 14 )
texture_male = ExtResource( 22 )
texture_female = ExtResource( 22 )
[sub_resource type="ItemVisualEntry" id=25]
mesh_male = ExtResource( 7 )
mesh_female = ExtResource( 7 )
texture_male = ExtResource( 22 )
texture_female = ExtResource( 22 )
[resource]
layer = 1
visual_pelvis = SubResource( 13 )
visual_spine_1 = SubResource( 24 )
visual_spine_2 = SubResource( 25 )
visual_neck = SubResource( 12 )
visual_head = SubResource( 1 )
visual_left_upper_arm = SubResource( 11 )
visual_left_forearm = SubResource( 6 )
visual_left_hand = SubResource( 7 )
visual_left_thumb_base = SubResource( 9 )
visual_left_thumb_end = SubResource( 10 )
visual_left_fingers_base = SubResource( 3 )
visual_left_fingers_end = SubResource( 4 )
visual_right_upper_arm = SubResource( 23 )
visual_right_forearm = SubResource( 18 )
visual_right_hand = SubResource( 19 )
visual_right_thumb_base = SubResource( 21 )
visual_right_thumb_end = SubResource( 22 )
visual_right_fingers_base = SubResource( 15 )
visual_right_fingers_end = SubResource( 16 )
visual_left_thigh = SubResource( 8 )
visual_left_calf = SubResource( 2 )
visual_left_foot = SubResource( 5 )
visual_right_thigh = SubResource( 20 )
visual_right_calf = SubResource( 14 )
visual_right_foot = SubResource( 17 )

File diff suppressed because one or more lines are too long

View File

@ -5,7 +5,7 @@
[ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=3]
[ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=4]
[ext_resource path="res://data/models/armature.tscn" type="PackedScene" id=5]
[ext_resource path="res://data/item_visuals/test_vis1.tres" type="ItemVisual" id=6]
[ext_resource path="res://data/item_visuals/test_base_v3.tres" type="ItemVisual" id=6]
[sub_resource type="Skin" id=1]
bind_count = 29
@ -209,16 +209,13 @@ viss = [ ExtResource( 6 ) ]
[node name="armature" parent="." instance=ExtResource( 5 )]
[node name="Skeleton" parent="armature/Armature" index="0"]
bones/0/bound_children = [ NodePath("RootAttachment") ]
bones/4/rest = Transform( 1, 6.46674e-07, 6.45602e-07, -6.48981e-07, 0.999994, 0.00358023, -6.43283e-07, -0.00358023, 0.999994, 0, 4.65661e-10, -0.147629 )
bones/5/rest = Transform( 1, -2.68318e-05, -0.000279704, 0.000117096, 0.944671, 0.328021, 0.000255427, -0.328021, 0.94467, -1.16415e-10, 4.88944e-08, -0.189165 )
bones/5/bound_children = [ NodePath("NeckAttachment") ]
bones/6/rest = Transform( 1, 0.000377033, 0.000350316, -0.000245136, 0.947438, -0.31994, -0.00045253, 0.319939, 0.947438, 1.16415e-10, 0, -0.0579902 )
bones/7/rest = Transform( 0.00701095, 0.0774391, -0.996973, 0.996989, -0.0775305, 0.000988811, -0.0772191, -0.993978, -0.0777495, 0.0321484, -0.00817799, -0.142039 )
bones/8/rest = Transform( 0.998087, 0.0364489, -0.0499443, -0.0372952, 0.999174, -0.016119, 0.0493155, 0.0179508, 0.998622, -1.49012e-08, -1.19209e-07, -0.123344 )
bones/9/rest = Transform( 0.997892, 0.0111941, 0.063919, -0.00935398, 0.999535, -0.0290152, -0.0642141, 0.0283562, 0.997533, 7.45058e-09, 1.19209e-07, -0.252095 )
bones/10/rest = Transform( -0.986881, -0.160856, -0.0138398, 0.160936, -0.973276, -0.163808, 0.0128795, -0.163886, 0.986395, -3.72529e-09, -1.19209e-07, -0.240671 )
bones/10/bound_children = [ NodePath("LeftHandAttachment") ]
bones/11/rest = Transform( -0.858768, 0.133704, 0.494612, -0.183369, -0.981613, -0.0530235, 0.478429, -0.136232, 0.867495, -0.0617973, 0.000467658, -0.0759538 )
bones/12/rest = Transform( 0.879725, 0.00470716, 0.47546, -0.00342996, 0.999988, -0.00355378, -0.475471, 0.00149554, 0.87973, 0, 0, -0.0346539 )
bones/13/rest = Transform( -0.990866, 0.133748, 0.0172254, -0.134848, -0.981619, -0.13506, -0.00115522, -0.136149, 0.990688, 0, 0, -0.109284 )
@ -227,7 +224,6 @@ bones/15/rest = Transform( 0.00659024, -0.0806892, 0.996718, -0.996735, -0.08074
bones/16/rest = Transform( 0.998936, -0.00708907, 0.0455772, 0.00908724, 0.999, -0.0437846, -0.0452212, 0.0441522, 0.998001, 0, 1.19209e-07, -0.123554 )
bones/17/rest = Transform( 0.997956, -0.0120584, -0.0627536, 0.0127437, 0.999863, 0.0105315, 0.062618, -0.0113097, 0.997973, 7.45058e-09, 0, -0.251481 )
bones/18/rest = Transform( 0.989714, -0.142888, 0.00706463, 0.142388, 0.979061, -0.145484, 0.0138712, 0.144993, 0.989335, 1.49012e-08, -1.19209e-07, -0.240761 )
bones/18/bound_children = [ NodePath("RightHandAttachment") ]
bones/19/rest = Transform( 0.848529, 0.124654, 0.514256, -0.17645, 0.982887, 0.0528969, -0.498861, -0.135625, 0.856004, -0.0617307, -0.00216746, -0.0760976 )
bones/20/rest = Transform( 0.870568, 0.0151711, -0.491814, -0.0140032, 0.999884, 0.00605627, 0.491849, 0.00161457, 0.870679, 1.49012e-08, 0, -0.0345328 )
bones/21/rest = Transform( 0.994898, 0.0954731, 0.0326043, -0.0981578, 0.990701, 0.0942105, -0.0233065, -0.0969302, 0.995018, -1.49012e-08, -1.19209e-07, -0.109269 )
@ -241,7 +237,7 @@ mesh = SubResource( 2 )
material/0 = null
[node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"]
transform = Transform( 0.103369, -0.988358, -0.111374, 0.0564146, -0.10592, 0.992699, -0.993035, -0.108901, 0.0448067, 0.244227, 0.759943, -0.0106616 )
transform = Transform( 0.103431, -0.988256, -0.112285, 0.0563176, -0.106856, 0.992626, -0.993037, -0.108994, 0.0446027, 0.245368, 0.762877, -0.00918405 )
bone_name = "left_hand"
[node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"]
@ -249,7 +245,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, -0.09 )
script = ExtResource( 4 )
[node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"]
transform = Transform( -0.0426668, -0.998146, 0.042682, -0.127478, 0.0477918, 0.990591, -0.990942, 0.0368403, -0.129294, -0.249511, 0.765826, -0.00542467 )
transform = Transform( -0.0416231, -0.998434, 0.0367112, -0.126418, 0.0416962, 0.991032, -0.991117, 0.0366207, -0.127964, -0.247466, 0.765191, -0.00755787 )
bone_name = "right_hand"
[node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"]
@ -265,7 +261,7 @@ transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0
script = ExtResource( 4 )
[node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
transform = Transform( 0.999941, -0.00398304, 0.0101906, 0.0109184, 0.316342, -0.948464, 0.000554104, 0.948624, 0.316407, 0.00117709, 1.31329, 0.00221987 )
transform = Transform( 0.999966, -0.00294882, 0.00777352, 0.00830044, 0.316377, -0.948514, 0.000337654, 0.948621, 0.316418, 0.00130594, 1.31563, 0.00220716 )
bone_name = "neck"
[node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"]

View File

@ -1,12 +1,11 @@
[gd_resource type="VoxelSurfaceMerger" load_steps=3 format=2]
[gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2]
[ext_resource path="res://data/voxel_textures/test_09.png" type="Texture" id=1]
[ext_resource path="res://data/voxel_textures/test_03.png" type="Texture" id=2]
[ext_resource path="res://data/voxel_textures/test_07.png" type="Texture" id=1]
[resource]
resource_name = "Stone"
id = 1
voxel_name = "Stone"
texture_top = ExtResource( 2 )
texture_top = ExtResource( 1 )
texture_bottom = ExtResource( 1 )
texture_side = ExtResource( 1 )

View File

@ -1,6 +1,6 @@
[gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2]
[ext_resource path="res://data/voxel_textures/test_02.png" type="Texture" id=1]
[ext_resource path="res://data/voxel_textures/test_05.png" type="Texture" id=1]
[resource]
resource_name = "Test"

View File

@ -1,12 +1,11 @@
[gd_resource type="VoxelSurfaceMerger" load_steps=3 format=2]
[gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2]
[ext_resource path="res://data/voxel_textures/test_11.png" type="Texture" id=2]
[ext_resource path="res://data/voxel_textures/test_01.png" type="Texture" id=3]
[ext_resource path="res://data/voxel_textures/test_04.png" type="Texture" id=1]
[resource]
resource_name = "Test2"
id = 3
voxel_name = "Test2"
texture_top = ExtResource( 3 )
texture_bottom = ExtResource( 2 )
texture_side = ExtResource( 3 )
texture_top = ExtResource( 1 )
texture_bottom = ExtResource( 1 )
texture_side = ExtResource( 1 )

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

View File

@ -187,6 +187,8 @@ func build_mesh(data) -> void:
st.add_bones(bone_array)
st.add_weights(weights_array)
st.add_color(Color(0.7, 0.7, 0.7))
st.add_vertex(bt.xform(vertices[i]))
for i in range(len(indices)):

View File

@ -38,7 +38,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6.822 )
current = true
fov = 60.0
size = 28.0
far = 300.0
far = 1000.0
[node name="Rotation_Helper" type="Spatial" parent="."]
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )

View File

@ -12,16 +12,16 @@ _level_seed = 0
_spawn_mobs = false
[sub_resource type="ProceduralSky" id=2]
sky_top_color = Color( 0.0431373, 0.00784314, 0.0666667, 1 )
sky_horizon_color = Color( 0.27451, 0.447059, 0.427451, 1 )
sky_top_color = Color( 0.447059, 0.780392, 0.854902, 1 )
sky_horizon_color = Color( 0.273637, 0.277344, 0.206924, 1 )
sky_curve = 0.263535
sky_energy = 0.3
ground_bottom_color = Color( 0.196078, 0.152941, 0.152941, 1 )
ground_horizon_color = Color( 0.223529, 0.192157, 0.164706, 1 )
ground_curve = 0.101965
ground_energy = 0.4
sun_color = Color( 0.619608, 0.47451, 0.113725, 1 )
sun_latitude = 37.43
sun_color = Color( 0.45098, 0.352941, 0.113725, 1 )
sun_latitude = 39.71
sun_longitude = -8.09
sun_angle_min = 0.0
sun_angle_max = 23.15
@ -31,12 +31,15 @@ texture_size = 0
[sub_resource type="Environment" id=3]
background_mode = 2
background_sky = SubResource( 2 )
ambient_light_color = Color( 0.737255, 0.737255, 0.737255, 1 )
ambient_light_color = Color( 1, 1, 1, 1 )
ambient_light_energy = 1.23
ambient_light_sky_contribution = 0.11
fog_enabled = true
fog_color = Color( 0.278431, 0.360784, 0.360784, 1 )
fog_sun_color = Color( 0.113725, 0.568627, 0.827451, 1 )
fog_depth_begin = 34.0
fog_depth_end = 257.9
fog_color = Color( 0.188235, 0.207843, 0.164706, 1 )
fog_sun_color = Color( 0.239216, 0.337255, 0.396078, 1 )
fog_sun_amount = 0.54
fog_depth_begin = 155.9
fog_depth_end = 379.9
fog_depth_curve = 1.18921
tonemap_mode = 2
tonemap_exposure = 0.83
@ -64,17 +67,23 @@ script = ExtResource( 8 )
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource( 3 )
__meta__ = {
"_editor_description_": ""
}
[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( -0.797163, 0.45442, 0.397535, 0, -0.658427, 0.752644, 0.603765, 0.59998, 0.524873, 0, 18.834, 0 )
transform = Transform( -0.797163, 0.45442, 0.397535, 0.124932, -0.520028, 0.844963, 0.590697, 0.723238, 0.357776, 0, 18.834, 0 )
layers = 3
light_energy = 1.4
light_specular = 0.7
light_color = Color( 1, 0.878431, 0.878431, 1 )
light_energy = 0.7
light_specular = 0.65
shadow_enabled = true
shadow_bias = 0.07
script = ExtResource( 3 )
[node name="DirectionalLight2" type="DirectionalLight" parent="."]
transform = Transform( -0.797163, 0.523191, -0.301335, 0, 0.499093, 0.866549, 0.603765, 0.69078, -0.397858, 0, 18.834, 0 )
light_energy = 0.4
transform = Transform( 0.826603, 0.474891, -0.302004, -0.49276, 0.351482, -0.79602, -0.271874, 0.806808, 0.524543, 0, 18.834, 0 )
light_color = Color( 0.631373, 0.631373, 0.631373, 1 )
light_energy = 0.48
light_specular = 0.0
directional_shadow_normal_bias = 0.1

View File

@ -66,6 +66,8 @@ func generate_terrarin(chunk : VoxelChunk, spawn_mobs: bool) -> void:
# chunk.set_voxel(int(255.0 * (val - int(val)) / 180.0) * 180, x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(int(255.0 * (val - int(val))), x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
# box_blur(chunk)
# chunk.build()
if not Engine.editor_hint and chunk.position_y == 0 and spawn_mobs:
@ -73,3 +75,29 @@ func generate_terrarin(chunk : VoxelChunk, spawn_mobs: bool) -> void:
(chunk.position_y + 1) * chunk.size_y * chunk.voxel_scale, \
chunk.position_z * chunk.size_z * chunk.voxel_scale - chunk.size_z / 2))
func box_blur(chunk : VoxelChunk):
for x in range(0, chunk.size_x):
for z in range(0, chunk.size_z):
for y in range(0, chunk.size_z):
var avg : float = 0
avg += chunk.get_voxel(x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg += chunk.get_voxel(x + 1, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg += chunk.get_voxel(x, y, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg += chunk.get_voxel(x + 1, y, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg += chunk.get_voxel(x, y + 1, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg += chunk.get_voxel(x + 1, y + 1, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg += chunk.get_voxel(x, y + 1, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg += chunk.get_voxel(x + 1, y + 1, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
avg /= 8.0
chunk.set_voxel(avg, x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(avg, x + 1, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(avg, x, y, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(avg, x + 1, y, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(avg, x, y + 1, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(avg, x + 1, y + 1, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(avg, x, y + 1, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)
chunk.set_voxel(avg, x + 1, y + 1, z + 1, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL)