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

Moved the texture scale property to VoxelMesher.

Browse Source
This commit is contained in:
Relintai 2020-08-25 23:09:41 +02:00
parent 142809d0cb
commit 64b9476eca
6 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meshers/cubic/voxel_mesher_cubic.cpp
View File

@ -28,13 +28,6 @@ SOFTWARE.
#include visual_server_h #include visual_server_h
int VoxelMesherCubic::get_texture_scale() const {
return _texture_scale;
}
void VoxelMesherCubic::set_texture_scale(const int value) {
_texture_scale = value;
}
void VoxelMesherCubic::_add_chunk(Ref<VoxelChunk> p_chunk) { void VoxelMesherCubic::_add_chunk(Ref<VoxelChunk> p_chunk) {
Ref<VoxelChunkDefault> chunk = p_chunk; Ref<VoxelChunkDefault> chunk = p_chunk;
@ -160,9 +153,5 @@ VoxelMesherCubic::~VoxelMesherCubic() {
} }
void VoxelMesherCubic::_bind_methods() { void VoxelMesherCubic::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_texture_scale"), &VoxelMesherCubic::get_texture_scale);
ClassDB::bind_method(D_METHOD("set_texture_scale", "value"), &VoxelMesherCubic::set_texture_scale);
ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_scale"), "set_texture_scale", "get_texture_scale");
ClassDB::bind_method(D_METHOD("_add_chunk", "buffer"), &VoxelMesherCubic::_add_chunk); ClassDB::bind_method(D_METHOD("_add_chunk", "buffer"), &VoxelMesherCubic::_add_chunk);
} }

3
meshers/cubic/voxel_mesher_cubic.h
View File

@ -35,9 +35,6 @@ class VoxelMesherCubic : public VoxelMesherDefault {
GDCLASS(VoxelMesherCubic, VoxelMesherDefault); GDCLASS(VoxelMesherCubic, VoxelMesherDefault);
public: public:
int get_texture_scale() const;
void set_texture_scale(const int value);
void _add_chunk(Ref<VoxelChunk> p_chunk); void _add_chunk(Ref<VoxelChunk> p_chunk);
VoxelMesherCubic(); VoxelMesherCubic();

12
meshers/marching_cubes/voxel_mesher_marching_cubes.cpp
View File

@ -39,13 +39,6 @@ SOFTWARE.
typedef class RenderingServer VisualServer; typedef class RenderingServer VisualServer;
#endif #endif
int VoxelMesherMarchingCubes::get_texture_scale() const {
return _texture_scale;
}
void VoxelMesherMarchingCubes::set_texture_scale(const int value) {
_texture_scale = value;
}
void VoxelMesherMarchingCubes::get_voxel_type_array(int *arr, Ref<VoxelChunk> chunk, const int x, const int y, const int z, const int size) { void VoxelMesherMarchingCubes::get_voxel_type_array(int *arr, Ref<VoxelChunk> chunk, const int x, const int y, const int z, const int size) {
uint8_t *channel_type = chunk->get_channel(_channel_index_type); uint8_t *channel_type = chunk->get_channel(_channel_index_type);
@ -538,8 +531,6 @@ Vector3 VoxelMesherMarchingCubes::get_regular_vertex_direction(int index1, int i
VoxelMesherMarchingCubes::VoxelMesherMarchingCubes() { VoxelMesherMarchingCubes::VoxelMesherMarchingCubes() {
_format = VisualServer::ARRAY_FORMAT_NORMAL | VisualServer::ARRAY_FORMAT_COLOR | VisualServer::ARRAY_FORMAT_TEX_UV | VisualServer::ARRAY_FORMAT_TEX_UV2; _format = VisualServer::ARRAY_FORMAT_NORMAL | VisualServer::ARRAY_FORMAT_COLOR | VisualServer::ARRAY_FORMAT_TEX_UV | VisualServer::ARRAY_FORMAT_TEX_UV2;
_texture_scale = 4;
for (int i = 0; i < 16; ++i) { for (int i = 0; i < 16; ++i) {
_regular_cell_datas[i] = Ref<MarchingCubesCellData>(memnew(MarchingCubesCellData(regularCellData[i]))); _regular_cell_datas[i] = Ref<MarchingCubesCellData>(memnew(MarchingCubesCellData(regularCellData[i])));
} }
@ -552,9 +543,6 @@ VoxelMesherMarchingCubes::~VoxelMesherMarchingCubes() {
} }
void VoxelMesherMarchingCubes::_bind_methods() { void VoxelMesherMarchingCubes::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_texture_scale"), &VoxelMesherMarchingCubes::get_texture_scale);
ClassDB::bind_method(D_METHOD("set_texture_scale", "value"), &VoxelMesherMarchingCubes::set_texture_scale);
ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_scale"), "set_texture_scale", "get_texture_scale");
ClassDB::bind_method(D_METHOD("_add_chunk", "chunk"), &VoxelMesherMarchingCubes::_add_chunk); ClassDB::bind_method(D_METHOD("_add_chunk", "chunk"), &VoxelMesherMarchingCubes::_add_chunk);

5
meshers/marching_cubes/voxel_mesher_marching_cubes.h
View File

@ -65,9 +65,6 @@ public:
VOXEL_ENTRY_MASK_111 = 1 << 7, VOXEL_ENTRY_MASK_111 = 1 << 7,
}; };
int get_texture_scale() const;
void set_texture_scale(const int value);
//arr should have a size of 8 //arr should have a size of 8
void get_voxel_type_array(int *arr, Ref<VoxelChunk> chunk, const int x, const int y, const int z, const int size = 1); void get_voxel_type_array(int *arr, Ref<VoxelChunk> chunk, const int x, const int y, const int z, const int size = 1);
int get_case_code_from_arr(const int *data); int get_case_code_from_arr(const int *data);
@ -95,8 +92,6 @@ protected:
static void _bind_methods(); static void _bind_methods();
Ref<MarchingCubesCellData> _regular_cell_datas[16]; Ref<MarchingCubesCellData> _regular_cell_datas[16];
int _texture_scale;
}; };
VARIANT_ENUM_CAST(VoxelMesherMarchingCubes::VoxelEntryIndices); VARIANT_ENUM_CAST(VoxelMesherMarchingCubes::VoxelEntryIndices);

13
meshers/voxel_mesher.cpp
View File

@ -107,6 +107,13 @@ void VoxelMesher::set_format(const int value) {
_format = value; _format = value;
} }
int VoxelMesher::get_texture_scale() const {
return _texture_scale;
}
void VoxelMesher::set_texture_scale(const int value) {
_texture_scale = value;
}
Ref<VoxelmanLibrary> VoxelMesher::get_library() { Ref<VoxelmanLibrary> VoxelMesher::get_library() {
return _library; return _library;
} }
@ -906,6 +913,7 @@ VoxelMesher::VoxelMesher(const Ref<VoxelmanLibrary> &library) {
_channel_index_isolevel = 0; _channel_index_isolevel = 0;
_format = 0; _format = 0;
_texture_scale = 1;
} }
VoxelMesher::VoxelMesher() { VoxelMesher::VoxelMesher() {
@ -918,6 +926,7 @@ VoxelMesher::VoxelMesher() {
_format = 0; _format = 0;
_channel_index_type = 0; _channel_index_type = 0;
_channel_index_isolevel = 0; _channel_index_isolevel = 0;
_texture_scale = 1;
} }
VoxelMesher::~VoxelMesher() { VoxelMesher::~VoxelMesher() {
@ -947,6 +956,10 @@ void VoxelMesher::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_format", "value"), &VoxelMesher::set_format); ClassDB::bind_method(D_METHOD("set_format", "value"), &VoxelMesher::set_format);
ADD_PROPERTY(PropertyInfo(Variant::INT, "format"), "set_format", "get_format"); ADD_PROPERTY(PropertyInfo(Variant::INT, "format"), "set_format", "get_format");
ClassDB::bind_method(D_METHOD("get_texture_scale"), &VoxelMesher::get_texture_scale);
ClassDB::bind_method(D_METHOD("set_texture_scale", "value"), &VoxelMesher::set_texture_scale);
ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_scale"), "set_texture_scale", "get_texture_scale");
ClassDB::bind_method(D_METHOD("get_library"), &VoxelMesher::get_library); ClassDB::bind_method(D_METHOD("get_library"), &VoxelMesher::get_library);
ClassDB::bind_method(D_METHOD("set_library", "value"), &VoxelMesher::set_library); ClassDB::bind_method(D_METHOD("set_library", "value"), &VoxelMesher::set_library);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"), "set_library", "get_library"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"), "set_library", "get_library");

5
meshers/voxel_mesher.h
View File

@ -99,6 +99,9 @@ public:
int get_format() const; int get_format() const;
void set_format(const int value); void set_format(const int value);
int get_texture_scale() const;
void set_texture_scale(const int value);
Ref<VoxelmanLibrary> get_library(); Ref<VoxelmanLibrary> get_library();
void set_library(const Ref<VoxelmanLibrary> &library); void set_library(const Ref<VoxelmanLibrary> &library);
@ -195,6 +198,8 @@ protected:
int _format; int _format;
int _texture_scale;
PoolVector<Vertex> _vertices; PoolVector<Vertex> _vertices;
PoolVector<int> _indices; PoolVector<int> _indices;