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

Renamed VoxelMeshBuilder => VoxelMesher

Browse Source
This commit is contained in:
Marc Gilleron 2016-05-08 01:09:00 +02:00
parent 5c2e388616
commit 7305fd7b27
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
register_types.cpp
View File

@ -1,13 +1,13 @@
#include "register_types.h" #include "register_types.h"
#include "voxel_buffer.h" #include "voxel_buffer.h"
#include "voxel_mesh_builder.h" #include "voxel_mesher.h"
#include "voxel_library.h" #include "voxel_library.h"
void register_voxel_types() { void register_voxel_types() {
ObjectTypeDB::register_type<Voxel>(); ObjectTypeDB::register_type<Voxel>();
ObjectTypeDB::register_type<VoxelBuffer>(); ObjectTypeDB::register_type<VoxelBuffer>();
ObjectTypeDB::register_type<VoxelMeshBuilder>(); ObjectTypeDB::register_type<VoxelMesher>();
ObjectTypeDB::register_type<VoxelLibrary>(); ObjectTypeDB::register_type<VoxelLibrary>();
} }

4
voxel.cpp
View File

@ -1,6 +1,6 @@
#include "voxel.h" #include "voxel.h"
#include "voxel_library.h" #include "voxel_library.h"
#include "voxel_mesh_builder.h" #include "voxel_mesher.h"
Voxel::Voxel() : Reference(), Voxel::Voxel() : Reference(),
_id(-1), _id(-1),
@ -21,7 +21,7 @@ Ref<Voxel> Voxel::set_id(int id) {
} }
Ref<Voxel> Voxel::set_material_id(unsigned int id) { Ref<Voxel> Voxel::set_material_id(unsigned int id) {
ERR_FAIL_COND_V(id >= VoxelMeshBuilder::MAX_MATERIALS, Ref<Voxel>(this)); ERR_FAIL_COND_V(id >= VoxelMesher::MAX_MATERIALS, Ref<Voxel>(this));
_material_id = id; _material_id = id;
return Ref<Voxel>(this); return Ref<Voxel>(this);
} }

26
voxel_mesh_builder.cpp → voxel_mesher.cpp
View File

@ -1,4 +1,4 @@
#include "voxel_mesh_builder.h" #include "voxel_mesher.h"
#include "voxel_library.h" #include "voxel_library.h"
@ -120,22 +120,22 @@ static const unsigned int g_edge_corners[EDGE_COUNT][2] = {
}; };
VoxelMeshBuilder::VoxelMeshBuilder(): _baked_occlusion_darkness(0.75), _bake_occlusion(true) { VoxelMesher::VoxelMesher(): _baked_occlusion_darkness(0.75), _bake_occlusion(true) {
} }
void VoxelMeshBuilder::set_library(Ref<VoxelLibrary> library) { void VoxelMesher::set_library(Ref<VoxelLibrary> library) {
ERR_FAIL_COND(library.is_null()); ERR_FAIL_COND(library.is_null());
_library = library; _library = library;
} }
void VoxelMeshBuilder::set_material(Ref<Material> material, unsigned int id) { void VoxelMesher::set_material(Ref<Material> material, unsigned int id) {
ERR_FAIL_COND(id >= MAX_MATERIALS); ERR_FAIL_COND(id >= MAX_MATERIALS);
_materials[id] = material; _materials[id] = material;
_surface_tool[id].set_material(material); _surface_tool[id].set_material(material);
} }
void VoxelMeshBuilder::set_occlusion_darkness(float darkness) { void VoxelMesher::set_occlusion_darkness(float darkness) {
_baked_occlusion_darkness = darkness; _baked_occlusion_darkness = darkness;
if (_baked_occlusion_darkness < 0.0) if (_baked_occlusion_darkness < 0.0)
_baked_occlusion_darkness = 0.0; _baked_occlusion_darkness = 0.0;
@ -143,7 +143,7 @@ void VoxelMeshBuilder::set_occlusion_darkness(float darkness) {
_baked_occlusion_darkness = 1.0; _baked_occlusion_darkness = 1.0;
} }
void VoxelMeshBuilder::set_occlusion_enabled(bool enable) { void VoxelMesher::set_occlusion_enabled(bool enable) {
_bake_occlusion = enable; _bake_occlusion = enable;
} }
@ -165,7 +165,7 @@ inline bool is_transparent(const VoxelLibrary & lib, int voxel_id) {
return true; return true;
} }
Ref<Mesh> VoxelMeshBuilder::build(Ref<VoxelBuffer> buffer_ref) { Ref<Mesh> VoxelMesher::build(Ref<VoxelBuffer> buffer_ref) {
ERR_FAIL_COND_V(buffer_ref.is_null(), Ref<Mesh>()); ERR_FAIL_COND_V(buffer_ref.is_null(), Ref<Mesh>());
ERR_FAIL_COND_V(_library.is_null(), Ref<Mesh>()); ERR_FAIL_COND_V(_library.is_null(), Ref<Mesh>());
@ -328,13 +328,13 @@ Ref<Mesh> VoxelMeshBuilder::build(Ref<VoxelBuffer> buffer_ref) {
return mesh_ref; return mesh_ref;
} }
void VoxelMeshBuilder::_bind_methods() { void VoxelMesher::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_material", "material", "id"), &VoxelMeshBuilder::set_material); ObjectTypeDB::bind_method(_MD("set_material", "material", "id"), &VoxelMesher::set_material);
ObjectTypeDB::bind_method(_MD("set_library", "voxel_library"), &VoxelMeshBuilder::set_library); ObjectTypeDB::bind_method(_MD("set_library", "voxel_library"), &VoxelMesher::set_library);
ObjectTypeDB::bind_method(_MD("set_occlusion_enabled", "enable"), &VoxelMeshBuilder::set_occlusion_enabled); ObjectTypeDB::bind_method(_MD("set_occlusion_enabled", "enable"), &VoxelMesher::set_occlusion_enabled);
ObjectTypeDB::bind_method(_MD("set_occlusion_darkness", "value"), &VoxelMeshBuilder::set_occlusion_darkness); ObjectTypeDB::bind_method(_MD("set_occlusion_darkness", "value"), &VoxelMesher::set_occlusion_darkness);
ObjectTypeDB::bind_method(_MD("build", "voxel_buffer"), &VoxelMeshBuilder::build); ObjectTypeDB::bind_method(_MD("build", "voxel_buffer"), &VoxelMesher::build);
} }

12
voxel_mesh_builder.h → voxel_mesher.h
View File

@ -1,5 +1,5 @@
#ifndef VOXEL_MESH_BUILDER #ifndef VOXEL_MESHER
#define VOXEL_MESH_BUILDER #define VOXEL_MESHER
#include <reference.h> #include <reference.h>
#include <scene/resources/mesh.h> #include <scene/resources/mesh.h>
@ -9,8 +9,8 @@
class VoxelLibrary; class VoxelLibrary;
class VoxelMeshBuilder : public Reference { class VoxelMesher : public Reference {
OBJ_TYPE(VoxelMeshBuilder, Reference); OBJ_TYPE(VoxelMesher, Reference);
public: public:
static const unsigned int MAX_MATERIALS = 8; // Arbitrary. Tweak if needed. static const unsigned int MAX_MATERIALS = 8; // Arbitrary. Tweak if needed.
@ -23,7 +23,7 @@ private:
bool _bake_occlusion; bool _bake_occlusion;
public: public:
VoxelMeshBuilder(); VoxelMesher();
void set_material(Ref<Material> material, unsigned int id); void set_material(Ref<Material> material, unsigned int id);
@ -42,4 +42,4 @@ protected:
}; };
#endif // VOXEL_MESH_BUILDER #endif // VOXEL_MESHER