From 52815f44a948bb878b05409e6bf54c2842130d27 Mon Sep 17 00:00:00 2001 From: Porteries Tristan Date: Sat, 25 Jun 2016 17:42:48 +0000 Subject: [PATCH] UPBGE: Remove AddVertex and AddPolygonVertex. RAS_MeshSlot should not be the constructor of a display array. It just use it. --- .../gameengine/Rasterizer/RAS_MeshObject.cpp | 19 ++++++++++--------- source/gameengine/Rasterizer/RAS_MeshSlot.cpp | 11 ----------- source/gameengine/Rasterizer/RAS_MeshSlot.h | 3 --- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index d4d13d600783..5df09c043be4 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -306,8 +306,8 @@ void RAS_MeshObject::AddLine(RAS_MaterialBucket *bucket, unsigned int v1, unsign // create a new polygon RAS_DisplayArray *darray = slot->GetDisplayArray(); darray->m_type = RAS_DisplayArray::LINES; - slot->AddPolygonVertex(v1); - slot->AddPolygonVertex(v2); + darray->m_index.push_back(v1); + darray->m_index.push_back(v2); } RAS_Polygon *RAS_MeshObject::AddPolygon(RAS_MaterialBucket *bucket, int numverts, unsigned int indices[4], @@ -329,9 +329,9 @@ RAS_Polygon *RAS_MeshObject::AddPolygon(RAS_MaterialBucket *bucket, int numverts if (visible && !bucket->IsWire()) { // Add the first triangle. - slot->AddPolygonVertex(indices[0]); - slot->AddPolygonVertex(indices[1]); - slot->AddPolygonVertex(indices[2]); + darray->m_index.push_back(indices[0]); + darray->m_index.push_back(indices[1]); + darray->m_index.push_back(indices[2]); poly->SetVertexOffset(0, indices[0]); poly->SetVertexOffset(1, indices[1]); @@ -339,9 +339,9 @@ RAS_Polygon *RAS_MeshObject::AddPolygon(RAS_MaterialBucket *bucket, int numverts if (numverts == 4) { // Add the second triangle. - slot->AddPolygonVertex(indices[0]); - slot->AddPolygonVertex(indices[2]); - slot->AddPolygonVertex(indices[3]); + darray->m_index.push_back(indices[0]); + darray->m_index.push_back(indices[2]); + darray->m_index.push_back(indices[3]); poly->SetVertexOffset(3, indices[3]); } @@ -395,7 +395,8 @@ unsigned int RAS_MeshObject::AddVertex(RAS_MaterialBucket *bucket, int i, } // no shared vertex found, add a new one - int offset = slot->AddVertex(texvert); + darray->m_vertex.push_back(texvert); + int offset = darray->m_vertex.size() - 1; { // Shared Vertex! SharedVertex shared; diff --git a/source/gameengine/Rasterizer/RAS_MeshSlot.cpp b/source/gameengine/Rasterizer/RAS_MeshSlot.cpp index 6a966f3dd919..bce2d3643376 100644 --- a/source/gameengine/Rasterizer/RAS_MeshSlot.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshSlot.cpp @@ -103,17 +103,6 @@ RAS_DisplayArray *RAS_MeshSlot::GetDisplayArray() return m_displayArray; } -int RAS_MeshSlot::AddVertex(const RAS_TexVert& tv) -{ - m_displayArray->m_vertex.push_back(tv); - return (m_displayArray->m_vertex.size() - 1); -} - -void RAS_MeshSlot::AddPolygonVertex(int offset) -{ - m_displayArray->m_index.push_back(offset); -} - void RAS_MeshSlot::SetDeformer(RAS_Deformer *deformer) { if (deformer && m_pDeformer != deformer) { diff --git a/source/gameengine/Rasterizer/RAS_MeshSlot.h b/source/gameengine/Rasterizer/RAS_MeshSlot.h index b423d603dd9c..1c301218a2c1 100644 --- a/source/gameengine/Rasterizer/RAS_MeshSlot.h +++ b/source/gameengine/Rasterizer/RAS_MeshSlot.h @@ -67,9 +67,6 @@ class RAS_MeshSlot void SetDeformer(RAS_Deformer *deformer); void SetMeshUser(RAS_MeshUser *user); - int AddVertex(const RAS_TexVert& tv); - void AddPolygonVertex(int offset); - #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_MeshSlot") #endif