diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2008-06-30 17:57:00 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2008-06-30 17:57:00 +0000 |
| commit | 939a506569433db7bff96c12200f03b3f85f40de (patch) | |
| tree | c9f308949400b0a4ce00c82a6a33f2868e31a1d1 /indra/newview/llviewercamera.cpp | |
| parent | 1a14cd34a9a4e6f51c445d477aaeeef0322d5853 (diff) | |
Merging in file-move-merge ( QAR-649 )
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."
Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
| -rw-r--r-- | indra/newview/llviewercamera.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index a1a2c34222..5f6fcb70e3 100644 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -50,9 +50,6 @@ #include "lltoolmgr.h" #include "llviewerjoystick.h" -GLfloat gGLZFar; -GLfloat gGLZNear; - //glu pick matrix implementation borrowed from Mesa3D glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport) { @@ -146,12 +143,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 ¢er, mScreenPixelArea =(S32)((F32)mViewHeightInPixels * ((F32)mViewHeightInPixels * mAspect)); } -// Handy copies of last good GL matrices -F64 gGLModelView[16]; -F64 gGLLastModelView[16]; -F64 gGLProjection[16]; -S32 gGLViewport[4]; - const LLMatrix4 &LLViewerCamera::getProjection() const { calcProjection(getFar()); @@ -343,9 +334,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection, gGLProjection[i] = proj_mat.m[i]; } - gGLZNear = z_near; - gGLZFar = z_far; - glMatrixMode( GL_MODELVIEW ); glh::matrix4f modelview((GLfloat*) OGL_TO_CFR_ROTATION); |