From 91c11c8d87c963f2b17e45b525396bf8c8386c26 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Geenz\" Goodman" Date: Wed, 22 Jul 2026 00:38:20 -0400 Subject: Revert "Geenz/texture loading speed (#5985)" This reverts commit a937b237de3651e79cdb517f14381a5bdd4c844b. --- indra/newview/llface.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index c96e1bd3b0..e34bea63ef 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -2297,8 +2297,6 @@ bool LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) // don't update every frame if (gFrameTimeSeconds - mLastPixelAreaUpdate < PIXEL_AREA_UPDATE_PERIOD) { - cos_angle_to_view_dir = mLastCosAngleToViewDir; - radius = mLastRadius; return true; } @@ -2370,7 +2368,6 @@ bool LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) // no rigged extents, zero out bounding box and skip update mRiggedExtents[0] = mRiggedExtents[1] = LLVector4a(0.f, 0.f, 0.f); - mInFrustum = false; return false; } @@ -2425,7 +2422,6 @@ bool LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) if(!camera->AABBInFrustum(center, size)) { mImportanceToCamera = 0.f ; - mInFrustum = false; return false ; } if(cos_angle_to_view_dir > camera->getCosHalfFov()) //the center is within the view frustum @@ -2454,24 +2450,6 @@ bool LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) mImportanceToCamera = LLFace::calcImportanceToCamera(cos_angle_to_view_dir, dist) ; } - // On-screen test: does the face's projected disc overlap the screen disc? - // (Same construction as adjustPartialOverlapPixelArea.) Behind-camera faces - // get acos(cos) near pi and fall out; the generous screen radius errs toward - // "on screen" so fetch admission never starves edge content. mFrustumOverflow - // is how far past the boundary the disc sits, as a fraction of screen size - - // 0 on screen, 0.1 = 10% of a screen out - and feeds the frustum allowance - // falloff in computeDesiredDiscard. - { - F32 center_px = acosf(llclamp(cos_angle_to_view_dir, -1.f, 1.f)) * LLDrawable::sCurPixelAngle; - F32 screen_radius = (F32)llmax(gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw()); - F32 past_edge = center_px - radius - screen_radius; - mInFrustum = past_edge <= 5.f; - mFrustumOverflow = llmax(past_edge - 5.f, 0.f) / screen_radius; - } - - mLastCosAngleToViewDir = cos_angle_to_view_dir; - mLastRadius = radius; - return true ; } -- cgit v1.3