aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:49 -0500
committerJacek Antonelli2008-08-15 23:45:49 -0500
commit8538c0f35dc5fb780f02930256e627e5266ede4a (patch)
tree58950646aae6534fafe680a5cf879d01cd99d254 /linden/indra/newview/llnetmap.cpp
parentSecond Life viewer sources 1.20.5 (diff)
downloadmeta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.zip
meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.gz
meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.bz2
meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.xz
Second Life viewer sources 1.20.6
Diffstat (limited to 'linden/indra/newview/llnetmap.cpp')
-rw-r--r--linden/indra/newview/llnetmap.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 9226fac..b6e22d8 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -287,7 +287,7 @@ void LLNetMap::draw()
287 287
288 // Draw using texture. 288 // Draw using texture.
289 LLViewerImage::bindTexture(regionp->getLand().getSTexture()); 289 LLViewerImage::bindTexture(regionp->getLand().getSTexture());
290 gGL.begin(GL_QUADS); 290 gGL.begin(LLVertexBuffer::QUADS);
291 gGL.texCoord2f(0.f, 1.f); 291 gGL.texCoord2f(0.f, 1.f);
292 gGL.vertex2f(left, top); 292 gGL.vertex2f(left, top);
293 gGL.texCoord2f(0.f, 0.f); 293 gGL.texCoord2f(0.f, 0.f);
@@ -304,7 +304,7 @@ void LLNetMap::draw()
304 if (regionp->getLand().getWaterTexture()) 304 if (regionp->getLand().getWaterTexture())
305 { 305 {
306 LLViewerImage::bindTexture(regionp->getLand().getWaterTexture()); 306 LLViewerImage::bindTexture(regionp->getLand().getWaterTexture());
307 gGL.begin(GL_QUADS); 307 gGL.begin(LLVertexBuffer::QUADS);
308 gGL.texCoord2f(0.f, 1.f); 308 gGL.texCoord2f(0.f, 1.f);
309 gGL.vertex2f(left, top); 309 gGL.vertex2f(left, top);
310 gGL.texCoord2f(0.f, 0.f); 310 gGL.texCoord2f(0.f, 0.f);
@@ -354,7 +354,7 @@ void LLNetMap::draw()
354 F32 image_half_width = 0.5f*mObjectMapPixels; 354 F32 image_half_width = 0.5f*mObjectMapPixels;
355 F32 image_half_height = 0.5f*mObjectMapPixels; 355 F32 image_half_height = 0.5f*mObjectMapPixels;
356 356
357 gGL.begin(GL_QUADS); 357 gGL.begin(LLVertexBuffer::QUADS);
358 gGL.texCoord2f(0.f, 1.f); 358 gGL.texCoord2f(0.f, 1.f);
359 gGL.vertex2f(map_center_agent.mV[VX] - image_half_width, image_half_height + map_center_agent.mV[VY]); 359 gGL.vertex2f(map_center_agent.mV[VX] - image_half_width, image_half_height + map_center_agent.mV[VY]);
360 gGL.texCoord2f(0.f, 0.f); 360 gGL.texCoord2f(0.f, 0.f);
@@ -463,7 +463,7 @@ void LLNetMap::draw()
463 { 463 {
464 gGL.color4fv(gFrustumMapColor.mV); 464 gGL.color4fv(gFrustumMapColor.mV);
465 465
466 gGL.begin( GL_TRIANGLES ); 466 gGL.begin( LLVertexBuffer::TRIANGLES );
467 gGL.vertex2f( ctr_x, ctr_y ); 467 gGL.vertex2f( ctr_x, ctr_y );
468 gGL.vertex2f( ctr_x - half_width_pixels, ctr_y + far_clip_pixels ); 468 gGL.vertex2f( ctr_x - half_width_pixels, ctr_y + far_clip_pixels );
469 gGL.vertex2f( ctr_x + half_width_pixels, ctr_y + far_clip_pixels ); 469 gGL.vertex2f( ctr_x + half_width_pixels, ctr_y + far_clip_pixels );
@@ -477,7 +477,7 @@ void LLNetMap::draw()
477 gGL.pushMatrix(); 477 gGL.pushMatrix();
478 gGL.translatef( ctr_x, ctr_y, 0 ); 478 gGL.translatef( ctr_x, ctr_y, 0 );
479 glRotatef( atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f); 479 glRotatef( atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
480 gGL.begin( GL_TRIANGLES ); 480 gGL.begin( LLVertexBuffer::TRIANGLES );
481 gGL.vertex2f( 0, 0 ); 481 gGL.vertex2f( 0, 0 );
482 gGL.vertex2f( -half_width_pixels, far_clip_pixels ); 482 gGL.vertex2f( -half_width_pixels, far_clip_pixels );
483 gGL.vertex2f( half_width_pixels, far_clip_pixels ); 483 gGL.vertex2f( half_width_pixels, far_clip_pixels );