Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update everything, to grab the multithreading fixes from Voxelman.

Browse Source
This commit is contained in:
Relintai 2020-02-12 14:20:26 +01:00
parent 09f66ef438
commit 0610cf0704
9 changed files with 75 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "8a0f94a688f18a9565a21657bf44791550aec96a", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "09372b146936fda509f5c23a522e998d12f38e13"}, "entity_spell_system": {"master": "0bdf71c431b62b24d56c1fc178dbcb792e5dca3d"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "fd1ff4b4ff3cd718f4f85253f1ebc865894e5ffe"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "d3f3a829eff40a93464f6b321c13ce26d44e11e3"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}
{"engine": {"3.2": "8a0f94a688f18a9565a21657bf44791550aec96a", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "09372b146936fda509f5c23a522e998d12f38e13"}, "entity_spell_system": {"master": "0bdf71c431b62b24d56c1fc178dbcb792e5dca3d"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "8a2524dc57b093aefef29b1d47636f1628fafdfe"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "d3f3a829eff40a93464f6b321c13ce26d44e11e3"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}

10
game/data/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

BIN
game/data/materials/Character.material
View File

Binary file not shown.

4
game/data/materials/world_material.tres
View File

File diff suppressed because one or more lines are too long

10
game/data/models/armature_model_orig_v2.tscn
View File

@ -210,7 +210,7 @@ bones/19/bound_children = [ NodePath("RightHandAttachment") ]
skin = SubResource( 1 )
[node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"]
transform = Transform( 0.102967, -0.987496, -0.119265, 0.0573135, -0.113794, 0.991801, -0.993029, -0.108962, 0.0448816, 0.268627, 0.766619, -0.00991327 )
transform = Transform( 0.103496, -0.988074, -0.113867, 0.0567376, -0.108407, 0.992451, -0.993007, -0.109178, 0.0448429, 0.269912, 0.765141, -0.009432 )
bone_name = "left_hand"
[node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"]
@ -218,7 +218,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="2"]
transform = Transform( -0.0405942, -0.99878, 0.0274949, -0.127065, 0.0324395, 0.991305, -0.991072, 0.0367556, -0.128231, -0.267414, 0.762608, -0.00672576 )
transform = Transform( -0.0414053, -0.998491, 0.0355513, -0.126356, 0.0405158, 0.991109, -0.991131, 0.0365534, -0.127846, -0.27264, 0.76424, -0.00749165 )
bone_name = "right_hand"
[node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"]
@ -234,7 +234,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="4"]
transform = Transform( 0.999977, -0.000428911, 0.00679835, 0.00681132, 0.0731365, -0.997232, -6.94931e-05, 0.997321, 0.0731426, 0.000994672, 1.31765, 6.19872e-05 )
transform = Transform( 0.999969, -0.000741187, 0.00780003, 0.0078302, 0.0731273, -0.997236, 0.000168743, 0.997322, 0.0731345, 0.00109308, 1.31594, 7.40913e-05 )
bone_name = "neck"
[node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"]
@ -242,7 +242,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 )
script = ExtResource( 4 )
[node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
transform = Transform( 0.999556, 1.49319e-08, -0.0297998, -0.0297998, 4.71632e-07, -0.999556, -8.7067e-10, 1, 4.71868e-07, 0.000666056, 0.776154, 2.76486e-10 )
transform = Transform( 0.999694, 1.49325e-08, -0.0247482, -0.0247482, 4.7167e-07, -0.999694, -3.25495e-09, 1, 4.71895e-07, 0.0026686, 0.774437, 1.07684e-09 )
bone_name = "pelvis"
[node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/RightHipAttachment"]
@ -255,7 +255,7 @@ material/0 = null
material/1 = null
[node name="BoneAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"]
transform = Transform( 0.999975, 0.000194523, 0.00708311, 0.0070831, -0.00105505, -0.999908, -0.000187049, 0.999999, -0.00105646, 0.00232345, 1.13007, -0.000136203 )
transform = Transform( 0.999967, -4.25729e-05, 0.00810519, 0.00810198, -0.00106443, -0.999911, 5.11901e-05, 1, -0.00106458, 0.00261359, 1.12836, -0.000125621 )
bone_name = "spine_2"
[node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/BoneAttachment"]

74
game/voxelman/transvoxel_mesher/TVTestScene.tscn
View File

@ -1,37 +1,42 @@
[gd_scene load_steps=16 format=2]
[gd_scene load_steps=18 format=2]
[ext_resource path="res://voxelman/transvoxel_mesher/TVVoxelWorld.tscn" type="PackedScene" id=1]
[ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2]
[ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3]
[ext_resource path="res://debug/FreeLookCam.tscn" type="PackedScene" id=4]
[ext_resource path="res://data/voxel_textures/a2.png" type="Texture" id=5]
[ext_resource path="res://data/voxel_textures/grass_albedo.png" type="Texture" id=5]
[ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=6]
[sub_resource type="Environment" id=1]
ambient_light_color = Color( 1, 1, 1, 1 )
[sub_resource type="SpatialMaterial" id=2]
[sub_resource type="VoxelmanLevelGenerator" id=2]
script = ExtResource( 6 )
_force_planet = -1
_level_seed = 0
_spawn_mobs = false
[sub_resource type="SpatialMaterial" id=3]
albedo_color = Color( 0.00392157, 0.105882, 0.0196078, 1 )
[sub_resource type="PlaneMesh" id=3]
[sub_resource type="PlaneMesh" id=4]
[sub_resource type="SphereMesh" id=4]
[sub_resource type="SphereMesh" id=5]
[sub_resource type="SpatialMaterial" id=5]
[sub_resource type="SpatialMaterial" id=6]
albedo_color = Color( 1, 0.00392157, 0.00392157, 1 )
[sub_resource type="PrismMesh" id=6]
[sub_resource type="PrismMesh" id=7]
[sub_resource type="SpatialMaterial" id=8]
[sub_resource type="PrismMesh" id=8]
[sub_resource type="SpatialMaterial" id=9]
albedo_color = Color( 0.129412, 1, 0.0156863, 1 )
albedo_texture = ExtResource( 5 )
[sub_resource type="PrismMesh" id=9]
[sub_resource type="PrismMesh" id=10]
[sub_resource type="SpatialMaterial" id=10]
[sub_resource type="SpatialMaterial" id=11]
albedo_color = Color( 0.00784314, 0.0627451, 1, 1 )
albedo_texture = ExtResource( 5 )
@ -46,8 +51,11 @@ environment = SubResource( 1 )
[node name="DebugGeom" type="ImmediateGeometry" parent="."]
[node name="VoxelWorld" parent="." instance=ExtResource( 1 )]
level_generator = SubResource( 2 )
voxel_scale = 1.0
chunk_spawn_range = 2
show_loading_screen = false
generate_on_ready = true
[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 1, 0, 0, 0, -0.236854, 0.971545, 0, -0.971545, -0.236854, 0, 41.8924, 0 )
@ -65,73 +73,73 @@ __meta__ = {
[node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 20, 0, 0, 0, 20, 0, 0, 0, 20, 0, -5, 0 )
material_override = SubResource( 2 )
mesh = SubResource( 3 )
material_override = SubResource( 3 )
mesh = SubResource( 4 )
material/0 = ExtResource( 2 )
[node name="gizmo" type="Spatial" parent="."]
[node name="MeshInstance2" type="MeshInstance" parent="gizmo"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 0, 0, 0 )
mesh = SubResource( 4 )
mesh = SubResource( 5 )
material/0 = ExtResource( 2 )
[node name="MeshInstance6" type="MeshInstance" parent="gizmo"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 1, 1, 1 )
mesh = SubResource( 4 )
mesh = SubResource( 5 )
material/0 = ExtResource( 2 )
[node name="MeshInstance7" type="MeshInstance" parent="gizmo"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 0, 1, 1 )
mesh = SubResource( 4 )
mesh = SubResource( 5 )
material/0 = ExtResource( 2 )
[node name="MeshInstance8" type="MeshInstance" parent="gizmo"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 1, 1, 0 )
mesh = SubResource( 4 )
mesh = SubResource( 5 )
material/0 = ExtResource( 2 )
[node name="MeshInstance9" type="MeshInstance" parent="gizmo"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 1, 0, 1 )
mesh = SubResource( 4 )
mesh = SubResource( 5 )
material/0 = ExtResource( 2 )
[node name="MeshInstance3" type="MeshInstance" parent="gizmo"]
transform = Transform( 5.96244e-10, 0.05, 0, -0.05, 5.96244e-10, 0, 0, 0, 0.05, 1, 0, 0 )
material_override = SubResource( 5 )
mesh = SubResource( 6 )
material_override = SubResource( 6 )
mesh = SubResource( 7 )
material/0 = ExtResource( 2 )
[node name="MeshInstance4" type="MeshInstance" parent="gizmo"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 0, 1, 0 )
mesh = SubResource( 7 )
material/0 = SubResource( 8 )
mesh = SubResource( 8 )
material/0 = SubResource( 9 )
[node name="MeshInstance5" type="MeshInstance" parent="gizmo"]
transform = Transform( 0.05, 0, 0, 0, -2.18557e-09, -0.05, 0, 0.05, -2.18557e-09, 0, 0, 1 )
mesh = SubResource( 9 )
material/0 = SubResource( 10 )
mesh = SubResource( 10 )
material/0 = SubResource( 11 )
[node name="gizmo2" type="Spatial" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 53.2071, 8.56598, 59.3495 )
[node name="MeshInstance2" type="MeshInstance" parent="gizmo2"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 0, 0, 0 )
mesh = SubResource( 4 )
mesh = SubResource( 5 )
material/0 = ExtResource( 2 )
[node name="MeshInstance3" type="MeshInstance" parent="gizmo2"]
transform = Transform( 5.96244e-10, 0.05, 0, -0.05, 5.96244e-10, 0, 0, 0, 0.05, 1, 0, 0 )
material_override = SubResource( 5 )
mesh = SubResource( 6 )
material_override = SubResource( 6 )
mesh = SubResource( 7 )
material/0 = ExtResource( 2 )
[node name="MeshInstance4" type="MeshInstance" parent="gizmo2"]
transform = Transform( 0.05, 0, 0, 0, 0.05, 0, 0, 0, 0.05, 0, 1, 0 )
mesh = SubResource( 7 )
material/0 = SubResource( 8 )
mesh = SubResource( 8 )
material/0 = SubResource( 9 )
[node name="MeshInstance5" type="MeshInstance" parent="gizmo2"]
transform = Transform( 0.05, 0, 0, 0, -2.18557e-09, -0.05, 0, 0.05, -2.18557e-09, 0, 0, 1 )
mesh = SubResource( 9 )
material/0 = SubResource( 10 )
mesh = SubResource( 10 )
material/0 = SubResource( 11 )

4
game/voxelman/transvoxel_mesher/TVVoxelChunk.gd
View File

@ -237,7 +237,7 @@ func generate_random_ao() -> void:
if val < 0:
val = -val
set_voxel(int(val * 255.0), x, y, z, VoxelChunk.DEFAULT_CHANNEL_RANDOM_AO)
func _physics_process(delta):
@ -245,7 +245,7 @@ func _physics_process(delta):
build_phase_lights()
set_physics_process_internal(false)
next_phase()
elif current_build_phase == VoxelChunk.BUILD_PHASE_PROP_MESH:
build_phase_prop_mesh()
set_physics_process_internal(false)

34
game/voxelman/transvoxel_mesher/TVVoxelMesher.gd
View File

@ -300,22 +300,22 @@ func add_buffer_normal(buffer : VoxelChunk) -> void:
var vpy : int = int(vert_pos.y)
var vpz : int = int(vert_pos.z)
var light : Color = Color(buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_LIGHT_COLOR_R) / 255.0, buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_LIGHT_COLOR_G) / 255.0, buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_LIGHT_COLOR_B) / 255.0)
var ao : float = (buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_AO) / 255.0) * ao_strength
var rao : float = (buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_RANDOM_AO) / 255.0)
ao += rao
light.r += base_light_value
light.g += base_light_value
light.b += base_light_value
light.r -= ao
light.g -= ao
light.b -= ao
light.r = clamp(light.r, 0, 1.0)
light.g = clamp(light.g, 0, 1.0)
light.b = clamp(light.b, 0, 1.0)
# var light : Color = Color(buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_LIGHT_COLOR_R) / 255.0, buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_LIGHT_COLOR_G) / 255.0, buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_LIGHT_COLOR_B) / 255.0)
# var ao : float = (buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_AO) / 255.0) * ao_strength
# var rao : float = (buffer.get_voxel(vpx, vpy, vpz, VoxelChunk.DEFAULT_CHANNEL_RANDOM_AO) / 255.0)
# ao += rao
#
# light.r += base_light_value
# light.g += base_light_value
# light.b += base_light_value
#
# light.r -= ao
# light.g -= ao
# light.b -= ao
#
# light.r = clamp(light.r, 0, 1.0)
# light.g = clamp(light.g, 0, 1.0)
# light.b = clamp(light.b, 0, 1.0)
# if regular_cell_class == 11:
# print("asd")
@ -327,7 +327,7 @@ func add_buffer_normal(buffer : VoxelChunk) -> void:
# light.b = 1
add_color(light)
#add_color(light)
vert_pos *= float(voxel_scale)
add_normal(normal)

2
game/voxelman/transvoxel_mesher/TVVoxelWorld.gd
View File

@ -112,6 +112,8 @@ func get_chunk_lod_level(x : int, y : int, z : int, default : int) -> int:
func _create_chunk(x : int, y : int, z : int, pchunk : Node) -> VoxelChunk:
var chunk : VoxelChunk = TVVoxelChunk.new()
#chunk.meshing_create_collider = false
chunk.lod_size = 1
return ._create_chunk(x, y, z, chunk)