Skip to content
Snippets Groups Projects
Commit b73f0f10 authored by prep's avatar prep
Browse files

Navmesh rendering api update to ll color structs

parent c262425b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llrender/llrendernavprim.cpp
+ 3
− 3
View file @ b73f0f10
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
//============================================================================= //=============================================================================
LLRenderNavPrim gRenderNav; 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 ); LLColor4 colorA( color );
gGL.color3fv( colorA.mV ); gGL.color3fv( colorA.mV );
...@@ -81,7 +81,7 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) ...@@ -81,7 +81,7 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
pVBO->drawArrays( LLRender::TRIANGLES, 0, 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++) for (int k=0; k<3; k++)
{ {
...@@ -90,7 +90,7 @@ void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, in ...@@ -90,7 +90,7 @@ void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, in
star[k] = 0.5f; star[k] = 0.5f;
pt1 = center + star; pt1 = center + star;
pt2 = center - star; pt2 = center - star;
renderSegment( pt1, pt2, color ); renderLLSegment( pt1, pt2, color );
} }
} }
//============================================================================= //=============================================================================
indra/llrender/llrendernavprim.h
+ 2
− 2
View file @ b73f0f10
...@@ -40,7 +40,7 @@ class LLRenderNavPrim ...@@ -40,7 +40,7 @@ class LLRenderNavPrim
{ {
public: public:
//Draw a line //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 //Draw simple tri
void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const; void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const;
//Draw simple tri //Draw simple tri
...@@ -48,7 +48,7 @@ class LLRenderNavPrim ...@@ -48,7 +48,7 @@ class LLRenderNavPrim
//Draw the contents of vertex buffer //Draw the contents of vertex buffer
void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt );
//Draw a star //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 //Flush the device
void flushDevice() { gGL.flush(); } void flushDevice() { gGL.flush(); }
private: private:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment