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

Remove normals and uv2 from the final mesh in Prop2DMesher's build_mesh. I haven't removed them internally yet.

Browse Source
This commit is contained in:
Relintai 2022-02-23 00:05:16 +01:00
parent 3cb79bfffb
commit 56a786800b
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
prop_2d_mesher.cpp
View File

@ -192,31 +192,6 @@ Array Prop2DMesher::build_mesh() {
a[VisualServer::ARRAY_VERTEX] = array; a[VisualServer::ARRAY_VERTEX] = array;
} }
if ((_format & VisualServer::ARRAY_FORMAT_NORMAL) == 0) {
generate_normals();
}
{
PoolVector<Vector3> array;
array.resize(_vertices.size());
#if !GODOT4
PoolVector<Vector3>::Write w = array.write();
#endif
for (int i = 0; i < _vertices.size(); ++i) {
#if !GODOT4
w[i] = _vertices[i].normal;
#else
array.set(i, _vertices[i].normal);
#endif
}
#if !GODOT4
w.release();
#endif
a[VisualServer::ARRAY_NORMAL] = array;
}
if ((_format & VisualServer::ARRAY_FORMAT_COLOR) != 0) { if ((_format & VisualServer::ARRAY_FORMAT_COLOR) != 0) {
PoolVector<Color> array; PoolVector<Color> array;
array.resize(_vertices.size()); array.resize(_vertices.size());
@ -260,27 +235,6 @@ Array Prop2DMesher::build_mesh() {
a[VisualServer::ARRAY_TEX_UV] = array; a[VisualServer::ARRAY_TEX_UV] = array;
} }
if ((_format & VisualServer::ARRAY_FORMAT_TEX_UV2) != 0) {
PoolVector<Vector2> array;
array.resize(_vertices.size());
#if !GODOT4
PoolVector<Vector2>::Write w = array.write();
#endif
for (int i = 0; i < _vertices.size(); ++i) {
#if !GODOT4
w[i] = _vertices[i].uv2;
#else
array.set(i, _vertices[i].uv2);
#endif
}
#if !GODOT4
w.release();
#endif
a[VisualServer::ARRAY_TEX_UV2] = array;
}
if (_indices.size() > 0) { if (_indices.size() > 0) {
PoolVector<int> array; PoolVector<int> array;
array.resize(_indices.size()); array.resize(_indices.size());
@ -615,22 +569,18 @@ void Prop2DMesher::add_tiled_wall_mesh_rect_simple(const int x, const int y, con
int vc = get_vertex_count(); int vc = get_vertex_count();
//x + 1, y //x + 1, y
//add_normal(transform.basis.xform(Vector3(0, 0, -1)));
add_uv(transform_uv(Vector2(1, 1), texture_rect)); add_uv(transform_uv(Vector2(1, 1), texture_rect));
add_vertex(transform.xform(Vector2(x + 1, y))); add_vertex(transform.xform(Vector2(x + 1, y)));
//x, y //x, y
//add_normal(transform.basis.xform(Vector3(0, 0, -1)));
add_uv(transform_uv(Vector2(0, 1), texture_rect)); add_uv(transform_uv(Vector2(0, 1), texture_rect));
add_vertex(transform.xform(Vector2(x, y))); add_vertex(transform.xform(Vector2(x, y)));
//x, y + 1 //x, y + 1
//add_normal(transform.basis.xform(Vector3(0, 0, -1)));
add_uv(transform_uv(Vector2(0, 0), texture_rect)); add_uv(transform_uv(Vector2(0, 0), texture_rect));
add_vertex(transform.xform(Vector2(x, y + 1))); add_vertex(transform.xform(Vector2(x, y + 1)));
//x + 1, y + 1 //x + 1, y + 1
//add_normal(transform.basis.xform(Vector3(0, 0, -1)));
add_uv(transform_uv(Vector2(1, 0), texture_rect)); add_uv(transform_uv(Vector2(1, 0), texture_rect));
add_vertex(transform.xform(Vector2(x + 1, y + 1))); add_vertex(transform.xform(Vector2(x + 1, y + 1)));