Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-13 21:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced Vectors to PoolVectors in VoxelMesher. Also added uv2 methods.

Browse Source
This commit is contained in:
Relintai 2020-01-19 18:25:03 +01:00
parent 2b9f28e573
commit a95973eeba
2 changed files with 106 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
meshers/voxel_mesher.cpp
View File

@ -68,7 +68,8 @@ void VoxelMesher::build_mesh(RID mesh) {
if (_colors.size() != _vertices.size()) { if (_colors.size() != _vertices.size()) {
print_error("Colors.size() != vertices.size() -> " + String::num(_colors.size()) + " " + String::num(_vertices.size())); print_error("Colors.size() != vertices.size() -> " + String::num(_colors.size()) + " " + String::num(_vertices.size()));
_colors.clear();
_colors.resize(0);
} }
int len = _vertices.size(); int len = _vertices.size();
@ -106,12 +107,13 @@ void VoxelMesher::build_mesh(RID mesh) {
} }
void VoxelMesher::reset() { void VoxelMesher::reset() {
_vertices.clear(); _vertices.resize(0);
_normals.clear(); _normals.resize(0);
_colors.clear(); _colors.resize(0);
_uvs.clear(); _uvs.resize(0);
_indices.clear(); _uv2s.resize(0);
_bones.clear(); _indices.resize(0);
_bones.resize(0);
_surface_tool->clear(); _surface_tool->clear();
} }
@ -531,8 +533,12 @@ void VoxelMesher::bake_lights(MeshInstance *node, Vector<Ref<VoxelLight> > &ligh
// } // }
} }
Vector<Vector3> *VoxelMesher::get_vertices() { PoolVector<Vector3> VoxelMesher::get_vertices() {
return &_vertices; return _vertices;
}
void VoxelMesher::set_vertices(PoolVector<Vector3> values) {
_vertices = values;
} }
int VoxelMesher::get_vertex_count() { int VoxelMesher::get_vertex_count() {
@ -551,8 +557,12 @@ void VoxelMesher::remove_vertex(int idx) {
_vertices.remove(idx); _vertices.remove(idx);
} }
Vector<Vector3> *VoxelMesher::get_normals() { PoolVector<Vector3> VoxelMesher::get_normals() {
return &_normals; return _normals;
}
void VoxelMesher::set_normals(PoolVector<Vector3> values) {
_normals = values;
} }
int VoxelMesher::get_normal_count() { int VoxelMesher::get_normal_count() {
@ -571,8 +581,12 @@ void VoxelMesher::remove_normal(int idx) {
_normals.remove(idx); _normals.remove(idx);
} }
Vector<Color> *VoxelMesher::get_colors() { PoolVector<Color> VoxelMesher::get_colors() {
return &_colors; return _colors;
}
void VoxelMesher::set_colors(PoolVector<Color> values) {
_colors = values;
} }
int VoxelMesher::get_color_count() { int VoxelMesher::get_color_count() {
@ -591,8 +605,12 @@ void VoxelMesher::remove_color(int idx) {
_colors.remove(idx); _colors.remove(idx);
} }
Vector<Vector2> *VoxelMesher::get_uvs() { PoolVector<Vector2> VoxelMesher::get_uvs() {
return &_uvs; return _uvs;
}
void VoxelMesher::set_uvs(PoolVector<Vector2> values) {
_uvs = values;
} }
int VoxelMesher::get_uv_count() { int VoxelMesher::get_uv_count() {
@ -611,8 +629,36 @@ void VoxelMesher::remove_uv(int idx) {
_uvs.remove(idx); _uvs.remove(idx);
} }
Vector<int> *VoxelMesher::get_indices() { PoolVector<Vector2> VoxelMesher::get_uv2s() {
return &_indices; return _uv2s;
}
void VoxelMesher::set_uv2s(PoolVector<Vector2> values) {
_uv2s = values;
}
int VoxelMesher::get_uv2_count() {
return _uv2s.size();
}
void VoxelMesher::add_uv2(Vector2 uv) {
_uv2s.push_back(uv);
}
Vector2 VoxelMesher::get_uv2(int idx) {
return _uv2s.get(idx);
}
void VoxelMesher::remove_uv2(int idx) {
_uv2s.remove(idx);
}
PoolVector<int> VoxelMesher::get_indices() {
return _indices;
}
void VoxelMesher::set_indices(PoolVector<int> values) {
_indices = values;
} }
int VoxelMesher::get_indices_count() { int VoxelMesher::get_indices_count() {
@ -652,13 +698,6 @@ VoxelMesher::VoxelMesher() {
} }
VoxelMesher::~VoxelMesher() { VoxelMesher::~VoxelMesher() {
_vertices.clear();
_normals.clear();
_colors.clear();
_uvs.clear();
_indices.clear();
_bones.clear();
_surface_tool.unref(); _surface_tool.unref();
if (_library.is_valid()) { if (_library.is_valid()) {
@ -712,26 +751,43 @@ void VoxelMesher::_bind_methods() {
ClassDB::bind_method(D_METHOD("bake_liquid_colors", "chunk"), &VoxelMesher::bake_liquid_colors_bind); ClassDB::bind_method(D_METHOD("bake_liquid_colors", "chunk"), &VoxelMesher::bake_liquid_colors_bind);
ClassDB::bind_method(D_METHOD("_bake_liquid_colors", "chunk"), &VoxelMesher::_bake_liquid_colors); ClassDB::bind_method(D_METHOD("_bake_liquid_colors", "chunk"), &VoxelMesher::_bake_liquid_colors);
ClassDB::bind_method(D_METHOD("get_vertices"), &VoxelMesher::get_vertices);
ClassDB::bind_method(D_METHOD("set_vertices", "values"), &VoxelMesher::set_vertices);
ClassDB::bind_method(D_METHOD("get_vertex_count"), &VoxelMesher::get_vertex_count); ClassDB::bind_method(D_METHOD("get_vertex_count"), &VoxelMesher::get_vertex_count);
ClassDB::bind_method(D_METHOD("get_vertex", "idx"), &VoxelMesher::get_vertex); ClassDB::bind_method(D_METHOD("get_vertex", "idx"), &VoxelMesher::get_vertex);
ClassDB::bind_method(D_METHOD("remove_vertex", "idx"), &VoxelMesher::remove_vertex); ClassDB::bind_method(D_METHOD("remove_vertex", "idx"), &VoxelMesher::remove_vertex);
ClassDB::bind_method(D_METHOD("add_vertex", "vertex"), &VoxelMesher::add_vertex); ClassDB::bind_method(D_METHOD("add_vertex", "vertex"), &VoxelMesher::add_vertex);
ClassDB::bind_method(D_METHOD("get_normals"), &VoxelMesher::get_normals);
ClassDB::bind_method(D_METHOD("set_normals", "values"), &VoxelMesher::set_normals);
ClassDB::bind_method(D_METHOD("get_normal_count"), &VoxelMesher::get_normal_count); ClassDB::bind_method(D_METHOD("get_normal_count"), &VoxelMesher::get_normal_count);
ClassDB::bind_method(D_METHOD("get_normal", "idx"), &VoxelMesher::get_normal); ClassDB::bind_method(D_METHOD("get_normal", "idx"), &VoxelMesher::get_normal);
ClassDB::bind_method(D_METHOD("remove_normal", "idx"), &VoxelMesher::remove_normal); ClassDB::bind_method(D_METHOD("remove_normal", "idx"), &VoxelMesher::remove_normal);
ClassDB::bind_method(D_METHOD("add_normal", "normal"), &VoxelMesher::add_normal); ClassDB::bind_method(D_METHOD("add_normal", "normal"), &VoxelMesher::add_normal);
ClassDB::bind_method(D_METHOD("get_colors"), &VoxelMesher::get_colors);
ClassDB::bind_method(D_METHOD("set_colors", "values"), &VoxelMesher::set_colors);
ClassDB::bind_method(D_METHOD("get_color_count"), &VoxelMesher::get_color_count); ClassDB::bind_method(D_METHOD("get_color_count"), &VoxelMesher::get_color_count);
ClassDB::bind_method(D_METHOD("get_color", "idx"), &VoxelMesher::get_color); ClassDB::bind_method(D_METHOD("get_color", "idx"), &VoxelMesher::get_color);
ClassDB::bind_method(D_METHOD("remove_color", "idx"), &VoxelMesher::remove_color); ClassDB::bind_method(D_METHOD("remove_color", "idx"), &VoxelMesher::remove_color);
ClassDB::bind_method(D_METHOD("add_color", "color"), &VoxelMesher::add_color); ClassDB::bind_method(D_METHOD("add_color", "color"), &VoxelMesher::add_color);
ClassDB::bind_method(D_METHOD("get_uvs"), &VoxelMesher::get_uvs);
ClassDB::bind_method(D_METHOD("set_uvs", "values"), &VoxelMesher::set_uvs);
ClassDB::bind_method(D_METHOD("get_uv_count"), &VoxelMesher::get_uv_count); ClassDB::bind_method(D_METHOD("get_uv_count"), &VoxelMesher::get_uv_count);
ClassDB::bind_method(D_METHOD("get_uv", "idx"), &VoxelMesher::get_uv); ClassDB::bind_method(D_METHOD("get_uv", "idx"), &VoxelMesher::get_uv);
ClassDB::bind_method(D_METHOD("remove_uv", "idx"), &VoxelMesher::remove_uv); ClassDB::bind_method(D_METHOD("remove_uv", "idx"), &VoxelMesher::remove_uv);
ClassDB::bind_method(D_METHOD("add_uv", "vertex"), &VoxelMesher::add_uv); ClassDB::bind_method(D_METHOD("add_uv", "uv"), &VoxelMesher::add_uv);
ClassDB::bind_method(D_METHOD("get_uv2s"), &VoxelMesher::get_uv2s);
ClassDB::bind_method(D_METHOD("set_uv2s", "values"), &VoxelMesher::set_uv2s);
ClassDB::bind_method(D_METHOD("get_uv2_count"), &VoxelMesher::get_uv2_count);
ClassDB::bind_method(D_METHOD("get_uv2", "idx"), &VoxelMesher::get_uv2);
ClassDB::bind_method(D_METHOD("remove_uv2", "idx"), &VoxelMesher::remove_uv2);
ClassDB::bind_method(D_METHOD("add_uv2", "uv"), &VoxelMesher::add_uv2);
ClassDB::bind_method(D_METHOD("get_indices"), &VoxelMesher::get_indices);
ClassDB::bind_method(D_METHOD("set_indices", "values"), &VoxelMesher::set_indices);
ClassDB::bind_method(D_METHOD("get_indices_count"), &VoxelMesher::get_indices_count); ClassDB::bind_method(D_METHOD("get_indices_count"), &VoxelMesher::get_indices_count);
ClassDB::bind_method(D_METHOD("get_indice", "idx"), &VoxelMesher::get_indice); ClassDB::bind_method(D_METHOD("get_indice", "idx"), &VoxelMesher::get_indice);
ClassDB::bind_method(D_METHOD("remove_indices", "idx"), &VoxelMesher::remove_indices); ClassDB::bind_method(D_METHOD("remove_indices", "idx"), &VoxelMesher::remove_indices);

36
meshers/voxel_mesher.h
View File

@ -5,6 +5,7 @@
#include "core/math/rect2.h" #include "core/math/rect2.h"
#include "core/math/vector2.h" #include "core/math/vector2.h"
#include "core/math/vector3.h" #include "core/math/vector3.h"
#include "core/pool_vector.h"
#include "core/reference.h" #include "core/reference.h"
#include "core/vector.h" #include "core/vector.h"
#include "scene/3d/immediate_geometry.h" #include "scene/3d/immediate_geometry.h"
@ -75,31 +76,43 @@ public:
void build_mesh(RID mesh); void build_mesh(RID mesh);
Vector<Vector3> *get_vertices(); PoolVector<Vector3> get_vertices();
void set_vertices(PoolVector<Vector3> values);
int get_vertex_count(); int get_vertex_count();
Vector3 get_vertex(int idx); Vector3 get_vertex(int idx);
void remove_vertex(int idx); void remove_vertex(int idx);
void add_vertex(Vector3 vertex); void add_vertex(Vector3 vertex);
Vector<Vector3> *get_normals(); PoolVector<Vector3> get_normals();
void set_normals(PoolVector<Vector3> values);
int get_normal_count(); int get_normal_count();
Vector3 get_normal(int idx); Vector3 get_normal(int idx);
void remove_normal(int idx); void remove_normal(int idx);
void add_normal(Vector3 normal); void add_normal(Vector3 normal);
Vector<Color> *get_colors(); PoolVector<Color> get_colors();
void set_colors(PoolVector<Color> values);
int get_color_count(); int get_color_count();
Color get_color(int idx); Color get_color(int idx);
void remove_color(int idx); void remove_color(int idx);
void add_color(Color color); void add_color(Color color);
Vector<Vector2> *get_uvs(); PoolVector<Vector2> get_uvs();
void set_uvs(PoolVector<Vector2> values);
int get_uv_count(); int get_uv_count();
Vector2 get_uv(int idx); Vector2 get_uv(int idx);
void remove_uv(int idx); void remove_uv(int idx);
void add_uv(Vector2 vector); void add_uv(Vector2 vector);
Vector<int> *get_indices(); PoolVector<Vector2> get_uv2s();
void set_uv2s(PoolVector<Vector2> values);
int get_uv2_count();
Vector2 get_uv2(int idx);
void remove_uv2(int idx);
void add_uv2(Vector2 vector);
PoolVector<int> get_indices();
void set_indices(PoolVector<int> values);
int get_indices_count(); int get_indices_count();
int get_indice(int idx); int get_indice(int idx);
void remove_indices(int idx); void remove_indices(int idx);
@ -112,12 +125,13 @@ public:
protected: protected:
static void _bind_methods(); static void _bind_methods();
Vector<Vector3> _vertices; PoolVector<Vector3> _vertices;
Vector<Vector3> _normals; PoolVector<Vector3> _normals;
Vector<Color> _colors; PoolVector<Color> _colors;
Vector<Vector2> _uvs; PoolVector<Vector2> _uvs;
Vector<int> _indices; PoolVector<Vector2> _uv2s;
Vector<int> _bones; PoolVector<int> _indices;
PoolVector<int> _bones;
Ref<VoxelmanLibrary> _library; Ref<VoxelmanLibrary> _library;
Ref<Material> _material; Ref<Material> _material;