[Gcblue-commits] gcb_wx/src/graphics tc3DModel.cpp,1.12,1.13 tcCreditView.cpp,1.1,1.2 tcScenarioSelectView.cpp,1.1,1.2

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

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

Modified Files:
	tc3DModel.cpp tcCreditView.cpp tcScenarioSelectView.cpp 
Log Message:


Index: tcCreditView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcCreditView.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcCreditView.cpp	5 Sep 2004 01:02:02 -0000	1.1
--- tcCreditView.cpp	6 Sep 2004 01:08:03 -0000	1.2
***************
*** 52,58 ****
      AddCredit(s, 40.0f, 1);
  
-     s = "CREDITS NOT UPDATED YET FOR 0.6";
-     AddCredit(s, 75.0f, 1);
- 
      s = "Dewitt Colclough";
      AddCredit(s, 25.0f, 1);
--- 52,55 ----
***************
*** 61,85 ****
      AddCredit(s, 80.0f, 0);
  
-     s = "Marcelo C\341ceres (op4_delta)"; 
-     AddCredit(s, 25.0f, 1);
  
      s = "3D art"; 
-     AddCredit(s, 60.0f, 0);
- 
-     s = "Marco Belli"; 
      AddCredit(s, 25.0f, 1);
  
!     s = "Developer - Sound, Linux port"; 
      AddCredit(s, 60.0f, 0);
  
!     s = "Jason Morris"; 
!     AddCredit(s, 25.0f, 1);
  
-     s = "Developer"; 
-     AddCredit(s, 60.0f, 0);
  
!     s = "Test\n"; 
!     AddCredit(s, 23.0f, 1);
  
      AddCredit(tcString("Marco Belli"), 12.0f, 2);
      AddCredit(tcString("Marcelo C\341ceres"), 12.0f, 2);
--- 58,89 ----
      AddCredit(s, 80.0f, 0);
  
  
      s = "3D art"; 
      AddCredit(s, 25.0f, 1);
  
!     s = "Marcelo C\341ceres (op4_delta)"; 
!     AddCredit(s, 25.0f, 0);
! 
!     s = "Guido Militello"; 
      AddCredit(s, 60.0f, 0);
  
! 	AddCredit(tcString("Other contributors"), 23.0f, 1);
!     AddCredit(tcString("Xavi Rubio (Linux)"), 12.0f, 2);
!     AddCredit(tcString(""), 25.0f, 2);
  
  
!     AddCredit(tcString("Test"), 23.0f, 1);
! 
!     AddCredit(tcString("Dust"), 12.0f, 2);
!     AddCredit(tcString("Marcelo C\341ceres"), 12.0f, 2);
!     AddCredit(tcString(""), 60.0f, 2);
  
+ 
+     AddCredit(tcString("GCB 0.5 Developers"), 23.0f, 1);
+     AddCredit(tcString("Marco Belli"), 12.0f, 2);
+     AddCredit(tcString("Dewitt Colclough"), 12.0f, 2);
+     AddCredit(tcString("Jason Morris"), 45.0f, 2);
+ 
+     AddCredit(tcString("GCB 0.5 Test"), 23.0f, 1);
      AddCredit(tcString("Marco Belli"), 12.0f, 2);
      AddCredit(tcString("Marcelo C\341ceres"), 12.0f, 2);
***************
*** 145,149 ****
      AddCredit(s, 30.0f, 0);
  
!     s = "To those who offered advice through e-mail and \nthe global_conflict discussion group";
      AddCredit(s, 120.0f, 0);
  
--- 149,153 ----
      AddCredit(s, 30.0f, 0);
  
!     s = "To those who provided feedback and suggestions through e-mail and \nthe GCB discussion forums";
      AddCredit(s, 120.0f, 0);
  
***************
*** 243,247 ****
          mpBrush->SetColor(Color(255,255,255,255));
          pGraphics->FillRectangle(mpBrush,0,0,mnWidth,mnHeight);
!         tcSound::Get()->PlayEffect(SEFFECT_EXPLOSION2);
      }
      if (nFlashId >= 0) 
--- 247,251 ----
          mpBrush->SetColor(Color(255,255,255,255));
          pGraphics->FillRectangle(mpBrush,0,0,mnWidth,mnHeight);
!         //tcSound::Get()->PlayEffect(SEFFECT_EXPLOSION2);
      }
      if (nFlashId >= 0) 

Index: tc3DModel.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DModel.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tc3DModel.cpp	9 Aug 2004 02:35:15 -0000	1.12
--- tc3DModel.cpp	6 Sep 2004 01:08:03 -0000	1.13
***************
*** 267,275 ****
  }
  
  void tc3DModel::DetachFromParent()
  {
!     if (modelTransform->getNumParents())
      {
!         modelTransform->getParent(0)->removeChild(modelTransform.get());
      }
  }
--- 267,277 ----
  }
  
+ 
  void tc3DModel::DetachFromParent()
  {
! 	unsigned nParents = modelTransform->getNumParents();
!     for(unsigned n=0; n < nParents; ++n)
      {
!         modelTransform->getParent(n)->removeChild(modelTransform.get());
      }
  }
***************
*** 312,315 ****
--- 314,325 ----
  }
  
+ /**
+ * @return radius of bounding sphere in meters
+ */
+ float tc3DModel::GetRadius()
+ {
+ 	return modelNode.get()->getBound().radius();
+ }
+ 
  void tc3DModel::Load(std::string model_name)
  {

Index: tcScenarioSelectView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcScenarioSelectView.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcScenarioSelectView.cpp	5 Sep 2004 01:02:02 -0000	1.1
--- tcScenarioSelectView.cpp	6 Sep 2004 01:08:03 -0000	1.2
***************
*** 483,487 ****
      wxASSERT(surfaceHost);
  
! 	LoadBackgroundImage("start_background.jpg");
  
      if (config)
--- 483,487 ----
      wxASSERT(surfaceHost);
  
! 	LoadBackgroundImage("start_background_plain.jpg");
  
      if (config)