Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
fef78653
Commit
fef78653
authored
12 years ago
by
prep
Browse files
Options
Downloads
Patches
Plain Diff
consolidate navmesh rendering calls
parent
8918c38f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llrender/llrendernavprim.cpp
+2
-8
2 additions, 8 deletions
indra/llrender/llrendernavprim.cpp
indra/llrender/llrendernavprim.h
+1
-3
1 addition, 3 deletions
indra/llrender/llrendernavprim.h
with
3 additions
and
11 deletions
indra/llrender/llrendernavprim.cpp
+
2
−
8
View file @
fef78653
...
@@ -75,16 +75,10 @@ void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const
...
@@ -75,16 +75,10 @@ void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const
gGL
.
end
();
gGL
.
end
();
}
}
//=============================================================================
//=============================================================================
void
LLRenderNavPrim
::
renderNavMeshVB
(
LLVertexBuffer
*
pVBO
,
int
vertCnt
)
void
LLRenderNavPrim
::
renderNavMeshVB
(
U32
mode
,
LLVertexBuffer
*
pVBO
,
int
vertCnt
)
{
{
pVBO
->
setBuffer
(
LLVertexBuffer
::
MAP_VERTEX
|
LLVertexBuffer
::
MAP_COLOR
|
LLVertexBuffer
::
MAP_NORMAL
);
pVBO
->
setBuffer
(
LLVertexBuffer
::
MAP_VERTEX
|
LLVertexBuffer
::
MAP_COLOR
|
LLVertexBuffer
::
MAP_NORMAL
);
pVBO
->
drawArrays
(
LLRender
::
TRIANGLES
,
0
,
vertCnt
);
pVBO
->
drawArrays
(
mode
,
0
,
vertCnt
);
}
//=============================================================================
void
LLRenderNavPrim
::
renderNavMeshEdgeVB
(
LLVertexBuffer
*
pVBO
,
int
vertCnt
)
{
pVBO
->
setBuffer
(
LLVertexBuffer
::
MAP_VERTEX
|
LLVertexBuffer
::
MAP_COLOR
|
LLVertexBuffer
::
MAP_NORMAL
);
pVBO
->
drawArrays
(
LLRender
::
LINES
,
0
,
vertCnt
);
}
}
//=============================================================================
//=============================================================================
void
LLRenderNavPrim
::
renderStar
(
const
LLVector3
&
center
,
const
float
scale
,
const
LLColor4U
&
color
)
const
void
LLRenderNavPrim
::
renderStar
(
const
LLVector3
&
center
,
const
float
scale
,
const
LLColor4U
&
color
)
const
...
...
This diff is collapsed.
Click to expand it.
indra/llrender/llrendernavprim.h
+
1
−
3
View file @
fef78653
...
@@ -46,9 +46,7 @@ class LLRenderNavPrim
...
@@ -46,9 +46,7 @@ class LLRenderNavPrim
//Draw simple tri
//Draw simple tri
void
renderLLTri
(
const
LLVector3
&
a
,
const
LLVector3
&
b
,
const
LLVector3
&
c
,
const
LLColor4U
&
color
,
const
LLVector3
&
n
)
const
;
void
renderLLTri
(
const
LLVector3
&
a
,
const
LLVector3
&
b
,
const
LLVector3
&
c
,
const
LLColor4U
&
color
,
const
LLVector3
&
n
)
const
;
//Draw the contents of vertex buffer
//Draw the contents of vertex buffer
void
renderNavMeshVB
(
LLVertexBuffer
*
pVBO
,
int
vertCnt
);
void
renderNavMeshVB
(
U32
mode
,
LLVertexBuffer
*
pVBO
,
int
vertCnt
);
//Draw the contents of the edge vertex buffer
void
renderNavMeshEdgeVB
(
LLVertexBuffer
*
pVBO
,
int
vertCnt
);
//Draw a star
//Draw a star
void
renderStar
(
const
LLVector3
&
center
,
const
float
scale
,
const
LLColor4U
&
color
)
const
;
void
renderStar
(
const
LLVector3
&
center
,
const
float
scale
,
const
LLColor4U
&
color
)
const
;
//Flush the device
//Flush the device
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment