diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-06-27 18:12:57 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-27 18:12:57 -0700 |
commit | fa562d19cf9bc698ce883191b6eea2af6abc4164 (patch) | |
tree | 43f74474fa19f454fba86832b71705c4760f6032 /indra/llrender | |
parent | edf5a3f8f6f8a0c6263e1b9e20553243412bad22 (diff) |
Removing unreferenced methods from the LLRenderNavPrim class.
Diffstat (limited to 'indra/llrender')
-rw-r--r-- | indra/llrender/llrendernavprim.cpp | 46 | ||||
-rw-r--r-- | indra/llrender/llrendernavprim.h | 20 |
2 files changed, 8 insertions, 58 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index e7bc89396c..ca72964832 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -30,41 +30,14 @@ #include "llrendernavprim.h" -#include "llerror.h" -#include "llglheaders.h" -#include "llglslshader.h" +#include "llrender.h" #include "llvertexbuffer.h" +#include "v4coloru.h" +#include "v3math.h" //============================================================================= LLRenderNavPrim gRenderNav; //============================================================================= -void LLRenderNavPrim::renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const -{ - LLColor4 colorA( color ); - gGL.color3fv( colorA.mV ); - - gGL.begin(LLRender::LINES); - { - gGL.vertex3fv( start.mV ); - gGL.vertex3fv( end.mV ); - } - gGL.end(); -} -//============================================================================= -void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const -{ - LLColor4 colorA( color ); - colorA*=1.25f; - gGL.color4fv( colorA.mV ); - gGL.begin(LLRender::TRIANGLES); - { - gGL.vertex3fv( a.mV ); - gGL.vertex3fv( b.mV ); - gGL.vertex3fv( c.mV ); - } - gGL.end(); -} -//============================================================================= void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const { LLColor4 cV(color); @@ -84,16 +57,3 @@ void LLRenderNavPrim::renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertC pVBO->drawArrays( mode, 0, vertCnt ); } //============================================================================= -void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const -{ - for (int k=0; k<3; k++) - { - LLVector3 star, pt1, pt2; - star = LLVector3( 0.0f,0.0f,0.0f); - star[k] = 0.5f; - pt1 = center + star; - pt2 = center - star; - renderLLSegment( pt1, pt2, color ); - } -} -//============================================================================= diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index a0c5e4005d..a3a5dfec3a 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -27,30 +27,20 @@ #ifndef LL_LLRENDERNAVPRIM_H #define LL_LLRENDERNAVPRIM_H -#include "llmath.h" -#include "v3math.h" -#include "v4math.h" -#include "m3math.h" -#include "m4math.h" -#include "v4color.h" -#include "llgl.h" +#include "stdtypes.h" + +class LLColor4U; +class LLVector3; +class LLVertexBuffer; class LLRenderNavPrim { public: - //Draw a line - 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 void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const; //Draw the contents of vertex buffer void renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertCnt ); - //Draw a star - void renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const; - //Flush the device - void flushDevice() { gGL.flush(); } private: }; |