[Gcblue-commits] gcb_wx/src/common tcOptions.cpp,1.16,1.17

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26502/src/common

Modified Files:
	tcOptions.cpp 
Log Message:
Fix for horizon darkening bug, option cleanup

Index: tcOptions.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptions.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcOptions.cpp	29 Mar 2005 00:12:25 -0000	1.16
--- tcOptions.cpp	16 Jul 2005 23:12:38 -0000	1.17
***************
*** 56,67 ****
      AddOption(oi);
  
-     oi.meType = tsOptionInfo::OT_RADIOBUTTON;
-     oi.mnStateCount = 3;
-     oi.mnValue = 1;
-     oi.mpAssociated = NULL;
-     oi.mzCaption[0] = "Test 1";
-     oi.mzCaption[1] = "Test 2";
-     oi.mzCaption[2] = "Test 3";
-     AddOption(oi);
  
      oi.meType = tsOptionInfo::OT_RADIOBUTTON;
--- 56,59 ----
***************
*** 81,100 ****
      AddOption(oi);
  
-     oi.meType = tsOptionInfo::OT_RADIOBUTTON;
-     oi.mnStateCount = 2;
-     oi.mnValue = 0;
-     oi.mpAssociated = &mbShowMapDebug;
-     oi.mzCaption[0] = "Map debug OFF";
-     oi.mzCaption[1] = "Map debug ON";
-     AddOption(oi);
  
-     oi.meType = tsOptionInfo::OT_RADIOBUTTON;
-     oi.mnStateCount = 3;
-     oi.mnValue = 0;
-     oi.mpAssociated = &debugLevel;
-     oi.mzCaption[0] = "Debug OFF";
-     oi.mzCaption[1] = "Debug 1";
-     oi.mzCaption[2] = "Debug 2";
-     AddOption(oi);
  
      oi.meType = tsOptionInfo::OT_RADIOBUTTON;
--- 73,77 ----
***************
*** 111,125 ****
      oi.mnValue = 0;
      oi.mpAssociated = &mbFillRangeCircles;
!     oi.mzCaption[0] = "Circle sensor regions";
!     oi.mzCaption[1] = "Filled sensor regions";
      AddOption(oi);
  
-     oi.meType = tsOptionInfo::OT_RADIOBUTTON;
-     oi.mnStateCount = 2;
-     oi.mnValue = 1;
-     oi.mpAssociated = &mbTextureMappedMaps;
-     oi.mzCaption[0] = "Use bitmap maps";
-     oi.mzCaption[1] = "Use texture-mapped maps";
-     AddOption(oi);
  
      oi.meType = tsOptionInfo::OT_RADIOBUTTON;
--- 88,95 ----
      oi.mnValue = 0;
      oi.mpAssociated = &mbFillRangeCircles;
!     oi.mzCaption[0] = "Circle range regions";
!     oi.mzCaption[1] = "Filled range regions";
      AddOption(oi);
  
  
      oi.meType = tsOptionInfo::OT_RADIOBUTTON;
***************
*** 141,144 ****
--- 111,133 ----
      AddOption(oi);
  
+     oi.meType = tsOptionInfo::OT_RADIOBUTTON;
+     oi.mnStateCount = 3;
+     oi.mnValue = 0;
+     oi.mpAssociated = &max3Drange;
+     oi.mzCaption[0] = "50 km 3D range";
+     oi.mzCaption[1] = "75 km 3D range";
+     oi.mzCaption[2] = "100 km 3D range";
+     AddOption(oi);
+ 
+     oi.meType = tsOptionInfo::OT_RADIOBUTTON;
+     oi.mnStateCount = 2;
+     oi.mnValue = 1;
+     oi.mpAssociated = &useFarSceneView;
+     oi.mzCaption[0] = "Faster sceneview";
+     oi.mzCaption[1] = "Reduce z-fighting";
+     AddOption(oi);
+ 
+ 
+ 
      Serialize(true); // read option state from file (options.dat)