aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-04-08 05:29:05 +1000
committerDavid Walter Seikel2013-04-08 05:29:05 +1000
commit57ab98a6448db9824f8634e4450ee16a8645065c (patch)
treeb78b5b72cc70a70ec219e81bef71d8a0942a17de
parentEven more useless variable deletions. (diff)
downloadmeta-impy-57ab98a6448db9824f8634e4450ee16a8645065c.zip
meta-impy-57ab98a6448db9824f8634e4450ee16a8645065c.tar.gz
meta-impy-57ab98a6448db9824f8634e4450ee16a8645065c.tar.bz2
meta-impy-57ab98a6448db9824f8634e4450ee16a8645065c.tar.xz
Comment out extra star rendering stuff, to get rid of unused variable warnings, but leave the code around in case it turns out to be a good idea.
-rw-r--r--linden/indra/newview/llvowlsky.cpp25
1 files changed, 13 insertions, 12 deletions
diff --git a/linden/indra/newview/llvowlsky.cpp b/linden/indra/newview/llvowlsky.cpp
index 96bd62e..2f77c7f 100644
--- a/linden/indra/newview/llvowlsky.cpp
+++ b/linden/indra/newview/llvowlsky.cpp
@@ -719,12 +719,13 @@ void LLVOWLSky::updateStarColors()
719{ 719{
720 std::vector<LLColor4>::iterator v_c = mStarColors.begin(); 720 std::vector<LLColor4>::iterator v_c = mStarColors.begin();
721 std::vector<F32>::iterator v_i = mStarIntensities.begin(); 721 std::vector<F32>::iterator v_i = mStarIntensities.begin();
722 std::vector<LLVector3>::iterator v_p = mStarVertices.begin(); 722 // A bunch of stuff here is not used, but looks like it might be useful later, so I'll leave it, but commented out.
723 //std::vector<LLVector3>::iterator v_p = mStarVertices.begin();
723 724
724 const F32 var = 0.15f; 725 const F32 var = 0.15f;
725 const F32 min = 0.5f; //0.75f; 726 const F32 min = 0.5f; //0.75f;
726 const F32 sunclose_max = 0.6f; 727 //const F32 sunclose_max = 0.6f;
727 const F32 sunclose_range = 1 - sunclose_max; 728 //const F32 sunclose_range = 1 - sunclose_max;
728 729
729 //F32 below_horizon = - llmin(0.0f, gSky.mVOSkyp->getToSunLast().mV[2]); 730 //F32 below_horizon = - llmin(0.0f, gSky.mVOSkyp->getToSunLast().mV[2]);
730 //F32 brightness_factor = llmin(1.0f, below_horizon * 20); 731 //F32 brightness_factor = llmin(1.0f, below_horizon * 20);
@@ -738,14 +739,14 @@ void LLVOWLSky::updateStarColors()
738 U32 x; 739 U32 x;
739 for (x = 0; x < getStarsNumVerts(); ++x) 740 for (x = 0; x < getStarsNumVerts(); ++x)
740 { 741 {
741 F32 sundir_factor = 1; 742 //F32 sundir_factor = 1;
742 LLVector3 tostar = *v_p; 743 //LLVector3 tostar = *v_p;
743 tostar.normVec(); 744 //tostar.normVec();
744 const F32 how_close_to_sun = tostar * gSky.mVOSkyp->getToSunLast(); 745 //const F32 how_close_to_sun = tostar * gSky.mVOSkyp->getToSunLast();
745 if (how_close_to_sun > sunclose_max) 746 //if (how_close_to_sun > sunclose_max)
746 { 747 //{
747 sundir_factor = (1 - how_close_to_sun) / sunclose_range; 748 // sundir_factor = (1 - how_close_to_sun) / sunclose_range;
748 } 749 //}
749 intensity = *(v_i); 750 intensity = *(v_i);
750 F32 alpha = v_c->mV[VALPHA] + (ll_frand() - 0.5f) * var * intensity; 751 F32 alpha = v_c->mV[VALPHA] + (ll_frand() - 0.5f) * var * intensity;
751 if (alpha < min * intensity) 752 if (alpha < min * intensity)
@@ -762,7 +763,7 @@ void LLVOWLSky::updateStarColors()
762 v_c->mV[VALPHA] = alpha; 763 v_c->mV[VALPHA] = alpha;
763 v_c++; 764 v_c++;
764 v_i++; 765 v_i++;
765 v_p++; 766 //v_p++;
766 } 767 }
767 } 768 }
768} 769}