[Gcblue-commits] gcb_wx/src/sim Game.cpp, 1.159, 1.160 tcTorpedoObject.cpp, 1.19, 1.20

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

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11768/src/sim

Modified Files:
	Game.cpp tcTorpedoObject.cpp 
Log Message:
Upgraded to OSG 1.2. Tried Demeter 4.0 but had to go back. It's not backwards compatible.
Added border to 3D view, alt-f to toggle frame counter
Fix for passive torpedo bug

Index: tcTorpedoObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcTorpedoObject.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcTorpedoObject.cpp	18 Jun 2006 00:45:04 -0000	1.19
--- tcTorpedoObject.cpp	24 Sep 2006 19:50:20 -0000	1.20
***************
*** 201,205 ****
          seeker->SetActiveSonar();
      }
! 	//seeker->SetActive(false); // override default for passive to always be active
  
      wxString s = wxString::Format("Torp %d-%d", obj->mnID, rand() % 1000);
--- 201,207 ----
          seeker->SetActiveSonar();
      }
! 
! 	seeker->mnMode = SSMODE_SEEKERSEARCH;
! 	seeker->SetActive(false); // override default for passive to always be active
  
      wxString s = wxString::Format("Torp %d-%d", obj->mnID, rand() % 1000);

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** Game.cpp	16 Sep 2006 14:01:24 -0000	1.159
--- Game.cpp	24 Sep 2006 19:50:20 -0000	1.160
***************
*** 104,107 ****
--- 104,108 ----
  EVT_COMMAND(ID_NEWHOOK, wxEVT_COMMAND_BUTTON_CLICKED, tcGame::NewHook)
  EVT_COMMAND(ID_GROUPHOOK, wxEVT_COMMAND_BUTTON_CLICKED, tcGame::NewGroupHook)
+ EVT_COMMAND(ID_DCLICKHOOK, wxEVT_COMMAND_BUTTON_CLICKED, tcGame::DoubleClickHook)
  EVT_COMMAND(ID_SECONDARYHOOK, wxEVT_COMMAND_BUTTON_CLICKED, tcGame::SecondaryHook)
  EVT_COMMAND(ID_SETBRIEFING, wxEVT_COMMAND_BUTTON_CLICKED, tcGame::SetBriefingMode)
***************
*** 219,222 ****
--- 220,235 ----
  }
  
+ /**
+ * m_extraLong has bitfield describing keys pressed during double clidk: 
+ *     1 - shift pressed, 2 - ctrl pressed, 4 - alt pressed
+ */
+ void tcGame::DoubleClickHook(wxCommandEvent& event)
+ {
+ 	unsigned int flags = (unsigned int)(event.GetExtraLong());
+ 
+     pythonInterface->ProcessDoubleClickHook(flags);
+ }
+ 
+ 
  void tcGame::EndGame(wxCommandEvent& event)
  {
***************
*** 566,570 ****
  
  		/* ** Init graphics engine  * **/
! 		mpGraphicsEngine = tcGraphicsEngine::Get();
  		tc3DWindow::Set3DViewer(viewer);
  
--- 579,583 ----
  
  		/* ** Init graphics engine  * **/
! 		mpGraphicsEngine = tcGraphicsInfo::Get();
  		tc3DWindow::Set3DViewer(viewer);
  
***************
*** 1622,1626 ****
  
      viewer->SetCameraSpinRate(0.01f);
! 
  
      if (meScreenMode != DATABASEVIEW)
--- 1635,1639 ----
  
      viewer->SetCameraSpinRate(0.01f);
! 	viewer->SetBorderActive(false);
  
      if (meScreenMode != DATABASEVIEW)
***************
*** 1742,1745 ****
--- 1755,1759 ----
  		oobView->SetActive(drawEdgeWindows);
  		viewer->SetActive(mb3DActive);
+ 		viewer->SetBorderActive(true);
  		gameWindow->SetActive(true);
  
***************
*** 1787,1790 ****
--- 1801,1805 ----
  		worldMap->SetActive(drawTacticalMap);
  		viewer->SetActive(mb3DActive);
+ 		viewer->SetBorderActive(true);
  		gameWindow->SetActive(true);
  
***************
*** 1846,1849 ****
--- 1861,1865 ----
              Update3DSize();
              viewer->SetCameraSpinRate(0.01f);
+ 			viewer->SetBorderActive(false);
              /// reselect display class to update camera range
              databaseViewer->SelectDisplayClass(databaseViewer->GetDisplayClass());
***************
*** 2445,2449 ****
--- 2461,2474 ----
  		}
  
+ 		switch (nChar)
+ 		{
+ 		case 'f':
+ 			tacticalMap->SetShowFrameCounter(!tacticalMap->GetShowFrameCounter());
+ 			break;
+ 		}
+ 		
+ 		return;
  	}
+ 
  	if (controlDown)
      {
***************
*** 2461,2468 ****
  	{
  	case 'a':
  		accelerateTime = 2*(accelerateTime + 1) - 1; 
          if (accelerateTime > 31)
  		{
! 			accelerateTime = 0; // return to normal time after 8x
  		}
  		return;
--- 2486,2494 ----
  	{
  	case 'a':
+ 	case '+':
  		accelerateTime = 2*(accelerateTime + 1) - 1; 
          if (accelerateTime > 31)
  		{
! 			accelerateTime = 31;
  		}
  		return;
***************
*** 2488,2495 ****
          return;
  	case 'A':
  		accelerateTime = (accelerateTime + 1)/2 - 1; 
          if (accelerateTime < 0)
  		{
! 			accelerateTime = 0; // return to normal time after 8x
  		}
  		return;
--- 2514,2522 ----
          return;
  	case 'A':
+ 	case '-':
  		accelerateTime = (accelerateTime + 1)/2 - 1; 
          if (accelerateTime < 0)
  		{
! 			accelerateTime = 0;
  		}
  		return;