Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-01-12 15:01:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work on updating the prop meshing implementation (does not work yet).

Browse Source
This commit is contained in:
Relintai 2020-06-23 14:30:49 +02:00
parent 718823a1eb
commit 7aa0edf98e
4 changed files with 219 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
world/default/voxel_chunk_default.cpp
View File

@ -1128,6 +1128,15 @@ void VoxelChunkDefault::_build_phase(int phase) {
mesher->reset(); mesher->reset();
} }
for (int i = 0; i < _prop_meshers.size(); ++i) {
Ref<VoxelMesher> mesher = _prop_meshers.get(i);
ERR_CONTINUE(!mesher.is_valid());
mesher->reset();
mesher->set_library(_library);
}
next_phase(); next_phase();
return; return;
@ -1153,7 +1162,7 @@ void VoxelChunkDefault::_build_phase(int phase) {
return; return;
} }
case BUILD_PHASE_TERRARIN_MESH_COLLIDER: { case BUILD_PHASE_COLLIDER: {
if ((_build_flags & BUILD_FLAG_CREATE_COLLIDER) == 0) { if ((_build_flags & BUILD_FLAG_CREATE_COLLIDER) == 0) {
next_phase(); next_phase();
return; return;
@ -1177,7 +1186,15 @@ void VoxelChunkDefault::_build_phase(int phase) {
} }
} }
if (temp_arr_collider.size() == 0 && temp_arr_collider_liquid.size() == 0) { for (int i = 0; i < _prop_meshers.size(); ++i) {
Ref<VoxelMesher> mesher = _prop_meshers.get(i);
ERR_CONTINUE(!mesher.is_valid());
temp_arr_collider.append_array(mesher->build_collider());
}
if (temp_arr_collider.size() == 0 && temp_arr_collider_liquid.size() == 0 && temp_arr_collider_prop.size() == 0) {
next_phase(); next_phase();
return; return;
} }
@ -1215,6 +1232,39 @@ void VoxelChunkDefault::_build_phase(int phase) {
temp_arr_collider_liquid.resize(0); temp_arr_collider_liquid.resize(0);
} }
if (temp_arr_collider_prop.size() != 0) {
if (!has_meshes(MESH_INDEX_PROP, MESH_TYPE_INDEX_BODY)) {
create_colliders(MESH_INDEX_PROP);
}
PhysicsServer::get_singleton()->shape_set_data(get_mesh_rid(MESH_INDEX_PROP, MESH_TYPE_INDEX_SHAPE), temp_arr_collider_prop);
temp_arr_collider_prop.resize(0);
}
next_phase();
return;
}
case BUILD_PHASE_LIGHTS: {
bool gr = (_build_flags & BUILD_FLAG_AUTO_GENERATE_RAO) != 0;
if (!gr && (_build_flags & BUILD_FLAG_USE_LIGHTING) == 0) {
next_phase();
return;
}
bool bl = (_build_flags & BUILD_FLAG_BAKE_LIGHTS) != 0;
if (bl)
clear_baked_lights();
if (gr)
generate_random_ao(_voxel_world->get_current_seed());
if (bl)
bake_lights();
next_phase(); next_phase();
return; return;
@ -1414,115 +1464,146 @@ void VoxelChunkDefault::_build_phase(int phase) {
return; return;
} }
case BUILD_PHASE_LIGHTS: {
bool gr = (_build_flags & BUILD_FLAG_AUTO_GENERATE_RAO) != 0;
if (!gr && (_build_flags & BUILD_FLAG_USE_LIGHTING) == 0) {
next_phase();
return;
}
bool bl = (_build_flags & BUILD_FLAG_BAKE_LIGHTS) != 0;
if (bl)
clear_baked_lights();
if (gr)
generate_random_ao(_voxel_world->get_current_seed());
if (bl)
bake_lights();
next_phase();
return;
}
case BUILD_PHASE_PROP_MESH: { case BUILD_PHASE_PROP_MESH: {
for (int i = 0; i < _meshers.size(); ++i) { if (_props.size() == 0) {
Ref<VoxelMesher> mesher = _meshers.get(i); next_phase();
return;
ERR_CONTINUE(!mesher.is_valid());
mesher->reset();
} }
if (_props.size() > 0) { for (int i = 0; i < _prop_meshers.size(); ++i) {
if (!has_meshes(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH)) { Ref<VoxelMesher> mesher = _prop_meshers.get(i);
create_meshes(MESH_INDEX_PROP, 1); //TODO LOD
}
for (int i = 0; i < _meshers.size(); ++i) {
Ref<VoxelMesher> mesher = _meshers.get(i);
ERR_CONTINUE(!mesher.is_valid()); ERR_CONTINUE(!mesher.is_valid());
//add all
//mesher->add_chunk(this);
mesher->bake_colors(this); for (int i = 0; i < _props.size(); ++i) {
Ref<VoxelChunkPropData> d = _props.get(i);
//add to mesher
}
}
Ref<VoxelMesher> mesher;
for (int i = 0; i < _meshers.size(); ++i) {
Ref<VoxelMesher> m = _meshers.get(i);
ERR_CONTINUE(!m.is_valid());
if (!mesher.is_valid()) {
mesher = m;
mesher->set_material(get_library()->get_material(0)); mesher->set_material(get_library()->get_material(0));
continue;
}
RID prop_mesh_rid = get_mesh_rid_index(MESH_INDEX_TERRARIN, MESH_TYPE_INDEX_MESH, 0); mesher->set_material(get_library()->get_material(0));
mesher->add_mesher(m);
}
ERR_FAIL_COND(prop_mesh_rid == RID()); ERR_FAIL_COND(!mesher.is_valid());
VS::get_singleton()->mesh_clear(prop_mesh_rid);
if (mesher->get_vertex_count() == 0) { if (mesher->get_vertex_count() == 0) {
next_phase(); next_phase();
return; return;
} }
Array arr = mesher->build_mesh(); if ((_build_flags & VoxelChunkDefault::BUILD_FLAG_USE_LIGHTING) != 0) {
mesher->bake_colors(this);
}
VS::get_singleton()->mesh_add_surface_from_arrays(prop_mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, arr); if (mesher->get_vertex_count() != 0) {
RID mesh_rid = get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 0);
Array temp_mesh_arr = mesher->build_mesh();
if (mesh_rid == RID()) {
if ((_build_flags & BUILD_FLAG_CREATE_LODS) != 0)
create_meshes(MESH_INDEX_PROP, _lod_num + 1);
else
create_meshes(MESH_INDEX_PROP, 1);
mesh_rid = get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 0);
}
if (VS::get_singleton()->mesh_get_surface_count(mesh_rid) > 0)
#if !GODOT4
VS::get_singleton()->mesh_remove_surface(mesh_rid, 0);
#else
VS::get_singleton()->mesh_clear(mesh_rid);
#endif
VS::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (_library->get_material(0).is_valid()) if (_library->get_material(0).is_valid())
VS::get_singleton()->mesh_surface_set_material(prop_mesh_rid, 0, _library->get_material(0)->get_rid()); VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, _library->get_material(0)->get_rid());
if ((_build_flags & BUILD_FLAG_CREATE_LODS) != 0) {
if (_lod_num >= 1) {
//for lod 1 just remove uv2
temp_mesh_arr[VisualServer::ARRAY_TEX_UV2] = Variant();
VisualServer::get_singleton()->mesh_add_surface_from_arrays(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 1), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (get_library()->get_material(1).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 1), 0, get_library()->get_material(1)->get_rid());
}
if (_lod_num >= 2) {
Array temp_mesh_arr2 = merge_mesh_array(temp_mesh_arr);
VisualServer::get_singleton()->mesh_add_surface_from_arrays(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 2), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr2);
if (get_library()->get_material(2).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 2), 0, get_library()->get_material(2)->get_rid());
}
if (_lod_num >= 3) {
Ref<ShaderMaterial> mat = get_library()->get_material(0);
Ref<SpatialMaterial> spmat = get_library()->get_material(0);
Ref<Texture> tex;
if (mat.is_valid()) {
tex = mat->get_shader_param("texture_albedo");
} else if (spmat.is_valid()) {
tex = spmat->get_texture(SpatialMaterial::TEXTURE_ALBEDO);
}
if (tex.is_valid()) {
temp_mesh_arr = bake_mesh_array_uv(temp_mesh_arr, tex);
temp_mesh_arr[VisualServer::ARRAY_TEX_UV] = Variant();
VisualServer::get_singleton()->mesh_add_surface_from_arrays(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 3), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (get_library()->get_material(3).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 3), 0, get_library()->get_material(3)->get_rid());
} }
} }
next_phase(); /*
if (_lod_num > 4) {
Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance();
fqms->initialize(temp_mesh_arr);
return; Array arr_merged_simplified;
for (int i = 4; i < _lod_num; ++i) {
fqms->simplify_mesh(arr_merged_simplified[0].size() * 0.8, 7);
arr_merged_simplified = fqms->get_arrays();
if (arr_merged_simplified[0].size() == 0)
break;
VisualServer::get_singleton()->mesh_add_surface_from_arrays(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, i), VisualServer::PRIMITIVE_TRIANGLES, arr_merged_simplified);
if (get_library()->get_material(i).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, i), 0, get_library()->get_material(i)->get_rid());
} }
case BUILD_PHASE_PROP_COLLIDER: {
if ((_build_flags & BUILD_FLAG_CREATE_COLLIDER) == 0) {
next_phase();
return;
} }
*/
for (int i = 0; i < _meshers.size(); ++i) {
Ref<VoxelMesher> mesher = _meshers.get(i);
ERR_CONTINUE(!mesher.is_valid());
temp_arr_collider.append_array(mesher->build_collider());
} }
for (int i = 0; i < _meshers.size(); ++i) {
Ref<VoxelMesher> mesher = _meshers.get(i);
ERR_CONTINUE(!mesher.is_valid());
mesher->reset();
} }
if (temp_arr_collider.size() == 0) {
next_phase();
return;
}
if (_is_build_threaded) {
set_active_build_phase_type(BUILD_PHASE_TYPE_PHYSICS_PROCESS);
return;
}
if (!has_meshes(MESH_INDEX_PROP, MESH_TYPE_INDEX_SHAPE)) {
create_colliders(MESH_INDEX_PROP);
}
PhysicsServer::get_singleton()->shape_set_data(get_mesh_rid(MESH_INDEX_PROP, MESH_TYPE_INDEX_SHAPE), temp_arr_collider);
//temp_arr_collider.resize(0);
next_phase(); next_phase();
return; return;
@ -1541,7 +1622,7 @@ void VoxelChunkDefault::_build_phase_process(int phase) {
} }
void VoxelChunkDefault::_build_phase_physics_process(int phase) { void VoxelChunkDefault::_build_phase_physics_process(int phase) {
if (phase == BUILD_PHASE_TERRARIN_MESH_COLLIDER) { if (phase == BUILD_PHASE_COLLIDER) {
if (temp_arr_collider.size() != 0) { if (temp_arr_collider.size() != 0) {
if (!has_meshes(MESH_INDEX_TERRARIN, MESH_TYPE_INDEX_BODY)) { if (!has_meshes(MESH_INDEX_TERRARIN, MESH_TYPE_INDEX_BODY)) {
create_colliders(MESH_INDEX_TERRARIN); create_colliders(MESH_INDEX_TERRARIN);
@ -1568,17 +1649,16 @@ void VoxelChunkDefault::_build_phase_physics_process(int phase) {
PhysicsServer::get_singleton()->shape_set_data(get_mesh_rid(MESH_INDEX_LIQUID, MESH_TYPE_INDEX_SHAPE), temp_arr_collider_liquid); PhysicsServer::get_singleton()->shape_set_data(get_mesh_rid(MESH_INDEX_LIQUID, MESH_TYPE_INDEX_SHAPE), temp_arr_collider_liquid);
temp_arr_collider_liquid.resize(0); temp_arr_collider_liquid.resize(0);
} else if (phase == BUILD_PHASE_PROP_COLLIDER) { }
if (!has_meshes(MESH_INDEX_PROP, MESH_TYPE_INDEX_SHAPE)) { if (temp_arr_collider_prop.size() != 0) {
if (!has_meshes(MESH_INDEX_PROP, MESH_TYPE_INDEX_BODY)) {
create_colliders(MESH_INDEX_PROP); create_colliders(MESH_INDEX_PROP);
} }
PhysicsServer::get_singleton()->shape_set_data(get_mesh_rid(MESH_INDEX_PROP, MESH_TYPE_INDEX_SHAPE), temp_arr_collider); PhysicsServer::get_singleton()->shape_set_data(get_mesh_rid(MESH_INDEX_PROP, MESH_TYPE_INDEX_SHAPE), temp_arr_collider_prop);
//temp_arr_collider.resize(0);
set_active_build_phase_type(BUILD_PHASE_TYPE_NORMAL); temp_arr_collider_prop.resize(0);
next_phase();
} }
set_active_build_phase_type(BUILD_PHASE_TYPE_NORMAL); set_active_build_phase_type(BUILD_PHASE_TYPE_NORMAL);
@ -1757,10 +1837,9 @@ void VoxelChunkDefault::_bind_methods() {
BIND_CONSTANT(BUILD_PHASE_DONE); BIND_CONSTANT(BUILD_PHASE_DONE);
BIND_CONSTANT(BUILD_PHASE_SETUP); BIND_CONSTANT(BUILD_PHASE_SETUP);
BIND_CONSTANT(BUILD_PHASE_TERRARIN_MESH_SETUP); BIND_CONSTANT(BUILD_PHASE_TERRARIN_MESH_SETUP);
BIND_CONSTANT(BUILD_PHASE_TERRARIN_MESH_COLLIDER); BIND_CONSTANT(BUILD_PHASE_COLLIDER);
BIND_CONSTANT(BUILD_PHASE_TERRARIN_MESH); BIND_CONSTANT(BUILD_PHASE_TERRARIN_MESH);
BIND_CONSTANT(BUILD_PHASE_PROP_MESH); BIND_CONSTANT(BUILD_PHASE_PROP_MESH);
BIND_CONSTANT(BUILD_PHASE_PROP_COLLIDER);
BIND_CONSTANT(BUILD_PHASE_LIGHTS); BIND_CONSTANT(BUILD_PHASE_LIGHTS);
BIND_CONSTANT(BUILD_PHASE_FINALIZE); BIND_CONSTANT(BUILD_PHASE_FINALIZE);
BIND_CONSTANT(BUILD_PHASE_MAX); BIND_CONSTANT(BUILD_PHASE_MAX);

4
world/default/voxel_chunk_default.h
View File

@ -73,11 +73,10 @@ public:
BUILD_PHASE_DONE = 0, BUILD_PHASE_DONE = 0,
BUILD_PHASE_SETUP, BUILD_PHASE_SETUP,
BUILD_PHASE_TERRARIN_MESH_SETUP, BUILD_PHASE_TERRARIN_MESH_SETUP,
BUILD_PHASE_TERRARIN_MESH_COLLIDER, BUILD_PHASE_COLLIDER,
BUILD_PHASE_LIGHTS, BUILD_PHASE_LIGHTS,
BUILD_PHASE_TERRARIN_MESH, BUILD_PHASE_TERRARIN_MESH,
BUILD_PHASE_PROP_MESH, BUILD_PHASE_PROP_MESH,
BUILD_PHASE_PROP_COLLIDER,
BUILD_PHASE_FINALIZE, BUILD_PHASE_FINALIZE,
BUILD_PHASE_MAX BUILD_PHASE_MAX
}; };
@ -286,6 +285,7 @@ protected:
Array temp_array; Array temp_array;
PoolVector<Vector3> temp_arr_collider; PoolVector<Vector3> temp_arr_collider;
PoolVector<Vector3> temp_arr_collider_liquid; PoolVector<Vector3> temp_arr_collider_liquid;
PoolVector<Vector3> temp_arr_collider_prop;
ActiveBuildPhaseType _active_build_phase_type; ActiveBuildPhaseType _active_build_phase_type;

34
world/voxel_chunk.cpp
View File

@ -251,6 +251,28 @@ int VoxelChunk::get_liquid_mesher_count() const {
return _liquid_meshers.size(); return _liquid_meshers.size();
} }
Ref<VoxelMesher> VoxelChunk::get_prop_mesher(int index) const {
ERR_FAIL_INDEX_V(index, _prop_meshers.size(), Ref<VoxelMesher>());
return _prop_meshers.get(index);
}
void VoxelChunk::set_prop_mesher(int index, const Ref<VoxelMesher> &mesher) {
ERR_FAIL_INDEX(index, _prop_meshers.size());
_prop_meshers.set(index, mesher);
}
void VoxelChunk::remove_prop_mesher(const int index) {
ERR_FAIL_INDEX(index, _prop_meshers.size());
_prop_meshers.remove(index);
}
void VoxelChunk::add_prop_mesher(const Ref<VoxelMesher> &mesher) {
_prop_meshers.push_back(mesher);
}
int VoxelChunk::get_prop_mesher_count() const {
return _prop_meshers.size();
}
//Voxel Data //Voxel Data
void VoxelChunk::setup_channels() { void VoxelChunk::setup_channels() {
ERR_FAIL_COND_MSG(!has_method("_setup_channels"), "VoxelChunk: _setup_channels() is missing! Please implement it!"); ERR_FAIL_COND_MSG(!has_method("_setup_channels"), "VoxelChunk: _setup_channels() is missing! Please implement it!");
@ -977,6 +999,18 @@ void VoxelChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("add_mesher", "mesher"), &VoxelChunk::add_mesher); ClassDB::bind_method(D_METHOD("add_mesher", "mesher"), &VoxelChunk::add_mesher);
ClassDB::bind_method(D_METHOD("get_mesher_count"), &VoxelChunk::get_mesher_count); ClassDB::bind_method(D_METHOD("get_mesher_count"), &VoxelChunk::get_mesher_count);
ClassDB::bind_method(D_METHOD("get_liquid_mesher", "index"), &VoxelChunk::get_liquid_mesher);
ClassDB::bind_method(D_METHOD("set_liquid_mesher", "index", "mesher"), &VoxelChunk::set_liquid_mesher);
ClassDB::bind_method(D_METHOD("remove_liquid_mesher", "index"), &VoxelChunk::remove_liquid_mesher);
ClassDB::bind_method(D_METHOD("add_liquid_mesher", "mesher"), &VoxelChunk::add_liquid_mesher);
ClassDB::bind_method(D_METHOD("get_liquid_mesher_count"), &VoxelChunk::get_liquid_mesher_count);
ClassDB::bind_method(D_METHOD("get_prop_mesher", "index"), &VoxelChunk::get_prop_mesher);
ClassDB::bind_method(D_METHOD("set_prop_mesher", "index", "mesher"), &VoxelChunk::set_prop_mesher);
ClassDB::bind_method(D_METHOD("remove_prop_mesher", "index"), &VoxelChunk::remove_prop_mesher);
ClassDB::bind_method(D_METHOD("add_prop_mesher", "mesher"), &VoxelChunk::add_prop_mesher);
ClassDB::bind_method(D_METHOD("get_prop_mesher_count"), &VoxelChunk::get_prop_mesher_count);
ClassDB::bind_method(D_METHOD("get_voxel_world"), &VoxelChunk::get_voxel_world); ClassDB::bind_method(D_METHOD("get_voxel_world"), &VoxelChunk::get_voxel_world);
ClassDB::bind_method(D_METHOD("set_voxel_world", "world"), &VoxelChunk::set_voxel_world_bind); ClassDB::bind_method(D_METHOD("set_voxel_world", "world"), &VoxelChunk::set_voxel_world_bind);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_world", PROPERTY_HINT_RESOURCE_TYPE, "VoxelWorld", 0), "set_voxel_world", "get_voxel_world"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_world", PROPERTY_HINT_RESOURCE_TYPE, "VoxelWorld", 0), "set_voxel_world", "get_voxel_world");

8
world/voxel_chunk.h
View File

@ -151,6 +151,13 @@ public:
void add_liquid_mesher(const Ref<VoxelMesher> &mesher); void add_liquid_mesher(const Ref<VoxelMesher> &mesher);
int get_liquid_mesher_count() const; int get_liquid_mesher_count() const;
//Prop Meshers
Ref<VoxelMesher> get_prop_mesher(const int index) const;
void set_prop_mesher(const int index, const Ref<VoxelMesher> &mesher);
void remove_prop_mesher(const int index);
void add_prop_mesher(const Ref<VoxelMesher> &mesher);
int get_prop_mesher_count() const;
//Channels //Channels
void setup_channels(); void setup_channels();
@ -264,6 +271,7 @@ protected:
Ref<VoxelmanLibrary> _library; Ref<VoxelmanLibrary> _library;
Vector<Ref<VoxelMesher> > _meshers; Vector<Ref<VoxelMesher> > _meshers;
Vector<Ref<VoxelMesher> > _liquid_meshers; Vector<Ref<VoxelMesher> > _liquid_meshers;
Vector<Ref<VoxelMesher> > _prop_meshers;
//mergeable props //mergeable props
Vector<Ref<VoxelChunkPropData> > _props; Vector<Ref<VoxelChunkPropData> > _props;