diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llhudrender.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llhudrender.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llhudrender.cpp b/linden/indra/newview/llhudrender.cpp index df1fa46..556b6d6 100644 --- a/linden/indra/newview/llhudrender.cpp +++ b/linden/indra/newview/llhudrender.cpp | |||
@@ -61,10 +61,10 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent, | |||
61 | const BOOL orthographic) | 61 | const BOOL orthographic) |
62 | { | 62 | { |
63 | // Do cheap plane culling | 63 | // Do cheap plane culling |
64 | LLVector3 dir_vec = pos_agent - gCamera->getOrigin(); | 64 | LLVector3 dir_vec = pos_agent - LLViewerCamera::getInstance()->getOrigin(); |
65 | dir_vec /= dir_vec.magVec(); | 65 | dir_vec /= dir_vec.magVec(); |
66 | 66 | ||
67 | if (wstr.empty() || (!orthographic && dir_vec * gCamera->getAtAxis() <= 0.f)) | 67 | if (wstr.empty() || (!orthographic && dir_vec * LLViewerCamera::getInstance()->getAtAxis() <= 0.f)) |
68 | { | 68 | { |
69 | return; | 69 | return; |
70 | } | 70 | } |
@@ -78,15 +78,15 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent, | |||
78 | } | 78 | } |
79 | else | 79 | else |
80 | { | 80 | { |
81 | gCamera->getPixelVectors(pos_agent, up_axis, right_axis); | 81 | LLViewerCamera::getInstance()->getPixelVectors(pos_agent, up_axis, right_axis); |
82 | } | 82 | } |
83 | LLCoordFrame render_frame = *gCamera; | 83 | LLCoordFrame render_frame = *LLViewerCamera::getInstance(); |
84 | LLQuaternion rot; | 84 | LLQuaternion rot; |
85 | if (!orthographic) | 85 | if (!orthographic) |
86 | { | 86 | { |
87 | rot = render_frame.getQuaternion(); | 87 | rot = render_frame.getQuaternion(); |
88 | rot = rot * LLQuaternion(-F_PI_BY_TWO, gCamera->getYAxis()); | 88 | rot = rot * LLQuaternion(-F_PI_BY_TWO, LLViewerCamera::getInstance()->getYAxis()); |
89 | rot = rot * LLQuaternion(F_PI_BY_TWO, gCamera->getXAxis()); | 89 | rot = rot * LLQuaternion(F_PI_BY_TWO, LLViewerCamera::getInstance()->getXAxis()); |
90 | } | 90 | } |
91 | else | 91 | else |
92 | { | 92 | { |