Fixed a bug in star repainting optimization.

diff --git a/SimGear.dsp b/SimGear.dsp
index 1aa6b91e41aa31576c0bd0d1cef712690bcd4cc6..a8fc058ec4dd377fa152fea7e3340c32b8995a16 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -240,21 +240,6 @@ SOURCE=.\simgear\ephemeris\neptune.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\ephemeris\pluto.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgephem"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgephem"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\ephemeris\saturn.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -428,21 +413,6 @@ SOURCE=.\simgear\io\sg_socket.cxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\magvar\coremag.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgmagvar"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgmagvar"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\magvar\coremag.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -661,36 +631,6 @@ SOURCE=.\simgear\metar\Fracpart.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\metar\Local.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgmetar"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgmetar"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\metar\Metar.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgmetar"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgmetar"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\metar\MetarReport.cpp\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -928,21 +868,6 @@ SOURCE=.\simgear\screen\GLBitmaps.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\GLBitmaps.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\screen\screen-dump.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -955,21 +880,6 @@ SOURCE=.\simgear\screen\screen-dump.cxx
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\screen\win32-printer.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgserial"\r
@@ -1237,21 +1147,6 @@ SOURCE=.\simgear\xgl\xglUtils.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\asciitab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\easyxml.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1267,21 +1162,6 @@ SOURCE=.\simgear\xml\easyxml.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\hashtable.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\hashtable.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1297,96 +1177,6 @@ SOURCE=.\simgear\xml\hashtable.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\iasciitab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\latin1tab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\nametab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\utf8tab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\xmldef.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\xmlparse.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\xmlparse.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1402,21 +1192,6 @@ SOURCE=.\simgear\xml\xmlparse.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\xmlrole.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\xmlrole.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1432,21 +1207,6 @@ SOURCE=.\simgear\xml\xmlrole.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\xmltok.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\xmltok.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1459,21 +1219,6 @@ SOURCE=.\simgear\xml\xmltok.c
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\xmltok_impl.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_z"\r
@@ -1541,21 +1286,6 @@ SOURCE=.\simgear\zlib\deflate.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\deflate.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\gzio.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1586,21 +1316,6 @@ SOURCE=.\simgear\zlib\infblock.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\infblock.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\infcodes.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1616,21 +1331,6 @@ SOURCE=.\simgear\zlib\infcodes.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\infcodes.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\inffast.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1646,36 +1346,6 @@ SOURCE=.\simgear\zlib\inffast.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\inffast.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inffixed.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\inflate.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1706,21 +1376,6 @@ SOURCE=.\simgear\zlib\inftrees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\inftrees.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\infutil.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1736,21 +1391,6 @@ SOURCE=.\simgear\zlib\infutil.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\infutil.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\trees.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1766,21 +1406,6 @@ SOURCE=.\simgear\zlib\trees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\trees.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\uncompr.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1808,21 +1433,6 @@ SOURCE=.\simgear\zlib\zutil.c
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\zutil.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/simgear/sky/stars.cxx b/simgear/sky/stars.cxx
index 920f247751fc2cf33e5e0bbe7e9f9af1199079fb..0ca2efb4409bbbd9418180ee6629b583d0c525a2 100644 (file)
--- a/simgear/sky/stars.cxx
+++ b/simgear/sky/stars.cxx
@@ -72,7 +72,9 @@ static int sgStarPostDraw( ssgEntity *e ) {
 
 
 // Constructor
-SGStars::SGStars( void ) {
+SGStars::SGStars( void ) :
+old_phase(-1)
+{
 }
 
 
@@ -149,12 +151,12 @@ ssgBranch * SGStars::build( int num, sgdVec3 *star_data, double star_dist ) {
 // 90 degrees = sun rise/set
 // 180 degrees = darkest midnight
 bool SGStars::repaint( double sun_angle, int num, sgdVec3 *star_data ) {
+    // cout << "repainting stars" << endl;
     // double min = 100;
     // double max = -100;
     double mag, nmag, alpha, factor, cutoff;
     float *color;
 
-    static int old_phase = -1;
     int phase;
 
     // determine which star structure to draw
@@ -195,6 +197,7 @@ bool SGStars::repaint( double sun_angle, int num, sgdVec3 *star_data ) {
     }
 
     if( phase != old_phase ) {
+       // cout << "  phase change, repainting stars, num = " << num << endl;
         old_phase = phase;
         for ( int i = 0; i < num; ++i ) {
             // if ( star_data[i][2] < min ) { min = star_data[i][2]; }
@@ -225,6 +228,8 @@ bool SGStars::repaint( double sun_angle, int num, sgdVec3 *star_data ) {
             sgSetVec4( color, 1.0, 1.0, 1.0, alpha );
             // cout << "alpha[" << i << "] = " << alpha << endl;
         }
+    } else {
+       // cout << "  no phase change, skipping" << endl;
     }
 
     // cout << "min = " << min << " max = " << max << " count = " << num 

diff --git a/simgear/sky/stars.hxx b/simgear/sky/stars.hxx
index 432bc6218a4017a044a0b9815ff95c189f634f48..4260aad4491fb47362e5dcfc6671b253479e26b1 100644 (file)
--- a/simgear/sky/stars.hxx
+++ b/simgear/sky/stars.hxx
@@ -41,6 +41,8 @@ class SGStars {
     ssgColourArray *cl;
     ssgVertexArray *vl;
 
+    int old_phase;             // data for optimization
+
 public:
 
     // Constructor