Relintai/props
1
0
Fork 0
mirror of https://github.com/Relintai/props.git synced 2025-02-04 16:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Actually use the vector write proxy in PropMesher's build_mesh.

Browse Source
This commit is contained in:
Relintai 2021-08-10 12:31:28 +02:00
parent 924b32e70a
commit 36663e46ae
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
prop_mesher.cpp
View File

@ -25,7 +25,6 @@ SOFTWARE.
const String PropMesher::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods"; const String PropMesher::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
bool PropMesher::Vertex::operator==(const Vertex &p_vertex) const { bool PropMesher::Vertex::operator==(const Vertex &p_vertex) const {
if (vertex != p_vertex.vertex) if (vertex != p_vertex.vertex)
return false; return false;
@ -61,7 +60,6 @@ bool PropMesher::Vertex::operator==(const Vertex &p_vertex) const {
} }
uint32_t PropMesher::VertexHasher::hash(const Vertex &p_vtx) { uint32_t PropMesher::VertexHasher::hash(const Vertex &p_vtx) {
uint32_t h = hash_djb2_buffer((const uint8_t *)&p_vtx.vertex, sizeof(real_t) * 3); uint32_t h = hash_djb2_buffer((const uint8_t *)&p_vtx.vertex, sizeof(real_t) * 3);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.normal, sizeof(real_t) * 3, h); h = hash_djb2_buffer((const uint8_t *)&p_vtx.normal, sizeof(real_t) * 3, h);
h = hash_djb2_buffer((const uint8_t *)&p_vtx.binormal, sizeof(real_t) * 3, h); h = hash_djb2_buffer((const uint8_t *)&p_vtx.binormal, sizeof(real_t) * 3, h);
@ -174,7 +172,11 @@ Array PropMesher::build_mesh() {
#endif #endif
for (int i = 0; i < _vertices.size(); ++i) { for (int i = 0; i < _vertices.size(); ++i) {
#if !GODOT4
w[i] = _vertices[i].vertex;
#else
array.set(i, _vertices[i].vertex); array.set(i, _vertices[i].vertex);
#endif
} }
#if !GODOT4 #if !GODOT4
@ -196,7 +198,11 @@ Array PropMesher::build_mesh() {
#endif #endif
for (int i = 0; i < _vertices.size(); ++i) { for (int i = 0; i < _vertices.size(); ++i) {
#if !GODOT4
w[i] = _vertices[i].normal;
#else
array.set(i, _vertices[i].normal); array.set(i, _vertices[i].normal);
#endif
} }
#if !GODOT4 #if !GODOT4
@ -213,7 +219,11 @@ Array PropMesher::build_mesh() {
#endif #endif
for (int i = 0; i < _vertices.size(); ++i) { for (int i = 0; i < _vertices.size(); ++i) {
#if !GODOT4
w[i] = _vertices[i].color;
#else
array.set(i, _vertices[i].color); array.set(i, _vertices[i].color);
#endif
} }
#if !GODOT4 #if !GODOT4
@ -230,7 +240,11 @@ Array PropMesher::build_mesh() {
#endif #endif
for (int i = 0; i < _vertices.size(); ++i) { for (int i = 0; i < _vertices.size(); ++i) {
#if !GODOT4
w[i] = _vertices[i].uv;
#else
array.set(i, _vertices[i].uv); array.set(i, _vertices[i].uv);
#endif
} }
#if !GODOT4 #if !GODOT4
@ -248,7 +262,11 @@ Array PropMesher::build_mesh() {
#endif #endif
for (int i = 0; i < _vertices.size(); ++i) { for (int i = 0; i < _vertices.size(); ++i) {
#if !GODOT4
w[i] = _vertices[i].uv2;
#else
array.set(i, _vertices[i].uv2); array.set(i, _vertices[i].uv2);
#endif
} }
#if !GODOT4 #if !GODOT4
@ -265,7 +283,11 @@ Array PropMesher::build_mesh() {
#endif #endif
for (int i = 0; i < _indices.size(); ++i) { for (int i = 0; i < _indices.size(); ++i) {
#if !GODOT4
w[i] = _indices[i];
#else
array.set(i, _indices[i]); array.set(i, _indices[i]);
#endif
} }
#if !GODOT4 #if !GODOT4
@ -296,7 +318,6 @@ void PropMesher::build_mesh_into(RID mesh) {
} }
void PropMesher::generate_normals(bool p_flip) { void PropMesher::generate_normals(bool p_flip) {
_format = _format | VisualServer::ARRAY_FORMAT_NORMAL; _format = _format | VisualServer::ARRAY_FORMAT_NORMAL;
for (int i = 0; i < _indices.size(); i += 3) { for (int i = 0; i < _indices.size(); i += 3) {
@ -641,11 +662,9 @@ PoolVector<Vector3> PropMesher::build_collider() const {
return face_points; return face_points;
if (_indices.size() == 0) { if (_indices.size() == 0) {
int len = (_vertices.size() / 4); int len = (_vertices.size() / 4);
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {
face_points.push_back(_vertices.get(i * 4).vertex); face_points.push_back(_vertices.get(i * 4).vertex);
face_points.push_back(_vertices.get((i * 4) + 2).vertex); face_points.push_back(_vertices.get((i * 4) + 2).vertex);
face_points.push_back(_vertices.get((i * 4) + 1).vertex); face_points.push_back(_vertices.get((i * 4) + 1).vertex);
@ -667,7 +686,7 @@ PoolVector<Vector3> PropMesher::build_collider() const {
} }
#ifdef TERRAMAN_PRESENT #ifdef TERRAMAN_PRESENT
void PropMesher::bake_lights(MeshInstance *node, Vector<Ref<TerraLight> > &lights) { void PropMesher::bake_lights(MeshInstance *node, Vector<Ref<TerraLight>> &lights) {
ERR_FAIL_COND(node == NULL); ERR_FAIL_COND(node == NULL);
Color darkColor(0, 0, 0, 1); Color darkColor(0, 0, 0, 1);