diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llviewercamera.h | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llviewercamera.h')
-rw-r--r-- | linden/indra/newview/llviewercamera.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewercamera.h b/linden/indra/newview/llviewercamera.h index 2fed21a..df89c19 100644 --- a/linden/indra/newview/llviewercamera.h +++ b/linden/indra/newview/llviewercamera.h | |||
@@ -62,7 +62,7 @@ public: | |||
62 | const LLVector3 &up_direction, | 62 | const LLVector3 &up_direction, |
63 | const LLVector3 &point_of_interest); | 63 | const LLVector3 &point_of_interest); |
64 | 64 | ||
65 | static void updateFrustumPlanes(LLCamera& camera, BOOL ortho = FALSE); | 65 | static void updateFrustumPlanes(LLCamera& camera, BOOL ortho = FALSE, BOOL zflip = FALSE); |
66 | void setPerspective(BOOL for_selection, S32 x, S32 y_from_bot, S32 width, S32 height, BOOL limit_select_distance, F32 z_near = 0, F32 z_far = 0); | 66 | void setPerspective(BOOL for_selection, S32 x, S32 y_from_bot, S32 width, S32 height, BOOL limit_select_distance, F32 z_near = 0, F32 z_far = 0); |
67 | 67 | ||
68 | const LLMatrix4 &getProjection() const; | 68 | const LLMatrix4 &getProjection() const; |
@@ -109,13 +109,14 @@ protected: | |||
109 | S16 mZoomSubregion; | 109 | S16 mZoomSubregion; |
110 | 110 | ||
111 | public: | 111 | public: |
112 | F64 mGLProjectionMatrix[16]; | ||
113 | |||
114 | }; | 112 | }; |
115 | 113 | ||
116 | extern LLViewerCamera *gCamera; | 114 | extern LLViewerCamera *gCamera; |
117 | extern F64 gGLModelView[16]; | 115 | extern F64 gGLModelView[16]; |
116 | extern F64 gGLLastModelView[16]; | ||
118 | extern F64 gGLProjection[16]; | 117 | extern F64 gGLProjection[16]; |
119 | extern S32 gGLViewport[4]; | 118 | extern S32 gGLViewport[4]; |
119 | extern F32 gGLZNear; | ||
120 | extern F32 gGLZFar; | ||
120 | 121 | ||
121 | #endif // LL_LLVIEWERCAMERA_H | 122 | #endif // LL_LLVIEWERCAMERA_H |