livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Navmesh rendering api update to ll color structs

master
prep 2012-03-27 15:33:04 -04:00
parent c262425bdd
commit b73f0f103d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llrender/llrendernavprim.cpp
View File

@ -35,7 +35,7 @@
//=============================================================================
LLRenderNavPrim gRenderNav;
//=============================================================================
void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color ) const
void LLRenderNavPrim::renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const
{
LLColor4 colorA( color );
gGL.color3fv( colorA.mV );
@ -81,7 +81,7 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
}
//=============================================================================
void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const
void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const
{
for (int k=0; k<3; k++)
{
@ -90,7 +90,7 @@ void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, in
star[k] = 0.5f;
pt1 = center + star;
pt2 = center - star;
renderSegment( pt1, pt2, color );
renderLLSegment( pt1, pt2, color );
}
}
//=============================================================================

4
indra/llrender/llrendernavprim.h
View File

@ -40,7 +40,7 @@ class LLRenderNavPrim
{
public:
//Draw a line
void renderSegment( const LLVector3& start, const LLVector3& end, int color ) const;
void renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const;
//Draw simple tri
void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const;
//Draw simple tri
@ -48,7 +48,7 @@ public:
//Draw the contents of vertex buffer
void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt );
//Draw a star
void renderStar( const LLVector3& center, const float scale, int color ) const;
void renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const;
//Flush the device
void flushDevice() { gGL.flush(); }
private: