summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-05-12 17:17:39 -0500
committerDave Parks <davep@lindenlab.com>2010-05-12 17:17:39 -0500
commitb2906b594470ced996f102f4797eef7671ad009c (patch)
tree6f100e1eede2411ff9c7e111fe730ac75667043f /indra
parent44e9e6d2310c598011d7af59ced43f32abbf68b0 (diff)
Moved LLPhysicsDecomp to llmeshrepository.
Better convex hull visualization.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llspatialpartition.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 6787018f5a..ed99f8648f 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -2671,10 +2671,8 @@ void renderPhysicsShape(LLDrawable* drawable)
if (decomp)
{
gGL.pushMatrix();
- glLoadMatrixd(gGLModelView);
- gGL.flush();
- glPointSize(4.f);
- gGL.begin(LLRender::POINTS);
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+ glMultMatrixf((F32*) volume->getRelativeXform().mMatrix);
static std::vector<LLColor4U> color;
for (U32 i = 0; i < decomp->mHull.size(); ++i)
@@ -2683,17 +2681,15 @@ void renderPhysicsShape(LLDrawable* drawable)
{
color.push_back(LLColor4U(rand()%128+127, rand()%128+127, rand()%128+127));
}
- gGL.color4ubv(color[i].mV);
- for (U32 j = 0; j < decomp->mHull[i].size(); ++j)
- {
- LLVector3 v = volume->volumePositionToAgent(decomp->mHull[i][j]);
- gGL.vertex3fv(v.mV);
- }
+ glColor4ubv(color[i].mV);
+
+ LLVertexBuffer* buff = decomp->mMesh;
+
+ buff->setBuffer(LLVertexBuffer::MAP_VERTEX);
+ buff->drawArrays(LLRender::TRIANGLES, 0, buff->getNumVerts());
}
- gGL.end();
- gGL.flush();
+ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
gGL.popMatrix();
- glPointSize(1.f);
}
}
}