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

Removing unreferenced methods from the LLRenderNavPrim class.

master
Todd Stinson 2012-06-27 18:12:57 -07:00
parent edf5a3f8f6
commit fa562d19cf
3 changed files with 14 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autobuild.xml
View File

@ -1110,9 +1110,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9a37d0201667a971887604f171394966</string>
<string>67bfd6a2bab9770fc1c9907f784c9449</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260580/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120625.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260768/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120627.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1122,9 +1122,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5600a7849a6bc00cfe08baa5bc251efd</string>
<string>e320ac6c5b2ea2463c70e25bbec61138</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260580/arch/Linux/installer/llphysicsextensions-0.1-linux-20120626.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260768/arch/Linux/installer/llphysicsextensions-0.1-linux-20120628.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1134,9 +1134,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>bfcfb9bc885e46a1b97f8f91cf5d5fd1</string>
<string>63a05f96e5b396ffdb1951679bfc1fe1</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260580/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120625.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260768/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120627.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

46
indra/llrender/llrendernavprim.cpp
View File

@ -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 );
}
}
//=============================================================================

20
indra/llrender/llrendernavprim.h
View File

@ -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:
};