aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewercamera.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llviewercamera.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewercamera.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 07e3109..32d20a9 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -50,9 +50,6 @@
50#include "lltoolmgr.h" 50#include "lltoolmgr.h"
51#include "llviewerjoystick.h" 51#include "llviewerjoystick.h"
52 52
53GLfloat gGLZFar;
54GLfloat gGLZNear;
55
56//glu pick matrix implementation borrowed from Mesa3D 53//glu pick matrix implementation borrowed from Mesa3D
57glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport) 54glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport)
58{ 55{
@@ -146,12 +143,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
146 mScreenPixelArea =(S32)((F32)mViewHeightInPixels * ((F32)mViewHeightInPixels * mAspect)); 143 mScreenPixelArea =(S32)((F32)mViewHeightInPixels * ((F32)mViewHeightInPixels * mAspect));
147} 144}
148 145
149// Handy copies of last good GL matrices
150F64 gGLModelView[16];
151F64 gGLLastModelView[16];
152F64 gGLProjection[16];
153S32 gGLViewport[4];
154
155const LLMatrix4 &LLViewerCamera::getProjection() const 146const LLMatrix4 &LLViewerCamera::getProjection() const
156{ 147{
157 calcProjection(getFar()); 148 calcProjection(getFar());
@@ -343,9 +334,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
343 gGLProjection[i] = proj_mat.m[i]; 334 gGLProjection[i] = proj_mat.m[i];
344 } 335 }
345 336
346 gGLZNear = z_near;
347 gGLZFar = z_far;
348
349 glMatrixMode( GL_MODELVIEW ); 337 glMatrixMode( GL_MODELVIEW );
350 338
351 glh::matrix4f modelview((GLfloat*) OGL_TO_CFR_ROTATION); 339 glh::matrix4f modelview((GLfloat*) OGL_TO_CFR_ROTATION);