[Gcblue-commits] gcb_wx/src/graphics ObjectUpdater.cpp,1.14,1.15 tc3DViewer.cpp,1.11,1.12 tcCreditView.cpp,1.11,1.12 tcHookInfo.cpp,1.7,1.8 tcMapView.cpp,1.19,1.20 tcPopupControl.cpp,1.7,1.8

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

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

Modified Files:
	ObjectUpdater.cpp tc3DViewer.cpp tcCreditView.cpp 
	tcHookInfo.cpp tcMapView.cpp tcPopupControl.cpp 
Log Message:


Index: tcCreditView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcCreditView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcCreditView.cpp	27 Jan 2005 01:01:49 -0000	1.11
--- tcCreditView.cpp	10 Mar 2005 03:28:28 -0000	1.12
***************
*** 56,59 ****
--- 56,65 ----
      AddCredit(s, 40.0f, 1);
  
+     s = "Credits not updated for 0.7 yet";
+     AddCredit(s, 45.0f, 1);
+ 
+     s = "GCB 0.6 Credits";
+     AddCredit(s, 45.0f, 1);
+ 
      s = "Dewitt Colclough";
      AddCredit(s, 25.0f, 1);
***************
*** 62,66 ****
      AddCredit(s, 80.0f, 0);
  
- 
      s = "3D art"; 
      AddCredit(s, 25.0f, 1);
--- 68,71 ----

Index: tcHookInfo.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcHookInfo.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcHookInfo.cpp	5 Mar 2005 22:38:02 -0000	1.7
--- tcHookInfo.cpp	10 Mar 2005 03:28:28 -0000	1.8
***************
*** 297,321 ****
              id = obj->mnDBKey;
              name = obj->mpDBObject->mzClass.mz;
!         }
!         else
!         {   
!             id = -1;
!             name = "Error";
!         }
!         bool matches = false;
!         for(unsigned k=0;(k<classID.size())&&(!matches);k++)
!         {
!             if (classID[k] == id)
              {
!                 matches = true;
!                 quantity[k]++;
              }
          }
!         if (!matches)
!         {
!             classID.push_back(id);
!             quantity.push_back(1);
!             className.Add(name);
          }
      }
  
--- 297,321 ----
              id = obj->mnDBKey;
              name = obj->mpDBObject->mzClass.mz;
! 
!             bool matches = false;
!             for(unsigned k=0;(k<classID.size())&&(!matches);k++)
              {
!                 if (classID[k] == id)
!                 {
!                     matches = true;
!                     quantity[k]++;
!                 }
!             }
!             if (!matches)
!             {
!                 classID.push_back(id);
!                 quantity.push_back(1);
!                 className.Add(name);
              }
          }
!         else
!         {   
          }
+        
      }
  

Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcMapView.cpp	5 Mar 2005 22:38:02 -0000	1.19
--- tcMapView.cpp	10 Mar 2005 03:28:28 -0000	1.20
***************
*** 2378,2382 ****
      mpointMouse = point; 
  
!     if (mpointMouse.x <= nScrollBorder) 
      {
          if (mnScrollState < SCROLL_DELAY) {mnScrollState++;} // allows for delay
--- 2378,2383 ----
      mpointMouse = point; 
  
!     // +200 is a hack to workaround the semi-transparent overlay window 
!     if (mpointMouse.x <= nScrollBorder + 200)
      {
          if (mnScrollState < SCROLL_DELAY) {mnScrollState++;} // allows for delay

Index: tcPopupControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcPopupControl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcPopupControl.cpp	11 Dec 2004 01:09:06 -0000	1.7
--- tcPopupControl.cpp	10 Mar 2005 03:28:28 -0000	1.8
***************
*** 308,313 ****
  tc3DWindow(parent, pos, size, name) 
  {
!     mpointUpperLeft.x = 100;
!     mpointUpperLeft.y = 100;
      mbActive = false;  
      mbRebuildMenu = false;
--- 308,313 ----
  tc3DWindow(parent, pos, size, name) 
  {
!     mpointUpperLeft.x = 250;
!     mpointUpperLeft.y = 150;
      mbActive = false;  
      mbRebuildMenu = false;

Index: ObjectUpdater.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/ObjectUpdater.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ObjectUpdater.cpp	8 Mar 2005 00:41:48 -0000	1.14
--- ObjectUpdater.cpp	10 Mar 2005 03:28:28 -0000	1.15
***************
*** 214,217 ****
--- 214,221 ----
  		z = pos->dz;
  		isVisible = pos->isVisible;
+         if (!isVisible)
+         {
+             z = -50000.0f;
+         }
  	}
  

Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DViewer.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tc3DViewer.cpp	5 Mar 2005 22:37:52 -0000	1.11
--- tc3DViewer.cpp	10 Mar 2005 03:28:28 -0000	1.12
***************
*** 1026,1031 ****
          cameraTarget = cameraPosition*m;
      }
!     // limit min camera altitude unless subsurface obj
!     if ((obj->mpDBObject->mnType & PTYPE_SUBSURFACE) != 0)
      {
          if (cameraPosition._v[2] < -480.0) cameraPosition._v[2] = -480.0; 
--- 1026,1031 ----
          cameraTarget = cameraPosition*m;
      }
!     // limit min camera altitude unless surface or subsurface obj
!     if ((obj->mpDBObject->mnType & (PTYPE_SUBSURFACE | PTYPE_SURFACE)) != 0)
      {
          if (cameraPosition._v[2] < -480.0) cameraPosition._v[2] = -480.0;