R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename IMeshLoader members

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-07-20 15:18:34 +02:00
parent e5f445e9c8
commit 68440361cc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/naveditor/InputGeom.cpp
View File

@ -132,7 +132,7 @@ bool InputGeom::loadMesh(rcContext* ctx, const std::string& filepath,bool is_tf2
m_mesh = new rcMeshLoaderObj;
//m_mesh->m_flip_tris = is_tf2;
m_mesh->m_tf2_import_flip = is_tf2;
m_mesh->m_flipAxis = is_tf2;
if (!m_mesh)
{
ctx->log(RC_LOG_ERROR, "loadMesh: Out of memory 'm_mesh'.");
@ -174,7 +174,7 @@ bool InputGeom::loadPlyMesh(rcContext* ctx, const std::string& filepath, bool is
m_mesh = new rcMeshLoaderPly;
//m_mesh->m_flip_tris = is_tf2;
m_mesh->m_tf2_import_flip = is_tf2;
m_mesh->m_flipAxis = is_tf2;
if (!m_mesh)
{
ctx->log(RC_LOG_ERROR, "loadMesh: Out of memory 'm_mesh'.");

4
r5dev/naveditor/MeshLoaderObj.cpp
View File

@ -48,7 +48,7 @@ void rcMeshLoaderObj::addVertex(float x, float y, float z, int& cap)
m_verts = nv;
}
float* dst = &m_verts[m_vertCount*3];
if (m_tf2_import_flip)
if (m_flipAxis)
{
*dst++ = x * m_scale;
*dst++ = z * m_scale;
@ -211,7 +211,7 @@ bool rcMeshLoaderObj::load(const std::string& filename)
const int c = face[i];
if (a < 0 || a >= m_vertCount || b < 0 || b >= m_vertCount || c < 0 || c >= m_vertCount)
continue;
if(m_flip_tris)
if(m_flipTris)
addTriangle(a, c, b, tcap);
else
addTriangle(a, b, c, tcap);

4
r5dev/naveditor/MeshLoaderPly.cpp
View File

@ -80,7 +80,7 @@ end_header
for (size_t i = 0; i < m_vertCount; i++)
{
//TODO: m_scale?
if (m_tf2_import_flip)
if (m_flipAxis)
{
input.read((char*)&m_verts[i * 3 + 0], sizeof(float));
input.read((char*)&m_verts[i * 3 + 2], sizeof(float));
@ -102,7 +102,7 @@ end_header
input.read(&count, 1);
if (count != 3)
return false;
if (m_flip_tris)
if (m_flipTris)
{
input.read((char*)&m_tris[i * 3 + 0], sizeof(int));
input.read((char*)&m_tris[i * 3 + 2], sizeof(int));