diff options
author | Jacek Antonelli | 2009-01-28 20:04:52 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-28 20:05:02 -0600 |
commit | 0ef11cf31364456ec247b0fc7ad8f6d1de408400 (patch) | |
tree | 50754b286468147a70271253a2a74215c80e1354 /linden/indra/newview/llviewerimage.h | |
parent | Second Life viewer sources 1.22.5-RC (diff) | |
download | meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.zip meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.gz meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.bz2 meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.xz |
Second Life viewer sources 1.22.6-RC
Diffstat (limited to 'linden/indra/newview/llviewerimage.h')
-rw-r--r-- | linden/indra/newview/llviewerimage.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h index 82da8d2..c735cb0 100644 --- a/linden/indra/newview/llviewerimage.h +++ b/linden/indra/newview/llviewerimage.h | |||
@@ -187,27 +187,7 @@ public: | |||
187 | 187 | ||
188 | // New methods for determining image quality/priority | 188 | // New methods for determining image quality/priority |
189 | // texel_area_ratio is ("scaled" texel area)/(original texel area), approximately. | 189 | // texel_area_ratio is ("scaled" texel area)/(original texel area), approximately. |
190 | void addTextureStats(F32 pixel_area) const | 190 | void addTextureStats(F32 virtual_size) const; |
191 | { | ||
192 | mMaxCosAngle = 1.0f; | ||
193 | if (pixel_area > mMaxVirtualSize) | ||
194 | { | ||
195 | mMaxVirtualSize = pixel_area; | ||
196 | } | ||
197 | } | ||
198 | void addTextureStats(F32 pixel_area, | ||
199 | F32 texel_area_ratio) const | ||
200 | { | ||
201 | mMaxCosAngle = 1.0f; | ||
202 | F32 virtual_size = pixel_area / texel_area_ratio; | ||
203 | if (virtual_size > mMaxVirtualSize) | ||
204 | { | ||
205 | mMaxVirtualSize = virtual_size; | ||
206 | } | ||
207 | } | ||
208 | void addTextureStats(F32 pixel_area, | ||
209 | F32 texel_area_ratio, | ||
210 | F32 cos_center_angle) const; | ||
211 | void resetTextureStats(BOOL zero = FALSE); | 191 | void resetTextureStats(BOOL zero = FALSE); |
212 | 192 | ||
213 | // Process image stats to determine priority/quality requirements. | 193 | // Process image stats to determine priority/quality requirements. |
@@ -304,7 +284,6 @@ public: | |||
304 | 284 | ||
305 | // Data used for calculating required image priority/quality level/decimation | 285 | // Data used for calculating required image priority/quality level/decimation |
306 | mutable F32 mMaxVirtualSize; // The largest virtual size of the image, in pixels - how much data to we need? | 286 | mutable F32 mMaxVirtualSize; // The largest virtual size of the image, in pixels - how much data to we need? |
307 | mutable F32 mMaxCosAngle; // The largest cos of the angle between camera X vector and the object | ||
308 | 287 | ||
309 | F32 mTexelsPerImage; // Texels per image. | 288 | F32 mTexelsPerImage; // Texels per image. |
310 | F32 mDiscardVirtualSize; // Virtual size used to calculate desired discard | 289 | F32 mDiscardVirtualSize; // Virtual size used to calculate desired discard |