From b73f0f103d433432a661fe416bd4d5ab91991cfc Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Tue, 27 Mar 2012 15:33:04 -0400
Subject: [PATCH] Navmesh rendering api update to ll color structs
---
indra/llrender/llrendernavprim.cpp | 6 +++---
indra/llrender/llrendernavprim.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp
index fb762b0870a..d6da722e0c1 100644
--- a/indra/llrender/llrendernavprim.cpp
+++ b/indra/llrender/llrendernavprim.cpp
@@ -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 );
}
}
//=============================================================================
diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h
index 044a20f0fe7..d5899471a63 100644
--- a/indra/llrender/llrendernavprim.h
+++ b/indra/llrender/llrendernavprim.h
@@ -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 @@ class LLRenderNavPrim
//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:
--
GitLab