From 0539b08370392385831f631fbdd8cb41977636b9 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 1 Dec 2011 11:38:16 -0500 Subject: Renamed segment rendering class into RenderNavPrim --- indra/llrender/llrendernavprim.h | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 indra/llrender/llrendernavprim.h (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h new file mode 100644 index 0000000000..697c344d21 --- /dev/null +++ b/indra/llrender/llrendernavprim.h @@ -0,0 +1,50 @@ +/** + * @file LLRenderNavPrim.h + * @brief + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_RENDER_NAVPRIM_H +#define LL_RENDER_NAVPRIM_H + +#include "llmath.h" +#include "v3math.h" +#include "v4math.h" +#include "m3math.h" +#include "m4math.h" +#include "v4color.h" +#include "llgl.h" + + +class LLRenderNavPrim +{ +public: + void renderSegment( const LLVector3& start, const LLVector3& end, int color ); + void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ); + +private: +}; + +extern LLRenderNavPrim gRenderNav; + +#endif -- cgit v1.2.3 From 0b99da8ba522da1a4a1e4b6dba24ee8dac42de60 Mon Sep 17 00:00:00 2001 From: prep Date: Mon, 5 Dec 2011 17:20:54 -0500 Subject: WIP: Implementing VB manager for complex physics shapes --- indra/llrender/llrendernavprim.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 697c344d21..f8fabfa95f 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -39,8 +39,12 @@ class LLRenderNavPrim { public: - void renderSegment( const LLVector3& start, const LLVector3& end, int color ); - void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ); + //Draw a line + void renderSegment( const LLVector3& start, const LLVector3& end, int color ) const; + //Draw simple tri + void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const; + //Draw the contents of vertex buffer + void renderNavMeshVB( const LLVertexBuffer* pVBO, int vertCnt ) const; private: }; -- cgit v1.2.3 From 8974278746932fe470e2cbc52511fbc915f1e893 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 7 Dec 2011 17:56:02 -0500 Subject: Turning on navmesh rendering toggles normal renderables --- indra/llrender/llrendernavprim.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index f8fabfa95f..cd57fd2223 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -44,7 +44,7 @@ public: //Draw simple tri void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const; //Draw the contents of vertex buffer - void renderNavMeshVB( const LLVertexBuffer* pVBO, int vertCnt ) const; + void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); private: }; -- cgit v1.2.3 From e2fd0266ca7249e2008b68f11050973d1e429a62 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 5 Jan 2012 10:20:18 -0500 Subject: path-149 overlay of navmesh on onto renderables --- indra/llrender/llrendernavprim.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index cd57fd2223..a30a14551d 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -40,9 +40,9 @@ class LLRenderNavPrim { public: //Draw a line - void renderSegment( const LLVector3& start, const LLVector3& end, int color ) const; + void renderSegment( const LLVector3& start, const LLVector3& end, int color,bool overlayMode ) const; //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,bool overlayMode ) const; //Draw the contents of vertex buffer void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); -- cgit v1.2.3 From e2ef5a5edce6a01724d91fde5b471b0bae18d045 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 19 Jan 2012 14:38:16 -0500 Subject: Path-196 : vbo cleanup, visual fixes (path-222) --- indra/llrender/llrendernavprim.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index a30a14551d..d88fe656b7 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -40,11 +40,13 @@ class LLRenderNavPrim { public: //Draw a line - void renderSegment( const LLVector3& start, const LLVector3& end, int color,bool overlayMode ) const; + void renderSegment( const LLVector3& start, const LLVector3& end, int color, bool overlayMode ) const; //Draw simple tri - void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color,bool overlayMode ) const; + void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color, bool overlayMode ) const; //Draw the contents of vertex buffer - void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); + void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); + //Draw a star + void renderStar( const LLVector3& center, const float scale, int color ) const; private: }; -- cgit v1.2.3 From 72f6df493cacdd8ccf160dd785081e5b2b579862 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 14 Mar 2012 16:22:19 -0400 Subject: Updated header for flush. --- indra/llrender/llrendernavprim.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index d88fe656b7..158093690e 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -47,7 +47,8 @@ public: void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); //Draw a star void renderStar( const LLVector3& center, const float scale, int color ) const; - + //Flush the device + void flushDevice() { gGL.flush(); } private: }; -- cgit v1.2.3 From 154e569923d0caf99fb0d24af8475731f5ceaf33 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 21 Mar 2012 09:53:32 -0400 Subject: Path-282: Added support for viewing the walkability map for various character types --- indra/llrender/llrendernavprim.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 158093690e..b5509d9c5e 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -43,6 +43,8 @@ public: void renderSegment( const LLVector3& start, const LLVector3& end, int color, bool overlayMode ) const; //Draw simple tri void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color, bool overlayMode ) const; + //Draw simple tri + void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color, bool overlayMode ) const; //Draw the contents of vertex buffer void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); //Draw a star -- cgit v1.2.3 From 89d20b750cbedc682dd203c0727c9e8fa5ebad6c Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 22 Mar 2012 15:56:00 -0400 Subject: Removed dead code --- indra/llrender/llrendernavprim.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index b5509d9c5e..044a20f0fe 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -40,11 +40,11 @@ class LLRenderNavPrim { public: //Draw a line - void renderSegment( const LLVector3& start, const LLVector3& end, int color, bool overlayMode ) const; + void renderSegment( const LLVector3& start, const LLVector3& end, int color ) const; //Draw simple tri - void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color, bool overlayMode ) const; + 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, bool overlayMode ) const; + void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const; //Draw the contents of vertex buffer void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); //Draw a star -- cgit v1.2.3 From b73f0f103d433432a661fe416bd4d5ab91991cfc Mon Sep 17 00:00:00 2001 From: prep Date: Tue, 27 Mar 2012 15:33:04 -0400 Subject: Navmesh rendering api update to ll color structs --- indra/llrender/llrendernavprim.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 044a20f0fe..d5899471a6 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 @@ 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: -- cgit v1.2.3 From 2388de3f958f019255c1eb50cafb540e87a3ca3a Mon Sep 17 00:00:00 2001 From: prep Date: Tue, 3 Apr 2012 13:06:21 -0400 Subject: Added normal support to navmesh tri renderer. --- indra/llrender/llrendernavprim.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index d5899471a6..7fbd02de93 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -43,8 +43,8 @@ public: 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 simple tri + void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color, const LLVector3& n ) const; //Draw the contents of vertex buffer void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); //Draw a star -- cgit v1.2.3 From b752a3a689ea2000398c9f93e801d87a2681223c Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 5 Apr 2012 11:08:31 -0400 Subject: Navmesh edges are now rendered via vertex buffers. Enjoy the speedup! --- indra/llrender/llrendernavprim.h | 120 ++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 59 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 7fbd02de93..809debb006 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -1,59 +1,61 @@ -/** - * @file LLRenderNavPrim.h - * @brief - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_RENDER_NAVPRIM_H -#define LL_RENDER_NAVPRIM_H - -#include "llmath.h" -#include "v3math.h" -#include "v4math.h" -#include "m3math.h" -#include "m4math.h" -#include "v4color.h" -#include "llgl.h" - - -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 LLVector3& n ) const; - //Draw the contents of vertex buffer - void renderNavMeshVB( 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: -}; - -extern LLRenderNavPrim gRenderNav; - -#endif +/** + * @file LLRenderNavPrim.h + * @brief + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_RENDER_NAVPRIM_H +#define LL_RENDER_NAVPRIM_H + +#include "llmath.h" +#include "v3math.h" +#include "v4math.h" +#include "m3math.h" +#include "m4math.h" +#include "v4color.h" +#include "llgl.h" + + +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 LLVector3& n ) const; + //Draw the contents of vertex buffer + void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); + //Draw the contents of the edge vertex buffer + void renderNavMeshEdgeVB( 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: +}; + +extern LLRenderNavPrim gRenderNav; + +#endif -- cgit v1.2.3 From fef78653cd2a81efb032d7570fc5e5a0814086b7 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 5 Apr 2012 14:27:05 -0400 Subject: consolidate navmesh rendering calls --- indra/llrender/llrendernavprim.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 809debb006..97d1c805af 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -46,9 +46,7 @@ public: //Draw simple tri void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color, const LLVector3& n ) const; //Draw the contents of vertex buffer - void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); - //Draw the contents of the edge vertex buffer - void renderNavMeshEdgeVB( LLVertexBuffer* pVBO, int vertCnt ); + 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 -- cgit v1.2.3 From 31543e637bcb0e6ddc83d21a3efdbe242fcf9f71 Mon Sep 17 00:00:00 2001 From: prep Date: Tue, 10 Apr 2012 14:34:28 -0400 Subject: Fixed default character width bug. Updated rendertri api for new path rendering bookends. --- indra/llrender/llrendernavprim.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 97d1c805af..eb45e259d2 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -43,8 +43,8 @@ public: 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 LLVector3& n ) 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 -- cgit v1.2.3 From 78910cf3016fc55eaf8214640b348df0f8bcdeda Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 26 Jun 2012 18:04:19 -0700 Subject: Updating the header licensing comments. --- indra/llrender/llrendernavprim.h | 56 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index eb45e259d2..a0c5e4005d 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -1,31 +1,31 @@ /** - * @file LLRenderNavPrim.h - * @brief - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_RENDER_NAVPRIM_H -#define LL_RENDER_NAVPRIM_H +* @file llrendernavprim.h +* @brief Header file for llrendernavprim +* @author Prep@lindenlab.com +* +* $LicenseInfo:firstyear=2012&license=viewerlgpl$ +* Second Life Viewer Source Code +* Copyright (C) 2012, Linden Research, Inc. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; +* version 2.1 of the License only. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* +* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA +* $/LicenseInfo$ +*/ +#ifndef LL_LLRENDERNAVPRIM_H +#define LL_LLRENDERNAVPRIM_H #include "llmath.h" #include "v3math.h" @@ -56,4 +56,4 @@ private: extern LLRenderNavPrim gRenderNav; -#endif +#endif // LL_LLRENDERNAVPRIM_H -- cgit v1.2.3 From fa562d19cf9bc698ce883191b6eea2af6abc4164 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 27 Jun 2012 18:12:57 -0700 Subject: Removing unreferenced methods from the LLRenderNavPrim class. --- indra/llrender/llrendernavprim.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'indra/llrender/llrendernavprim.h') 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: }; -- cgit v1.2.3