gcblue-commits — Mailing list for CVS commit messages

[Gcblue-commits] gcb_wx/src/ai BlackboardInterface.cpp,1.3,1.4 BlackboardItem.cpp,1.2,1.3 Brain.cpp,1.11,1.12 Nav.cpp,1.6,1.7 ScriptedTask.cpp,1.2,1.3 ScriptedTaskInterface.cpp,1.4,1.5 SelfPreservation.cpp,1.2,1.3 Task.cpp,1.4,1.5 tcAIData.cpp,1.1,1.2

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

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

Modified Files:
	BlackboardInterface.cpp BlackboardItem.cpp Brain.cpp Nav.cpp 
	ScriptedTask.cpp ScriptedTaskInterface.cpp 
	SelfPreservation.cpp Task.cpp tcAIData.cpp 
Log Message:
vc8 updates

Index: ScriptedTaskInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/ScriptedTaskInterface.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScriptedTaskInterface.cpp	1 Jun 2005 00:13:28 -0000	1.4
--- ScriptedTaskInterface.cpp	23 Mar 2006 01:11:01 -0000	1.5
***************
*** 2,6 ****
  **  @file ScriptedTaskInterface.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file ScriptedTaskInterface.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: Task.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/Task.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Task.cpp	1 Jun 2005 00:13:28 -0000	1.4
--- Task.cpp	23 Mar 2006 01:11:01 -0000	1.5
***************
*** 2,6 ****
  **  @file Task.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file Task.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: SelfPreservation.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/SelfPreservation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelfPreservation.cpp	1 Jun 2005 00:13:28 -0000	1.2
--- SelfPreservation.cpp	23 Mar 2006 01:11:01 -0000	1.3
***************
*** 2,6 ****
  **  @file SelfPreservation.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file SelfPreservation.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: ScriptedTask.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/ScriptedTask.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScriptedTask.cpp	1 Jun 2005 00:13:28 -0000	1.2
--- ScriptedTask.cpp	23 Mar 2006 01:11:01 -0000	1.3
***************
*** 2,6 ****
  **  @file ScriptedTask.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file ScriptedTask.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: BlackboardInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/BlackboardInterface.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlackboardInterface.cpp	12 Dec 2005 02:37:01 -0000	1.3
--- BlackboardInterface.cpp	23 Mar 2006 01:11:01 -0000	1.4
***************
*** 2,6 ****
  **  @file BlackboardInterface.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file BlackboardInterface.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: Brain.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/Brain.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Brain.cpp	12 Dec 2005 02:37:01 -0000	1.11
--- Brain.cpp	23 Mar 2006 01:11:01 -0000	1.12
***************
*** 2,6 ****
  **  @file Brain.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file Brain.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: Nav.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/Nav.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Nav.cpp	8 Dec 2005 23:27:55 -0000	1.6
--- Nav.cpp	23 Mar 2006 01:11:01 -0000	1.7
***************
*** 2,6 ****
  **  @file Nav.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file Nav.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAIData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/tcAIData.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcAIData.cpp	1 Jun 2005 00:13:28 -0000	1.1
--- tcAIData.cpp	23 Mar 2006 01:11:01 -0000	1.2
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: BlackboardItem.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/ai/BlackboardItem.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlackboardItem.cpp	16 Feb 2005 23:13:49 -0000	1.2
--- BlackboardItem.cpp	23 Mar 2006 01:11:01 -0000	1.3
***************
*** 2,6 ****
  **  @file BlackboardItem.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file BlackboardItem.cpp
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/src/network tcAuthenticationMessageHandler.cpp,1.1,1.2 tcConnectionData.cpp,1.14,1.15 tcControlMessageHandler.cpp,1.9,1.10 tcMessage.cpp,1.11,1.12 tcMessageHandler.cpp,1.3,1.4 tcMultiplayerInterface.cpp,1.32,1.33 tcNetworkInterface.cpp,1.21,1.22 tcTextMessageHandler.cpp,1.7,1.8 tcUpdateMessageHandler.cpp,1.18,1.19

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

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

Modified Files:
	tcAuthenticationMessageHandler.cpp tcConnectionData.cpp 
	tcControlMessageHandler.cpp tcMessage.cpp tcMessageHandler.cpp 
	tcMultiplayerInterface.cpp tcNetworkInterface.cpp 
	tcTextMessageHandler.cpp tcUpdateMessageHandler.cpp 
Log Message:
vc8 updates

Index: tcUpdateMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcUpdateMessageHandler.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcUpdateMessageHandler.cpp	10 Sep 2005 21:47:38 -0000	1.18
--- tcUpdateMessageHandler.cpp	23 Mar 2006 01:11:02 -0000	1.19
***************
*** 2,6 ****
  *  @file tcUpdateMessageHandler.cpp
  *
! *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  *  All rights reserved.
  *
--- 2,6 ----
  *  @file tcUpdateMessageHandler.cpp
  *
! *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  *  All rights reserved.
  *

Index: tcMessage.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMessage.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcMessage.cpp	29 Jul 2005 02:35:53 -0000	1.11
--- tcMessage.cpp	23 Mar 2006 01:11:02 -0000	1.12
***************
*** 2,6 ****
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcTextMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcTextMessageHandler.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcTextMessageHandler.cpp	8 May 2005 23:28:58 -0000	1.7
--- tcTextMessageHandler.cpp	23 Mar 2006 01:11:02 -0000	1.8
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcNetworkInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcNetworkInterface.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tcNetworkInterface.cpp	10 Sep 2005 21:47:38 -0000	1.21
--- tcNetworkInterface.cpp	23 Mar 2006 01:11:02 -0000	1.22
***************
*** 1,5 ****
  /** @file tcNetworkInterface.cpp */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcNetworkInterface.cpp */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMessageHandler.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcMessageHandler.cpp	8 Aug 2004 00:31:34 -0000	1.3
--- tcMessageHandler.cpp	23 Mar 2006 01:11:02 -0000	1.4
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcAuthenticationMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcAuthenticationMessageHandler.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcAuthenticationMessageHandler.cpp	6 May 2005 23:57:50 -0000	1.1
--- tcAuthenticationMessageHandler.cpp	23 Mar 2006 01:11:02 -0000	1.2
***************
*** 2,6 ****
  *  @file tcAuthenticationMessageHandler.cpp
  *
! *  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  *  All rights reserved.
  *
--- 2,6 ----
  *  @file tcAuthenticationMessageHandler.cpp
  *
! *  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  *  All rights reserved.
  *

Index: tcConnectionData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcConnectionData.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcConnectionData.cpp	29 Jul 2005 02:35:53 -0000	1.14
--- tcConnectionData.cpp	23 Mar 2006 01:11:02 -0000	1.15
***************
*** 2,6 ****
  **  @file tcConnectionData.cpp
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcConnectionData.cpp
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 105,109 ****
              if (*iter == ackId)
              {
!                 waitForAck.erase(iter);
                  found = true;
              }
--- 105,109 ----
              if (*iter == ackId)
              {
!                 iter = waitForAck.erase(iter);
                  found = true;
              }

Index: tcControlMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcControlMessageHandler.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcControlMessageHandler.cpp	29 Apr 2005 18:52:54 -0000	1.9
--- tcControlMessageHandler.cpp	23 Mar 2006 01:11:02 -0000	1.10
***************
*** 2,6 ****
  *  @file tcControlMessageHandler.cpp
  *
! *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  *  All rights reserved.
  *
--- 2,6 ----
  *  @file tcControlMessageHandler.cpp
  *
! *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  *  All rights reserved.
  *

Index: tcMultiplayerInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMultiplayerInterface.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tcMultiplayerInterface.cpp	10 Sep 2005 21:47:38 -0000	1.32
--- tcMultiplayerInterface.cpp	23 Mar 2006 01:11:02 -0000	1.33
***************
*** 2,6 ****
  **  @file tcMultiplayerInterface.cpp 
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMultiplayerInterface.cpp 
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 54,58 ****
  BEGIN_NAMESPACE(network)
  
- using tcAccountDatabase::UserData;
  
  /**
--- 54,57 ----
***************
*** 343,347 ****
  	if (loginStatus == tcAccountDatabase::SUCCESS)
  	{
! 		UserData userData;
  		tcAccountDatabase::Get()->GetUserData(username, userData);
  		
--- 342,346 ----
  	if (loginStatus == tcAccountDatabase::SUCCESS)
  	{
! 		tcAccountDatabase::UserData userData;
  		tcAccountDatabase::Get()->GetUserData(username, userData);
  		

[Gcblue-commits] gcb_wx/include/sim Game.h,1.65,1.66 commandlist.h,1.10,1.11 gcb.h,1.11,1.12 tcAero.h,1.7,1.8 tcAeroAirObject.h,1.14,1.15 tcAirObject.h,1.14,1.15 tcAirfieldObject.h,1.4,1.5 tcBallisticWeapon.h,1.7,1.8 tcCarrierObject.h,1.13,1.14 tcCommandObject.h,1.4,1.5 tcCommandQueue.h,1.4,1.5 tcControllableObject.h,1.2,1.3 tcDemTileReader.h,1.1,1.2 tcDirector.h,1.10,1.11 tcDirectorEvent.h,1.13,1.14 tcESMSensor.h,1.9,1.10 tcEngagementData.h,1.3,1.4 tcFlightOpsObject.h,1.8,1.9 tcFlightPort.h,1.13,1.14 tcGameObjIterator.h,1.4,1.5 tcGameObject.h,1.44,1.45 tcGoal.h,1.7,1.8 tcGroundObject.h,1.1,1.2 tcGuidanceState.h,1.5,1.6 tcHeloObject.h,1.3,1.4 tcLaunchRequest.h,1.3,1.4 tcLauncher.h,1.24,1.25 tcLauncherState.h,1.18,1.19 tcMapData.h,1.12,1.13 tcMenu.h,1.10,1.11 tcMissileObject.h,1.20,1.21 tcObjectControl.h,1.20,1.21 tcOpticalSensor.h,1.3,1.4 tcPlatformObject.h,1.33,1.34 tcPool.h,1.8,1.9 tcPositionRegistry.h,1.1,1.2 tcRadar.h,1.17,1.18 tcSensorMap.h,1.16,1.17 tcSensorMapTrack.h,1.4,1.5 tcSensorPlatform.h,1.5,1.6 tcSensorState.h,1.21,1.22 tcSensorTrackIterator.h,1.3,1.4 tcSimState.h,1.45,1.46 tcSonar.h,1.6,1.7 tcSonobuoy.h,1.2,1.3 tcStores.h,1.7,1.8 tcSubObject.h,1.10,1.11 tcSurfaceObject.h,1.12,1.13 tcTime.h,1.9,1.10 tcTorpedoObject.h,1.5,1.6 tcUserInfo.h,1.7,1.8 tcUserSelectedGroups.h,1.1,1.2 tcWeaponObject.h,1.9,1.10

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

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15307/include/sim

Modified Files:
	Game.h commandlist.h gcb.h tcAero.h tcAeroAirObject.h 
	tcAirObject.h tcAirfieldObject.h tcBallisticWeapon.h 
	tcCarrierObject.h tcCommandObject.h tcCommandQueue.h 
	tcControllableObject.h tcDemTileReader.h tcDirector.h 
	tcDirectorEvent.h tcESMSensor.h tcEngagementData.h 
	tcFlightOpsObject.h tcFlightPort.h tcGameObjIterator.h 
	tcGameObject.h tcGoal.h tcGroundObject.h tcGuidanceState.h 
	tcHeloObject.h tcLaunchRequest.h tcLauncher.h 
	tcLauncherState.h tcMapData.h tcMenu.h tcMissileObject.h 
	tcObjectControl.h tcOpticalSensor.h tcPlatformObject.h 
	tcPool.h tcPositionRegistry.h tcRadar.h tcSensorMap.h 
	tcSensorMapTrack.h tcSensorPlatform.h tcSensorState.h 
	tcSensorTrackIterator.h tcSimState.h tcSonar.h tcSonobuoy.h 
	tcStores.h tcSubObject.h tcSurfaceObject.h tcTime.h 
	tcTorpedoObject.h tcUserInfo.h tcUserSelectedGroups.h 
	tcWeaponObject.h 
Log Message:
Updates for vc8 compiler

Index: tcSubObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSubObject.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcSubObject.h	26 Jul 2005 00:37:03 -0000	1.10
--- tcSubObject.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 2,6 ****
  **  @file tcSubObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSubObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcTorpedoObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTorpedoObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcTorpedoObject.h	28 Jun 2005 02:51:20 -0000	1.5
--- tcTorpedoObject.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  @file tcTorpedoObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcTorpedoObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMapData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapData.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcMapData.h	28 Jun 2005 02:51:20 -0000	1.12
--- tcMapData.h	22 Mar 2006 01:23:29 -0000	1.13
***************
*** 6,10 ****
  **  Georeferencing info: http://www.ngdc.noaa.gov/seg/topo/report/s5/s5Biii.html 
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 6,10 ----
  **  Georeferencing info: http://www.ngdc.noaa.gov/seg/topo/report/s5/s5Biii.html 
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: gcb.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/gcb.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gcb.h	5 Jan 2006 03:47:22 -0000	1.11
--- gcb.h	22 Mar 2006 01:23:29 -0000	1.12
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcOpticalSensor.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcOpticalSensor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcOpticalSensor.h	1 Jun 2005 00:13:28 -0000	1.3
--- tcOpticalSensor.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcOpticalSensor.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcOpticalSensor.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcGroundObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGroundObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcGroundObject.h	31 Jan 2005 01:32:36 -0000	1.1
--- tcGroundObject.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 2,6 ****
  **  @file tcGroundObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcGroundObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSonar.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSonar.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcSonar.h	7 Jul 2005 01:13:23 -0000	1.6
--- tcSonar.h	22 Mar 2006 01:23:29 -0000	1.7
***************
*** 2,6 ****
  **  @file tcSonar.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSonar.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcHeloObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcHeloObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcHeloObject.h	28 Jun 2005 02:51:20 -0000	1.3
--- tcHeloObject.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcHeloObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcHeloObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSensorTrackIterator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorTrackIterator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcSensorTrackIterator.h	1 Jun 2005 00:13:28 -0000	1.3
--- tcSensorTrackIterator.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 3,7 ****
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSensorMapTrack.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorMapTrack.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSensorMapTrack.h	26 Jul 2005 00:37:03 -0000	1.4
--- tcSensorMapTrack.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 2,6 ****
  **  @file tcSensorMapTrack.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSensorMapTrack.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 108,111 ****
--- 108,112 ----
  	std::vector<long> engaged; ///< vector of weapon ids that are tracking / engaging
  	std::vector<long> ambiguityList; ///< vector of platform ids consistent with detected emitters
+ 
  	static unsigned int ambiguityListUpdates;
  

Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tcLauncher.h	18 Dec 2005 18:48:16 -0000	1.24
--- tcLauncher.h	22 Mar 2006 01:23:29 -0000	1.25
***************
*** 2,6 ****
  **  @file tcLauncher.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcLauncher.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **
***************
*** 128,131 ****
--- 128,133 ----
  	float GetCycleTime() const;
      short int GetErrorCode() const {return errorCode;}
+ 	unsigned GetFireControlTrackCount() const; ///< active FC tracks (0 if N/A)
+ 	unsigned GetMaxFireControlTracks() const; ///< max FC tracks (999 if N/A)
      int GetLauncherStatus();
  	tcGameObject* GetParent() const;

Index: tcCommandObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCommandObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcCommandObject.h	21 May 2005 02:00:28 -0000	1.4
--- tcCommandObject.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 1,5 ****
  /** @file tcCommandObject.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcCommandObject.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcLauncherState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcLauncherState.h	18 Dec 2005 18:48:16 -0000	1.18
--- tcLauncherState.h	22 Mar 2006 01:23:29 -0000	1.19
***************
*** 1,5 ****
  /** @file tcLauncherState.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcLauncherState.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcRadar.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcRadar.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcRadar.h	27 Nov 2005 22:21:28 -0000	1.17
--- tcRadar.h	22 Mar 2006 01:23:29 -0000	1.18
***************
*** 2,7 ****
  **  @file tcRadar.h
  */
! /*
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcRadar.h
  */
! /*  Copyright (C) 2003-2006 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 30,33 ****
--- 29,33 ----
  #include "tcSensorState.h"
  #include "tcRadarDBObject.h"
+ #include <map>
  #include <vector>
  
***************
*** 63,67 ****
  {
  public:
!     tcRadarDBObject *mpDBObj;
  
      // fire-control vars
--- 63,67 ----
  {
  public:
!     tcRadarDBObject* mpDBObj;
  
      // fire-control vars
***************
*** 74,77 ****
--- 74,79 ----
  
      // fire control methods
+ 	unsigned GetFireControlTrackCount() const;
+ 	unsigned GetMaxFireControlTracks() const;
      virtual bool IsTrackAvailable();
      virtual bool RequestTrack();
***************
*** 85,88 ****
--- 87,94 ----
      void Serialize(tcFile& file, bool mbLoad);
  
+     void AddOrUpdateJammer(long id, float powerDensity, float az_rad);
+     bool IsJammed() const;
+     void RemoveJammer(long id);
+ 
      virtual bool IsRadar() const;
      virtual void Update(double t);
***************
*** 99,102 ****
--- 105,113 ----
  
  protected:
+     struct JamInfo
+     {
+         float powerDensity; ///< (Pj/Rj^2) [dB-W/km2]
+         float az_rad; ///< az of jammer
+     };
      bool isSemiactive;
      bool isCommandReceiver;
***************
*** 104,109 ****
  	float target_x_offset_m; ///< offset for seeker target point in model coords
  	float target_y_offset_m; ///< may want to move params like this to a seeker derived class
  
! 	void AdjustTrackForFineTargeting(const tcGameObject* target);
      void UpdateSeeker(double t);
      void UpdateSensorMap(double t, const tcGameObject* target, float range_km);
--- 115,129 ----
  	float target_x_offset_m; ///< offset for seeker target point in model coords
  	float target_y_offset_m; ///< may want to move params like this to a seeker derived class
+     std::map<long, JamInfo> jamMap;
+     float jamConstant;
+     float jammingDegradation_dB;
+     bool isJammed;
  
!     float CalculateJamConstant(); ///< (0.4*pi*Rref^4/Perp simple model assuming 10x jam to radar bw)
!     float CalculateJammingDegradation();
!     void RemoveAllJammers();
!     void UpdateJammingDegradation();
! 
!     void AdjustTrackForFineTargeting(const tcGameObject* target);
      void UpdateSeeker(double t);
      void UpdateSensorMap(double t, const tcGameObject* target, float range_km);

Index: tcFlightOpsObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightOpsObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcFlightOpsObject.h	10 Dec 2005 16:52:02 -0000	1.8
--- tcFlightOpsObject.h	22 Mar 2006 01:23:29 -0000	1.9
***************
*** 3,7 ****
  **  Header for tcFlightOpsObject class.
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 3,7 ----
  **  Header for tcFlightOpsObject class.
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcDemTileReader.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDemTileReader.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcDemTileReader.h	24 Jun 2004 01:43:43 -0000	1.1
--- tcDemTileReader.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 4,8 ****
  **  Header for the tcDemTileReader.h class.
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 4,8 ----
  **  Header for the tcDemTileReader.h class.
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** tcGameObject.h	12 Dec 2005 02:37:01 -0000	1.44
--- tcGameObject.h	22 Mar 2006 01:23:29 -0000	1.45
***************
*** 3,7 ****
  */
  /*
! **  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  */
  /*
! **  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcEngagementData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcEngagementData.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcEngagementData.h	17 Aug 2004 02:22:56 -0000	1.3
--- tcEngagementData.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 1,4 ****
  /**  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcSonobuoy.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSonobuoy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSonobuoy.h	1 Jun 2005 00:13:28 -0000	1.2
--- tcSonobuoy.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcSonobuoy.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSonobuoy.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcFlightPort.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcFlightPort.h	11 Jun 2005 21:01:43 -0000	1.13
--- tcFlightPort.h	22 Mar 2006 01:23:29 -0000	1.14
***************
*** 1,4 ****
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAeroAirObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcAeroAirObject.h	11 Dec 2005 00:34:28 -0000	1.14
--- tcAeroAirObject.h	22 Mar 2006 01:23:29 -0000	1.15
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAirfieldObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirfieldObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcAirfieldObject.h	10 Dec 2005 16:52:02 -0000	1.4
--- tcAirfieldObject.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 2,6 ****
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcBallisticWeapon.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcBallisticWeapon.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcBallisticWeapon.h	1 Jun 2005 00:13:28 -0000	1.7
--- tcBallisticWeapon.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 1,5 ****
  /** @file tcBallisticWeapon.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcBallisticWeapon.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcGoal.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGoal.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcGoal.h	11 Dec 2005 00:34:28 -0000	1.7
--- tcGoal.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 2,6 ****
  **  @file tcGoal.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcGoal.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 44,48 ****
  }
  
! void InitGoalPython(boost::python::dict *dictionary);
  
  class tcGoal
--- 44,48 ----
  }
  
! void InitGoalPython();
  
  class tcGoal

Index: tcStores.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStores.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcStores.h	11 Dec 2005 00:34:28 -0000	1.7
--- tcStores.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 2,6 ****
  **  @file tcStores.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcStores.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcAirObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcAirObject.h	17 Apr 2005 22:35:00 -0000	1.14
--- tcAirObject.h	22 Mar 2006 01:23:29 -0000	1.15
***************
*** 2,6 ****
  **  @file tcAirObject.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcAirObject.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMenu.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMenu.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcMenu.h	18 Dec 2005 04:10:32 -0000	1.10
--- tcMenu.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 37,41 ****
  namespace osg
  {
! 	class ref_ptr;
  	class Geometry;
  }
--- 37,41 ----
  namespace osg
  {
! //	class ref_ptr;
  	class Geometry;
  }

Index: tcTime.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTime.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcTime.h	16 Apr 2005 20:43:56 -0000	1.9
--- tcTime.h	22 Mar 2006 01:23:29 -0000	1.10
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcPositionRegistry.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPositionRegistry.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcPositionRegistry.h	4 Mar 2005 00:46:15 -0000	1.1
--- tcPositionRegistry.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 2,6 ****
  **  @file tcPositionRegistry.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPositionRegistry.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcCarrierObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCarrierObject.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcCarrierObject.h	10 Dec 2005 16:52:02 -0000	1.13
--- tcCarrierObject.h	22 Mar 2006 01:23:29 -0000	1.14
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcSensorPlatform.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorPlatform.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcSensorPlatform.h	28 Jun 2005 02:51:20 -0000	1.5
--- tcSensorPlatform.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  @file tcSensorPlatform.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSensorPlatform.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 59,63 ****
  	{
  		RADAR_ACTIVE = 1,
! 		ACTIVE_SONAR_ACTIVE = 2
  	};
  
--- 59,64 ----
  	{
  		RADAR_ACTIVE = 1,
! 		ACTIVE_SONAR_ACTIVE = 2,
!         ECM_ACTIVE = 4
  	};
  

Index: tcSurfaceObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSurfaceObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcSurfaceObject.h	28 Jun 2005 02:51:20 -0000	1.12
--- tcSurfaceObject.h	22 Mar 2006 01:23:29 -0000	1.13
***************
*** 1,4 ****
  /**  
! *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  *  All rights reserved.
  *
--- 1,4 ----
  /**  
! *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  *  All rights reserved.
  *

Index: tcDirector.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirector.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcDirector.h	1 Jun 2005 00:13:28 -0000	1.10
--- tcDirector.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 2,6 ****
  **  tcDirector.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcDirector.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcObjectControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcObjectControl.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcObjectControl.h	2 Jan 2006 15:40:52 -0000	1.20
--- tcObjectControl.h	22 Mar 2006 01:23:29 -0000	1.21
***************
*** 2,6 ****
  **  @file tcObjectControl.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcObjectControl.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 95,99 ****
      BS_READY, ///< ready for immediate launch
      BS_ACTIVE, ///<  active but launch conditions not satisfied yet
!     BS_LOADING ///< loading item(s) into launcher
  };
  
--- 95,100 ----
      BS_READY, ///< ready for immediate launch
      BS_ACTIVE, ///<  active but launch conditions not satisfied yet
!     BS_LOADING, ///< loading item(s) into launcher
!     BS_WARN ///< used to indicate jamming or warning condition
  };
  

Index: tcGameObjIterator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObjIterator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcGameObjIterator.h	10 Dec 2005 16:52:02 -0000	1.4
--- tcGameObjIterator.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 1,5 ****
  /** @file tcGameObjIterator.h */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcGameObjIterator.h */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 34,38 ****
  {
  public:
!     static SetSimState(tcSimState *ss) {simState = ss;}
  
      void First();
--- 34,38 ----
  {
  public:
!     static void SetSimState(tcSimState *ss) {simState = ss;}
  
      void First();

Index: tcCommandQueue.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCommandQueue.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcCommandQueue.h	18 Dec 2005 04:10:32 -0000	1.4
--- tcCommandQueue.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 2,6 ****
  **  @file tcCommandQueue.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcCommandQueue.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** tcSimState.h	12 Dec 2005 03:20:29 -0000	1.45
--- tcSimState.h	22 Mar 2006 01:23:29 -0000	1.46
***************
*** 2,6 ****
  **  @file tcSimState.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSimState.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 216,226 ****
      void EvaluateTorpedoHit(tcTorpedoObject* torp, tcGameObject* target);
      float GetFractionalDamage(float afDamage, tcGameObject *apGameObj);
-     bool IsDetectedESM(tcESMSensor* apESM, const tcRadar* apEmitterRadar, float& rfAz_rad);
      void PerformAutoEngage(tcGameObject* apGameObj, double afTime);
  	void PlayEntitySoundEffect(tcGameObject* obj, const std::string& effect);
      void ProcessRadarDetection(tcGameObject *apRadarPlat,tcGameObject *apTarget,
          tcRadar *apRadarSS);
-     void ProcessESMDetection(tcGameObject *apESMPlat,tcGameObject *apTarget,
-         tcESMSensor *apESMSS);
      void RegisterPlatform(tcGameObject* obj);
  	void UnregisterPlatform(tcGameObject* obj);
--- 216,223 ----

Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Game.h	5 Jan 2006 03:47:22 -0000	1.65
--- Game.h	22 Mar 2006 01:23:29 -0000	1.66
***************
*** 1,6 ****
  /** 
! ** @file Game.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
--- 1,6 ----
  /** 
! **  @file Game.h
  */
! /*  Copyright (C) 2003-2006 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 213,217 ****
  
      int mbPaused;
!     bool mbQuit; ///< set to true to exit game
      bool mbScenarioEdit; ///< scenario edit mode
      int accelerateTime; ///< time acceleration factor, 0 is no accel, 1 is 2x, 2 is 3x, etc
--- 213,218 ----
  
      int mbPaused;
!     bool mbQuit; ///< set to true to exit game to desktop
! 	bool endGame; ///< set to true to exit game to start screen
      bool mbScenarioEdit; ///< scenario edit mode
      int accelerateTime; ///< time acceleration factor, 0 is no accel, 1 is 2x, 2 is 3x, etc
***************
*** 261,265 ****
  	void OnNcPaint(wxNcPaintEvent& event);
      void OnPaint(wxPaintEvent& event);
!     void OnRButtonDown(wxMouseEvent& event);   
  	void ProcessCallback(tsCommandInfo& cmd); ///< for python interface
      void ProcessCommandList();
--- 262,266 ----
  	void OnNcPaint(wxNcPaintEvent& event);
      void OnPaint(wxPaintEvent& event);
!     void OnRButtonDown(wxMouseEvent& event);
  	void ProcessCallback(tsCommandInfo& cmd); ///< for python interface
      void ProcessCommandList();
***************
*** 278,281 ****
--- 279,283 ----
      void SetTimeAccel(wxCommandEvent& event);
      void ShiftTime(float delta_s); ///< shifts time for sky/environment updates
+ 	void ShowDatabaseInfo();
      void SkipBriefing(wxCommandEvent& event);
      void StartGame(wxCommandEvent& event);

Index: tcWeaponObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcWeaponObject.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcWeaponObject.h	1 Jun 2005 00:13:28 -0000	1.9
--- tcWeaponObject.h	22 Mar 2006 01:23:29 -0000	1.10
***************
*** 1,5 ****
  /** @file tcWeaponObject.h */
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,5 ----
  /** @file tcWeaponObject.h */
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcGuidanceState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGuidanceState.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcGuidanceState.h	20 Jul 2005 16:24:53 -0000	1.5
--- tcGuidanceState.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 1,4 ****
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: commandlist.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/commandlist.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** commandlist.h	10 Dec 2005 16:52:02 -0000	1.10
--- commandlist.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 2,6 ****
  **  @file commandlist.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file commandlist.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 38,41 ****
--- 38,42 ----
     GC_NULL,
     GC_QUIT,
+    GC_QUITTODESKTOP,
     GC_RESETMAP,
     GC_ADDRANDPLAT,

Index: tcLaunchRequest.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLaunchRequest.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcLaunchRequest.h	17 Aug 2004 02:22:56 -0000	1.3
--- tcLaunchRequest.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 1,4 ****
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcPlatformObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** tcPlatformObject.h	11 Dec 2005 00:34:28 -0000	1.33
--- tcPlatformObject.h	22 Mar 2006 01:23:29 -0000	1.34
***************
*** 1,19 ****
! /** @file tcPlatformObject
! *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
! *  All rights reserved.
! *
! *  This file is part of the Global Conflict Blue (GCB) program.
! *  GCB is free software; you can redistribute it and/or modify
! *  it under the terms of version 2 of the GNU General Public License as 
! *  published by the Free Software Foundation.
! *
! *  GCB is distributed in the hope that it will be useful,
! *  but WITHOUT ANY WARRANTY; without even the implied warranty of
! *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! *  GNU General Public License for more details.
! *
! *  You should have received a copy of the GNU General Public License
! *  along with GCB; if not, write to the Free Software
! *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
--- 1,21 ----
! /** 
! **  @file tcPlatformObject
! */  
! /*  Copyright (C) 2003-2006 Dewitt Colclough (de...@gc...)
! **  All rights reserved.
! 
! **  This file is part of the Global Conflict Blue (GCB) program.
! **  GCB is free software; you can redistribute it and/or modify
! **  it under the terms of version 2 of the GNU General Public License as 
! **  published by the Free Software Foundation.
! 
! **  GCB is distributed in the hope that it will be useful,
! **  but WITHOUT ANY WARRANTY; without even the implied warranty of
! **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! **  GNU General Public License for more details.
! 
! **  You should have received a copy of the GNU General Public License
! **  along with GCB; if not, write to the Free Software
! **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  

Index: tcAero.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAero.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcAero.h	1 Jun 2005 00:13:28 -0000	1.7
--- tcAero.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 4,8 ****
  */
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 4,8 ----
  */
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPool.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPool.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcPool.h	20 Jul 2005 16:24:53 -0000	1.8
--- tcPool.h	22 Mar 2006 01:23:29 -0000	1.9
***************
*** 2,6 ****
  **  tcPool.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPool.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 388,392 ****
  /**********************************************************/
  template <class T, int POOLSIZE>
! tcPool<T,POOLSIZE>::tcPool<T,POOLSIZE>()
  {
     mnSize = 0;
--- 388,392 ----
  /**********************************************************/
  template <class T, int POOLSIZE>
! tcPool<T,POOLSIZE>::tcPool()
  {
     mnSize = 0;
***************
*** 405,409 ****
  /**********************************************************/
  template <class T, int POOLSIZE>
! tcPool<T,POOLSIZE>::~tcPool<T,POOLSIZE>() 
  {
     for(tnPoolIndex k=0;k<POOLSIZE;k++) 
--- 405,409 ----
  /**********************************************************/
  template <class T, int POOLSIZE>
! tcPool<T,POOLSIZE>::~tcPool() 
  {
     for(tnPoolIndex k=0;k<POOLSIZE;k++) 

Index: tcUserSelectedGroups.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcUserSelectedGroups.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcUserSelectedGroups.h	28 Dec 2004 00:42:07 -0000	1.1
--- tcUserSelectedGroups.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 1,5 ****
  /** @file tcUserSelectedGroups.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcUserSelectedGroups.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcESMSensor.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcESMSensor.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcESMSensor.h	22 Jun 2005 01:21:27 -0000	1.9
--- tcESMSensor.h	22 Mar 2006 01:23:29 -0000	1.10
***************
*** 1,20 ****
! /*
!  *  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
!  *  All rights reserved.
!  *
!  *  This file is part of the Global Conflict Blue (GCB) program.
!  *  GCB is free software; you can redistribute it and/or modify
!  *  it under the terms of version 2 of the GNU General Public License as 
!  *  published by the Free Software Foundation.
!  *
!  *  GCB is distributed in the hope that it will be useful,
!  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *  GNU General Public License for more details.
!  *
!  *  You should have received a copy of the GNU General Public License
!  *  along with GCB; if not, write to the Free Software
!  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
  
  #ifndef _tcESMSensor_H_
--- 1,22 ----
! /**
! **  @file tcESMSensor.h
! */  
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
! **  All rights reserved.
! 
! **  This file is part of the Global Conflict Blue (GCB) program.
! **  GCB is free software; you can redistribute it and/or modify
! **  it under the terms of version 2 of the GNU General Public License as 
! **  published by the Free Software Foundation.
! 
! **  GCB is distributed in the hope that it will be useful,
! **  but WITHOUT ANY WARRANTY; without even the implied warranty of
! **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! **  GNU General Public License for more details.
! 
! **  You should have received a copy of the GNU General Public License
! **  along with GCB; if not, write to the Free Software
! **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  
  #ifndef _tcESMSensor_H_
***************
*** 30,33 ****
--- 32,36 ----
  
  class tcGameObject;
+ class tcECM;
  class tcRadar;
  class tcStream;
***************
*** 45,49 ****
  	virtual bool CanDetectTarget(const tcGameObject* target, float& range_km);
      virtual bool InitFromDatabase(long key); ///< initializes sensor using database data at key
!     bool IsDetected(const tcRadar* emitter, float& rfAz_rad);
      virtual bool IsESM() const;
      void Serialize(tcFile& file, bool mbLoad);
--- 48,55 ----
  	virtual bool CanDetectTarget(const tcGameObject* target, float& range_km);
      virtual bool InitFromDatabase(long key); ///< initializes sensor using database data at key
!     bool IsDetected(const tcSensorState* emitter, float ERP_dBW, float& az_rad);
!     bool IsDetectedECM(const tcECM* emitter, float& az_rad);
!     bool IsDetectedRadar(const tcRadar* emitter, float& az_rad);
!     
      virtual bool IsESM() const;
      void Serialize(tcFile& file, bool mbLoad);

Index: tcControllableObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcControllableObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcControllableObject.h	26 Jul 2005 00:37:03 -0000	1.2
--- tcControllableObject.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcControllableObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcControllableObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcUserInfo.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcUserInfo.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcUserInfo.h	29 Apr 2005 18:52:02 -0000	1.7
--- tcUserInfo.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 2,6 ****
  **  tcUserInfo.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcUserInfo.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMissileObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMissileObject.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcMissileObject.h	28 Jun 2005 02:51:20 -0000	1.20
--- tcMissileObject.h	22 Mar 2006 01:23:29 -0000	1.21
***************
*** 1,4 ****
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcSensorMap.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorMap.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcSensorMap.h	10 Dec 2005 16:52:02 -0000	1.16
--- tcSensorMap.h	22 Mar 2006 01:23:29 -0000	1.17
***************
*** 3,7 ****
  **  TODO needs cleanup, this area is a mess
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  **  TODO needs cleanup, this area is a mess
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDirectorEvent.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirectorEvent.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcDirectorEvent.h	1 Jun 2005 00:13:28 -0000	1.13
--- tcDirectorEvent.h	22 Mar 2006 01:23:29 -0000	1.14
***************
*** 2,6 ****
  **  tcDirectorEvent.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcDirectorEvent.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 42,49 ****
  class tc3DViewer;
  
- namespace osg
- {
-     class ref_ptr;
- }
  
  namespace osgText
--- 42,45 ----
***************
*** 63,67 ****
      double eventStop;  ///< time in seconds relative to start of director control, end of event
  
!     static AttachEventHandler(wxWindow *win) {eventHandler = win;}
      bool EventStarted(double t) {return t >= eventStart;}
      bool EventFinished(double t) {return t >= eventStop;}
--- 59,63 ----
      double eventStop;  ///< time in seconds relative to start of director control, end of event
  
!     static void AttachEventHandler(wxWindow *win) {eventHandler = win;}
      bool EventStarted(double t) {return t >= eventStart;}
      bool EventFinished(double t) {return t >= eventStop;}

Index: tcSensorState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorState.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tcSensorState.h	5 Jan 2006 03:47:22 -0000	1.21
--- tcSensorState.h	22 Mar 2006 01:23:29 -0000	1.22
***************
*** 2,6 ****
  **  @file tcSensorState.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSensorState.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 85,88 ****
--- 85,89 ----
      bool IsHidden() const;
      
+ 	virtual bool IsECM() const;
      virtual bool IsESM() const;
      virtual bool IsRadar() const;

[Gcblue-commits] gcb_wx/include/graphics ObjectUpdater.h,1.9,1.10 tc3DModel.h,1.20,1.21 tc3DTerrain.h,1.14,1.15 tc3DViewer.h,1.12,1.13 tc3DWindow.h,1.23,1.24 tcAltitudeBarControl.h,1.1,1.2 tcBriefingView.h,1.1,1.2 tcButton.h,1.13,1.14 tcChatBox.h,1.2,1.3 tcConsoleBox.h,1.8,1.9 tcContainerGui.h,1.4,1.5 tcContainerItem.h,1.1,1.2 tcControl.h,1.1,1.2 tcCreditView.h,1.3,1.4 tcDisplayModes.h,1.2,1.3 tcDisplaySettingsView.h,1.4,1.5 tcDragStatus.h,1.1,1.2 tcDraggedIconDisplay.h,1.1,1.2 tcEditBox.h,1.9,1.10 tcFIFO.h,1.4,1.5 tcFlightportGui.h,1.3,1.4 tcGameView.h,1.2,1.3 tcGraphicsEngine.h,1.15,1.16 tcHookInfo.h,1.6,1.7 tcLauncherContainerItem.h,1.2,1.3 tcLauncherPopup.h,1.7,1.8 tcMapObject.h,1.10,1.11 tcMapOverlay.h,1.2,1.3 tcMapView.h,1.27,1.28 tcMessageCenter.h,1.6,1.7 tcMessageChannel.h,1.3,1.4 tcMessageInterface.h,1.6,1.7 tcNetworkView.h,1.5,1.6 tcNumberWidget.h,1.3,1.4 tcOOBView.h,1.7,1.8 tcPanel.h,1.2,1.3 tcParticleEffect.h,1.5,1.6 tcParticlePlacer.h,1.3,1.4 tcPlatformGui.h,1.3,1.4 tcPopupControl.h,1.5,1.6 tcPopupMessage.h,1.1,1.2 tcPopupText.h,1.1,1.2 tcRadioButton.h,1.6,1.7 tcScenarioSelectView.h,1.5,1.6 tcSmoker.h,1.2,1.3 tcStartView.h,1.3,1.4 tcStoresContainerItem.h,1.2,1.3 tcStoresGui.h,1.2,1.3 tcTerrainTextureFactory.h,1.5,1.6 tcTerrainView.h,1.5,1.6 tcXmlWindow.h,1.6,1.7

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

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

Modified Files:
	ObjectUpdater.h tc3DModel.h tc3DTerrain.h tc3DViewer.h 
	tc3DWindow.h tcAltitudeBarControl.h tcBriefingView.h 
	tcButton.h tcChatBox.h tcConsoleBox.h tcContainerGui.h 
	tcContainerItem.h tcControl.h tcCreditView.h tcDisplayModes.h 
	tcDisplaySettingsView.h tcDragStatus.h tcDraggedIconDisplay.h 
	tcEditBox.h tcFIFO.h tcFlightportGui.h tcGameView.h 
	tcGraphicsEngine.h tcHookInfo.h tcLauncherContainerItem.h 
	tcLauncherPopup.h tcMapObject.h tcMapOverlay.h tcMapView.h 
	tcMessageCenter.h tcMessageChannel.h tcMessageInterface.h 
	tcNetworkView.h tcNumberWidget.h tcOOBView.h tcPanel.h 
	tcParticleEffect.h tcParticlePlacer.h tcPlatformGui.h 
	tcPopupControl.h tcPopupMessage.h tcPopupText.h 
	tcRadioButton.h tcScenarioSelectView.h tcSmoker.h 
	tcStartView.h tcStoresContainerItem.h tcStoresGui.h 
	tcTerrainTextureFactory.h tcTerrainView.h tcXmlWindow.h 
Log Message:
Updates for vc8 compiler

Index: tcXmlWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcXmlWindow.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcXmlWindow.h	10 Sep 2005 21:48:06 -0000	1.6
--- tcXmlWindow.h	22 Mar 2006 01:23:29 -0000	1.7
***************
*** 1,5 ****
  /** @file tcXmlWindow.h */
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcXmlWindow.h */
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 53,56 ****
--- 53,57 ----
  protected:
      TiXmlDocument* config; ///< XML auto-configuration file for window
+ 	static int windowLayer;  ///< used to achieve some layering of GUI windows (last always on top)
  
      virtual void OnButtonCommand(wxCommandEvent& event);

Index: tcStoresContainerItem.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcStoresContainerItem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcStoresContainerItem.h	22 Jun 2005 01:21:26 -0000	1.2
--- tcStoresContainerItem.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcStoresContainerItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcStoresContainerItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcOOBView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcOOBView.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcOOBView.h	2 Jan 2006 15:40:52 -0000	1.7
--- tcOOBView.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 3,7 ****
  **  order of battle view window
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  **  order of battle view window
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: ObjectUpdater.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/ObjectUpdater.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ObjectUpdater.h	26 Jul 2005 00:37:02 -0000	1.9
--- ObjectUpdater.h	22 Mar 2006 01:23:28 -0000	1.10
***************
*** 2,6 ****
  **  @file ObjectUpdater.h 
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file ObjectUpdater.h 
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcScenarioSelectView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcScenarioSelectView.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcScenarioSelectView.h	10 Sep 2005 21:48:06 -0000	1.5
--- tcScenarioSelectView.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  @file tcScenarioSelectView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcScenarioSelectView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcParticlePlacer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcParticlePlacer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcParticlePlacer.h	7 Nov 2004 03:40:43 -0000	1.3
--- tcParticlePlacer.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 42,45 ****
--- 42,47 ----
              manually.
          */
+ 		osg::Vec3 getControlPosition() const {return osg::Vec3(0, 0, 0);} // had to add to avoid error C2259
+ 
          inline void place(Particle *P) const;
  		inline void placeAlongPath(Particle *P, float a) const;

Index: tcGraphicsEngine.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcGraphicsEngine.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcGraphicsEngine.h	20 Feb 2005 21:54:32 -0000	1.15
--- tcGraphicsEngine.h	22 Mar 2006 01:23:28 -0000	1.16
***************
*** 2,6 ****
  **  tcGraphicsEngine.h: interface for the tcGraphicsEngine class.
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcGraphicsEngine.h: interface for the tcGraphicsEngine class.
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcFIFO.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcFIFO.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcFIFO.h	8 Aug 2004 00:31:32 -0000	1.4
--- tcFIFO.h	22 Mar 2006 01:23:28 -0000	1.5
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDraggedIconDisplay.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDraggedIconDisplay.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcDraggedIconDisplay.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcDraggedIconDisplay.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file tcDraggedIconDisplay.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcDraggedIconDisplay.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPopupMessage.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcPopupMessage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcPopupMessage.h	14 Nov 2004 22:52:20 -0000	1.1
--- tcPopupMessage.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 2,6 ****
  **  @file tcPopupMessage.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPopupMessage.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcContainerGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcContainerGui.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcContainerGui.h	26 Dec 2005 22:14:03 -0000	1.4
--- tcContainerGui.h	22 Mar 2006 01:23:28 -0000	1.5
***************
*** 2,6 ****
  **  @file tcContainerGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcContainerGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 115,119 ****
  	tcContainerItem* parentItem; ///< item that was clicked to popup this gui (if applicable)
  	static tc3DWindow* parent;
- 	static int windowLayer; ///< used to achieve some layering of GUI windows (last always on top)
  	static std::list<tcContainerGui*> openContainers; ///< to allow closing all open GUIs
  
--- 115,118 ----

Index: tcContainerItem.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcContainerItem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcContainerItem.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcContainerItem.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file tcContainerItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcContainerItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDragStatus.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDragStatus.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcDragStatus.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcDragStatus.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file tcDragStatus.h 
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcDragStatus.h 
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSmoker.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcSmoker.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSmoker.h	27 Jan 2005 01:01:45 -0000	1.2
--- tcSmoker.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcSmoker.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSmoker.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcConsoleBox.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcConsoleBox.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcConsoleBox.h	29 Apr 2005 18:52:01 -0000	1.8
--- tcConsoleBox.h	22 Mar 2006 01:23:28 -0000	1.9
***************
*** 3,7 ****
  */
  /*  
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  */
  /*  
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPopupControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcPopupControl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcPopupControl.h	1 Jun 2005 00:13:27 -0000	1.5
--- tcPopupControl.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  @file tcPopupControl.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPopupControl.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** tcMapView.h	5 Jan 2006 03:47:22 -0000	1.27
--- tcMapView.h	22 Mar 2006 01:23:29 -0000	1.28
***************
*** 2,6 ****
  **  @file tcMapView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMapView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPlatformGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcPlatformGui.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcPlatformGui.h	22 Jun 2005 01:21:26 -0000	1.3
--- tcPlatformGui.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcPlatformGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPlatformGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMapOverlay.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapOverlay.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcMapOverlay.h	8 May 2005 23:27:56 -0000	1.2
--- tcMapOverlay.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcMapOverlay.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMapOverlay.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMessageChannel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMessageChannel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcMessageChannel.h	26 Jul 2005 00:37:02 -0000	1.3
--- tcMessageChannel.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcMessageChannel.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMessageChannel.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcEditBox.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcEditBox.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcEditBox.h	14 Jan 2006 17:13:59 -0000	1.9
--- tcEditBox.h	22 Mar 2006 01:23:28 -0000	1.10
***************
*** 2,6 ****
  **  @file tcEditBox.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcEditBox.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcTerrainView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcTerrainView.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcTerrainView.h	1 Jun 2005 00:13:27 -0000	1.5
--- tcTerrainView.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 1,6 ****
  /*  
! **  tcTerrainView.h
! **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,6 ----
  /*  
! **  @file tcTerrainView.h
! */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcNetworkView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcNetworkView.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcNetworkView.h	10 Sep 2005 21:48:06 -0000	1.5
--- tcNetworkView.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  @file tcNetworkView.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcNetworkView.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcLauncherContainerItem.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcLauncherContainerItem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcLauncherContainerItem.h	22 Jun 2005 01:21:26 -0000	1.2
--- tcLauncherContainerItem.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcStoresContainerItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcStoresContainerItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tc3DModel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DModel.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tc3DModel.h	18 Dec 2005 18:48:15 -0000	1.20
--- tc3DModel.h	22 Mar 2006 01:23:28 -0000	1.21
***************
*** 2,6 ****
  **  @file tc3DModel.h 
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tc3DModel.h 
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDisplaySettingsView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDisplaySettingsView.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcDisplaySettingsView.h	1 Jun 2005 00:13:26 -0000	1.4
--- tcDisplaySettingsView.h	22 Mar 2006 01:23:28 -0000	1.5
***************
*** 2,6 ****
  **  @file tcDisplaySettingsView.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcDisplaySettingsView.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcCreditView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcCreditView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcCreditView.h	2 Oct 2004 22:41:32 -0000	1.3
--- tcCreditView.h	22 Mar 2006 01:23:28 -0000	1.4
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPanel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcPanel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcPanel.h	29 Oct 2004 02:50:43 -0000	1.2
--- tcPanel.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcPanel.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPanel.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tc3DWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DWindow.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** tc3DWindow.h	5 Jan 2006 03:47:22 -0000	1.23
--- tc3DWindow.h	22 Mar 2006 01:23:28 -0000	1.24
***************
*** 2,6 ****
  **  @file tc3DWindow.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tc3DWindow.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 133,157 ****
  
      void DrawText(const char* s, float x, float y, osgText::Font* font, 
! 		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment); 
  
  	/// returns bounding box in r
!     void DrawText(const char* s, float x, float y, osgText::Font* font, 
! 		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment,
! 		tcRect& r); 
  
      void DrawTextInRect(const char* s, const tcRect& r, osgText::Font* font, 
  		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment);
  
-     void DrawTextInRectWrap(const char* s, const tcRect& r, osgText::Font* font, 
- 		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment);
- 
  	/// workaround method for inverted coordinates
      void DrawTextR(const char* s, float x, float y, osgText::Font* font, 
! 		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment); 
  
  	/// workaround method for inverted coordinates
      void DrawTextR(const char* s, float x, float y, osgText::Font* font, 
  		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment,
! 		tcRect& r); 
  
  	/// workaround method for inverted coordinates
--- 133,156 ----
  
      void DrawText(const char* s, float x, float y, osgText::Font* font, 
! 		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment,
! 		float maximumWidth = 0.0); 
  
  	/// returns bounding box in r
!   //  void DrawText(const char* s, float x, float y, osgText::Font* font, 
! 		//const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment,
! 		//float maximumWidth, tcRect& r); 
  
      void DrawTextInRect(const char* s, const tcRect& r, osgText::Font* font, 
  		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment);
  
  	/// workaround method for inverted coordinates
      void DrawTextR(const char* s, float x, float y, osgText::Font* font, 
! 		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment,
! 		float maximumWidth = 0.0); 
  
  	/// workaround method for inverted coordinates
      void DrawTextR(const char* s, float x, float y, osgText::Font* font, 
  		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment,
! 		float maximumWidth, osg::BoundingBox& bb); 
  
  	/// workaround method for inverted coordinates
***************
*** 159,165 ****
  		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment);
  
- 	/// workaround method for inverted coordinates
-     void DrawTextInRectWrapR(const char* s, const tcRect& r, osgText::Font* font, 
- 		const osg::Vec4& color, float fontSize, osgText::Text::AlignmentType alignment);
  
  	void DrawGeometry(osg::Geometry* geometry, float x, float y);
--- 158,161 ----
***************
*** 175,178 ****
--- 171,175 ----
      virtual void Freeze();
  	osgText::Font* GetDefaultFont();
+ 	const osg::BoundingBox& GetLastTextBoundingBox() const;
  	bool IsActive() const {return mbActive;}
  	bool IsBackgroundEnabled() const;
***************
*** 316,319 ****
--- 313,317 ----
  	unsigned int transformIdx;
  
+ 	osg::BoundingBox lastTextBoundingBox; ///< bounding box for last text object
  
  	void UpdateBackgroundQuad();

Index: tcChatBox.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcChatBox.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcChatBox.h	29 Apr 2005 18:52:01 -0000	1.2
--- tcChatBox.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcChatBox.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcChatBox.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcBriefingView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcBriefingView.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcBriefingView.h	14 Sep 2005 01:33:24 -0000	1.1
--- tcBriefingView.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file tcBriefingView.h 
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcBriefingView.h 
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcFlightportGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcFlightportGui.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcFlightportGui.h	18 Dec 2005 18:48:16 -0000	1.3
--- tcFlightportGui.h	22 Mar 2006 01:23:28 -0000	1.4
***************
*** 2,6 ****
  **  @file tcFlightPortGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcFlightPortGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcHookInfo.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcHookInfo.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcHookInfo.h	2 Jan 2006 15:40:52 -0000	1.6
--- tcHookInfo.h	22 Mar 2006 01:23:28 -0000	1.7
***************
*** 2,6 ****
  **  @file tcHookInfo.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcHookInfo.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPopupText.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcPopupText.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcPopupText.h	7 Jul 2005 01:13:23 -0000	1.1
--- tcPopupText.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 2,6 ****
  **  @file tcPopupText.h 
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPopupText.h 
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcNumberWidget.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcNumberWidget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcNumberWidget.h	4 Mar 2005 00:46:15 -0000	1.3
--- tcNumberWidget.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcNumberWidget.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcNumberWidget.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcButton.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcButton.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcButton.h	10 Sep 2005 21:48:06 -0000	1.13
--- tcButton.h	22 Mar 2006 01:23:28 -0000	1.14
***************
*** 2,6 ****
  **  @file tcButton.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcButton.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMessageCenter.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMessageCenter.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcMessageCenter.h	10 Sep 2005 21:48:06 -0000	1.6
--- tcMessageCenter.h	22 Mar 2006 01:23:29 -0000	1.7
***************
*** 2,6 ****
  **  @file tcMessageCenter.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMessageCenter.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcLauncherPopup.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcLauncherPopup.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcLauncherPopup.h	10 Sep 2005 21:48:06 -0000	1.7
--- tcLauncherPopup.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 2,6 ****
  **  @file tcLauncherPopup.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcLauncherPopup.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tc3DTerrain.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DTerrain.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tc3DTerrain.h	10 Sep 2005 21:48:06 -0000	1.14
--- tc3DTerrain.h	22 Mar 2006 01:23:28 -0000	1.15
***************
*** 2,6 ****
  **  @file tc3DTerrain.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tc3DTerrain.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 104,107 ****
--- 104,108 ----
      int update_i;
      bool doGradualUpdate; ///< true to update elevation over multiple frames
+ 	bool terrainShaderOn;
  
      float LonToX(double lon); 

Index: tcControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcControl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcControl.h	23 Nov 2004 23:30:46 -0000	1.1
--- tcControl.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 3,7 ****
  **  Defines base class for ObjectControl GUI view
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  **  Defines base class for ObjectControl GUI view
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMapObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapObject.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcMapObject.h	1 Jun 2005 00:13:26 -0000	1.10
--- tcMapObject.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 2,6 ****
  **  @file tcMapObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMapObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcParticleEffect.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcParticleEffect.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcParticleEffect.h	27 Jan 2005 01:01:44 -0000	1.5
--- tcParticleEffect.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 1,5 ****
  /** @file tcParticleEffect.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcParticleEffect.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcMessageInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMessageInterface.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcMessageInterface.h	29 Jul 2005 02:35:52 -0000	1.6
--- tcMessageInterface.h	22 Mar 2006 01:23:29 -0000	1.7
***************
*** 2,6 ****
  **  @file tcMessageInterface.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMessageInterface.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcStartView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcStartView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcStartView.h	2 Oct 2004 22:41:32 -0000	1.3
--- tcStartView.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcStartView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcStartView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcRadioButton.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcRadioButton.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcRadioButton.h	10 Sep 2005 21:48:06 -0000	1.6
--- tcRadioButton.h	22 Mar 2006 01:23:29 -0000	1.7
***************
*** 2,6 ****
  **  @file tcRadioButton.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcRadioButton.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDisplayModes.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDisplayModes.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcDisplayModes.h	10 Jul 2004 01:51:15 -0000	1.2
--- tcDisplayModes.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 1,5 ****
  /** @file tcDisplayModes.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcDisplayModes.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcGameView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcGameView.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcGameView.h	1 Jun 2005 00:13:26 -0000	1.2
--- tcGameView.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  tcGameView.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcGameView.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcStoresGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcStoresGui.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcStoresGui.h	22 Jun 2005 01:21:26 -0000	1.2
--- tcStoresGui.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcStoresGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcStoresGui.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcTerrainTextureFactory.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcTerrainTextureFactory.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcTerrainTextureFactory.h	26 Jul 2004 01:44:40 -0000	1.5
--- tcTerrainTextureFactory.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  tcTerrainTextureFactory.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcTerrainTextureFactory.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tc3DViewer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DViewer.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tc3DViewer.h	12 Dec 2005 02:37:01 -0000	1.12
--- tc3DViewer.h	22 Mar 2006 01:23:28 -0000	1.13
***************
*** 2,6 ****
  **  @file tc3DViewer.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tc3DViewer.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAltitudeBarControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcAltitudeBarControl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcAltitudeBarControl.h	23 Nov 2004 23:30:46 -0000	1.1
--- tcAltitudeBarControl.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file tcAltitudeBarControl.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcAltitudeBarControl.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/include/database CsvTranslator.h,1.7,1.8 tcAccountDatabase.h,1.2,1.3 tcAirDBObject.h,1.13,1.14 tcBallisticDBObject.h,1.8,1.9 tcDBObjSerializer.h,1.5,1.6 tcDBObjSerializerSql.h,1.5,1.6 tcDBString.h,1.7,1.8 tcDatabase.h,1.12,1.13 tcDatabaseIterator.h,1.2,1.3 tcDatabaseObject.h,1.26,1.27 tcESMDBObject.h,1.8,1.9 tcFixedDBObject.h,1.7,1.8 tcFlightportDBObject.h,1.6,1.7 tcGenericDBObject.h,1.20,1.21 tcItemDBObject.h,1.1,1.2 tcLauncherDBObject.h,1.14,1.15 tcMissileDBObject.h,1.22,1.23 tcOpticalDBObject.h,1.3,1.4 tcRadarDBObject.h,1.14,1.15 tcSensorDBObject.h,1.11,1.12 tcSensorPlatformDBObject.h,1.2,1.3 tcSonarDBObject.h,1.5,1.6 tcSonobuoyDBObject.h,1.2,1.3 tcSqlReader.h,1.5,1.6 tcStoresDBObject.h,1.5,1.6 tcSubDBObject.h,1.2,1.3 tcTorpedoDBObject.h,1.3,1.4 tcWeaponDBObject.h,1.6,1.7

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

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15307/include/database

Modified Files:
	CsvTranslator.h tcAccountDatabase.h tcAirDBObject.h 
	tcBallisticDBObject.h tcDBObjSerializer.h 
	tcDBObjSerializerSql.h tcDBString.h tcDatabase.h 
	tcDatabaseIterator.h tcDatabaseObject.h tcESMDBObject.h 
	tcFixedDBObject.h tcFlightportDBObject.h tcGenericDBObject.h 
	tcItemDBObject.h tcLauncherDBObject.h tcMissileDBObject.h 
	tcOpticalDBObject.h tcRadarDBObject.h tcSensorDBObject.h 
	tcSensorPlatformDBObject.h tcSonarDBObject.h 
	tcSonobuoyDBObject.h tcSqlReader.h tcStoresDBObject.h 
	tcSubDBObject.h tcTorpedoDBObject.h tcWeaponDBObject.h 
Log Message:
Updates for vc8 compiler

Index: tcDatabaseIterator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseIterator.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcDatabaseIterator.h	1 Jun 2005 00:13:26 -0000	1.2
--- tcDatabaseIterator.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcDatabaseIterator.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcDatabaseIterator.h 
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcRadarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcRadarDBObject.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcRadarDBObject.h	28 Jun 2005 02:51:19 -0000	1.14
--- tcRadarDBObject.h	22 Mar 2006 01:23:28 -0000	1.15
***************
*** 2,6 ****
  **  @file tcRadarDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcRadarDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcESMDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcESMDBObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcESMDBObject.h	1 Jun 2005 00:13:26 -0000	1.8
--- tcESMDBObject.h	22 Mar 2006 01:23:28 -0000	1.9
***************
*** 2,6 ****
  **  @file tcESMDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcESMDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAirDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcAirDBObject.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcAirDBObject.h	1 Jun 2005 00:13:25 -0000	1.13
--- tcAirDBObject.h	22 Mar 2006 01:23:28 -0000	1.14
***************
*** 2,6 ****
  **  @file tcAirDBObject.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcAirDBObject.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDBString.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBString.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcDBString.h	12 Jun 2005 20:46:27 -0000	1.7
--- tcDBString.h	22 Mar 2006 01:23:28 -0000	1.8
***************
*** 2,6 ****
  **  tcDBString.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcDBString.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 43,49 ****
          char mz[DB_STRING_SIZE];
          
!         void AssignRandomString(void);
!         void AssignRandomStringB(void);
!         void AssignRandomSuffix(void); // adds random suffix to existing string
          tcDBString& operator= (tcDBString&);
          int operator== (tcDBString&);
--- 43,51 ----
          char mz[DB_STRING_SIZE];
          
!         void AssignRandomString();
!         void AssignRandomStringB();
!         void AssignRandomSuffix(); // adds random suffix to existing string
! 		const char* c_str();
! 
          tcDBString& operator= (tcDBString&);
          int operator== (tcDBString&);

Index: CsvTranslator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/CsvTranslator.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CsvTranslator.h	12 Jun 2005 20:46:26 -0000	1.7
--- CsvTranslator.h	22 Mar 2006 01:23:28 -0000	1.8
***************
*** 2,6 ****
  **  CsvTranslator.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  CsvTranslator.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcStoresDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcStoresDBObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcStoresDBObject.h	25 Jun 2005 22:09:46 -0000	1.5
--- tcStoresDBObject.h	22 Mar 2006 01:23:28 -0000	1.6
***************
*** 2,6 ****
  **  @file tcStoresDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcStoresDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcTorpedoDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcTorpedoDBObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcTorpedoDBObject.h	1 Jun 2005 00:13:26 -0000	1.3
--- tcTorpedoDBObject.h	22 Mar 2006 01:23:28 -0000	1.4
***************
*** 2,6 ****
  **  @file tcTorpedoDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcTorpedoDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSensorDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSensorDBObject.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcSensorDBObject.h	22 Jun 2005 01:21:26 -0000	1.11
--- tcSensorDBObject.h	22 Mar 2006 01:23:28 -0000	1.12
***************
*** 2,6 ****
  **  @file tcSensorDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSensorDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcLauncherDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcLauncherDBObject.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcLauncherDBObject.h	25 Jun 2005 22:09:46 -0000	1.14
--- tcLauncherDBObject.h	22 Mar 2006 01:23:28 -0000	1.15
***************
*** 2,6 ****
  **  @file tcLauncherDBObject.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcLauncherDBObject.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcWeaponDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcWeaponDBObject.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcWeaponDBObject.h	1 Jun 2005 00:13:26 -0000	1.6
--- tcWeaponDBObject.h	22 Mar 2006 01:23:28 -0000	1.7
***************
*** 2,6 ****
  **  @file tcWeaponDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcWeaponDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSonobuoyDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSonobuoyDBObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSonobuoyDBObject.h	1 Jun 2005 00:13:26 -0000	1.2
--- tcSonobuoyDBObject.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcSonobuoyDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSonobuoyDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcItemDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcItemDBObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcItemDBObject.h	12 Jun 2005 20:46:27 -0000	1.1
--- tcItemDBObject.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file tcItemDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcItemDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcBallisticDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcBallisticDBObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcBallisticDBObject.h	1 Jun 2005 00:13:25 -0000	1.8
--- tcBallisticDBObject.h	22 Mar 2006 01:23:28 -0000	1.9
***************
*** 2,6 ****
  **  @file tcBallisticDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcBallisticDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAccountDatabase.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcAccountDatabase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcAccountDatabase.h	16 Sep 2005 00:16:08 -0000	1.2
--- tcAccountDatabase.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcAccountDatabase.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcAccountDatabase.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcFlightportDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFlightportDBObject.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcFlightportDBObject.h	1 Jun 2005 00:13:26 -0000	1.6
--- tcFlightportDBObject.h	22 Mar 2006 01:23:28 -0000	1.7
***************
*** 1,5 ****
  /** @file tcFlightportDBObject.h */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcFlightportDBObject.h */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSonarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSonarDBObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcSonarDBObject.h	28 Jun 2005 02:51:19 -0000	1.5
--- tcSonarDBObject.h	22 Mar 2006 01:23:28 -0000	1.6
***************
*** 2,6 ****
  **  @file tcSonarDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSonarDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDatabaseObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** tcDatabaseObject.h	7 Jul 2005 01:13:23 -0000	1.26
--- tcDatabaseObject.h	22 Mar 2006 01:23:28 -0000	1.27
***************
*** 2,6 ****
  **  @file tcDatabaseObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcDatabaseObject.h
  */
! /*  Copyright (C) 2003-2006 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 118,132 ****
  #define DTYPE_CM 18
  #define DTYPE_SUBMARINE 19
  #define DTYPE_NULL 0xFFFFFFFF
      
      
!     /*************** SENSOR ********************/
! #define STYPE_RADAR 0
! #define STYPE_ESM 1
! #define STYPE_ACTIVESONAR 2
! #define STYPE_PASSIVESONAR 3
! #define STYPE_SARADAR 4
! #define STYPE_SALASER 5
! #define STYPE_ACTIVELASER 6
      
      
--- 118,126 ----
  #define DTYPE_CM 18
  #define DTYPE_SUBMARINE 19
+ #define DTYPE_ECM 20
  #define DTYPE_NULL 0xFFFFFFFF
      
      
! 
      
      
***************
*** 140,144 ****
          UINT mnClassID;                     ///< DTYPE_ class identifier, identifies database class, may be obsolete with dynamic casting
          UINT mnType;                        ///< functional classification type: helo, air, surf, sub, land
!         UINT mnModelType;                   ///<  model class to use, e.g. tcSurfaceObject, tcAirObject
          tcDBString mzImageFileName;         ///< used for icon file name
          tcDBString mz3DModelFileName;
--- 134,139 ----
          UINT mnClassID;                     ///< DTYPE_ class identifier, identifies database class, may be obsolete with dynamic casting
          UINT mnType;                        ///< functional classification type: helo, air, surf, sub, land
!         UINT mnModelType;                   ///< model class to use, e.g. tcSurfaceObject, tcAirObject
!         float cost;                         ///< default cost for scoring purposes
          tcDBString mzImageFileName;         ///< used for icon file name
          tcDBString mz3DModelFileName;
***************
*** 147,150 ****
--- 142,146 ----
          static void AttachDatabase(tcDatabase *db) {database = db;}
          virtual const char* GetClassName() {return "Object";} ///< returns class name of database object
+         const char* GetCostString() const; ///< return cost as string
          virtual tc3DModel* Copy3DModel(); ///< creates copy of model (must be deleted)
          virtual tc3DModel* Get3DModel(); ///< gets pointer to database model
***************
*** 153,157 ****
          void Load3DModel();
  		void LoadIcon();
!         void RandInit(void);
          virtual void PrintToFile(tcFile& file);
          int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);
--- 149,153 ----
          void Load3DModel();
  		void LoadIcon();
!         void RandInit();
          virtual void PrintToFile(tcFile& file);
          int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);

Index: tcSqlReader.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSqlReader.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcSqlReader.h	16 Sep 2005 00:16:08 -0000	1.5
--- tcSqlReader.h	22 Mar 2006 01:23:28 -0000	1.6
***************
*** 2,6 ****
  **  @file tcSqlReader.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcSqlReader.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcDBObjSerializerSql.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBObjSerializerSql.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcDBObjSerializerSql.h	16 Sep 2005 00:16:08 -0000	1.5
--- tcDBObjSerializerSql.h	22 Mar 2006 01:23:28 -0000	1.6
***************
*** 2,6 ****
  **  @file tcDBObjSerializerSql.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcDBObjSerializerSql.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMissileDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcMissileDBObject.h	18 Dec 2005 04:10:32 -0000	1.22
--- tcMissileDBObject.h	22 Mar 2006 01:23:28 -0000	1.23
***************
*** 2,6 ****
  **  @file tcMissileDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMissileDBObject.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcGenericDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcGenericDBObject.h	18 Dec 2005 18:48:15 -0000	1.20
--- tcGenericDBObject.h	22 Mar 2006 01:23:28 -0000	1.21
***************
*** 2,6 ****
  **  tcGenericDBObject.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcGenericDBObject.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 85,89 ****
          std::vector<animationDBInfo> animationInfo;
  
! 
          virtual const char* GetClassName() {return "Generic";} ///< returns class name of database object
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
--- 85,89 ----
          std::vector<animationDBInfo> animationInfo;
  
! 		tcDatabaseObject* AsDatabaseObject();
          virtual const char* GetClassName() {return "Generic";} ///< returns class name of database object
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj

Index: tcFixedDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFixedDBObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcFixedDBObject.h	1 Jun 2005 00:13:26 -0000	1.7
--- tcFixedDBObject.h	22 Mar 2006 01:23:28 -0000	1.8
***************
*** 2,6 ****
  **  tcFixedDBObject.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcFixedDBObject.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSensorPlatformDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSensorPlatformDBObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSensorPlatformDBObject.h	1 Jun 2005 00:13:26 -0000	1.2
--- tcSensorPlatformDBObject.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcSensorPlatformDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSensorPlatformDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSubDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSubDBObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSubDBObject.h	10 Jul 2005 20:32:01 -0000	1.2
--- tcSubDBObject.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcSubDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSubDBObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcDBObjSerializer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBObjSerializer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcDBObjSerializer.h	1 Jun 2005 00:13:25 -0000	1.5
--- tcDBObjSerializer.h	22 Mar 2006 01:23:28 -0000	1.6
***************
*** 2,6 ****
  **  @file tcDBObjSerializer.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcDBObjSerializer.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcDatabase.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabase.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcDatabase.h	22 Jun 2005 01:21:25 -0000	1.12
--- tcDatabase.h	22 Mar 2006 01:23:28 -0000	1.13
***************
*** 2,6 ****
  **  @file tcDatabase.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcDatabase.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcOpticalDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcOpticalDBObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcOpticalDBObject.h	1 Jun 2005 00:13:26 -0000	1.3
--- tcOpticalDBObject.h	22 Mar 2006 01:23:28 -0000	1.4
***************
*** 2,6 ****
  **  @file tcOpticalDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcOpticalDBObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/include/network tcAuthenticationMessageHandler.h,1.1,1.2 tcConnectionData.h,1.11,1.12 tcControlMessageHandler.h,1.8,1.9 tcMessage.h,1.9,1.10 tcMessageHandler.h,1.4,1.5 tcMultiplayerInterface.h,1.27,1.28 tcNetworkInterface.h,1.13,1.14 tcTextMessageHandler.h,1.3,1.4 tcUpdateMessageHandler.h,1.11,1.12

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

Update of /cvsroot/gcblue/gcb_wx/include/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15307/include/network

Modified Files:
	tcAuthenticationMessageHandler.h tcConnectionData.h 
	tcControlMessageHandler.h tcMessage.h tcMessageHandler.h 
	tcMultiplayerInterface.h tcNetworkInterface.h 
	tcTextMessageHandler.h tcUpdateMessageHandler.h 
Log Message:
Updates for vc8 compiler

Index: tcMessageHandler.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMessageHandler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcMessageHandler.h	8 Aug 2004 00:31:32 -0000	1.4
--- tcMessageHandler.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 1,5 ****
  /** @file tcMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,5 ----
  /** @file tcMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcMultiplayerInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMultiplayerInterface.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** tcMultiplayerInterface.h	10 Sep 2005 21:48:06 -0000	1.27
--- tcMultiplayerInterface.h	22 Mar 2006 01:23:29 -0000	1.28
***************
*** 2,6 ****
  **  @file tcMultiplayerInterface.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcMultiplayerInterface.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMessage.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMessage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcMessage.h	29 Jul 2005 02:35:52 -0000	1.9
--- tcMessage.h	22 Mar 2006 01:23:29 -0000	1.10
***************
*** 2,6 ****
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcConnectionData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcConnectionData.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcConnectionData.h	29 Jul 2005 02:35:52 -0000	1.11
--- tcConnectionData.h	22 Mar 2006 01:23:29 -0000	1.12
***************
*** 2,6 ****
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcTextMessageHandler.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcTextMessageHandler.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcTextMessageHandler.h	8 Aug 2004 00:31:32 -0000	1.3
--- tcTextMessageHandler.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 1,5 ****
  /** @file tcTextMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,5 ----
  /** @file tcTextMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcNetworkInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcNetworkInterface.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcNetworkInterface.h	10 Sep 2005 21:48:06 -0000	1.13
--- tcNetworkInterface.h	22 Mar 2006 01:23:29 -0000	1.14
***************
*** 2,6 ****
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcControlMessageHandler.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcControlMessageHandler.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcControlMessageHandler.h	29 Apr 2005 18:52:02 -0000	1.8
--- tcControlMessageHandler.h	22 Mar 2006 01:23:29 -0000	1.9
***************
*** 1,5 ****
  /** @file tcControlMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,5 ----
  /** @file tcControlMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcUpdateMessageHandler.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcUpdateMessageHandler.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcUpdateMessageHandler.h	10 Sep 2005 21:48:06 -0000	1.11
--- tcUpdateMessageHandler.h	22 Mar 2006 01:23:29 -0000	1.12
***************
*** 1,5 ****
  /** @file tcUpdateMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,5 ----
  /** @file tcUpdateMessageHandler.h
   *
!  *  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcAuthenticationMessageHandler.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcAuthenticationMessageHandler.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcAuthenticationMessageHandler.h	6 May 2005 23:57:15 -0000	1.1
--- tcAuthenticationMessageHandler.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 2,6 ****
  **  @file tcAuthenticationMessageHandler.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcAuthenticationMessageHandler.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/include/scriptinterface tcFlightPortInterface.h,1.8,1.9 tcGroupInterface.h,1.3,1.4 tcPanelInterface.h,1.5,1.6 tcPlatformInterface.h,1.48,1.49 tcPythonInterface.h,1.6,1.7 tcScenarioInterface.h,1.25,1.26 tcScenarioLogger.h,1.2,1.3 tcSimPythonInterface.h,1.31,1.32 tcSubInterface.h,1.5,1.6 tcTrackInterface.h,1.8,1.9

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

Update of /cvsroot/gcblue/gcb_wx/include/scriptinterface
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15307/include/scriptinterface

Modified Files:
	tcFlightPortInterface.h tcGroupInterface.h tcPanelInterface.h 
	tcPlatformInterface.h tcPythonInterface.h 
	tcScenarioInterface.h tcScenarioLogger.h 
	tcSimPythonInterface.h tcSubInterface.h tcTrackInterface.h 
Log Message:
Updates for vc8 compiler

Index: tcPlatformInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPlatformInterface.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** tcPlatformInterface.h	12 Dec 2005 02:37:01 -0000	1.48
--- tcPlatformInterface.h	22 Mar 2006 01:23:29 -0000	1.49
***************
*** 2,6 ****
  **  @file tcPlatformInterface.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPlatformInterface.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 62,65 ****
--- 62,67 ----
          double sectorCenter; ///< az of center of launch engagement sector in deg
          double sectorWidth;  ///< width of engagement sector in deg
+ 		int fireControlTracks; ///< number of active FC tracks (0 if N/A)
+ 		int maxFireControlTracks; ///< max number of FC tracks (999 if N/A)
  
          bool IsValid() const {return mnLauncher != -1;}

Index: tcTrackInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcTrackInterface.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcTrackInterface.h	22 Jun 2005 01:21:26 -0000	1.8
--- tcTrackInterface.h	22 Mar 2006 01:23:29 -0000	1.9
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcScenarioInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcScenarioInterface.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** tcScenarioInterface.h	18 Dec 2005 18:48:16 -0000	1.25
--- tcScenarioInterface.h	22 Mar 2006 01:23:29 -0000	1.26
***************
*** 2,6 ****
  **  tcScenarioInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcScenarioInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 190,194 ****
          static object GetInterface();
          static void InitPythonClasses();
!         static void AddGoalClasses(boost::python::dict *dictionary);
          static void AttachDirector(tcDirector *dir) {director = dir;}
          static void AttachMapData(tcMapData *md) {mapData = md;}
--- 190,194 ----
          static object GetInterface();
          static void InitPythonClasses();
!         static void AddGoalClasses();
          static void AttachDirector(tcDirector *dir) {director = dir;}
          static void AttachMapData(tcMapData *md) {mapData = md;}

Index: tcScenarioLogger.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcScenarioLogger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcScenarioLogger.h	12 Dec 2005 02:37:01 -0000	1.2
--- tcScenarioLogger.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcScenarioLogger.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcScenarioLogger.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPythonInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPythonInterface.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcPythonInterface.h	1 Jun 2005 00:13:27 -0000	1.6
--- tcPythonInterface.h	22 Mar 2006 01:23:29 -0000	1.7
***************
*** 2,6 ****
  **  tcPythonInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPythonInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 32,70 ****
  #endif // WIN32
  #include <string>
! //#include <boost/python.hpp>
  
! namespace boost
! {
!     namespace python
!     {
!         class dict;
!     }
! }
  
  using namespace boost::python;
  
! namespace scriptinterface {
!     class tcPythonInterface {
      public:
!         dict *mpDictionary;
  
!         void Test(void);
!         void Test2(void);
!         void Test3(void);
!         void Test4(void);
          char* ReadFile(const char* filename); 
  
!         tcPythonInterface(void);
!         virtual ~tcPythonInterface(void);
      };
  
!     typedef struct _world {
          void set(std::string msg) { this->msg = msg; }
          std::string greet() { return msg; }
          std::string msg;
!     } World;
  
  
!     class tcOutside {
      public:
          int maValues[10];
--- 32,79 ----
  #endif // WIN32
  #include <string>
! #include <boost/python.hpp>
  
! //namespace boost
! //{
! //    namespace python
! //    {
! //		namespace api
! //		{
! //			class object;
! //		}
! //    }
! //}
  
  using namespace boost::python;
  
! namespace scriptinterface 
! {
!     class tcPythonInterface 
! 	{
      public:
! 		object main_module;
! 		object main_namespace;
!         //dict *mpDictionary;
  
!         void Test();
!         void Test2();
!         void Test3();
!         void Test4();
          char* ReadFile(const char* filename); 
  
!         tcPythonInterface();
!         virtual ~tcPythonInterface();
      };
  
!     struct World 
! 	{
          void set(std::string msg) { this->msg = msg; }
          std::string greet() { return msg; }
          std::string msg;
!     };
  
  
!     class tcOutside 
! 	{
      public:
          int maValues[10];
***************
*** 73,77 ****
      };
  
!     class tcTest {
      public:
          int x;
--- 82,87 ----
      };
  
!     class tcTest 
! 	{
      public:
          int x;
***************
*** 80,86 ****
  
          int cube(int n) {return n*n*n;}
!         void setytox2(void) {y = cube(x);}
          void setx(int ax) {x = ax;}
!         int gety(void) {return y;}
          int geto(int n) {
              if (mpOutside==NULL) {return -2;} 
--- 90,96 ----
  
          int cube(int n) {return n*n*n;}
!         void setytox2() {y = cube(x);}
          void setx(int ax) {x = ax;}
!         int gety() {return y;}
          int geto(int n) {
              if (mpOutside==NULL) {return -2;} 

Index: tcSimPythonInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcSimPythonInterface.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** tcSimPythonInterface.h	18 Dec 2005 04:10:32 -0000	1.31
--- tcSimPythonInterface.h	22 Mar 2006 01:23:29 -0000	1.32
***************
*** 82,88 ****
  		void AddItemUIWithTextParam(const std::string& caption, const std::string& callback, 
  			const std::string& input, const std::string &textParam);
!         void BeginSubMenu(void);
!         void Clear(void);
!         void EndSubMenu(void);
  
          static void AttachMenu(tcMenu *apMenu) {mpMenu = apMenu;}
--- 82,88 ----
  		void AddItemUIWithTextParam(const std::string& caption, const std::string& callback, 
  			const std::string& input, const std::string &textParam);
!         void BeginSubMenu();
!         void Clear();
!         void EndSubMenu();
  
          static void AttachMenu(tcMenu *apMenu) {mpMenu = apMenu;}
***************
*** 166,170 ****
      private:
          tcSimPythonInterface();
!         ~tcSimPythonInterface();
  
  		bool showPythonErrors; ///< true to send python errors to F7 console in game
--- 166,170 ----
      private:
          tcSimPythonInterface();
!         virtual ~tcSimPythonInterface();
  
  		bool showPythonErrors; ///< true to send python errors to F7 console in game

Index: tcGroupInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcGroupInterface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcGroupInterface.h	1 Jun 2005 00:13:27 -0000	1.3
--- tcGroupInterface.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcGroupInterface.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcGroupInterface.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcFlightPortInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcFlightPortInterface.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcFlightPortInterface.h	22 Jun 2005 01:21:26 -0000	1.8
--- tcFlightPortInterface.h	22 Mar 2006 01:23:29 -0000	1.9
***************
*** 2,6 ****
  **  tcFlightPortInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcFlightPortInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcPanelInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPanelInterface.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcPanelInterface.h	1 Jun 2005 00:13:27 -0000	1.5
--- tcPanelInterface.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  tcPanelInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPanelInterface.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSubInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcSubInterface.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcSubInterface.h	14 Jul 2005 23:41:50 -0000	1.5
--- tcSubInterface.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 1,5 ****
  /*  @file tcSubInterface.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /*  @file tcSubInterface.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/include/common AError.h,1.4,1.5 math_constants.h,1.11,1.12 nsNav.h,1.8,1.9 simmath.h,1.33,1.34 tc3DPoint.h,1.1,1.2 tcFile.h,1.8,1.9 tcObjStream.h,1.2,1.3 tcOggStreamer.h,1.9,1.10 tcOptions.h,1.12,1.13 tcOptionsView.h,1.10,1.11 tcRect.h,1.1,1.2 tcSound.h,1.22,1.23 tcSoundConsole.h,1.13,1.14 tcStream.h,1.11,1.12 tcString.h,1.4,1.5 util.h,1.4,1.5 wxcommands.h,1.21,1.22

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

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

Modified Files:
	AError.h math_constants.h nsNav.h simmath.h tc3DPoint.h 
	tcFile.h tcObjStream.h tcOggStreamer.h tcOptions.h 
	tcOptionsView.h tcRect.h tcSound.h tcSoundConsole.h tcStream.h 
	tcString.h util.h wxcommands.h 
Log Message:
Updates for vc8 compiler

Index: nsNav.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/nsNav.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** nsNav.h	1 Jun 2005 00:13:25 -0000	1.8
--- nsNav.h	22 Mar 2006 01:23:28 -0000	1.9
***************
*** 1,4 ****
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcRect.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcRect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcRect.h	14 Nov 2004 22:52:19 -0000	1.1
--- tcRect.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file tcRect.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcRect.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: wxcommands.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/wxcommands.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxcommands.h	10 Sep 2005 21:48:06 -0000	1.21
--- wxcommands.h	22 Mar 2006 01:23:28 -0000	1.22
***************
*** 3,7 ****
  **  IDs for commands processed via wxWindows event handler.
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  **  IDs for commands processed via wxWindows event handler.
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSound.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSound.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcSound.h	10 Sep 2005 21:48:06 -0000	1.22
--- tcSound.h	22 Mar 2006 01:23:28 -0000	1.23
***************
*** 2,6 ****
  **  @file tcSound.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSound.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcOptions.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcOptions.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcOptions.h	16 Jul 2005 23:10:59 -0000	1.12
--- tcOptions.h	22 Mar 2006 01:23:28 -0000	1.13
***************
*** 2,6 ****
  **  @file tcOptions.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcOptions.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 72,75 ****
--- 72,77 ----
  	int max3Drange; ///< 0 - 50 km, 1 - 75 km, 2 - 100 km
  	int useFarSceneView; ///< 0 - only one scene view, 1 - use near and far scene views (help with z-fighting)
+ 	int terrainShaderOn; ///< 1 - enable terrain elevation shader
+ 	int shadersOn; ///< 0 - 3D shaders disabled, 1 - shaders activated
  
  	/// 0 - own-alliance only, 1 - raw track data,  2 - add true pitch roll if available, 3 - use true data if avail

Index: tcStream.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcStream.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcStream.h	22 Jun 2005 01:21:25 -0000	1.11
--- tcStream.h	22 Mar 2006 01:23:28 -0000	1.12
***************
*** 2,6 ****
  **  @file tcStream.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcStream.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: math_constants.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/math_constants.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** math_constants.h	1 Jun 2005 00:13:25 -0000	1.11
--- math_constants.h	22 Mar 2006 01:23:28 -0000	1.12
***************
*** 1,4 ****
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tc3DPoint.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tc3DPoint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tc3DPoint.h	6 Aug 2004 02:47:50 -0000	1.1
--- tc3DPoint.h	22 Mar 2006 01:23:28 -0000	1.2
***************
*** 2,6 ****
  **  @file simmath.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file simmath.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcOggStreamer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcOggStreamer.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcOggStreamer.h	15 Mar 2005 00:36:23 -0000	1.9
--- tcOggStreamer.h	22 Mar 2006 01:23:28 -0000	1.10
***************
*** 2,6 ****
  **  @file tcOggStreamer.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcOggStreamer.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcString.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcString.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcString.h	8 Aug 2004 00:31:32 -0000	1.4
--- tcString.h	22 Mar 2006 01:23:28 -0000	1.5
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: simmath.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** simmath.h	27 Nov 2005 22:21:28 -0000	1.33
--- simmath.h	22 Mar 2006 01:23:28 -0000	1.34
***************
*** 4,8 ****
  **  file for better modularity.
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 4,8 ----
  **  file for better modularity.
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcObjStream.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcObjStream.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcObjStream.h	17 Apr 2005 22:34:59 -0000	1.2
--- tcObjStream.h	22 Mar 2006 01:23:28 -0000	1.3
***************
*** 2,6 ****
  **  @file tcObjStream.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcObjStream.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: util.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/util.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** util.h	8 Aug 2004 00:31:32 -0000	1.4
--- util.h	22 Mar 2006 01:23:28 -0000	1.5
***************
*** 2,6 ****
  **  util.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  util.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSoundConsole.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSoundConsole.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcSoundConsole.h	2 Jan 2006 15:40:52 -0000	1.13
--- tcSoundConsole.h	22 Mar 2006 01:23:28 -0000	1.14
***************
*** 2,6 ****
  **  @file tcSoundConsole.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSoundConsole.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: AError.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/AError.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AError.h	8 Aug 2004 00:31:31 -0000	1.4
--- AError.h	22 Mar 2006 01:23:28 -0000	1.5
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcOptionsView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcOptionsView.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcOptionsView.h	2 Oct 2004 22:41:32 -0000	1.10
--- tcOptionsView.h	22 Mar 2006 01:23:28 -0000	1.11
***************
*** 2,6 ****
  **  @file tcOptionsView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcOptionsView.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcFile.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcFile.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcFile.h	10 Dec 2005 16:52:02 -0000	1.8
--- tcFile.h	22 Mar 2006 01:23:28 -0000	1.9
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/include stdwx.h,1.4,1.5

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

Update of /cvsroot/gcblue/gcb_wx/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15307/include

Modified Files:
	stdwx.h 
Log Message:
Updates for vc8 compiler

Index: stdwx.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/stdwx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** stdwx.h	24 May 2004 00:14:46 -0000	1.4
--- stdwx.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 1,5 ****
  // precompiled headers are only used for WIN32
  #ifdef WIN32
! #pragma warning (disable:4312) 
  #include "wx/wxprec.h"      // wxwindows precompiled / standard headers, defines WX_PRECOMP
  #include "wx/msw/private.h" // for MS Windows specific definitions
--- 1,6 ----
  // precompiled headers are only used for WIN32
  #ifdef WIN32
! #pragma warning (disable : 4312) 
! #pragma warning (disable : 4996) // 'strdup' was declared deprecated
  #include "wx/wxprec.h"      // wxwindows precompiled / standard headers, defines WX_PRECOMP
  #include "wx/msw/private.h" // for MS Windows specific definitions

[Gcblue-commits] gcb_wx/docs CHANGES.txt,1.51,1.52

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

Update of /cvsroot/gcblue/gcb_wx/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14813/docs

Modified Files:
	CHANGES.txt 
Log Message:


Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/docs/CHANGES.txt,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** CHANGES.txt	8 Mar 2006 01:09:38 -0000	1.51
--- CHANGES.txt	22 Mar 2006 01:22:26 -0000	1.52
***************
*** 1,4 ****
--- 1,15 ----
  CHANGES
  
+ 0.8.3
+ ---------------------------------------------------------------------
+ *** 2006-03-08 through 2006-03-21 ***
+ - Upgraded to OSG 1.0
+ - Upgraded code for vc8 compiler
+ - Added ECM sim model. Simple barrage jamming for now. Quirk in system that
+   allows ESM to identify ECM sources.
+ - Added unit cost to database. This will act as a default scoring value for kill/loss
+   adjustments. Also can be used for purchase cost in multiplayer.
+ 
+ 
  0.8.2
  ---------------------------------------------------------------------

[Gcblue-commits] gcb_wx GCblue.vcproj,1.101,1.102

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

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

Modified Files:
	GCblue.vcproj 
Log Message:


Index: GCblue.vcproj
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/GCblue.vcproj,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** GCblue.vcproj	12 Dec 2005 02:37:00 -0000	1.101
--- GCblue.vcproj	8 Mar 2006 01:10:52 -0000	1.102
***************
*** 39,43 ****
  				Name="VCLinkerTool"
  				IgnoreImportLibrary="FALSE"
! 				AdditionalDependencies="python23.lib boost_python_debug.lib winmm.lib opengl32.lib glu32.lib GLaux.lib comctl32.lib rpcrt4.lib wsock32.lib wxmswd.lib zlibd.lib pngd.lib jpegd.lib tiffd.lib osgd.lib osgDBd.lib osgParticled.lib osgTextd.lib osgUtild.lib DemeterDebug.lib DemeterOSGDebug.lib sqlited.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib OpenAL32.lib ALut.lib oalpp_gcbd.lib"
  				ShowProgress="0"
  				OutputFile="$(ProjectDir)/bin/GCblueD.exe"
--- 39,43 ----
  				Name="VCLinkerTool"
  				IgnoreImportLibrary="FALSE"
! 				AdditionalDependencies="python24.lib boost_python_debug.lib winmm.lib opengl32.lib glu32.lib GLaux.lib comctl32.lib rpcrt4.lib wsock32.lib wxmswd.lib zlibd.lib pngd.lib jpegd.lib tiffd.lib osgd.lib osgDBd.lib osgParticled.lib osgTextd.lib osgUtild.lib DemeterDebug.lib DemeterOSGDebug.lib sqlited.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib OpenAL32.lib ALut.lib oalpp_gcbd.lib"
  				ShowProgress="0"
  				OutputFile="$(ProjectDir)/bin/GCblueD.exe"
***************
*** 105,109 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="boost_python.lib python23.lib opengl32.lib winmm.lib GLaux.lib glu32.lib comctl32.lib rpcrt4.lib wsock32.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib osg.lib osgDB.lib osgParticle.lib osgUtil.lib osgText.lib Demeter.lib DemeterOSG.lib sqlite.lib OpenThreadsWin32.lib OpenAL32.lib ALut.lib oalpp_gcb.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib"
  				OutputFile="$(ProjectDir)/bin/$(ProjectName).exe"
  				LinkIncremental="1"
--- 105,109 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="boost_python.lib python24.lib opengl32.lib winmm.lib GLaux.lib glu32.lib comctl32.lib rpcrt4.lib wsock32.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib osg.lib osgDB.lib osgParticle.lib osgUtil.lib osgText.lib Demeter.lib DemeterOSG.lib sqlite.lib OpenThreadsWin32.lib OpenAL32.lib ALut.lib oalpp_gcb.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib"
  				OutputFile="$(ProjectDir)/bin/$(ProjectName).exe"
  				LinkIncremental="1"
***************
*** 273,276 ****
--- 273,279 ----
  				</File>
  				<File
+ 					RelativePath=".\src\graphics\tcDatabaseInfoWindow.cpp">
+ 				</File>
+ 				<File
  					RelativePath=".\src\graphics\tcDisplayModes.cpp">
  				</File>
***************
*** 372,375 ****
--- 375,381 ----
  				</File>
  				<File
+ 					RelativePath=".\src\graphics\tcShaderControl.cpp">
+ 				</File>
+ 				<File
  					RelativePath=".\src\graphics\tcSmoker.cpp">
  				</File>
***************
*** 1312,1315 ****
--- 1318,1324 ----
  				</File>
  				<File
+ 					RelativePath=".\include\graphics\tcDatabaseInfoWindow.h">
+ 				</File>
+ 				<File
  					RelativePath=".\include\graphics\tcDisplayModes.h">
  				</File>
***************
*** 1402,1405 ****
--- 1411,1417 ----
  				</File>
  				<File
+ 					RelativePath=".\include\graphics\tcShaderControl.h">
+ 				</File>
+ 				<File
  					RelativePath=".\include\graphics\tcSmoker.h">
  				</File>

[Gcblue-commits] gcb_wx/include/ai BlackboardInterface.h,1.3,1.4 BlackboardItem.h,1.3,1.4 Brain.h,1.9,1.10 Nav.h,1.5,1.6 ScriptedTask.h,1.1,1.2 ScriptedTaskInterface.h,1.3,1.4 SelfPreservation.h,1.1,1.2 Task.h,1.5,1.6 tcAIData.h,1.2,1.3

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

Update of /cvsroot/gcblue/gcb_wx/include/ai
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2467/include/ai

Modified Files:
	BlackboardInterface.h BlackboardItem.h Brain.h Nav.h 
	ScriptedTask.h ScriptedTaskInterface.h SelfPreservation.h 
	Task.h tcAIData.h 
Log Message:


Index: BlackboardInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/BlackboardInterface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlackboardInterface.h	12 Dec 2005 02:37:01 -0000	1.3
--- BlackboardInterface.h	8 Mar 2006 01:10:22 -0000	1.4
***************
*** 2,6 ****
  **  @file BlackboardInterface.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file BlackboardInterface.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: ScriptedTask.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/ScriptedTask.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScriptedTask.h	16 Feb 2005 23:13:38 -0000	1.1
--- ScriptedTask.h	8 Mar 2006 01:10:22 -0000	1.2
***************
*** 2,6 ****
  **  @file ScriptedTask.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file ScriptedTask.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: SelfPreservation.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/SelfPreservation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelfPreservation.h	16 Feb 2005 23:13:38 -0000	1.1
--- SelfPreservation.h	8 Mar 2006 01:10:22 -0000	1.2
***************
*** 2,6 ****
  **  @file SelfPreservation.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file SelfPreservation.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: BlackboardItem.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/BlackboardItem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlackboardItem.h	2 Mar 2005 22:28:35 -0000	1.3
--- BlackboardItem.h	8 Mar 2006 01:10:22 -0000	1.4
***************
*** 2,6 ****
  **  @file BlackboardItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file BlackboardItem.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: Nav.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/Nav.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Nav.h	8 Dec 2005 23:27:54 -0000	1.5
--- Nav.h	8 Mar 2006 01:10:22 -0000	1.6
***************
*** 2,6 ****
  **  @file Nav.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file Nav.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAIData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/tcAIData.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcAIData.h	14 Jul 2005 23:41:50 -0000	1.2
--- tcAIData.h	8 Mar 2006 01:10:22 -0000	1.3
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: Brain.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/Brain.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Brain.h	11 Dec 2005 00:34:28 -0000	1.9
--- Brain.h	8 Mar 2006 01:10:22 -0000	1.10
***************
*** 2,6 ****
  **  @file Brain.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file Brain.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: Task.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/Task.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Task.h	1 Jun 2005 00:13:25 -0000	1.5
--- Task.h	8 Mar 2006 01:10:22 -0000	1.6
***************
*** 2,6 ****
  **  @file Task.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file Task.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: ScriptedTaskInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/ScriptedTaskInterface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScriptedTaskInterface.h	1 Jun 2005 00:13:25 -0000	1.3
--- ScriptedTaskInterface.h	8 Mar 2006 01:10:22 -0000	1.4
***************
*** 2,6 ****
  **  @file ScriptedTaskInterface.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file ScriptedTaskInterface.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/docs CHANGES.txt,1.50,1.51

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

Update of /cvsroot/gcblue/gcb_wx/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2255/docs

Modified Files:
	CHANGES.txt 
Log Message:


Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/docs/CHANGES.txt,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** CHANGES.txt	5 Jan 2006 03:47:22 -0000	1.50
--- CHANGES.txt	8 Mar 2006 01:09:38 -0000	1.51
***************
*** 1,4 ****
--- 1,19 ----
  CHANGES
  
+ 0.8.2
+ ---------------------------------------------------------------------
+ *** 2006-02-11 through 2006-03-07 ***
+ - Fixed memory leak due to not deleting window graphics when exiting to start screen
+ - Started database information popup window. Hit 'i' with unit selected to see class
+   and description. Doesn't work with weapon entities yet.
+ - Fixed bug related to non-power of two textures support in OSG 0.9.9 and on. This was
+   causing graphics problems on some nVidia cards. Changed initializer in osg::Texture 
+   class and rebuilt osg binaries.
+ - Adjusted multiple scene views to call update() once. Modified structure of near and 
+   far views to remove double text artifacts.
+ - Started work with GLSL shaders. Options screen has options to try water blend between
+   two textures (shaders on option) and using shader for procedural texture gen (terrain
+   shader on).
+ - Upgraded libraries to Python 2.4 and Boost Python 1.33.1
  
  0.8.1

[Gcblue-commits] gcb_wx/docs BUILDING.txt,1.7,1.8

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

Update of /cvsroot/gcblue/gcb_wx/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1592/docs

Modified Files:
	BUILDING.txt 
Log Message:
Updated build notes for Python 2.4 and boost 1.31.1

Index: BUILDING.txt
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/docs/BUILDING.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BUILDING.txt	12 Oct 2005 22:17:42 -0000	1.7
--- BUILDING.txt	26 Feb 2006 16:52:31 -0000	1.8
***************
*** 1,5 ****
  --- Building GCB Windows Dependencies ---
  
! Updated October 2005
  
  --- Download information ---
--- 1,5 ----
  --- Building GCB Windows Dependencies ---
  
! Updated February 2006
  
  --- Download information ---
***************
*** 32,43 ****
  libvorbis 1.0.1 source
  
! * Boost 1.31.0
  http://www.boost.org
- (Latest version 1.33.0 has not been tried)
  
! * Python 2.3.3
! http://www.python.org/2.3.3/    
! Download  Python-2.3.3.tgz
! (Latest version, Python 2.4.2, has not been tried yet)
  
  * SQLite 3.2.5
--- 32,43 ----
  libvorbis 1.0.1 source
  
! * Boost 1.33.1
  http://www.boost.org
  
! 
! * Python 2.4.2
! http://www.python.org    
! Download and install python-2.4.2.msi
! 
  
  * SQLite 3.2.5
***************
*** 50,54 ****
  --- Required libraries ---
  
! Library                          Nominal installation path
  ------------------               -----------------------
  wxWidgets-2.6.1                  C:\wxWidgets-2.6.1
--- 50,54 ----
  --- Required libraries ---
  
! Library                          Example installation path
  ------------------               -----------------------
  wxWidgets-2.6.1                  C:\wxWidgets-2.6.1
***************
*** 60,65 ****
  Lib OGG 1.1			 C:\libogg-1.1
  Lib Vorbis 1.0.1                 C:\libvorbis-1.0.1
! Python 2.3.3                     C:\Python-2.3.3
! Boost Python 1.31.0              C:\boost_1_31_0
  SQLite version 3.2               C:\sqlite
  
--- 60,65 ----
  Lib OGG 1.1			 C:\libogg-1.1
  Lib Vorbis 1.0.1                 C:\libvorbis-1.0.1
! Python 2.4                       C:\Python24
! Boost Python 1.33.1              C:\boost_1_31_1
  SQLite version 3.2               C:\sqlite
  
***************
*** 74,79 ****
  C:\OSG_OP_OT-0.9.9\OpenThreads\include
  C:\openal\include
! C:\Python-2.3.3\include
! C:\boost_1_31_0
  C:\demeter-3.21\include
  C:\libogg-1.1\include
--- 74,79 ----
  C:\OSG_OP_OT-0.9.9\OpenThreads\include
  C:\openal\include
! C:\Python24\include
! C:\boost_1_33_1
  C:\demeter-3.21\include
  C:\libogg-1.1\include
***************
*** 88,93 ****
  C:\OSG_OP_OT-0.9.9\OpenSceneGraph\lib
  C:\openal\lib
! C:\Python-2.3.3\libs
! C:\boost_1_31_0\libs\python\build\bin-stage
  C:\demeter-3.21\lib
  C:\libogg-1.1\lib
--- 88,93 ----
  C:\OSG_OP_OT-0.9.9\OpenSceneGraph\lib
  C:\openal\lib
! C:\Python24\libs
! C:\boost_1_33_1\libs\python\build\bin-stage
  C:\demeter-3.21\lib
  C:\libogg-1.1\lib
***************
*** 137,143 ****
  
  
! * Python 2.3.3 
  
! - Option 1 (easiest): Use pre-built python23.lib included in .exe installer distribution
  
  - Option 2: Build it yourself from source distribution
--- 137,143 ----
  
  
! * Python 2.4 
  
! - Option 1 (easiest): Use pre-built python24.lib included in .exe installer distribution, use dll from WINDOWS/system32/python24.dll
  
  - Option 2: Build it yourself from source distribution
***************
*** 156,164 ****
  
  
! * Build Boost Python 1.31.0
  
  - Project file is at libs/python/build/VisualStudio/boost_python.dsw
  
! - Debug preprocessor defs do not need to be modified if using the release python23.lib only
    Defs should be: 
      _DEBUG;WIN32;_WINDOWS;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB;BOOST_PYTHON_SOURCE 
--- 156,164 ----
  
  
! * Build Boost Python 1.33.1
  
  - Project file is at libs/python/build/VisualStudio/boost_python.dsw
  
! - Debug preprocessor defs do not need to be modified if using the release python24.lib only
    Defs should be: 
      _DEBUG;WIN32;_WINDOWS;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB;BOOST_PYTHON_SOURCE 
***************
*** 168,172 ****
      NDEBUG;WIN32;_WINDOWS;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB;BOOST_PYTHON_SOURCE
  
- - Produces warning C4244
  
  
--- 168,171 ----

[Gcblue-commits] gcb_wx/xml options.xml,1.23,1.24

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

Update of /cvsroot/gcblue/gcb_wx/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15004/xml

Modified Files:
	options.xml 
Log Message:


Index: options.xml
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/xml/options.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** options.xml	12 Dec 2005 02:37:01 -0000	1.23
--- options.xml	14 Jan 2006 17:17:12 -0000	1.24
***************
*** 1,6 ****
  <Options>
      <HostAddress>192.168.0.100</HostAddress>
!     <LastScenarioPath>SinglePlayer.BrokenBow.py</LastScenarioPath>
!     <LastScenarioName>BrokenBow</LastScenarioName>
      <noCopyDatabase />
      <noWriteXmlDatabase />
--- 1,6 ----
  <Options>
      <HostAddress>192.168.0.100</HostAddress>
!     <LastScenarioPath>SinglePlayer.JumpingFish.py</LastScenarioPath>
!     <LastScenarioName>JumpingFish</LastScenarioName>
      <noCopyDatabase />
      <noWriteXmlDatabase />

[Gcblue-commits] gcb_wx/database database.db,1.19,1.20

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

Update of /cvsroot/gcblue/gcb_wx/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14428/database

Modified Files:
	database.db 
Log Message:
Changes up to 0.8.1

Index: database.db
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/database/database.db,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
Binary files /tmp/cvsqCdxTn and /tmp/cvsTnqo8a differ

[Gcblue-commits] gcb_wx/src/scriptinterface tcPlatformInterface.cpp,1.57,1.58 tcScenarioInterface.cpp,1.36,1.37

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

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

Modified Files:
	tcPlatformInterface.cpp tcScenarioInterface.cpp 
Log Message:
Changes up to 0.8.1

Index: tcPlatformInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterface.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** tcPlatformInterface.cpp	18 Dec 2005 04:10:33 -0000	1.57
--- tcPlatformInterface.cpp	14 Jan 2006 17:13:59 -0000	1.58
***************
*** 1417,1420 ****
--- 1417,1421 ----
  		if (!mpPlatformObj->IsEditMode()) return;
  
+ 		if (s.size() < 2) return;
  		mpSimState->RenameObject(mpPlatformObj, s);
  	}

Index: tcScenarioInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcScenarioInterface.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** tcScenarioInterface.cpp	18 Dec 2005 18:48:17 -0000	1.36
--- tcScenarioInterface.cpp	14 Jan 2006 17:13:59 -0000	1.37
***************
*** 251,256 ****
      }
  
- 
- 
  	bool tcScenarioInterface::AddUnitToAlliance(scriptinterface::tcScenarioUnit unit, int alliance)
      {
--- 251,254 ----

[Gcblue-commits] gcb_wx/scripts Menu.py,1.21,1.22 MissionEditCommands.py,1.2,1.3

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

Update of /cvsroot/gcblue/gcb_wx/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14428/scripts

Modified Files:
	Menu.py MissionEditCommands.py 
Log Message:
Changes up to 0.8.1

Index: MissionEditCommands.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/MissionEditCommands.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MissionEditCommands.py	18 Dec 2005 18:48:16 -0000	1.2
--- MissionEditCommands.py	14 Jan 2006 17:13:59 -0000	1.3
***************
*** 45,47 ****
      unitName = 'Needname %d' % int(1000*random())
  
!     SM.AddUnitToFlightDeck(hostName, className, unitName, 3)
\ No newline at end of file
--- 45,51 ----
      unitName = 'Needname %d' % int(1000*random())
  
!     SM.AddUnitToFlightDeck(hostName, className, unitName, 3)
! 
! def AddMapLabel(SM, lon, lat, labelText):
!     SM.OverlayText(labelText, rad_to_deg*lon, rad_to_deg*lat)
! 

Index: Menu.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/Menu.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Menu.py	18 Dec 2005 18:48:16 -0000	1.21
--- Menu.py	14 Jan 2006 17:13:59 -0000	1.22
***************
*** 427,430 ****
  
  
- 
- 
--- 427,428 ----

[Gcblue-commits] gcb_wx/src/graphics tcEditBox.cpp,1.13,1.14

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

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

Modified Files:
	tcEditBox.cpp 
Log Message:
Changes up to 0.8.1

Index: tcEditBox.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcEditBox.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcEditBox.cpp	5 May 2005 02:14:52 -0000	1.13
--- tcEditBox.cpp	14 Jan 2006 17:13:59 -0000	1.14
***************
*** 110,113 ****
--- 110,120 ----
  
  
+ void tcEditBox::GetBuffer(char* azDest) 
+ {
+ 	strncpy(azDest, mzBuffer, MAX_EDITBOX_CHAR-1);
+ }
+ 
+ 
+ 
  /**
  * If clearOnReturn is true, a text updated event will be posted
***************
*** 268,271 ****
--- 275,288 ----
  }
  
+ void tcEditBox::SetClearOnReturn(bool state) 
+ {
+ 	clearOnReturn = state;
+ }
+ 
+ void tcEditBox::SetCommand(long cmd) 
+ {
+ 	command = cmd;
+ }
+ 
  tcEditBox::tcEditBox(tc3DWindow *parent, TiXmlNode *config)
              : tc3DWindow(parent, wxPoint(0,0), wxSize(10,10), "XMLEditBox", parent),

[Gcblue-commits] gcb_wx/include/graphics tcEditBox.h,1.8,1.9

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

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

Modified Files:
	tcEditBox.h 
Log Message:
Changes up to 0.8.1

Index: tcEditBox.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcEditBox.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcEditBox.h	5 May 2005 02:14:18 -0000	1.8
--- tcEditBox.h	14 Jan 2006 17:13:59 -0000	1.9
***************
*** 40,48 ****
  public:
      virtual void Draw();
!     void GetBuffer(char* azDest) {strcpy(azDest,mzBuffer);}
      void SetBuffer(const char* azBuffer); 
      void SetCaption(const char* azCaption);
!     void SetClearOnReturn(bool state) {clearOnReturn = state;}
!     void SetCommand(long cmd) {command = cmd;}
  
      tcEditBox(tc3DWindow *parent, TiXmlNode *config);
--- 40,48 ----
  public:
      virtual void Draw();
!     void GetBuffer(char* azDest);
      void SetBuffer(const char* azBuffer); 
      void SetCaption(const char* azCaption);
!     void SetClearOnReturn(bool state);
!     void SetCommand(long cmd);
  
      tcEditBox(tc3DWindow *parent, TiXmlNode *config);

[Gcblue-commits] gcb_wx/src/graphics tc3DViewer.cpp,1.28,1.29 tc3DWindow.cpp,1.31,1.32 tcButton.cpp,1.19,1.20 tcContainerGui.cpp,1.7,1.8 tcContainerItem.cpp,1.1,1.2 tcFlightPortGui.cpp,1.5,1.6 tcLauncherPopup.cpp,1.10,1.11 tcMapView.cpp,1.42,1.43 tcPlatformGui.cpp,1.6,1.7 tcStoresGui.cpp,1.5,1.6 tcTextEntryBox.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-serv30927/src/graphics

Modified Files:
	tc3DViewer.cpp tc3DWindow.cpp tcButton.cpp tcContainerGui.cpp 
	tcContainerItem.cpp tcFlightPortGui.cpp tcLauncherPopup.cpp 
	tcMapView.cpp tcPlatformGui.cpp tcStoresGui.cpp 
	tcTextEntryBox.cpp 
Log Message:
db fixes, GUI tweaks, random sensor detections

Index: tcFlightPortGui.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcFlightPortGui.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcFlightPortGui.cpp	26 Dec 2005 22:14:03 -0000	1.5
--- tcFlightPortGui.cpp	5 Jan 2006 03:47:22 -0000	1.6
***************
*** 566,570 ****
  {
      ReadGuiParameters();
!     
      InitializeGui();
  
--- 566,570 ----
  {
      ReadGuiParameters();
! 
      InitializeGui();
  

Index: tcLauncherPopup.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcLauncherPopup.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcLauncherPopup.cpp	12 Dec 2005 02:37:01 -0000	1.10
--- tcLauncherPopup.cpp	5 Jan 2006 03:47:22 -0000	1.11
***************
*** 510,513 ****
--- 510,515 ----
  {
      SetBaseRenderBin(parent->GetBaseRenderBin() + 10);
+ 	tc3DWindow::MoveToTop();
+ 
      birthCount = tcTime::Get()->Get30HzCount();
  

Index: tcPlatformGui.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcPlatformGui.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcPlatformGui.cpp	26 Dec 2005 22:14:03 -0000	1.6
--- tcPlatformGui.cpp	5 Jan 2006 03:47:22 -0000	1.7
***************
*** 654,658 ****
  {
      ReadGuiParameters();
!     
      InitializeGui();
  
--- 654,658 ----
  {
      ReadGuiParameters();
! 
      InitializeGui();
  

Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** tcMapView.cpp	2 Jan 2006 15:40:53 -0000	1.42
--- tcMapView.cpp	5 Jan 2006 03:47:22 -0000	1.43
***************
*** 469,473 ****
  	osg::Vec4 color(0.784, 0.784, 0.784, 1.0);
  
! 	DrawTextR(sText.GetBuffer(), leftMargin + 50.0, mnHeight-25.0, 
          defaultFont.get(), color, 16.0, CENTER_CENTER);
  
--- 469,473 ----
  	osg::Vec4 color(0.784, 0.784, 0.784, 1.0);
  
! 	DrawTextR(sText.GetBuffer(), leftMargin + 50.0, mnHeight - 225.0, 
          defaultFont.get(), color, 16.0, CENTER_CENTER);
  
***************
*** 477,483 ****
  	color.set(1, 1, 1, 1);
  
!     DrawLineR(nBarX1, mnHeight-15, nBarX2, mnHeight-15, color); // draw horizontal piece
!     DrawLineR(nBarX1, mnHeight-15-5, nBarX1, mnHeight-15+5, color); // draw left vertical piece
!     DrawLineR(nBarX2, mnHeight-15-5, nBarX2, mnHeight-15+5, color); // draw right vert piece
  }
  
--- 477,483 ----
  	color.set(1, 1, 1, 1);
  
!     DrawLineR(nBarX1, mnHeight-215, nBarX2, mnHeight-215, color); // draw horizontal piece
!     DrawLineR(nBarX1, mnHeight-215-5, nBarX1, mnHeight-215+5, color); // draw left vertical piece
!     DrawLineR(nBarX2, mnHeight-215-5, nBarX2, mnHeight-215+5, color); // draw right vert piece
  }
  
***************
*** 510,514 ****
  	osg::Vec4 color(1, 1, 1, 1);
  	
! 	DrawTextR(sText.GetBuffer(), leftMargin + 50.0, mnHeight - 50.0, 
          defaultFont.get(), color, 16.0, LEFT_BASE_LINE);
  }
--- 510,514 ----
  	osg::Vec4 color(1, 1, 1, 1);
  	
! 	DrawTextR(sText.GetBuffer(), leftMargin + 50.0, mnHeight - 250.0, 
          defaultFont.get(), color, 16.0, LEFT_BASE_LINE);
  }
***************
*** 650,654 ****
  	unsigned timeCount = tcTime::Get()->Get30HzCount();
  
! 	if (scrollActive && (timeCount - lastScrollTime > 1))
  	{
          ScrollMap(scrollDirection);
--- 650,654 ----
  	unsigned timeCount = tcTime::Get()->Get30HzCount();
  
! 	if (scrollActive && (timeCount - lastScrollTime >= 1))
  	{
          ScrollMap(scrollDirection);
***************
*** 2282,2287 ****
  void tcTacticalMapView::OnLeaveWindow(wxMouseEvent& event)
  {
!     scrollActive = false;
!     isLButtonDown = false;
  }
  
--- 2282,2288 ----
  void tcTacticalMapView::OnLeaveWindow(wxMouseEvent& event)
  {
!     wxPoint point = event.GetPosition();
! 
! 	UpdateEdgeScroll(point);
  }
  
***************
*** 2394,2397 ****
--- 2395,2405 ----
  }
  
+ 
+ void tcTacticalMapView::CancelScroll()
+ {
+     scrollActive = false;
+ 	scrollDirection = 0.0f;
+ }
+ 
  /**
  * Check if button is down near a nav waypoint-- if so, start edit
***************
*** 2518,2525 ****
  {
      wxPoint point = event.GetPosition();
-     const int nScrollBorder = 10;
- 
      mpointMouse = point; 
  
      // +200 is a hack to workaround the semi-transparent overlay window 
      if (mpointMouse.x <= nScrollBorder + 200)
--- 2526,2539 ----
  {
      wxPoint point = event.GetPosition();
      mpointMouse = point; 
  
+     scrollActive = false;
+ 	scrollDirection = 0.0f;
+ 
+ 	// changed to scroll at window edge
+ 	/*
+ 
+     const int nScrollBorder = 10;
+ 
      // +200 is a hack to workaround the semi-transparent overlay window 
      if (mpointMouse.x <= nScrollBorder + 200)
***************
*** 2553,2556 ****
--- 2567,2571 ----
  	    lastScrollTime = tcTime::Get()->Get30HzCount();
  	}
+ 	*/
  
  }
***************
*** 2577,2580 ****
--- 2592,2597 ----
      overlay->SetActive(abActive);
      tcMapView::SetActive(abActive);
+ 
+ 	if (!abActive) CancelScroll();
  }
  
***************
*** 2617,2620 ****
--- 2634,2677 ----
  }
  
+ /**
+ * Check if cursor is near edge of window, if so activate scroll
+ */
+ void tcTacticalMapView::UpdateEdgeScroll(const wxPoint& pos)
+ {
+ 	const int nScrollBorder = 10;
+ 
+     mpointMouse = pos; 
+ 
+     if (mpointMouse.x <= nScrollBorder)
+     {
+ 		scrollActive = true;
+         scrollDirection = 270.0f;
+     }
+     else if (mpointMouse.x >= mnWidth - nScrollBorder) 
+     {
+         scrollActive = true;
+         scrollDirection = 90.0f;
+     }
+     else if (mpointMouse.y <= nScrollBorder) 
+     {
+         scrollActive = true;
+         scrollDirection = 0.0f;
+     }
+     else if (mpointMouse.y >= mnHeight - nScrollBorder)
+     {
+         scrollActive = true;
+         scrollDirection = 180.0f;
+     }
+     else 
+     {
+         scrollActive = false;
+ 		scrollDirection = 0.0f;
+     }
+ 
+ 	if (scrollActive)
+ 	{
+ 	    lastScrollTime = tcTime::Get()->Get30HzCount();
+ 	}
+ }
  
  void tcTacticalMapView::UpdateNavPoints(vector<GeoPoint> *mpPoints) 
***************
*** 2964,2967 ****
--- 3021,3026 ----
      wxPoint point = event.GetPosition();
      mpointMouse = point; // TranslatePoint(point);
+ 
+ 	event.Skip();
  }
  

Index: tcContainerItem.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcContainerItem.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcContainerItem.cpp	11 Jun 2005 21:01:44 -0000	1.1
--- tcContainerItem.cpp	5 Jan 2006 03:47:22 -0000	1.2
***************
*** 123,126 ****
--- 123,130 ----
  tcContainerItem::~tcContainerItem()
  {
+ 	if (gui)
+ 	{
+ 		gui->SetParentItem(0);
+ 	}
  }
  

Index: tcContainerGui.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcContainerGui.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcContainerGui.cpp	2 Jan 2006 15:40:53 -0000	1.7
--- tcContainerGui.cpp	5 Jan 2006 03:47:22 -0000	1.8
***************
*** 520,523 ****
--- 520,528 ----
  tcContainerGui::~tcContainerGui() 
  {
+ 	if (parentItem)
+ 	{
+ 		parentItem->SetGui(0);
+ 	}
+ 
      for (size_t n=0; n<slots.size(); n++)
      {

Index: tcStoresGui.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStoresGui.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcStoresGui.cpp	26 Dec 2005 22:14:03 -0000	1.5
--- tcStoresGui.cpp	5 Jan 2006 03:47:22 -0000	1.6
***************
*** 349,353 ****
  {
      ReadGuiParameters();
!     
      InitializeGui();
  
--- 349,353 ----
  {
      ReadGuiParameters();
!    
      InitializeGui();
  

Index: tcButton.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcButton.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcButton.cpp	10 Sep 2005 21:47:38 -0000	1.19
--- tcButton.cpp	5 Jan 2006 03:47:22 -0000	1.20
***************
*** 212,225 ****
      offColor(0, 0, 0, 1),
      overColor(0.4, 1, 0.4, 1),
!     onColor(1, 1, 1, 1)
  {
-     caption = "NULL";
-     command = -1;
-     isButtonOn = false;
-     isMouseOver = false;
-     soundEffect = "MutedBeep";
-     fontSize = 12.0f;
-     sendRedraw = false;
-     backgroundAlpha = 1.0f;
  
      ref_count++;
--- 212,225 ----
      offColor(0, 0, 0, 1),
      overColor(0.4, 1, 0.4, 1),
!     onColor(1, 1, 1, 1),
!     caption("NULL"),
!     command(-1),
!     isButtonOn(false),
!     isMouseOver(false),
!     soundEffect(""),
!     fontSize(12.0f),
!     sendRedraw(false),
!     backgroundAlpha(1.0f)
  {
  
      ref_count++;
***************
*** 310,314 ****
  			overOnImageName = onImageName;
  		}
! 
  
          LoadImages(offImageName, onImageName, overOffImageName, overOnImageName);
--- 310,318 ----
  			overOnImageName = onImageName;
  		}
! 		
! 		if (const char* s = imageElement->Attribute("SoundEffect"))
! 		{
! 			soundEffect = s;
! 		}
  
          LoadImages(offImageName, onImageName, overOffImageName, overOnImageName);

Index: tc3DWindow.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DWindow.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** tc3DWindow.cpp	2 Jan 2006 15:40:53 -0000	1.31
--- tc3DWindow.cpp	5 Jan 2006 03:47:22 -0000	1.32
***************
*** 168,171 ****
--- 168,172 ----
  void tc3DWindow::OnLeaveWindow(wxMouseEvent& event)
  {
+ 	event.Skip();
  }
  
***************
*** 218,221 ****
--- 219,223 ----
  void tc3DWindow::UpdatePositionAndSize(const wxPoint& pos, const wxSize& size)
  {
+ 	bool sizeChanged = (size.GetWidth() != mnWidth) || (size.GetHeight() != mnHeight);
  	mnWidth = size.GetWidth();
      mnHeight = size.GetHeight();
***************
*** 234,241 ****
  	mrectWindow.height = size.GetHeight();
  
- 
  	transform->setMatrix(osg::Matrix::translate(pos.x, pos.y + yOffset, 0)); 
  
! 	UpdateBackgroundQuadVertices();
  }
  
--- 236,245 ----
  	mrectWindow.height = size.GetHeight();
  
  	transform->setMatrix(osg::Matrix::translate(pos.x, pos.y + yOffset, 0)); 
  
! 	if (sizeChanged)
! 	{
! 		UpdateBackgroundShape();
! 	}
  }
  
***************
*** 320,332 ****
  }
  
  /**
! * Called after window size change to update quad boundaries
  */
! void tc3DWindow::UpdateBackgroundQuadVertices()
  {
! 	//UpdateBackgroundShape();
! 	//return;
! 
! 	wxASSERT(backgroundQuad.valid());
  
  	osg::Vec3Array* vertices = new osg::Vec3Array(4);
--- 324,338 ----
  }
  
+ 
+ 
  /**
! * Called at window creation or after window size change to update quad boundaries
  */
! void tc3DWindow::UpdateBackgroundQuad()
  {
! 	if (!backgroundQuad.valid())
! 	{
! 		backgroundQuad = new osg::Geometry;
! 	}
  
  	osg::Vec3Array* vertices = new osg::Vec3Array(4);
***************
*** 337,355 ****
  
  	backgroundQuad->setVertexArray(vertices);
- 	backgroundQuad->dirtyDisplayList();
- }
- 
- 
- 
- void tc3DWindow::CreateBackgroundQuad()
- {
- 	//CreateBackgroundShape();
- 	//return;
- 
- 	wxASSERT(!backgroundQuad.valid());
- 
- 	backgroundQuad = new osg::Geometry;
- 
- 	UpdateBackgroundQuadVertices();
  
  	osg::Vec2Array* texcoords = new osg::Vec2Array(4);
--- 343,346 ----
***************
*** 393,446 ****
  /**
  * Version to create rounded background quads
  */
! void tc3DWindow::CreateBackgroundShape()
  {
  	//wxASSERT(!backgroundQuad.valid());
  
! 	backgroundQuad = new osg::Geometry;
  
! 	
  
  	osg::Vec3Array* vertices = new osg::Vec3Array;
  	osg::Vec2Array* texcoords = new osg::Vec2Array;
  
- 	float xc = 0.5; // normalized coords (0-1)
- 	float yc = 0.5;
- 	float rx = 0.5;
- 	float ry = 0.5;
- 	float xp = xc;
- 	float yp = yc + ry;
  	float width = float(mnWidth);
  	float height = float(mnHeight);
  
! 	int nAngles = 32;
! 	float dangle = C_TWOPI / float(nAngles);
! 	float angle = dangle;
  	for (int k=0; k<nAngles; k++)
  	{
! 		float x = xc + rx * sinf(angle);
! 		float y = yc + ry * cosf(angle);
  
! 		vertices->push_back(osg::Vec3(width*xc, height*yc, 0));
! 		texcoords->push_back(osg::Vec2(xc, yc));
  
! 		vertices->push_back(osg::Vec3(width*x, height*y, 0));
! 		texcoords->push_back(osg::Vec2(x, y));
  
! 		vertices->push_back(osg::Vec3(width*xp, height*yp, 0));
! 		texcoords->push_back(osg::Vec2(xp, yp));
  
  
  		
  		xp = x;
  		yp = y;
! 		angle += dangle;
  	}
  
  
! 	backgroundQuad->setVertexArray(vertices);
! 	backgroundQuad->dirtyDisplayList();
  
! 	backgroundQuad->setTexCoordArray(0,texcoords);
  
  	osg::Vec4Array* colors = new osg::Vec4Array;
--- 384,611 ----
  /**
  * Version to create rounded background quads
+ * Create background polygon and border graphics based on cornerRadius value.
+ * cornerRadius = 0 is square corners (no rounding)
  */
! void tc3DWindow::UpdateBackgroundShape()
  {
  	//wxASSERT(!backgroundQuad.valid());
+ 	
+ 	if (cornerRadius == 0)
+ 	{
+ 		UpdateBackgroundQuad();
+ 		return;
+ 	}
  
! 	if (!backgroundQuad.valid())
! 	{
! 		backgroundQuad = new osg::Geometry;
! 	}
  
! 	if (!border.valid())
! 	{
! 		border = new osg::Geometry;
! 	}
  
  	osg::Vec3Array* vertices = new osg::Vec3Array;
  	osg::Vec2Array* texcoords = new osg::Vec2Array;
+ 	osg::Vec3Array* borderVertices = new osg::Vec3Array;
  
  	float width = float(mnWidth);
  	float height = float(mnHeight);
+ 	float inv_width = 1.0f / width;
+ 	float inv_height = 1.0f / height;
+ 	float xc = 0.5 * width;
+ 	float yc = 0.5 * height;
  
! 
! 	int nAngles = 4; // number of points for rounded corner
! 	float dangle = C_PIOVER2 / float(nAngles);
! 
! 	float x, y, xp, yp;
! 	float xcorner, ycorner; // center point for corner arc
! 	float angle;
! 
! 
! 	// add top section
! 
! 	x = width - cornerRadius;
! 	y = height;
! 	vertices->push_back(osg::Vec3(x, y, 0));
! 	borderVertices->push_back(osg::Vec3(x, y, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 	x = cornerRadius;
! 	y = height;
! 	vertices->push_back(osg::Vec3(x, y, 0));
! 	borderVertices->push_back(osg::Vec3(x, y, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 	vertices->push_back(osg::Vec3(xc, yc, 0));
! 	//texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
! 	texcoords->push_back(osg::Vec2(0.5f, 0.5f));
! 
! 
! 
! 	
! 
! 	
! 	// add top left corner
! 	xp = x;
! 	yp = y;
! 	xcorner = cornerRadius;
! 	ycorner = height - cornerRadius;
! 
! 	angle = -dangle;
  	for (int k=0; k<nAngles; k++)
  	{
! 		x = xcorner + cornerRadius * sinf(angle);
! 		y = ycorner + cornerRadius * cosf(angle);
  
! 		vertices->push_back(osg::Vec3(xp, yp, 0));
! 		borderVertices->push_back(osg::Vec3(xp, yp, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * xp, inv_height * yp));
! 		
! 		vertices->push_back(osg::Vec3(x, y, 0));
! 		borderVertices->push_back(osg::Vec3(x, y, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
  
! 		vertices->push_back(osg::Vec3(xc, yc, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
  
! 		xp = x;
! 		yp = y;
! 		angle -= dangle;
! 	}
! 	
! 
! 	// add left section
! 	vertices->push_back(osg::Vec3(x, y, 0));
! 	borderVertices->push_back(osg::Vec3(x, y, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 	x = 0;
! 	y = cornerRadius;
! 	vertices->push_back(osg::Vec3(x, y, 0));
! 	borderVertices->push_back(osg::Vec3(x, y, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 	vertices->push_back(osg::Vec3(xc, yc, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
! 
! 	// add lower left corner
! 	xp = x;
! 	yp = y;
! 	xcorner = cornerRadius;
! 	ycorner = cornerRadius;
  
+ 	angle = -(C_PIOVER2 + dangle);
+ 	for (int k=0; k<nAngles; k++)
+ 	{
+ 		x = xcorner + cornerRadius * sinf(angle);
+ 		y = ycorner + cornerRadius * cosf(angle);
  
+ 		vertices->push_back(osg::Vec3(xp, yp, 0));
+ 		borderVertices->push_back(osg::Vec3(xp, yp, 0));
+ 		texcoords->push_back(osg::Vec2(inv_width * xp, inv_height * yp));
+ 
+ 		vertices->push_back(osg::Vec3(x, y, 0));
+ 		borderVertices->push_back(osg::Vec3(x, y, 0));
+ 		texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));		
  		
+ 		vertices->push_back(osg::Vec3(xc, yc, 0));
+ 		texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
+ 
  		xp = x;
  		yp = y;
! 		angle -= dangle;
  	}
  
+ 	// add bottom section
+ 	vertices->push_back(osg::Vec3(x, y, 0));
+ 	borderVertices->push_back(osg::Vec3(x, y, 0));
+ 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
  
! 	x = width - cornerRadius;
! 	y = 0;
! 	vertices->push_back(osg::Vec3(x, y, 0));
! 	borderVertices->push_back(osg::Vec3(x, y, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
  
! 	vertices->push_back(osg::Vec3(xc, yc, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
! 
! 	// add bottom right corner
! 	xp = x;
! 	yp = y;
! 	xcorner = width - cornerRadius;
! 	ycorner = cornerRadius;
! 
! 	angle = C_PI - dangle;
! 	for (int k=0; k<nAngles; k++)
! 	{
! 		x = xcorner + cornerRadius * sinf(angle);
! 		y = ycorner + cornerRadius * cosf(angle);
! 
! 		vertices->push_back(osg::Vec3(xp, yp, 0));
! 		borderVertices->push_back(osg::Vec3(xp, yp, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * xp, inv_height * yp));
! 
! 		vertices->push_back(osg::Vec3(x, y, 0));
! 		borderVertices->push_back(osg::Vec3(x, y, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 		vertices->push_back(osg::Vec3(xc, yc, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
! 
! 		xp = x;
! 		yp = y;
! 		angle -= dangle;
! 	}
! 
! 	// add right section
! 	vertices->push_back(osg::Vec3(x, y, 0));
! 	borderVertices->push_back(osg::Vec3(x, y, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 	x = width;
! 	y = height - cornerRadius;
! 	vertices->push_back(osg::Vec3(x, y, 0));
! 	borderVertices->push_back(osg::Vec3(x, y, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 	vertices->push_back(osg::Vec3(xc, yc, 0));
! 	texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
! 
! 	// add top right corner
! 	xp = x;
! 	yp = y;
! 	xcorner = width - cornerRadius;
! 	ycorner = height - cornerRadius;
! 
! 	angle = C_PIOVER2 - dangle;
! 	for (int k=0; k<nAngles; k++)
! 	{
! 		x = xcorner + cornerRadius * sinf(angle);
! 		y = ycorner + cornerRadius * cosf(angle);
! 
! 		vertices->push_back(osg::Vec3(xp, yp, 0));
! 		borderVertices->push_back(osg::Vec3(xp, yp, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * xp, inv_height * yp));
! 
! 		vertices->push_back(osg::Vec3(x, y, 0));
! 		borderVertices->push_back(osg::Vec3(x, y, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * x, inv_height * y));
! 
! 		vertices->push_back(osg::Vec3(xc, yc, 0));
! 		texcoords->push_back(osg::Vec2(inv_width * xc, inv_height * yc));
! 
! 		xp = x;
! 		yp = y;
! 		angle -= dangle;
! 	}
! 
! 	
! 	backgroundQuad->setVertexArray(vertices);
! 	backgroundQuad->setTexCoordArray(0, texcoords);
  
  	osg::Vec4Array* colors = new osg::Vec4Array;
***************
*** 449,453 ****
  	backgroundQuad->setColorBinding(osg::Geometry::BIND_OVERALL);
  
! 	backgroundQuad->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLES,0,3*nAngles));
  
  	/*
--- 614,627 ----
  	backgroundQuad->setColorBinding(osg::Geometry::BIND_OVERALL);
  
! 	backgroundQuad->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLES,0,vertices->size()));
! 
! 	border->setVertexArray(borderVertices);
! 	osg::Vec4Array* borderColors = new osg::Vec4Array;
! 	borderColors->push_back(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f)); 
! 	border->setColorArray(borderColors);
! 	border->setColorBinding(osg::Geometry::BIND_OVERALL);
! 
! 	border->addPrimitiveSet(new osg::DrawArrays(GL_LINES, 0, borderVertices->size()));
! 
  
  	/*
***************
*** 467,495 ****
  }
  
- /**
- * Call after window size change
- */
- void tc3DWindow::UpdateBackgroundShape()
- {
- 	wxASSERT(backgroundQuad.valid());
- 
- 	osg::Vec2Array* texcoords = dynamic_cast<osg::Vec2Array*>(backgroundQuad->getTexCoordArray(0));
- 	wxASSERT(texcoords != 0);
- 
- 	osg::Vec3Array* vertices = new osg::Vec3Array();
- 
- 	float width = float(mnWidth);
- 	float height = float(mnHeight);
- 
- 	for (size_t k=0; k<texcoords->size(); k++)
- 	{
- 		osg::Vec2& t = texcoords->at(k);
- 		vertices->push_back(osg::Vec3(width*t.x(), height*t.y(), 0));
- 	}
- 
- 	backgroundQuad->setVertexArray(vertices);
- 	backgroundQuad->dirtyDisplayList();
- 	
- }
  
  
--- 641,644 ----
***************
*** 801,810 ****
  void tc3DWindow::DrawBorder() 
  {
! 	osg::Vec4 white(1.0f, 1.0f, 1.0f, 1.0f);
  
! 	DrawLine(0, 0, 0, mnHeight, white); // left
! 	DrawLine(0, mnHeight-1, mnWidth, mnHeight-1, white); // top
! 	DrawLine(mnWidth-1, 0, mnWidth-1, mnHeight, white); // right
! 	DrawLine(0, 0, mnWidth, 0, white); // bottom
  }
  
--- 950,967 ----
  void tc3DWindow::DrawBorder() 
  {
! 	if (cornerRadius == 0)
! 	{
! 		osg::Vec4 white(1.0f, 1.0f, 1.0f, 0.7f);
  
! 		DrawLine(0, 0, 0, mnHeight, white); // left
! 		DrawLine(0, mnHeight-1, mnWidth, mnHeight-1, white); // top
! 		DrawLine(mnWidth-1, 0, mnWidth-1, mnHeight, white); // right
! 		DrawLine(0, 0, mnWidth, 0, white); // bottom
! 	}
! 	else
! 	{
! 		wxASSERT(border.valid());
! 		DrawGeometry(border.get(), 0, 0);
! 	}
  }
  
***************
*** 1280,1283 ****
--- 1437,1445 ----
  }
  
+ float tc3DWindow::GetCornerRadius() const
+ {
+ 	return cornerRadius;
+ }
+ 
  osgText::Font* tc3DWindow::GetDefaultFont()
  {
***************
*** 1440,1443 ****
--- 1602,1615 ----
  }
  
+ void tc3DWindow::SetCornerRadius(float r)
+ {
+ 	if (cornerRadius != r)
+ 	{
+ 		cornerRadius = r;
+ 		UpdateBackgroundShape();
+ 	}
+ }
+ 
+ 
  void tc3DWindow::SetOpaque()
  {
***************
*** 1992,1996 ****
  	//	setRenderBinDetails(baseRenderBin + backgroundRenderBin, "RenderBin");
  
! 	UpdateBackgroundQuadVertices();
  
  	osg::StateSet* textStateSet = textRoot->getOrCreateStateSet();
--- 2164,2169 ----
  	//	setRenderBinDetails(baseRenderBin + backgroundRenderBin, "RenderBin");
  
! 	//UpdateBackgroundQuadVertices();
! 	UpdateBackgroundShape();
  
  	osg::StateSet* textStateSet = textRoot->getOrCreateStateSet();
***************
*** 2054,2058 ****
          hostParent(graphicsHost),
          blendingOn(true),
! 		isMouseCaptured(false)
  
  {
--- 2227,2232 ----
          hostParent(graphicsHost),
          blendingOn(true),
! 		isMouseCaptured(false),
! 		cornerRadius(0)
  
  {
***************
*** 2094,2097 ****
--- 2268,2272 ----
      groupStateSet->setRenderBinDetails(baseRenderBin + geometryRenderBin, "RenderBin");
  	
+ 
  	textRoot = new osg::Geode;
  	osg::StateSet* textStateSet = textRoot->getOrCreateStateSet();
***************
*** 2126,2129 ****
--- 2301,2305 ----
  	//stateSet->setAttributeAndModes(depth, osg::StateAttribute::ON);
  
+ 
  	switchNode = new osg::Switch;
  	switchNode->addChild(root.get());
***************
*** 2157,2161 ****
  
  
- 
  	/* need to update to create default icon position as a 
  	** function of initial window position
--- 2333,2336 ----
***************
*** 2202,2206 ****
  	referenceText->setUseDisplayList(false);
  
! 	CreateBackgroundQuad();
  	
  	//LoadBackgroundImage("console_b.jpg");
--- 2377,2381 ----
  	referenceText->setUseDisplayList(false);
  
! 	UpdateBackgroundShape();
  	
  	//LoadBackgroundImage("console_b.jpg");

Index: tcTextEntryBox.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcTextEntryBox.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcTextEntryBox.cpp	12 Dec 2005 02:37:01 -0000	1.1
--- tcTextEntryBox.cpp	5 Jan 2006 03:47:22 -0000	1.2
***************
*** 134,137 ****
--- 134,138 ----
  
  	SetBaseRenderBin(parent->GetBaseRenderBin() + 10);
+ 	tc3DWindow::MoveToTop();
  
      // add chat text edit box

Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DViewer.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tc3DViewer.cpp	12 Dec 2005 02:37:01 -0000	1.28
--- tc3DViewer.cpp	5 Jan 2006 03:47:22 -0000	1.29
***************
*** 260,263 ****
--- 260,265 ----
  {
      isMouseDown = false;
+ 
+ 	event.Skip(); // pass up to app level
  }
  
***************
*** 291,294 ****
--- 293,298 ----
  void tc3DViewer::OnMouseMove(wxMouseEvent& event)
  {
+ 	event.Skip(); // pass up to app level
+ 
      wxPoint point = event.GetPosition();
      if (isMouseDown)

[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.149,1.150 gcb.cpp,1.20,1.21 tcESMSensor.cpp,1.15,1.16 tcObjectControl.cpp,1.49,1.50 tcRadar.cpp,1.34,1.35 tcSensorState.cpp,1.16,1.17 tcSonar.cpp,1.14,1.15

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

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

Modified Files:
	Game.cpp gcb.cpp tcESMSensor.cpp tcObjectControl.cpp 
	tcRadar.cpp tcSensorState.cpp tcSonar.cpp 
Log Message:
db fixes, GUI tweaks, random sensor detections

Index: tcSonar.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSonar.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcSonar.cpp	14 Jul 2005 23:42:24 -0000	1.14
--- tcSonar.cpp	5 Jan 2006 03:47:22 -0000	1.15
***************
*** 170,174 ****
      last_range_km = range_km;
  
!     return excessSNR > 0;
  }
  
--- 170,174 ----
      last_range_km = range_km;
  
!     return RandomDetect(excessSNR);
  }
  

Index: tcESMSensor.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcESMSensor.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcESMSensor.cpp	22 Jun 2005 01:22:09 -0000	1.15
--- tcESMSensor.cpp	5 Jan 2006 03:47:22 -0000	1.16
***************
*** 185,193 ****
          + 20.0f*(log10f(mpDBObj->mfRefRange_km)-log10f(targetRange_km));
  
!     if (fSNR >= 0) 
!     {
!         return true;
!     }
!     return false;
  }
  
--- 185,189 ----
          + 20.0f*(log10f(mpDBObj->mfRefRange_km)-log10f(targetRange_km));
  
! 	return RandomDetect(fSNR);
  }
  

Index: tcObjectControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcObjectControl.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** tcObjectControl.cpp	2 Jan 2006 15:40:53 -0000	1.49
--- tcObjectControl.cpp	5 Jan 2006 03:47:22 -0000	1.50
***************
*** 1344,1347 ****
--- 1344,1349 ----
  {
  	isMouseOver = false;
+ 
+ 	event.Skip(); // pass up so that event can be passed back to map for edge scroll
  }
  
***************
*** 1578,1581 ****
--- 1580,1585 ----
  void tcObjectControl::OnMouseMove(wxMouseEvent& event) 
  {
+ 	event.Skip(); // pass upward to application
+ 
      wxASSERT(mpSS);
      if (mpHookedGameObj == NULL) {return;} // no valid hooked obj

Index: tcSensorState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSensorState.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcSensorState.cpp	28 Jun 2005 02:51:35 -0000	1.16
--- tcSensorState.cpp	5 Jan 2006 03:47:22 -0000	1.17
***************
*** 223,226 ****
--- 223,250 ----
  
  /**
+ * Adds randomness to detection with Pd that varies with SNR margin
+ * Pd varies linearly over hard-coded window, with Pd = 0.5 at 0 dB margin
+ * @return true if detected, false otherwise
+ */
+ bool tcSensorState::RandomDetect(float margin_dB)
+ {
+ 	const float snr_window_dB = 3.0f;
+ 	const float pd_scale = 0.1666f;
+ 	if (margin_dB < -snr_window_dB)
+ 	{
+ 		return false;
+ 	}
+ 	else if (margin_dB >= snr_window_dB)
+ 	{
+ 		return true;
+ 	}
+ 	else
+ 	{
+ 		return ( randf() <= (pd_scale * (margin_dB + snr_window_dB)) );
+ 	}
+ 
+ }
+ 
+ /**
   *
   */

Index: gcb.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/gcb.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gcb.cpp	19 Nov 2005 19:27:47 -0000	1.20
--- gcb.cpp	5 Jan 2006 03:47:22 -0000	1.21
***************
*** 43,47 ****
--- 43,49 ----
    	EVT_KEY_DOWN(GcbApp::OnKeyDown)  ///< any key has been pressed
    	EVT_CHAR(GcbApp::OnChar)
+ 	EVT_LEAVE_WINDOW(GcbApp::OnLeaveWindow)
  	EVT_LEFT_DOWN(GcbApp::OnLButtonDown)
+ 	EVT_MOTION(GcbApp::OnMouseMove)
  	EVT_RIGHT_DOWN(GcbApp::OnRButtonDown)
  	EVT_ERASE_BACKGROUND(GcbApp::OnEraseBackground)
***************
*** 96,99 ****
--- 98,112 ----
  }
  
+ void GcbApp::OnLeaveWindow(wxMouseEvent& event)
+ {
+ 	gameFrame->OnLeaveWindow(event);
+ }
+ 
+ void GcbApp::OnMouseMove(wxMouseEvent& event)
+ {
+ 	gameFrame->OnMouseMove(event);
+ }
+ 
+ 
  /**
   * Passes the right mouse button down event to gameFrame.

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** Game.cpp	2 Jan 2006 15:40:53 -0000	1.149
--- Game.cpp	5 Jan 2006 03:47:22 -0000	1.150
***************
*** 79,82 ****
--- 79,83 ----
  EVT_NC_PAINT(tcGame::OnNcPaint)
  EVT_ERASE_BACKGROUND(tcGame::OnEraseBackground)
+ EVT_LEAVE_WINDOW(tcGame::OnLeaveWindow)
  EVT_LEFT_DOWN(tcGame::OnLButtonDown)
  EVT_LEFT_UP(tcGame::OnLButtonUp)
***************
*** 988,992 ****
  	mrectLowerLeft.bottom = mnHeight;
  
! 	infoConsole = new tcSoundConsole(glCanvas, 
  		wxPoint(mrectLowerLeft.left, mrectLowerLeft.top), 
  		wxSize(panelWidth, mrectLowerLeft.bottom - mrectLowerLeft.top),
--- 989,993 ----
  	mrectLowerLeft.bottom = mnHeight;
  
! 	infoConsole = new tcSoundConsole(gameWindow, 
  		wxPoint(mrectLowerLeft.left, mrectLowerLeft.top), 
  		wxSize(panelWidth, mrectLowerLeft.bottom - mrectLowerLeft.top),
***************
*** 1003,1007 ****
  
  	infoConsole->SetEffect(""); //"MutedBeep"); // no sound
- //	infoConsole->InitGdi(10.0f,0xFF64FF64);
  	infoConsole->SetLineSpacing(10);
  	//infoConsole->SetWrap(28);
--- 1004,1007 ----
***************
*** 1010,1014 ****
  
  	/* ** hookInfo init  * **/
! 	hookInfo = new tcHookInfo(glCanvas, 
  		wxPoint(mrectLowerLeft.right,mrectLowerLeft.top),
  		wxSize(panelWidth, mrectLowerLeft.bottom - mrectLowerLeft.top),
--- 1010,1014 ----
  
  	/* ** hookInfo init  * **/
! 	hookInfo = new tcHookInfo(gameWindow, 
  		wxPoint(mrectLowerLeft.right,mrectLowerLeft.top),
  		wxSize(panelWidth, mrectLowerLeft.bottom - mrectLowerLeft.top),
***************
*** 1030,1038 ****
  
  	// objectControl init
! 	objectControl = new tcObjectControl(glCanvas, 
  		wxPoint(mrectLowerLeft.right+panelWidth, mrectLowerLeft.top), 
  		wxSize(mnWidth-2*panelWidth, 200), "ObjectControl",
  		gameWindow);
- 	//objectControl->SetBaseRenderBin(20);
  	if (!objectControl)
  	{
--- 1030,1037 ----
  
  	// objectControl init
! 	objectControl = new tcObjectControl(gameWindow, 
  		wxPoint(mrectLowerLeft.right+panelWidth, mrectLowerLeft.top), 
  		wxSize(mnWidth-2*panelWidth, 200), "ObjectControl",
  		gameWindow);
  	if (!objectControl)
  	{
***************
*** 1052,1056 ****
  	mrectOOB.right = panelWidth;
  	mrectOOB.bottom = mnHeight-200;
! 	oobView = new tcOOBView(glCanvas, wxPoint(mrectOOB.left,mrectOOB.top),
  		wxSize(mrectOOB.right-mrectOOB.left, mrectOOB.bottom-mrectOOB.top),
  		"OrderOfBattle", gameWindow);
--- 1051,1055 ----
  	mrectOOB.right = panelWidth;
  	mrectOOB.bottom = mnHeight-200;
! 	oobView = new tcOOBView(gameWindow, wxPoint(mrectOOB.left,mrectOOB.top),
  		wxSize(mrectOOB.right-mrectOOB.left, mrectOOB.bottom-mrectOOB.top),
  		"OrderOfBattle", gameWindow);
***************
*** 1064,1074 ****
  
  
- 	//oobView->LoadBackgroundImage("console_b.jpg");
- 
  	oobView->AttachMapView(tacticalMap);
  	oobView->mnAlliance = userInfo->GetOwnAlliance(); // TODO: make this configurable
  
  	// popupControl init
! 	popupControl = new tcPopupControl(glCanvas, wxPoint(1400, 400), 
  		wxSize(400, 400));
  	popupControl->SetBaseRenderBin(40);
--- 1063,1072 ----
  
  
  	oobView->AttachMapView(tacticalMap);
  	oobView->mnAlliance = userInfo->GetOwnAlliance(); // TODO: make this configurable
  
+ 
  	// popupControl init
! 	popupControl = new tcPopupControl(gameWindow, wxPoint(1400, 400), 
  		wxSize(400, 400));
  	popupControl->SetBaseRenderBin(40);
***************
*** 1083,1088 ****
  	popupControl->SetActive(false);
  	popupControl->SetBlend(true);
- 	//popupControl->Show(true); // to prevent artifact when displaying for first time
- 	//popupControl->SetSkipCount(0);
  	popupControl->Raise(); // bring popup to top of windows hierarchy to receive mouse events
  
--- 1081,1084 ----
***************
*** 1095,1124 ****
  
      // should inherit these from common base?
!     tcPopupMessage::SetParent(tacticalMap);
!     tcLauncherPopup::SetParent(tacticalMap); 
  	tcContainerGui::SetParent(gameWindow);
! 	tcTextEntryBox::SetParent(tacticalMap);
! 
! #if 0
! 
! 
! 	/ * ** Console init  * **/
! 		mrectConsole.left = 400;
! 	mrectConsole.top = 0;
! 	mrectConsole.right = r.right-r.left;
! 	mrectConsole.bottom = 200;
! 	mcConsole.SetWindow(mrectConsole);
! 
! 	if(!mcConsole.CreateSurfaces(mpGraphicsEngine))
! 	{
! 		return false;
! 	}
! 
! 	/ * ** help view  * **/
! 		mcHelpView.SetWindow(mrectOOB);
! 	mcHelpView.LoadBackgroundImage("console_b.jpg");
! 	mcHelpView.ShareSurfaceWith(&mcOOBView);
! 	mcHelpView.LoadText("help.txt");
! #endif
  
  
--- 1091,1098 ----
  
      // should inherit these from common base?
!     tcPopupMessage::SetParent(gameWindow);
!     tcLauncherPopup::SetParent(gameWindow); 
  	tcContainerGui::SetParent(gameWindow);
! 	tcTextEntryBox::SetParent(gameWindow);
  
  
***************
*** 2030,2034 ****
  }
  
! void tcGame::OnMouseMove(wxMouseEvent& event) {}
  
  void tcGame::OnMouseWheel(wxMouseEvent& event) {}
--- 2004,2017 ----
  }
  
! void tcGame::OnMouseMove(wxMouseEvent& event)
! {
! 	if (meGameMode != GM_PLAY) return;
! 
! 	// pass back to tactical map to cancel edge scroll
! 	if (tacticalMap->IsActive())
! 	{
! 		tacticalMap->CancelScroll();
! 	}
! }
  
  void tcGame::OnMouseWheel(wxMouseEvent& event) {}
***************
*** 2055,2059 ****
  }
  
! void tcGame::OnLButtonUp(wxMouseEvent& event) {}
  
  
--- 2038,2059 ----
  }
  
! void tcGame::OnLButtonUp(wxMouseEvent& event)
! {
! }
! 
! 
! void tcGame::OnLeaveWindow(wxMouseEvent& event)
! {
! 	if (meGameMode != GM_PLAY) return;
! 
! 	// pass back to tactical map to handle edge scroll
! 	if (tacticalMap->IsActive())
! 	{
! 		// use screen coords since this event is passed from a sub window with local coords
! 		wxPoint pos = wxGetMousePosition();
! 		tacticalMap->UpdateEdgeScroll(pos);
! 	}
! }
! 
  
  

Index: tcRadar.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcRadar.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** tcRadar.cpp	27 Nov 2005 22:21:29 -0000	1.34
--- tcRadar.cpp	5 Jan 2006 03:47:22 -0000	1.35
***************
*** 190,209 ****
  		(mpDBObj->mbDetectsGround && isGround);
  
!     bool bDetectable;
      if (isSemiactive)
      {
!         bDetectable = 
              20.0f*(2.0f*log10f(mpDBObj->mfRefRange_km) 
              - log10f(fTargetRange_km)
              - log10f(illuminatorTargetRange_km)
!             ) + rcs_dBsm >= 0;
      }
      else
      {
!         bDetectable = 
!             (40.0f*(log10f(mpDBObj->mfRefRange_km) - log10f(fTargetRange_km)) + rcs_dBsm >= 0);
      }
-     return bDetectable && bTargetTypeMatch;
  
  }
  
--- 190,212 ----
  		(mpDBObj->mbDetectsGround && isGround);
  
! 	if (bTargetTypeMatch == false) return false;
! 
! 	float margin_dB; // SNR margin
! 
      if (isSemiactive)
      {
! 		margin_dB = 
              20.0f*(2.0f*log10f(mpDBObj->mfRefRange_km) 
              - log10f(fTargetRange_km)
              - log10f(illuminatorTargetRange_km)
!             ) + rcs_dBsm ;
      }
      else
      {
! 		margin_dB = 
!             40.0f*(log10f(mpDBObj->mfRefRange_km) - log10f(fTargetRange_km)) + rcs_dBsm;
      }
  
+     return RandomDetect(margin_dB);
  }
  

[Gcblue-commits] gcb_wx/xml briefing_view.xml,NONE,1.1 flightport_gui_default.xml,NONE,1.1 oobview.xml,NONE,1.1 platform_gui_default.xml,NONE,1.1 stores_gui_default.xml,NONE,1.1 test_container.xml,NONE,1.1 text_entry_box.xml,NONE,1.1

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

Update of /cvsroot/gcblue/gcb_wx/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30927/xml

Added Files:
	briefing_view.xml flightport_gui_default.xml oobview.xml 
	platform_gui_default.xml stores_gui_default.xml 
	test_container.xml text_entry_box.xml 
Log Message:
db fixes, GUI tweaks, random sensor detections

--- NEW FILE: oobview.xml ---
<Window>

<Button X="10" Y="5" Width="80" Height="15" Caption="OWN" Command="1" YDir="1" FontSize="10" Alpha="0.5" />
<Button X="100" Y="5" Width="80" Height="15" Caption="TRACKS" Command="2" YDir="1" FontSize="10" Alpha="0.5" />


</Window>
--- NEW FILE: stores_gui_default.xml ---
<Window Width="180" Height="250" BackgroundImage="dblue031.jpg" >
  <Button X="162" Y="2" Width="16" Height="16" Command="86" Caption="">
    <Image Off="close.png" On="close.png" />
  </Button>
  <Stores SlotSize="32" UpperLeftX="12" UpperLeftY="30" HorizontalSpacing="40" VerticalSpacing="55" RowSize="4" />



</Window>
--- NEW FILE: flightport_gui_default.xml ---
<Window Width="420" Height="260" BackgroundImage="flightport_background1.jpg" >
  <Button X="402" Y="2" Width="16" Height="16" Command="86" Caption="">
    <Image Off="close.png" On="close.png" />
  </Button>
  <FlightPort SlotSize="32" LaunchX="15" LaunchY="30" LaunchSpacing="40" ReadyX="15" ReadyY="90" ReadySpacing="40" HangarX="15" HangarY="155" HangarSpacingH="40" HangarSpacingV="55" HangarRowSize="10" />



</Window>
--- NEW FILE: test_container.xml ---
<Window Width="400" Height="300" BackgroundImage="dblue031.jpg" >
  <Button X="384" Y="0" Width="16" Height="16" Command="86" Caption="">
    <Image Off="close.png" On="close.png" />
  </Button>
  <Slot X="10" Y="60" Size="32"/>
  <Slot X="50" Y="60" Size="32"/>
  <Slot X="10" Y="100" Size="32"/>
  <Slot X="50" Y="100" Size="32"/>

</Window>
--- NEW FILE: text_entry_box.xml ---
<Window>
  <TextEntry X="5" Y="15" Width="200" Height="16" BarX="0.0" BarY="1.0" BarWidth="200.0" BarHeight="14.0" Caption="Enter Text" FontSize="14.0"  DrawBorder="1"/>
</Window>
--- NEW FILE: briefing_view.xml ---
<Window BackgroundImage="briefing_background.jpg">

  <Button X="30" Y="30" Width="65" Height="15" Caption="Play" Command="10"/>
  <Button X="100" Y="30" Width="65" Height="15" Caption="Options" Command="40"/>
  <Button X="170" Y="30" Width="65" Height="15" Caption="Network" Command="60"/>

</Window>
--- NEW FILE: platform_gui_default.xml ---
<Window Width="420" Height="190" BackgroundImage="dblue031.jpg" >
  <Button X="402" Y="2" Width="16" Height="16" Command="86" Caption="">
    <Image Off="close.png" On="close.png" />
  </Button>
  <Platform SlotSize="32" LauncherLocX="12" LauncherLocY="30" LauncherOffsetX="50" MagazineLocX="12" MagazineLocY="85" MagazineOffsetX="50" FlightPortLocX="12" FlightPortLocY="140" FuelLocX="300" FuelLocY="140" />



</Window>

[Gcblue-commits] gcb_wx/scenarios TaiwanTest.py,1.5,NONE

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

Update of /cvsroot/gcblue/gcb_wx/scenarios
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30927/scenarios

Removed Files:
	TaiwanTest.py 
Log Message:
db fixes, GUI tweaks, random sensor detections

--- TaiwanTest.py DELETED ---

[Gcblue-commits] gcb_wx/include/sim Game.h,1.64,1.65 gcb.h,1.10,1.11 tcSensorState.h,1.20,1.21

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

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30927/include/sim

Modified Files:
	Game.h gcb.h tcSensorState.h 
Log Message:
db fixes, GUI tweaks, random sensor detections

Index: tcSensorState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorState.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcSensorState.h	28 Jun 2005 02:51:20 -0000	1.20
--- tcSensorState.h	5 Jan 2006 03:47:22 -0000	1.21
***************
*** 117,120 ****
--- 117,122 ----
      unsigned char fireControlIdx; ///< sensor index of fire control sensor platform
  
+ 	bool RandomDetect(float margin_dB);
+ 
  };
  #endif
\ No newline at end of file

Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Game.h	2 Jan 2006 15:40:52 -0000	1.64
--- Game.h	5 Jan 2006 03:47:22 -0000	1.65
***************
*** 256,259 ****
--- 256,260 ----
      void OnLButtonDown(wxMouseEvent& event);
      void OnLButtonUp(wxMouseEvent& event);
+ 	void OnLeaveWindow(wxMouseEvent& event);
      void OnMouseMove(wxMouseEvent& event);
      void OnMouseWheel(wxMouseEvent& event);

Index: gcb.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/gcb.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gcb.h	19 Nov 2005 19:27:47 -0000	1.10
--- gcb.h	5 Jan 2006 03:47:22 -0000	1.11
***************
*** 42,46 ****
      void OnKeyDown(wxKeyEvent& event);
      void OnLButtonDown(wxMouseEvent& event);
!     void OnRButtonDown(wxMouseEvent& event);
  
  private:
--- 42,48 ----
      void OnKeyDown(wxKeyEvent& event);
      void OnLButtonDown(wxMouseEvent& event);
!     void OnLeaveWindow(wxMouseEvent& event);
! 	void OnMouseMove(wxMouseEvent& event);
! 	void OnRButtonDown(wxMouseEvent& event);
  
  private: