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 Voxelman to the latest to get the mesher changes.

Browse Source
This commit is contained in:
Relintai 2020-06-12 19:55:37 +02:00
parent 9dd721fb3c
commit 2dfba2bc97
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "6c9b7c27d5ab008c039a15a1805dd2c4a55f2255", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "68443b835ca11da1008c8c5ce3edd52f540409bd"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "aeff73083e25a1b6efaed28d94f898314ea700ad"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}
{"engine": {"3.2": "6c9b7c27d5ab008c039a15a1805dd2c4a55f2255", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "68443b835ca11da1008c8c5ce3edd52f540409bd"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "cdc918a5b89a226bad0510f270ddc0d06097f07e"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}

4
game/modules/core/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

4
game/project.godot
View File

@ -259,12 +259,12 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://scripts/spells/gd_spell_script.gd"
}, {
"base": "VoxelChunkDefault",
"base": "VoxelChunkMarchingCubes",
"class": "TVVoxelChunk",
"language": "GDScript",
"path": "res://voxelman/world/TVVoxelChunk.gd"
}, {
"base": "VoxelMesherUVTransvoxel",
"base": "VoxelMesherMarchingCubes",
"class": "TVVoxelMesher",
"language": "GDScript",
"path": "res://voxelman/world/TVVoxelMesher.gd"

2
game/voxelman/world/TVVoxelChunk.gd
View File

@ -1,5 +1,5 @@
tool
extends VoxelChunkDefault
extends VoxelChunkMarchingCubes
class_name TVVoxelChunk
# Copyright Péter Magyar relintai@gmail.com

4
game/voxelman/world/TVVoxelMesher.gd
View File

@ -1,4 +1,4 @@
extends VoxelMesherUVTransvoxel
extends VoxelMesherMarchingCubes
class_name TVVoxelMesher
# Copyright Péter Magyar relintai@gmail.com
@ -160,7 +160,7 @@ func n_add_chunk(chunk : VoxelChunk) -> void:
var regular_cell_class : int = get_regular_cell_class(case_code)
var cell_data : TransvoxelCellData = get_regular_cell_data(regular_cell_class)
var cell_data : MarchingCubesCellData = get_regular_cell_data(regular_cell_class)
var index_count : int = cell_data.get_triangle_count() * 3
var vertex_count : int = cell_data.get_vertex_count()