gcblue-commits — Mailing list for CVS commit messages

[Gcblue-commits] gcb_wx/src/sim gcb.cpp,1.15,1.16 tc3DViewer.cpp,1.32,1.33 tcAIData.cpp,1.5,1.6 tcAero.cpp,1.4,1.5 tcAeroAirObject.cpp,1.5,1.6 tcChatBox.cpp,1.1,1.2 tcCustomControl.cpp,1.4,1.5 tcDirectorEvent.cpp,1.7,1.8 tcESMSensor.cpp,1.5,1.6 tcEditControl.cpp,1.6,1.7 tcEngagementData.cpp,1.1,1.2 tcFlightPort.cpp,1.8,1.9 tcGameObjIterator.cpp,1.3,1.4 tcGameObject.cpp,1.18,1.19 tcGameView.cpp,1.11,1.12 tcGoal.cpp,1.3,1.4 tcGoalTracker.cpp,1.3,1.4 tcGuidanceState.cpp,1.2,1.3 tcHookInfo.cpp,1.8,1.9 tcLaunchRequest.cpp,1.1,1.2 tcMapView.cpp,1.28,1.29 tcMenu.cpp,1.5,1.6 tcNetworkView.cpp,1.13,1.14 tcOOBView.cpp,1.6,1.7 tcPanel.cpp,1.4,1.5 tcPopupControl.cpp,1.6,1.7 tcRadar.cpp,1.10,1.11 tcScenarioSelectView.cpp,1.14,1.15 tcSensorMap.cpp,1.8,1.9 tcSensorState.cpp,1.9,1.10 tcStartView.cpp,1.10,1.11 tcSurfaceObject.cpp,1.11,1.12 tcTerrainView.cpp,1.11,1.12 tcTime.cpp,1.6,1.7 tcUserInfo.cpp,1.3,1.4 tcWeaponObject.cpp,1.6,1.7

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

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

Modified Files:
	gcb.cpp tc3DViewer.cpp tcAIData.cpp tcAero.cpp 
	tcAeroAirObject.cpp tcChatBox.cpp tcCustomControl.cpp 
	tcDirectorEvent.cpp tcESMSensor.cpp tcEditControl.cpp 
	tcEngagementData.cpp tcFlightPort.cpp tcGameObjIterator.cpp 
	tcGameObject.cpp tcGameView.cpp tcGoal.cpp tcGoalTracker.cpp 
	tcGuidanceState.cpp tcHookInfo.cpp tcLaunchRequest.cpp 
	tcMapView.cpp tcMenu.cpp tcNetworkView.cpp tcOOBView.cpp 
	tcPanel.cpp tcPopupControl.cpp tcRadar.cpp 
	tcScenarioSelectView.cpp tcSensorMap.cpp tcSensorState.cpp 
	tcStartView.cpp tcSurfaceObject.cpp tcTerrainView.cpp 
	tcTime.cpp tcUserInfo.cpp tcWeaponObject.cpp 
Log Message:


Index: tcStartView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcStartView.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcStartView.cpp	29 Feb 2004 22:51:36 -0000	1.10
--- tcStartView.cpp	8 Aug 2004 00:31:35 -0000	1.11
***************
*** 2,6 ****
  **  tcStartView.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcStartView.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcUserInfo.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcUserInfo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcUserInfo.cpp	26 Oct 2003 21:21:17 -0000	1.3
--- tcUserInfo.cpp	8 Aug 2004 00:31:35 -0000	1.4
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcAeroAirObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAeroAirObject.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcAeroAirObject.cpp	13 Feb 2004 01:31:33 -0000	1.5
--- tcAeroAirObject.cpp	8 Aug 2004 00:31:35 -0000	1.6
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcMenu.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMenu.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcMenu.cpp	30 Nov 2003 17:23:52 -0000	1.5
--- tcMenu.cpp	8 Aug 2004 00:31:35 -0000	1.6
***************
*** 2,6 ****
  **  tcMenu.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcMenu.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcPanel.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcPanel.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcPanel.cpp	30 Nov 2003 17:23:52 -0000	1.4
--- tcPanel.cpp	8 Aug 2004 00:31:35 -0000	1.5
***************
*** 2,6 ****
  **  tcPanel.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPanel.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcESMSensor.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcESMSensor.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcESMSensor.cpp	24 May 2004 00:14:47 -0000	1.5
--- tcESMSensor.cpp	8 Aug 2004 00:31:35 -0000	1.6
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcHookInfo.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcHookInfo.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcHookInfo.cpp	15 Feb 2004 19:47:23 -0000	1.8
--- tcHookInfo.cpp	8 Aug 2004 00:31:35 -0000	1.9
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcSensorMap.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSensorMap.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcSensorMap.cpp	8 May 2004 21:25:26 -0000	1.8
--- tcSensorMap.cpp	8 Aug 2004 00:31:35 -0000	1.9
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcTime.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcTime.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcTime.cpp	14 May 2004 23:37:08 -0000	1.6
--- tcTime.cpp	8 Aug 2004 00:31:35 -0000	1.7
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcCustomControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcCustomControl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcCustomControl.cpp	30 Nov 2003 17:23:52 -0000	1.4
--- tcCustomControl.cpp	8 Aug 2004 00:31:35 -0000	1.5
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcWeaponObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcWeaponObject.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcWeaponObject.cpp	27 Jul 2004 00:16:24 -0000	1.6
--- tcWeaponObject.cpp	8 Aug 2004 00:31:35 -0000	1.7
***************
*** 1,5 ****
  /** @file tcWeaponObject.cpp */
  /*  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,5 ----
  /** @file tcWeaponObject.cpp */
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcOOBView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcOOBView.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcOOBView.cpp	29 Feb 2004 22:51:36 -0000	1.6
--- tcOOBView.cpp	8 Aug 2004 00:31:35 -0000	1.7
***************
*** 1,5 ****
  /*  
  **  tcOOBView.cpp
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /*  
  **  tcOOBView.cpp
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcPopupControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcPopupControl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcPopupControl.cpp	21 Jun 2004 22:22:00 -0000	1.6
--- tcPopupControl.cpp	8 Aug 2004 00:31:35 -0000	1.7
***************
*** 2,6 ****
  **  tcPopupControl.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPopupControl.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapView.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tcMapView.cpp	19 Jul 2004 00:53:01 -0000	1.28
--- tcMapView.cpp	8 Aug 2004 00:31:35 -0000	1.29
***************
*** 2,6 ****
  **  tcMapView.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcMapView.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcGameView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcGameView.cpp	19 Jul 2004 00:53:01 -0000	1.11
--- tcGameView.cpp	8 Aug 2004 00:31:35 -0000	1.12
***************
*** 2,6 ****
  **  tcGameView.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcGameView.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcAero.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAero.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcAero.cpp	23 Apr 2004 00:15:17 -0000	1.4
--- tcAero.cpp	8 Aug 2004 00:31:35 -0000	1.5
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcAIData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAIData.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcAIData.cpp	8 Jan 2004 23:54:27 -0000	1.5
--- tcAIData.cpp	8 Aug 2004 00:31:35 -0000	1.6
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcEditControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcEditControl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcEditControl.cpp	14 May 2004 23:37:08 -0000	1.6
--- tcEditControl.cpp	8 Aug 2004 00:31:35 -0000	1.7
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcRadar.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcRadar.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcRadar.cpp	29 Jul 2004 00:14:19 -0000	1.10
--- tcRadar.cpp	8 Aug 2004 00:31:35 -0000	1.11
***************
*** 1,4 ****
  /*  
! *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  *  All rights reserved. 
  *
--- 1,4 ----
  /*  
! *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  *  All rights reserved. 
  *

Index: tcChatBox.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcChatBox.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcChatBox.cpp	24 May 2004 00:14:47 -0000	1.1
--- tcChatBox.cpp	8 Aug 2004 00:31:35 -0000	1.2
***************
*** 1,5 ****
  /** tcChatBox.cpp */
  /*
! **  Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** tcChatBox.cpp */
  /*
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcGuidanceState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGuidanceState.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcGuidanceState.cpp	13 Apr 2004 00:24:39 -0000	1.2
--- tcGuidanceState.cpp	8 Aug 2004 00:31:35 -0000	1.3
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved. 
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved. 
   *

Index: tcEngagementData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcEngagementData.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcEngagementData.cpp	3 Dec 2003 05:53:02 -0000	1.1
--- tcEngagementData.cpp	8 Aug 2004 00:31:35 -0000	1.2
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcDirectorEvent.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcDirectorEvent.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcDirectorEvent.cpp	24 Jun 2004 21:35:41 -0000	1.7
--- tcDirectorEvent.cpp	8 Aug 2004 00:31:35 -0000	1.8
***************
*** 2,6 ****
  **  tcDirectorEvent.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcDirectorEvent.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcTerrainView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcTerrainView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcTerrainView.cpp	24 Jun 2004 21:35:41 -0000	1.11
--- tcTerrainView.cpp	8 Aug 2004 00:31:35 -0000	1.12
***************
*** 2,6 ****
  **  tcTerrainView.cpp
  **
! **  Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcTerrainView.cpp
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcLaunchRequest.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLaunchRequest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcLaunchRequest.cpp	4 Dec 2003 05:15:22 -0000	1.1
--- tcLaunchRequest.cpp	8 Aug 2004 00:31:35 -0000	1.2
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved. 
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved. 
   *

Index: tcGameObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameObject.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcGameObject.cpp	6 Aug 2004 02:47:51 -0000	1.18
--- tcGameObject.cpp	8 Aug 2004 00:31:35 -0000	1.19
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved. 
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved. 
   *

Index: tcNetworkView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcNetworkView.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcNetworkView.cpp	9 May 2004 20:40:23 -0000	1.13
--- tcNetworkView.cpp	8 Aug 2004 00:31:35 -0000	1.14
***************
*** 1,5 ****
  /** tcNetworkView.cpp */
  /*
! **  Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** tcNetworkView.cpp */
  /*
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcSurfaceObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSurfaceObject.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcSurfaceObject.cpp	21 Jun 2004 22:22:00 -0000	1.11
--- tcSurfaceObject.cpp	8 Aug 2004 00:31:35 -0000	1.12
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcSensorState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSensorState.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcSensorState.cpp	24 May 2004 00:14:47 -0000	1.9
--- tcSensorState.cpp	8 Aug 2004 00:31:35 -0000	1.10
***************
*** 1,4 ****
  /**  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcGameObjIterator.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameObjIterator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcGameObjIterator.cpp	9 Apr 2004 03:08:09 -0000	1.3
--- tcGameObjIterator.cpp	8 Aug 2004 00:31:35 -0000	1.4
***************
*** 1,5 ****
  /** @file tcGameObjIterator.cpp */
  /**
! *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  *  All rights reserved.
  *
--- 1,5 ----
  /** @file tcGameObjIterator.cpp */
  /**
! *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  *  All rights reserved.
  *

Index: gcb.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/gcb.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gcb.cpp	14 Jun 2004 21:52:55 -0000	1.15
--- gcb.cpp	8 Aug 2004 00:31:34 -0000	1.16
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcScenarioSelectView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcScenarioSelectView.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcScenarioSelectView.cpp	20 Mar 2004 18:46:47 -0000	1.14
--- tcScenarioSelectView.cpp	8 Aug 2004 00:31:35 -0000	1.15
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcFlightPort.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcFlightPort.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcFlightPort.cpp	18 Jul 2004 03:18:01 -0000	1.8
--- tcFlightPort.cpp	8 Aug 2004 00:31:35 -0000	1.9
***************
*** 1,5 ****
  /** @file tcFlightport.cpp */
  /**
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,5 ----
  /** @file tcFlightport.cpp */
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcGoalTracker.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGoalTracker.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcGoalTracker.cpp	10 Jan 2004 21:55:31 -0000	1.3
--- tcGoalTracker.cpp	8 Aug 2004 00:31:35 -0000	1.4
***************
*** 2,6 ****
  **  tcGoalTracker.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcGoalTracker.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tc3DViewer.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tc3DViewer.cpp	18 Jul 2004 03:18:01 -0000	1.32
--- tc3DViewer.cpp	8 Aug 2004 00:31:35 -0000	1.33
***************
*** 2,6 ****
  **  tc3DViewer.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tc3DViewer.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcGoal.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGoal.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcGoal.cpp	29 Dec 2003 01:10:25 -0000	1.3
--- tcGoal.cpp	8 Aug 2004 00:31:35 -0000	1.4
***************
*** 2,6 ****
  **  tcGoal.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcGoal.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/include/sqlite sqlite_internal.h,NONE,1.1 sqlite_plus.h,NONE,1.1

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

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

Added Files:
	sqlite_internal.h sqlite_plus.h 
Log Message:


--- NEW FILE: sqlite_plus.h ---
/*
	Copyright (c) 2004 Cory Nelson

	Permission is hereby granted, free of charge, to any person obtaining
	a copy of this software and associated documentation files (the
	"Software"), to deal in the Software without restriction, including
	without limitation the rights to use, copy, modify, merge, publish,
	distribute, sublicense, and/or sell copies of the Software, and to
	permit persons to whom the Software is furnished to do so, subject to
	the following conditions:

	The above copyright notice and this permission notice shall be included
	in all copies or substantial portions of the Software.

	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#ifndef __SQLITE_PLUS_H__
#define __SQLITE_PLUS_H__

#include <string>
#include <cstdarg>

namespace sqlite {
	class connection {
	private:
		void *internal;

		class reader executereader(const char *fmt, va_list args);
	
	public:
		connection();
		connection(const char *db);
		~connection();

		void open(const char *db);
		void close();

		int insertid();

		int executenonquery(const char *fmt, ...);
		std::string executescalar(const char *fmt, ...);
		class reader executereader(const char *fmt, ...);
	};

	class reader {
		friend connection;

	private:
		void *vm;
		int argc;
		const char **argv;

	public:
		reader();
		bool read();
		void close();

		int GetFieldCount() {return argc;}
		int getint(int index);
		double getdouble(int index);
		std::string getstring(int index);

		std::string operator[](int index);
	};
};

#endif

--- NEW FILE: sqlite_internal.h ---
/*
	Copyright (c) 2004 Cory Nelson

	Permission is hereby granted, free of charge, to any person obtaining
	a copy of this software and associated documentation files (the
	"Software"), to deal in the Software without restriction, including
	without limitation the rights to use, copy, modify, merge, publish,
	distribute, sublicense, and/or sell copies of the Software, and to
	permit persons to whom the Software is furnished to do so, subject to
	the following conditions:

	The above copyright notice and this permission notice shall be included
	in all copies or substantial portions of the Software.

	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#ifndef __SQLITE_PLUS_INTERNAL_H__
#define __SQLITE_PLUS_INTERNAL_H__

#include <cstdarg>

#ifndef SQLITE_OK
#define SQLITE_OK 0
#endif

#ifndef SQLITE_ROW
#define SQLITE_ROW 100
#endif

#ifndef SQLITE_DONE
#define SQLITE_DONE 101
#endif

void *_sqlite_open(const char *db);
void _sqlite_close(void *db);
int _sqlite_compile(void *db, const char *sql, void **vm);
int _sqlite_step(void *vm, int *argc, const char ***argv);
int _sqlite_finalize(void *vm);
int _sqlite_last_insert_rowid(void *db);
int _sqlite_changes(void *db);

char *_sqlite_vmprintf(const char *fmt, va_list args);
void _sqlite_freemem(char *str);

const char *_sqlite_error_string(int err);

#endif

[Gcblue-commits] gcb_wx/src/network tcConnectionData.cpp,1.7,1.8 tcControlMessageHandler.cpp,1.5,1.6 tcMessage.cpp,1.6,1.7 tcMessageHandler.cpp,1.2,1.3 tcMultiplayerInterface.cpp,1.16,1.17 tcNetworkInterface.cpp,1.12,1.13 tcTextMessageHandler.cpp,1.2,1.3

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

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

Modified Files:
	tcConnectionData.cpp tcControlMessageHandler.cpp tcMessage.cpp 
	tcMessageHandler.cpp tcMultiplayerInterface.cpp 
	tcNetworkInterface.cpp tcTextMessageHandler.cpp 
Log Message:


Index: tcMessage.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMessage.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcMessage.cpp	24 May 2004 00:14:46 -0000	1.6
--- tcMessage.cpp	8 Aug 2004 00:31:34 -0000	1.7
***************
*** 2,6 ****
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMessageHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcMessageHandler.cpp	27 Apr 2004 21:45:14 -0000	1.2
--- tcMessageHandler.cpp	8 Aug 2004 00:31:34 -0000	1.3
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2004 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcConnectionData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcConnectionData.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcConnectionData.cpp	14 May 2004 23:37:08 -0000	1.7
--- tcConnectionData.cpp	8 Aug 2004 00:31:34 -0000	1.8
***************
*** 2,6 ****
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  /*
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcNetworkInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcNetworkInterface.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcNetworkInterface.cpp	14 May 2004 23:37:08 -0000	1.12
--- tcNetworkInterface.cpp	8 Aug 2004 00:31:34 -0000	1.13
***************
*** 1,5 ****
  /** @file tcNetworkInterface.cpp */
  /*
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcNetworkInterface.cpp */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcTextMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcTextMessageHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcTextMessageHandler.cpp	27 Apr 2004 21:45:14 -0000	1.2
--- tcTextMessageHandler.cpp	8 Aug 2004 00:31:34 -0000	1.3
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2004 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcMultiplayerInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMultiplayerInterface.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcMultiplayerInterface.cpp	14 May 2004 23:37:08 -0000	1.16
--- tcMultiplayerInterface.cpp	8 Aug 2004 00:31:34 -0000	1.17
***************
*** 1,5 ****
  /** @file tcMultiplayerInterface.cpp 
  **
! **  Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcMultiplayerInterface.cpp 
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcControlMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcControlMessageHandler.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcControlMessageHandler.cpp	27 Apr 2004 21:45:14 -0000	1.5
--- tcControlMessageHandler.cpp	8 Aug 2004 00:31:34 -0000	1.6
***************
*** 2,6 ****
  *  @file tcControlMessageHandler.cpp
  *
! *  Copyright (C) 2004 Dewitt "Cole" Colclough (de...@tw...)
  *  All rights reserved.
  *
--- 2,6 ----
  *  @file tcControlMessageHandler.cpp
  *
! *  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  *  All rights reserved.
  *

[Gcblue-commits] gcb_wx/src/sqlite sqlite_connection.cpp,NONE,1.1 sqlite_internal.cpp,NONE,1.1 sqlite_reader.cpp,NONE,1.1

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

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

Added Files:
	sqlite_connection.cpp sqlite_internal.cpp sqlite_reader.cpp 
Log Message:


--- NEW FILE: sqlite_internal.cpp ---
/*
	Copyright (c) 2004 Cory Nelson

	Permission is hereby granted, free of charge, to any person obtaining
	a copy of this software and associated documentation files (the
	"Software"), to deal in the Software without restriction, including
	without limitation the rights to use, copy, modify, merge, publish,
	distribute, sublicense, and/or sell copies of the Software, and to
	permit persons to whom the Software is furnished to do so, subject to
	the following conditions:

	The above copyright notice and this permission notice shall be included
	in all copies or substantial portions of the Software.

	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include <cstdarg>

#ifndef NULL
#define NULL 0
#endif

#include <sqlite.h>
#include "sqlite/sqlite_internal.h"

void *_sqlite_open(const char *db) {
	return (void*)sqlite_open(db, 0, NULL);
}

void _sqlite_close(void *db) {
	sqlite_close((sqlite*)db);
}

int _sqlite_exec_vprintf(void *db, const char *sql, int (*cb)(void*,int,char**, char**), void *arg, va_list args) {
	return sqlite_exec_vprintf((sqlite*)db, sql, cb, arg, NULL, args);
}

int _sqlite_compile(void *db, const char *sql, void **vm) {
	const char *tail;
	return sqlite_compile((sqlite*)db, sql, &tail, (sqlite_vm**)vm, NULL);
}

int _sqlite_step(void *vm, int *argc, const char ***argv) {
	const char **colnames;
	return sqlite_step((sqlite_vm*)vm, argc, argv, &colnames);
}

int _sqlite_finalize(void *vm) {
	return sqlite_finalize((sqlite_vm*)vm, NULL);
}

const char *_sqlite_error_string(int err) {
	return sqlite_error_string(err);
}

int _sqlite_last_insert_rowid(void *db) {
	return sqlite_last_insert_rowid((sqlite*)db);
}

int _sqlite_changes(void *db) {
	return sqlite_changes((sqlite*)db);
}

char *_sqlite_vmprintf(const char *fmt, va_list args) {
	return sqlite_vmprintf(fmt, args);
}

void _sqlite_freemem(char *str) {
	sqlite_freemem(str);
}

--- NEW FILE: sqlite_reader.cpp ---
/*
	Copyright (c) 2004 Cory Nelson

	Permission is hereby granted, free of charge, to any person obtaining
	a copy of this software and associated documentation files (the
	"Software"), to deal in the Software without restriction, including
	without limitation the rights to use, copy, modify, merge, publish,
	distribute, sublicense, and/or sell copies of the Software, and to
	permit persons to whom the Software is furnished to do so, subject to
	the following conditions:

	The above copyright notice and this permission notice shall be included
	in all copies or substantial portions of the Software.

	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include <string>
#include <stdexcept>
#include <cstddef>
using namespace std;

#include "sqlite/sqlite_plus.h"
#include "sqlite/sqlite_internal.h"

namespace sqlite {
	reader::reader() {
		this->vm=NULL;
	}

	bool reader::read() {
		if(!this->vm) throw runtime_error("can't read from an unopened reader");

		int ret=_sqlite_step(this->vm, &this->argc, &this->argv);
		switch(ret) {
			case SQLITE_ROW:
				return true;
			case SQLITE_DONE:
				return false;
			default:
				throw runtime_error(_sqlite_error_string(ret));
		}
	}
	
	void reader::close() {
		if(this->vm) {
			int ret=_sqlite_finalize(this->vm);
			this->vm=NULL;
			if(ret!=SQLITE_OK) throw runtime_error(_sqlite_error_string(ret));
		}
	}
	
	int reader::getint(int index) {
		string s=this->getstring(index);
		return atoi(s.c_str());
	}

	double reader::getdouble(int index) {
		string s=this->getstring(index);
		return atof(s.c_str());
	}

	std::string reader::getstring(int index) {
		if(index>(argc-1)) throw out_of_range("index is out of range");
		return argv[index]?argv[index]:"";
	}

	std::string reader::operator[](int index) {
		return this->getstring(index);
	}
};

--- NEW FILE: sqlite_connection.cpp ---
/*
	Copyright (c) 2004 Cory Nelson

	Permission is hereby granted, free of charge, to any person obtaining
	a copy of this software and associated documentation files (the
	"Software"), to deal in the Software without restriction, including
	without limitation the rights to use, copy, modify, merge, publish,
	distribute, sublicense, and/or sell copies of the Software, and to
	permit persons to whom the Software is furnished to do so, subject to
	the following conditions:

	The above copyright notice and this permission notice shall be included
	in all copies or substantial portions of the Software.

	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include <string>
#include <stdexcept>
#include <sstream>
#include <cstdarg>
using namespace std;

#include "sqlite/sqlite_plus.h"
#include "sqlite/sqlite_internal.h"

static int es_callback(void *arg, int argc, char *argv[], char **colnames) {
	if(argc>0 && argv[0]!=NULL) *((string*)arg)=argv[0];
	return 0;
}

namespace sqlite {
	connection::connection() {
		this->internal=NULL;
	}

	connection::connection(const char *db) {
		this->internal=NULL;
		this->open(db);
	}

	connection::~connection() {
		this->close();
	}

	void connection::open(const char *db) {
		this->internal=_sqlite_open(db);
	}

	void connection::close() {
		if(this->internal) {
			_sqlite_close(this->internal);
			this->internal=NULL;
		}
	}

	int connection::insertid() {
		if(!this->internal) throw runtime_error("must have an open connection to get insert id");
		return _sqlite_last_insert_rowid(this->internal);
	}

	reader connection::executereader(const char *fmt, va_list args) {
		char *sql=_sqlite_vmprintf(fmt, args);

		reader r;		
		int ret=_sqlite_compile(this->internal, sql, &r.vm);
		if(ret!=SQLITE_OK) throw runtime_error(_sqlite_error_string(ret));

		_sqlite_freemem(sql);
		
		return r;
	}

	int connection::executenonquery(const char *fmt, ...) {
		va_list args;
		va_start(args, fmt);
		reader r=this->executereader(fmt, args);
		va_end(args);

		r.read();
		r.close();

		return _sqlite_changes(this->internal);
	}

	string connection::executescalar(const char *fmt, ...) {
		va_list args;
		va_start(args, fmt);
		reader r=this->executereader(fmt, args);
		va_end(args);

		string str;
		if(r.read()) str=r[0];
		r.close();

		return str;
	}

	reader connection::executereader(const char *fmt, ...) {
		va_list args;
		va_start(args, fmt);
		reader r=this->executereader(fmt, args);
		va_end(args);
		
		return r;
	}
};

[Gcblue-commits] gcb_wx/src/graphics tc2DGraphicsSurface.cpp,1.9,1.10 tcButton.cpp,1.9,1.10 tcButtonConsole.cpp,1.3,1.4 tcConsoleBox.cpp,1.5,1.6 tcEditBox.cpp,1.5,1.6 tcFIFO.cpp,1.3,1.4 tcGraphicsEngine.cpp,1.16,1.17 tcMapObject.cpp,1.2,1.3 tcRadioButton.cpp,1.4,1.5 tcStandardWindow.cpp,1.7,1.8 tcTerrainTextureFactory.cpp,1.10,1.11 tcWindow.cpp,1.6,1.7

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

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

Modified Files:
	tc2DGraphicsSurface.cpp tcButton.cpp tcButtonConsole.cpp 
	tcConsoleBox.cpp tcEditBox.cpp tcFIFO.cpp tcGraphicsEngine.cpp 
	tcMapObject.cpp tcRadioButton.cpp tcStandardWindow.cpp 
	tcTerrainTextureFactory.cpp tcWindow.cpp 
Log Message:


Index: tcTerrainTextureFactory.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcTerrainTextureFactory.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcTerrainTextureFactory.cpp	26 Jul 2004 01:44:40 -0000	1.10
--- tcTerrainTextureFactory.cpp	8 Aug 2004 00:31:34 -0000	1.11
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcButtonConsole.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcButtonConsole.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcButtonConsole.cpp	27 Feb 2004 00:07:59 -0000	1.3
--- tcButtonConsole.cpp	8 Aug 2004 00:31:34 -0000	1.4
***************
*** 1,5 ****
  /** @file tcButtonConsole.cpp */
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcButtonConsole.cpp */
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcStandardWindow.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStandardWindow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcStandardWindow.cpp	11 Apr 2004 22:13:57 -0000	1.7
--- tcStandardWindow.cpp	8 Aug 2004 00:31:34 -0000	1.8
***************
*** 1,5 ****
  /** @file tcStandardWindow.cpp */
  /*
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcStandardWindow.cpp */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcFIFO.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcFIFO.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcFIFO.cpp	11 Apr 2004 22:21:38 -0000	1.3
--- tcFIFO.cpp	8 Aug 2004 00:31:34 -0000	1.4
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcMapObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapObject.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcMapObject.cpp	11 Apr 2004 21:55:40 -0000	1.2
--- tcMapObject.cpp	8 Aug 2004 00:31:34 -0000	1.3
***************
*** 2,6 ****
  **  tcDirector.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcDirector.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcConsoleBox.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcConsoleBox.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcConsoleBox.cpp	14 May 2004 23:37:07 -0000	1.5
--- tcConsoleBox.cpp	8 Aug 2004 00:31:34 -0000	1.6
***************
*** 1,5 ****
  /** @file tcConsoleBox.cpp */
  /*  
! **  Copyright (C) 2004 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcConsoleBox.cpp */
  /*  
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcRadioButton.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcRadioButton.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcRadioButton.cpp	11 Apr 2004 21:59:16 -0000	1.4
--- tcRadioButton.cpp	8 Aug 2004 00:31:34 -0000	1.5
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcWindow.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcWindow.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcWindow.cpp	18 Jul 2004 03:18:01 -0000	1.6
--- tcWindow.cpp	8 Aug 2004 00:31:34 -0000	1.7
***************
*** 2,6 ****
  **  tcWindow.cpp: implementation of the tcWindow class.
  ** 
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcWindow.cpp: implementation of the tcWindow class.
  ** 
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcButton.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcButton.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcButton.cpp	24 Mar 2004 21:09:26 -0000	1.9
--- tcButton.cpp	8 Aug 2004 00:31:34 -0000	1.10
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *

Index: tcGraphicsEngine.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcGraphicsEngine.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcGraphicsEngine.cpp	14 Jun 2004 21:52:47 -0000	1.16
--- tcGraphicsEngine.cpp	8 Aug 2004 00:31:34 -0000	1.17
***************
*** 1,5 ****
  // tcGraphicsEngine.cpp: implementation of the tcGraphicsEngine class.
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  // tcGraphicsEngine.cpp: implementation of the tcGraphicsEngine class.
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tc2DGraphicsSurface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc2DGraphicsSurface.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tc2DGraphicsSurface.cpp	11 Apr 2004 22:19:31 -0000	1.9
--- tc2DGraphicsSurface.cpp	8 Aug 2004 00:31:34 -0000	1.10
***************
*** 2,6 ****
  **  tc2DGraphicsSurface.cpp: implementation of the tc2DGraphicsSurface class.
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tc2DGraphicsSurface.cpp: implementation of the tc2DGraphicsSurface class.
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcEditBox.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcEditBox.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcEditBox.cpp	14 May 2004 23:37:07 -0000	1.5
--- tcEditBox.cpp	8 Aug 2004 00:31:34 -0000	1.6
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/src/scriptinterface tcFlightPortInterface.cpp,1.5,1.6 tcPanelInterface.cpp,1.4,1.5 tcPlatformInterfaceExtension.cpp,1.9,1.10 tcPlatformInterfaceExtensionB.cpp,1.12,1.13 tcPythonInterface.cpp,1.6,1.7 tcScenarioInterface.cpp,1.12,1.13 tcSimPythonInterface.cpp,1.15,1.16 tcTrackInterface.cpp,1.5,1.6

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

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

Modified Files:
	tcFlightPortInterface.cpp tcPanelInterface.cpp 
	tcPlatformInterfaceExtension.cpp 
	tcPlatformInterfaceExtensionB.cpp tcPythonInterface.cpp 
	tcScenarioInterface.cpp tcSimPythonInterface.cpp 
	tcTrackInterface.cpp 
Log Message:


Index: tcFlightPortInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcFlightPortInterface.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcFlightPortInterface.cpp	27 Apr 2004 22:18:44 -0000	1.5
--- tcFlightPortInterface.cpp	8 Aug 2004 00:31:34 -0000	1.6
***************
*** 2,6 ****
  **  tcFlightPortInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcFlightPortInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcScenarioInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcScenarioInterface.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcScenarioInterface.cpp	18 Jul 2004 03:18:01 -0000	1.12
--- tcScenarioInterface.cpp	8 Aug 2004 00:31:34 -0000	1.13
***************
*** 2,6 ****
  **  tcScenarioInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcScenarioInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcPlatformInterfaceExtensionB.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterfaceExtensionB.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcPlatformInterfaceExtensionB.cpp	19 Jul 2004 00:53:01 -0000	1.12
--- tcPlatformInterfaceExtensionB.cpp	8 Aug 2004 00:31:34 -0000	1.13
***************
*** 2,6 ****
  **  tcPlatformInterfaceExtensionB.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPlatformInterfaceExtensionB.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcSimPythonInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcSimPythonInterface.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcSimPythonInterface.cpp	19 Jul 2004 00:53:01 -0000	1.15
--- tcSimPythonInterface.cpp	8 Aug 2004 00:31:34 -0000	1.16
***************
*** 2,6 ****
  **  tcSimPythonInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcSimPythonInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcPlatformInterfaceExtension.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterfaceExtension.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcPlatformInterfaceExtension.cpp	18 Jul 2004 03:18:01 -0000	1.9
--- tcPlatformInterfaceExtension.cpp	8 Aug 2004 00:31:34 -0000	1.10
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcTrackInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcTrackInterface.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcTrackInterface.cpp	27 Apr 2004 22:18:52 -0000	1.5
--- tcTrackInterface.cpp	8 Aug 2004 00:31:34 -0000	1.6
***************
*** 2,6 ****
  **  tcTrackInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcTrackInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcPanelInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPanelInterface.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcPanelInterface.cpp	27 Apr 2004 22:18:44 -0000	1.4
--- tcPanelInterface.cpp	8 Aug 2004 00:31:34 -0000	1.5
***************
*** 2,6 ****
  **  tcPanelInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPanelInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcPythonInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPythonInterface.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcPythonInterface.cpp	27 Apr 2004 22:18:52 -0000	1.6
--- tcPythonInterface.cpp	8 Aug 2004 00:31:34 -0000	1.7
***************
*** 2,6 ****
  **  tcPythonInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcPythonInterface.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/src/common AError.cpp,1.7,1.8 math_constants.cpp,1.3,1.4 nsNav.cpp,1.6,1.7 simmath.cpp,1.14,1.15 tcConsole.cpp,1.8,1.9 tcFile.cpp,1.4,1.5 tcOggStreamer.cpp,1.8,1.9 tcOptionsView.cpp,1.7,1.8 tcSoundConsole.cpp,1.6,1.7 tcString.cpp,1.2,1.3 util.cpp,1.2,1.3

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

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

Modified Files:
	AError.cpp math_constants.cpp nsNav.cpp simmath.cpp 
	tcConsole.cpp tcFile.cpp tcOggStreamer.cpp tcOptionsView.cpp 
	tcSoundConsole.cpp tcString.cpp util.cpp 
Log Message:


Index: tcSoundConsole.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSoundConsole.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcSoundConsole.cpp	29 Feb 2004 22:51:36 -0000	1.6
--- tcSoundConsole.cpp	8 Aug 2004 00:31:33 -0000	1.7
***************
*** 1,5 ****
  /** @file tcSoundConsole.cpp */
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcSoundConsole.cpp */
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcString.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcString.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcString.cpp	19 Oct 2003 17:46:01 -0000	1.2
--- tcString.cpp	8 Aug 2004 00:31:33 -0000	1.3
***************
*** 2,6 ****
  **  tcString.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcString.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcConsole.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcConsole.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcConsole.cpp	9 Apr 2004 14:15:18 -0000	1.8
--- tcConsole.cpp	8 Aug 2004 00:31:33 -0000	1.9
***************
*** 2,6 ****
  **  tcConsole.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcConsole.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcOggStreamer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOggStreamer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcOggStreamer.cpp	5 Aug 2004 02:22:35 -0000	1.8
--- tcOggStreamer.cpp	8 Aug 2004 00:31:33 -0000	1.9
***************
*** 2,6 ****
  **  tcOggStreamer.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcOggStreamer.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: AError.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/AError.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AError.cpp	26 Nov 2003 20:39:14 -0000	1.7
--- AError.cpp	8 Aug 2004 00:31:33 -0000	1.8
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: simmath.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** simmath.cpp	5 Aug 2004 02:22:35 -0000	1.14
--- simmath.cpp	8 Aug 2004 00:31:33 -0000	1.15
***************
*** 1,4 ****
  /*
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: math_constants.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/math_constants.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** math_constants.cpp	28 Mar 2004 18:50:31 -0000	1.3
--- math_constants.cpp	8 Aug 2004 00:31:33 -0000	1.4
***************
*** 1,4 ****
  /*
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcOptionsView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptionsView.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcOptionsView.cpp	14 Jun 2004 22:37:11 -0000	1.7
--- tcOptionsView.cpp	8 Aug 2004 00:31:33 -0000	1.8
***************
*** 2,6 ****
  **  tcOptionsView.cpp
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcOptionsView.cpp
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: util.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/util.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** util.cpp	19 Oct 2003 17:46:01 -0000	1.2
--- util.cpp	8 Aug 2004 00:31:33 -0000	1.3
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcFile.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcFile.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcFile.cpp	21 Jun 2004 22:21:59 -0000	1.4
--- tcFile.cpp	8 Aug 2004 00:31:33 -0000	1.5
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: nsNav.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/nsNav.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nsNav.cpp	5 Aug 2004 02:22:35 -0000	1.6
--- nsNav.cpp	8 Aug 2004 00:31:33 -0000	1.7
***************
*** 1,4 ****
  /*
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

[Gcblue-commits] gcb_wx/src/sqlite - New directory

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

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

Log Message:
Directory /cvsroot/gcblue/gcb_wx/src/sqlite added to the repository

[Gcblue-commits] gcb_wx/include/sqlite - New directory

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

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

Log Message:
Directory /cvsroot/gcblue/gcb_wx/include/sqlite added to the repository

[Gcblue-commits] gcb_wx/src/graphics tc3DModel.cpp,1.10,1.11

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

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

Modified Files:
	tc3DModel.cpp 
Log Message:


Index: tc3DModel.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DModel.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tc3DModel.cpp	4 Jun 2004 21:39:22 -0000	1.10
--- tc3DModel.cpp	6 Aug 2004 02:47:51 -0000	1.11
***************
*** 1,5 ****
! /** @file tc3DModel.cpp */
  /*  
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,7 ----
! /** 
! **  @file tc3DModel.cpp 
! */
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
***************
*** 67,71 ****
      {
  		std::string name = node.getName();
! 	//	std::cout << "MODEL NODE: " << name << "\n";
          /*
          if (node.getNumParents())
--- 69,75 ----
      {
  		std::string name = node.getName();
! #ifdef _DEBUG
! 		std::cout << " - "<< name << "\n";
! #endif
          /*
          if (node.getNumParents())

[Gcblue-commits] gcb_wx/docs CHANGES.txt,1.30,1.31

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

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

Modified Files:
	CHANGES.txt 
Log Message:


Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/docs/CHANGES.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** CHANGES.txt	5 Aug 2004 02:22:34 -0000	1.30
--- CHANGES.txt	6 Aug 2004 02:47:50 -0000	1.31
***************
*** 3,6 ****
--- 3,10 ----
  0.6
  ---------------------------------------------------------------------
+ *** 2004-08-05 Dewitt Colclough ***
+ - Added launcher location field to database. Launched objects (e.g. 
+   missiles) start at this location.
+ 
  *** 2004-08-04 Dewitt Colclough ***
  - Fixed bug in auto music that caused music to freeze at the end of

[Gcblue-commits] gcb_wx/src/sim tcBallisticWeapon.cpp,1.3,1.4 tcGameObject.cpp,1.17,1.18 tcMissileObject.cpp,1.15,1.16

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

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

Modified Files:
	tcBallisticWeapon.cpp tcGameObject.cpp tcMissileObject.cpp 
Log Message:


Index: tcBallisticWeapon.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcBallisticWeapon.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcBallisticWeapon.cpp	5 Aug 2004 02:22:35 -0000	1.3
--- tcBallisticWeapon.cpp	6 Aug 2004 02:47:51 -0000	1.4
***************
*** 25,32 ****
--- 25,34 ----
  #include "common/tcStream.h"
  #include "common/tcObjStream.h"
+ #include "database/tcGenericDBObject.h"
  #include "tc3DModel.h"
  #include "tcParticleEffect.h"
  #include "tcLauncher.h"
  #include "tcSimState.h"
+ #include "tc3DPoint.h"
  
  /**
***************
*** 62,67 ****
  	const tcLauncher* pLauncher = obj->GetLauncher(nLauncher);
  
  	mfStatusTime = obj->mfStatusTime;
- 	mcKin = obj->mcKin;
  	mcKin.mfHeading_rad += pLauncher->pointingAngle;
  	mcKin.mfPitch_rad += pLauncher->pointingElevation;
--- 64,88 ----
  	const tcLauncher* pLauncher = obj->GetLauncher(nLauncher);
  
+     if (tcPlatformObject* platObj = dynamic_cast<tcPlatformObject*>(obj))
+ 	{
+ 		tc3DPoint launcherPos = platObj->mpDBObject->GetLauncherPosition(nLauncher);
+ 		tsGeoPoint pos = obj->RelPosToLatLonAlt(launcherPos.x, launcherPos.y,
+ 			launcherPos.z);
+ 		mcKin.mfLon_rad = pos.mfLon_rad;
+ 		mcKin.mfLat_rad = pos.mfLat_rad;
+ 		mcKin.mfAlt_m = pos.mfAlt_m;
+ 	}
+ 	else
+ 	{
+ 		mcKin.mfLon_rad = obj->mcKin.mfLon_rad;
+ 		mcKin.mfLat_rad = obj->mcKin.mfLat_rad;
+ 		mcKin.mfAlt_m = obj->mcKin.mfAlt_m;
+ 	}
+ 
+ 	mcKin.mfSpeed_kts = obj->mcKin.mfSpeed_kts;
+ 	mcKin.mfHeading_rad = obj->mcKin.mfHeading_rad;
+ 	mcKin.mfPitch_rad = obj->mcKin.mfPitch_rad;
+ 
  	mfStatusTime = obj->mfStatusTime;
  	mcKin.mfHeading_rad += pLauncher->pointingAngle;
  	mcKin.mfPitch_rad += pLauncher->pointingElevation;

Index: tcMissileObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMissileObject.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcMissileObject.cpp	27 Jul 2004 23:26:07 -0000	1.15
--- tcMissileObject.cpp	6 Aug 2004 02:47:52 -0000	1.16
***************
*** 1,21 ****
! /** @file tcMissileObject.cpp
  */
  /*
! *  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
  */
  
--- 1,22 ----
! /**
! **  @file tcMissileObject.cpp
  */
  /*
! **  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
  */
  
***************
*** 23,30 ****
--- 24,33 ----
  #include "common/tcStream.h"
  #include "common/tcObjStream.h"
+ #include "database/tcGenericDBObject.h"
  #include "tc3DModel.h"
  #include "tcParticleEffect.h"
  #include "tcLauncher.h"
  #include "tcSimState.h"
+ #include "tc3DPoint.h"
  
  /**
***************
*** 79,83 ****
  	tsMissileFlightSegment* segmentInfo = 
  		&mpDBObject->maFlightProfile[mnCurrentSegment];
! 	
  	return segmentInfo->meAltitudeMode;
  }
--- 82,86 ----
  	tsMissileFlightSegment* segmentInfo = 
  		&mpDBObject->maFlightProfile[mnCurrentSegment];
! 
  	return segmentInfo->meAltitudeMode;
  }
***************
*** 104,108 ****
  void tcMissileObject::LaunchFrom(tcGameObject* obj, unsigned nLauncher)
  {
! 	msKState.mfAltitude_m = obj->mcKin.mfAlt_m;
  	if (msKState.mfAltitude_m < 5.0f) 
  	{
--- 107,143 ----
  void tcMissileObject::LaunchFrom(tcGameObject* obj, unsigned nLauncher)
  {
!     if (tcPlatformObject* platObj = dynamic_cast<tcPlatformObject*>(obj))
! 	{
! 		tc3DPoint launcherPos = platObj->mpDBObject->GetLauncherPosition(nLauncher);
! 		tsGeoPoint pos = obj->RelPosToLatLonAlt(launcherPos.x, launcherPos.y,
! 			launcherPos.z);
! 		mcKin.mfLon_rad = pos.mfLon_rad;
! 		mcKin.mfLat_rad = pos.mfLat_rad;
! 		mcKin.mfAlt_m = pos.mfAlt_m;
! 	}
! 	else
! 	{
! 		mcKin.mfLon_rad = obj->mcKin.mfLon_rad;
! 		mcKin.mfLat_rad = obj->mcKin.mfLat_rad;
! 		mcKin.mfAlt_m = obj->mcKin.mfAlt_m;
! 	}
! 
! 	mcKin.mfSpeed_kts = obj->mcKin.mfSpeed_kts;
! 	mcKin.mfHeading_rad = obj->mcKin.mfHeading_rad;
! 
! 
! 	if (dynamic_cast<tcSurfaceObject*>(obj))
! 	{
! 		// point surface launched missiles up
! 		mcKin.mfPitch_rad = 0.45f * C_PI;
! 	}
! 	else
! 	{
! 		mcKin.mfPitch_rad = obj->mcKin.mfPitch_rad;
! 	}
! 
! 
! 
! 	msKState.mfAltitude_m = mcKin.mfAlt_m;
  	if (msKState.mfAltitude_m < 5.0f) 
  	{
***************
*** 138,145 ****
  	// add pitch initializer eventually, have to deal with launcher elevation
  	mfStatusTime = obj->mfStatusTime;
- 	mcKin = obj->mcKin;
  	mcKin.mfHeading_rad += pLauncher->pointingAngle;
  	mcKin.mfPitch_rad += pLauncher->pointingElevation;
  
  	tcString s;
  	s.Format("From %s", obj->mzUnit.mz);
--- 173,183 ----
  	// add pitch initializer eventually, have to deal with launcher elevation
  	mfStatusTime = obj->mfStatusTime;
  	mcKin.mfHeading_rad += pLauncher->pointingAngle;
  	mcKin.mfPitch_rad += pLauncher->pointingElevation;
  
+ 	mcKin.mfClimbAngle_rad = mcKin.mfPitch_rad;
+ 	msKState.mfPitch_rad = mcKin.mfPitch_rad;
+ 
+ 
  	tcString s;
  	s.Format("From %s", obj->mzUnit.mz);
***************
*** 294,298 ****
  			}
  
!  			mfInterceptTime = tti_s;
  
  			//interceptPitch_rad = atanf(0.001f*(msWaypoint.mfAlt_m - mcKin.mfAlt_m)/
--- 332,336 ----
  			}
  
! 			mfInterceptTime = tti_s;
  
  			//interceptPitch_rad = atanf(0.001f*(msWaypoint.mfAlt_m - mcKin.mfAlt_m)/

Index: tcGameObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameObject.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcGameObject.cpp	18 Jul 2004 03:18:01 -0000	1.17
--- tcGameObject.cpp	6 Aug 2004 02:47:51 -0000	1.18
***************
*** 157,161 ****
  
  /**
! * Looking forward from the object, dx is right, and dz is back
  * TODO fix this system to use dx right, dy forward, dz up
  */
--- 157,161 ----
  
  /**
! * Looking forward from the object, dx is right, dy is up, and dz is back
  * TODO fix this system to use dx right, dy forward, dz up
  */

[Gcblue-commits] gcb_wx/src/database tcGenericDBObject.cpp,1.9,1.10

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

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

Modified Files:
	tcGenericDBObject.cpp 
Log Message:


Index: tcGenericDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcGenericDBObject.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcGenericDBObject.cpp	18 Jul 2004 03:18:00 -0000	1.9
--- tcGenericDBObject.cpp	6 Aug 2004 02:47:51 -0000	1.10
***************
*** 61,64 ****
--- 61,77 ----
  }
  
+ /**
+ * @returns a tc3DPoint object with (x,y,z) relative position of launcher n
+ */
+ tc3DPoint tcGenericDBObject::GetLauncherPosition(unsigned n)
+ {
+ 	if ((int)n >= mnNumLaunchers)
+ 	{
+ 		fprintf(stderr, "Error - GetLauncherPosition - bad launcher index\n");
+ 		return tc3DPoint(0, 0, 0);
+ 	}
+ 	return launcherPosition[n];
+ }
+ 
  void tcGenericDBObject::RandInit() 
  {
***************
*** 210,219 ****
          {
              float az;
              *csv >> s;
              *csv >> az;
              if (s.size() > 0)
              {
                  maLauncherClass[mnNumLaunchers] = s.c_str();
!                 launcherAz[mnNumLaunchers++] = az;
              }
          }
--- 223,237 ----
          {
              float az;
+ 			tc3DPoint loc;
              *csv >> s;
              *csv >> az;
+ 			*csv >> loc.x;
+ 			*csv >> loc.y;
+ 			*csv >> loc.z;
              if (s.size() > 0)
              {
                  maLauncherClass[mnNumLaunchers] = s.c_str();
!                 launcherAz[mnNumLaunchers] = az;
! 				launcherPosition[mnNumLaunchers++] = loc;
              }
          }
***************
*** 269,272 ****
--- 287,293 ----
                  *csv << string(maLauncherClass[i].mz);
                  *csv << launcherAz[i];
+ 				*csv << launcherPosition[i].x;
+ 				*csv << launcherPosition[i].y;
+ 				*csv << launcherPosition[i].z;
              }
              else
***************
*** 274,277 ****
--- 295,301 ----
                  *csv << "";
                  *csv << "";
+                 *csv << "";
+                 *csv << "";
+                 *csv << "";
              }
          }
***************
*** 351,354 ****
--- 375,381 ----
          childNode->SetAttribute("class", maLauncherClass[i].mz);
          childNode->SetAttribute("az",  launcherAz[i]);
+         childNode->SetAttribute("x",  launcherPosition[i].x);
+         childNode->SetAttribute("y",  launcherPosition[i].y);
+         childNode->SetAttribute("z",  launcherPosition[i].z);
      }
          
***************
*** 394,400 ****
      {
          tcString s;
!         s.Format("Launcher%d",i+1);
          *csv << s.GetBuffer();
!         s.Format("Launcher%d-angle",i+1);
          *csv << s.GetBuffer();
      }
--- 421,433 ----
      {
          tcString s;
!         s.Format("Lau%d",i+1);
          *csv << s.GetBuffer();
!         s.Format("Lau%d-angle",i+1);
!         *csv << s.GetBuffer();
!         s.Format("Lau%d-x",i+1);
!         *csv << s.GetBuffer();
!         s.Format("Lau%d-y",i+1);
!         *csv << s.GetBuffer();
!         s.Format("Lau%d-z",i+1);
          *csv << s.GetBuffer();
      }
***************
*** 471,474 ****
--- 504,508 ----
          maLauncherClass[i] = obj.maLauncherClass[i];  
          launcherAz[i] = obj.launcherAz[i];
+ 		launcherPosition[i] = obj.launcherPosition[i];
      }
      for(i=0;i<MAXSENSORS;i++)

[Gcblue-commits] gcb_wx/include/sim tcGameObject.h,1.22,1.23

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

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

Modified Files:
	tcGameObject.h 
Log Message:


Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcGameObject.h	19 Jul 2004 00:52:27 -0000	1.22
--- tcGameObject.h	6 Aug 2004 02:47:51 -0000	1.23
***************
*** 18,26 ****
   */
  
- #pragma once
- 
  #ifndef _TCGAMEOBJECT_H_
  #define _TCGAMEOBJECT_H_
  
  #include <vector>
  #include <sstream>
--- 18,29 ----
   */
  
  #ifndef _TCGAMEOBJECT_H_
  #define _TCGAMEOBJECT_H_
  
+ #if _MSC_VER > 1000
+ #pragma once
+ #endif // _MSC_VER > 1000
+ 
+ 
  #include <vector>
  #include <sstream>

[Gcblue-commits] gcb_wx/include/database tcGenericDBObject.h,1.8,1.9

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

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

Modified Files:
	tcGenericDBObject.h 
Log Message:


Index: tcGenericDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcGenericDBObject.h	18 Jul 2004 03:17:59 -0000	1.8
--- tcGenericDBObject.h	6 Aug 2004 02:47:50 -0000	1.9
***************
*** 29,36 ****
--- 29,38 ----
  #include "tcDatabaseObject.h"
  #include <vector>
+ #include "tc3DPoint.h"
  
  struct animationDBInfo;
  class TiXmlElement;
  
+ 
  namespace Database
  {
***************
*** 72,76 ****
--- 74,81 ----
          tcDBString maSensorClass[MAXSENSORS];  
          float launcherAz[MAXLAUNCHERS]; ///< pointing angles of launchers in degrees
+ 		tc3DPoint launcherPosition[MAXLAUNCHERS]; ///< relative position of launchers in meters
          float sensorAz[MAXSENSORS]; ///< pointing angles of sensors in degrees
+ 
+ 
          tcDBString flightportClass; ///< database class name of flightport (or empty if none)
          std::vector<animationDBInfo> animationInfo;
***************
*** 79,82 ****
--- 84,88 ----
          virtual const char* GetClassName() {return "Generic";} ///< returns class name of database object
  		tcFlightportDBObject* GetFlightport();
+ 		tc3DPoint GetLauncherPosition(unsigned n);
          void RandInit();
          virtual void PrintToFile(tcFile& file);

[Gcblue-commits] gcb_wx/include/common tc3DPoint.h,NONE,1.1 simmath.h,1.17,1.18

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

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

Modified Files:
	simmath.h 
Added Files:
	tc3DPoint.h 
Log Message:


Index: simmath.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** simmath.h	5 Aug 2004 02:22:34 -0000	1.17
--- simmath.h	6 Aug 2004 02:47:50 -0000	1.18
***************
*** 1,6 ****
! /*
! **  simmath.h
! **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,6 ----
! /**
! **  @file simmath.h
! */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
***************
*** 24,27 ****
--- 24,31 ----
  #define _SIMMATH_H_
  
+ #if _MSC_VER > 1000
+ #pragma once
+ #endif // _MSC_VER > 1000
+ 
  #include <math.h>
  #include "math_constants.h"
***************
*** 43,47 ****
      float x;
      float y;
!     float DistanceTo(tcPoint p) {return (sqrtf((p.x-x)*(p.x-x)+(p.y-y)*(p.y-y)));}
  
      tcPoint() : x(0), y(0) {}
--- 47,51 ----
      float x;
      float y;
!     float DistanceTo(const tcPoint& p) {return (sqrtf((p.x-x)*(p.x-x)+(p.y-y)*(p.y-y)));}
  
      tcPoint() : x(0), y(0) {}
***************
*** 50,53 ****
--- 54,58 ----
  };
  
+ 
  class tcRect 
  {

--- NEW FILE: tc3DPoint.h ---
/**
**  @file simmath.h
*/
/*  Copyright (C) 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 _TC3DPOINT_H_
#define _TC3DPOINT_H_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000

#include <math.h>

class tc3DPoint
{
public:
    float x;
    float y;
	float z;

    float DistanceTo(const tc3DPoint& p) 
	{
		return (sqrtf((p.x-x)*(p.x-x)+(p.y-y)*(p.y-y) +
			(p.z-z)));
	}

    tc3DPoint() : x(0), y(0), z(0) {}
    tc3DPoint(float ax, float ay, float az) : x(ax), y(ay), z(az) {}
    tc3DPoint(const tc3DPoint &p) : x(p.x), y(p.y), z(p.z) {}
};


#endif

[Gcblue-commits] gcb_wx GCblue.vcproj,1.60,1.61

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

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

Modified Files:
	GCblue.vcproj 
Log Message:


Index: GCblue.vcproj
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/GCblue.vcproj,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** GCblue.vcproj	29 Jul 2004 00:14:16 -0000	1.60
--- GCblue.vcproj	6 Aug 2004 02:47:50 -0000	1.61
***************
*** 594,597 ****
--- 594,600 ----
  				</File>
  				<File
+ 					RelativePath=".\include\common\tc3DPoint.h">
+ 				</File>
+ 				<File
  					RelativePath="include\common\tcConsole.h">
  				</File>

[Gcblue-commits] gcb_data/sound/ogg gcb_theme2.ogg,NONE,1.1

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

Update of /cvsroot/gcblue/gcb_data/sound/ogg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31051/sound/ogg

Added Files:
	gcb_theme2.ogg 
Log Message:


--- NEW FILE: gcb_theme2.ogg ---
(This appears to be a binary file; contents omitted.)

[Gcblue-commits] gcb_wx/src/common nsNav.cpp,1.5,1.6 simmath.cpp,1.13,1.14 tcOggStreamer.cpp,1.7,1.8 tcSound.cpp,1.15,1.16

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

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

Modified Files:
	nsNav.cpp simmath.cpp tcOggStreamer.cpp tcSound.cpp 
Log Message:


Index: nsNav.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/nsNav.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nsNav.cpp	28 Mar 2004 18:49:24 -0000	1.5
--- nsNav.cpp	5 Aug 2004 02:22:35 -0000	1.6
***************
*** 41,48 ****
        (fDeltaLon <= GCDISTANCE_APPROXDELTA);
  
!    if (bUseApprox) {
!       return sqrtf(fDeltaLat*fDeltaLat + cosf(a.mfLat_rad)*fDeltaLon*fDeltaLon); 
     }
!    else {
        return acosf(sinf(a.mfLat_rad)*sinf(b.mfLat_rad) +
           cosf(a.mfLat_rad)*cosf(b.mfLat_rad)*cosf(fDeltaLon)); 
--- 41,55 ----
        (fDeltaLon <= GCDISTANCE_APPROXDELTA);
  
!    
! 
!    if (bUseApprox) 
!    {
! 	  float cos_term = cosf(0.5f * (a.mfLat_rad + b.mfLat_rad));
! 	  float adjustedLon = cos_term * fDeltaLon;
! 
!       return sqrtf(fDeltaLat*fDeltaLat + adjustedLon*adjustedLon); 
     }
!    else 
!    {
        return acosf(sinf(a.mfLat_rad)*sinf(b.mfLat_rad) +
           cosf(a.mfLat_rad)*cosf(b.mfLat_rad)*cosf(fDeltaLon)); 
***************
*** 50,70 ****
  }
  // version that always uses approximation
! float nsNav::GCDistanceApprox_rad(tsGeoPointRad a, tsGeoPointRad b) {
     float fDeltaLat = a.mfLat_rad - b.mfLat_rad;
     float fDeltaLon = a.mfLon_rad - b.mfLon_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
!    return sqrtf(fDeltaLat*fDeltaLat + cosf(a.mfLat_rad)*fDeltaLon*fDeltaLon); 
  }
  
! float nsNav::GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad) {
     float fDeltaLat = afLatA_rad - afLatB_rad;
     float fDeltaLon = afLonA_rad - afLonB_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
!    return sqrtf(fDeltaLat*fDeltaLat + cosf(afLatA_rad)*fDeltaLon*fDeltaLon); 
  }
! float nsNav::GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad,
!                                   float afAltA_m, float afAltB_m) {
     float fDeltaLat = afLatA_rad - afLatB_rad;
     float fDeltaLon = afLonA_rad - afLonB_rad;
--- 57,90 ----
  }
  // version that always uses approximation
! float nsNav::GCDistanceApprox_rad(tsGeoPointRad a, tsGeoPointRad b) 
! {
     float fDeltaLat = a.mfLat_rad - b.mfLat_rad;
     float fDeltaLon = a.mfLon_rad - b.mfLon_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
! 
!    float cos_term = cosf(0.5f * (a.mfLat_rad + b.mfLat_rad));
!    float adjustedLon = cos_term * fDeltaLon;
! 
!    return sqrtf(fDeltaLat*fDeltaLat + adjustedLon*adjustedLon); 
  }
  
! float nsNav::GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, 
! 								  float afLatB_rad, float afLonB_rad) 
! {
     float fDeltaLat = afLatA_rad - afLatB_rad;
     float fDeltaLon = afLonA_rad - afLonB_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
! 
!    float cos_term = cosf(0.5f * (afLatA_rad + afLatB_rad));
!    float adjustedLon = cos_term * fDeltaLon;
! 
!    return sqrtf(fDeltaLat*fDeltaLat + adjustedLon*adjustedLon); 
  }
! float nsNav::GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, 
! 								  float afLatB_rad, float afLonB_rad,
!                                   float afAltA_m, float afAltB_m) 
! {
     float fDeltaLat = afLatA_rad - afLatB_rad;
     float fDeltaLon = afLonA_rad - afLonB_rad;
***************
*** 72,126 ****
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
!    return sqrtf(fDeltaLat*fDeltaLat + cosf(afLatA_rad)*fDeltaLon*fDeltaLon + fDeltaAlt*fDeltaAlt); 
  }
! // great circle heading from point a to point b
! // stores distance in *apfDistance_rad if not NULL
! float nsNav::GCHeading_rad(tsGeoPointRad a, tsGeoPointRad b, float *apfDistance_rad) {
     float fDistanceRad = GCDistance_rad(a,b);
  
     if (apfDistance_rad != NULL) {*apfDistance_rad = fDistanceRad;}
     float fTerm = (sinf(b.mfLat_rad)-cosf(fDistanceRad)*sinf(a.mfLat_rad))/
        (sinf(fDistanceRad)*cosf(a.mfLat_rad));
!    if (sinf(a.mfLon_rad-b.mfLon_rad) < 0) {
        return acosf( max( min( fTerm,1.0f ),-1.0f ) );
     }
!    else {
        return C_TWOPI - acosf( max( min(fTerm,1.0f), -1.0f) );
     }
  }
  
! // approximate heading from point a to point b
! // approximation assuming short distances
! // a few tenths of a deg of error for <= 2 deg lat/lon difference at 
! // high (80+ deg) latitudes, less error near equator
! float nsNav::GCHeadingApprox_rad(tsGeoPointRad a, tsGeoPointRad b) {
     float fCosLatAvg_rad = cosf(0.5f*(a.mfLat_rad+b.mfLat_rad));
     float fDeltaLon = b.mfLon_rad - a.mfLon_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
!    return atan2f(fCosLatAvg_rad*fDeltaLon,b.mfLat_rad-a.mfLat_rad);
  }
! float nsNav::GCHeadingApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad) {
     float fCosLatAvg_rad = cosf(0.5f*(afLatA_rad+afLatB_rad));
     float fDeltaLon = afLonB_rad - afLonA_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
!    return atan2f(fCosLatAvg_rad*fDeltaLon,afLatB_rad-afLatA_rad);
  }
! // sets point b at heading afHeading_rad and range of afRange_rad from point a
! // has accuracy issues (maybe this heading is only the initial heading or similar?)
! void nsNav::Offset(const tsGeoPointRad& a, tsGeoPointRad& b, float afHeading_rad, float afRange_rad) {
     float fTerm = sinf(a.mfLat_rad)*cosf(afRange_rad) +
        cosf(a.mfLat_rad)*sinf(afRange_rad)*cosf(afHeading_rad);
     if (fTerm > 1) {fTerm = 1;}
     else if (fTerm < -1) {fTerm = -1;}
     b.mfLat_rad = asinf(fTerm);
     fTerm = sinf(afHeading_rad)*sinf(afRange_rad)/cosf(a.mfLat_rad);
     if (fTerm > 1) {fTerm = 1;}
     else if (fTerm < -1) {fTerm = -1;}
     b.mfLon_rad = a.mfLon_rad + asinf(fTerm);
  }
! // sets point b at heading afHeading_rad and range of afRange_rad from point a
! void nsNav::OffsetApprox(const tsGeoPointRad& a, tsGeoPointRad& b, float afHeading_rad, float afRange_rad) {
     b.mfLat_rad = a.mfLat_rad + cosf(afHeading_rad)*afRange_rad;
     b.mfLon_rad = a.mfLon_rad + sinf(afHeading_rad)*afRange_rad/cosf(a.mfLat_rad);
--- 92,179 ----
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
! 
!    float cos_term = cosf(0.5f * (afLatA_rad + afLatB_rad));
!    float adjustedLon = cos_term * fDeltaLon;
! 
!    return sqrtf(fDeltaLat*fDeltaLat + adjustedLon*adjustedLon + fDeltaAlt*fDeltaAlt); 
  }
! /**
! * great circle heading from point a to point b
! * stores distance in *apfDistance_rad if not NULL
! */
! float nsNav::GCHeading_rad(tsGeoPointRad a, tsGeoPointRad b, float *apfDistance_rad) 
! {
     float fDistanceRad = GCDistance_rad(a,b);
  
     if (apfDistance_rad != NULL) {*apfDistance_rad = fDistanceRad;}
+ 
     float fTerm = (sinf(b.mfLat_rad)-cosf(fDistanceRad)*sinf(a.mfLat_rad))/
        (sinf(fDistanceRad)*cosf(a.mfLat_rad));
! 
!    if (sinf(a.mfLon_rad-b.mfLon_rad) < 0) 
!    {
        return acosf( max( min( fTerm,1.0f ),-1.0f ) );
     }
!    else 
!    {
        return C_TWOPI - acosf( max( min(fTerm,1.0f), -1.0f) );
     }
  }
  
! /**
! * approximate heading from point a to point b
! * approximation assuming short distances
! * a few tenths of a deg of error for <= 2 deg lat/lon difference at 
! * high (80+ deg) latitudes, less error near equator
! */
! float nsNav::GCHeadingApprox_rad(tsGeoPointRad a, tsGeoPointRad b) 
! {
     float fCosLatAvg_rad = cosf(0.5f*(a.mfLat_rad+b.mfLat_rad));
     float fDeltaLon = b.mfLon_rad - a.mfLon_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
! 
!    return atan2f(fCosLatAvg_rad*fDeltaLon, b.mfLat_rad-a.mfLat_rad);
  }
! 
! float nsNav::GCHeadingApprox_rad(float afLatA_rad, float afLonA_rad, 
! 								 float afLatB_rad, float afLonB_rad) 
! {
     float fCosLatAvg_rad = cosf(0.5f*(afLatA_rad+afLatB_rad));
     float fDeltaLon = afLonB_rad - afLonA_rad;
     if (fDeltaLon > C_PI) {fDeltaLon -= C_TWOPI;}
     else if (fDeltaLon < -C_PI) {fDeltaLon += C_TWOPI;}
! 
!    return atan2f(fCosLatAvg_rad*fDeltaLon, afLatB_rad-afLatA_rad);
  }
! 
! /**
! * sets point b at heading afHeading_rad and range of afRange_rad from point a
! * has accuracy issues (maybe this heading is only the initial heading or similar?)
! */
! void nsNav::Offset(const tsGeoPointRad& a, tsGeoPointRad& b, 
! 				   float afHeading_rad, float afRange_rad) 
! {
     float fTerm = sinf(a.mfLat_rad)*cosf(afRange_rad) +
        cosf(a.mfLat_rad)*sinf(afRange_rad)*cosf(afHeading_rad);
+ 
     if (fTerm > 1) {fTerm = 1;}
     else if (fTerm < -1) {fTerm = -1;}
+ 
     b.mfLat_rad = asinf(fTerm);
     fTerm = sinf(afHeading_rad)*sinf(afRange_rad)/cosf(a.mfLat_rad);
+ 
     if (fTerm > 1) {fTerm = 1;}
     else if (fTerm < -1) {fTerm = -1;}
+ 
     b.mfLon_rad = a.mfLon_rad + asinf(fTerm);
  }
! 
! /**
! * sets point b at heading afHeading_rad and range of afRange_rad from point a
! */
! void nsNav::OffsetApprox(const tsGeoPointRad& a, tsGeoPointRad& b, 
! 						 float afHeading_rad, float afRange_rad) 
! {
     b.mfLat_rad = a.mfLat_rad + cosf(afHeading_rad)*afRange_rad;
     b.mfLon_rad = a.mfLon_rad + sinf(afHeading_rad)*afRange_rad/cosf(a.mfLat_rad);
***************
*** 141,166 ****
     afLonB_rad = afLonA_rad + sinf(afHeading_rad)*afRange_rad/cosf(afLatA_rad);
  }
! // return latitude of point at afLon_rad along GC path between a and b
! float nsNav::GetLatAlongGCPath(tsGeoPointRad a, tsGeoPointRad b, float afLon_rad) {
     float fNum, fDen;
!    if (b.mfLon_rad == a.mfLon_rad) {
        b.mfLon_rad = a.mfLon_rad + 0.001f;
     }
     fNum = sinf(a.mfLat_rad)*cosf(b.mfLat_rad)*sinf(afLon_rad-b.mfLon_rad) -
        sinf(b.mfLat_rad)*cosf(a.mfLat_rad)*sinf(afLon_rad-a.mfLon_rad);
     fDen = cosf(a.mfLat_rad)*cosf(b.mfLat_rad)*sinf(a.mfLon_rad-b.mfLon_rad);
     return atanf(fNum/fDen);
  }
! // prints test info to file
! void nsNav::Test() {
     FILE* testfile=NULL;
     int nTrials = 8;
  
     testfile = fopen("navtest.txt","wt");
!    if (testfile==NULL) {
        wxMessageBox("Failed to open nav test file");
        return;
     }
!    for(int i=0;i<nTrials;i++) {
        tsGeoPointRad a,b;
        a.mfLat_rad = 0.9f*randfc(C_PI);
--- 194,233 ----
     afLonB_rad = afLonA_rad + sinf(afHeading_rad)*afRange_rad/cosf(afLatA_rad);
  }
! /**
! * @return latitude of point at afLon_rad along GC path between a and b
! */
! float nsNav::GetLatAlongGCPath(tsGeoPointRad a, tsGeoPointRad b, float afLon_rad) 
! {
     float fNum, fDen;
! 
!    if (b.mfLon_rad == a.mfLon_rad) 
!    {
        b.mfLon_rad = a.mfLon_rad + 0.001f;
     }
+ 
     fNum = sinf(a.mfLat_rad)*cosf(b.mfLat_rad)*sinf(afLon_rad-b.mfLon_rad) -
        sinf(b.mfLat_rad)*cosf(a.mfLat_rad)*sinf(afLon_rad-a.mfLon_rad);
+ 
     fDen = cosf(a.mfLat_rad)*cosf(b.mfLat_rad)*sinf(a.mfLon_rad-b.mfLon_rad);
+ 
     return atanf(fNum/fDen);
  }
! 
! /**
! * prints test info to file
! */
! void nsNav::Test() 
! {
     FILE* testfile=NULL;
     int nTrials = 8;
  
     testfile = fopen("navtest.txt","wt");
!    if (testfile==NULL) 
!    {
        wxMessageBox("Failed to open nav test file");
        return;
     }
!    for(int i=0; i<nTrials; i++) 
!    {
        tsGeoPointRad a,b;
        a.mfLat_rad = 0.9f*randfc(C_PI);

Index: tcOggStreamer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOggStreamer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcOggStreamer.cpp	29 Feb 2004 22:51:35 -0000	1.7
--- tcOggStreamer.cpp	5 Aug 2004 02:22:35 -0000	1.8
***************
*** 190,202 ****
      paused = false;
  
!     bool isPlaying = true;
!     if(IsPlaying())
!         return true;
!     
!     for (int nBuff = 0;nBuff < NUM_BUFFERS;nBuff++)
      {
!         if(!Stream(buffers[nBuff])) isPlaying = false; // out of music for stream
          alSourceQueueBuffers(source, 1, &buffers[nBuff]);
      }
  
      alSourcePlay(source);
--- 190,205 ----
      paused = false;
  
!     if (IsPlaying()) return true;
! 
! 	Update(); // new way of doing this
! 
! #if 0
!     bool dataAvailable = true;
!     for (int nBuff = 0;(nBuff < NUM_BUFFERS) && dataAvailable; nBuff++)
      {
!         if(!Stream(buffers[nBuff])) dataAvailable = false; // out of music for stream
          alSourceQueueBuffers(source, 1, &buffers[nBuff]);
      }
+ #endif
  
      alSourcePlay(source);
***************
*** 259,282 ****
      bool active = true;
      int processed;
-     int queued;
  
      if (paused) return true;
  
!     // Check for stall, and fix if necessary
!     alGetSourcei(source, AL_BUFFERS_QUEUED, &queued);
!     if (!queued)
!     {
!         Play();
!     }
!     if (!IsPlaying())
!     {
!         alSourcePlay(source);
!     }
  
      // Ask OpenAL how many buffers it has managed to play back
      alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
  
  
!     while (processed--)
      {
          alSourceUnqueueBuffers(source, 1, &buffers[bufferIndex]);
--- 262,293 ----
      bool active = true;
      int processed;
  
      if (paused) return true;
  
! 
  
      // Ask OpenAL how many buffers it has managed to play back
      alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
+ 	nFreeBuffers += processed;
  
+ 	if (nFreeBuffers > NUM_BUFFERS)
+ 	{
+ 		wxASSERT(false);
+ 		nFreeBuffers = NUM_BUFFERS;
+ 	}
  
! 
!     /* If stall condition then set nFreeBuffers to NUM_BUFFERS
!     ** to restart streaming (not sure if this works yet)
! 	*/
! 	int nQueued;
!     alGetSourcei(source, AL_BUFFERS_QUEUED, &nQueued);
! 	if ((nFreeBuffers == 0) && (nQueued == 0))
! 	{
! 		nFreeBuffers = NUM_BUFFERS;
! 	}
! 
! 
!     while (active && nFreeBuffers)
      {
          alSourceUnqueueBuffers(source, 1, &buffers[bufferIndex]);
***************
*** 285,293 ****
          active = Stream(buffers[bufferIndex]);
  
!         alSourceQueueBuffers(source, 1, &buffers[bufferIndex]);
  
!        // fprintf(stdout,"Queued buffer: %d\n", bufferIndex);
  
!         bufferIndex = (bufferIndex + 1) % NUM_BUFFERS;
  
          Check();
--- 296,308 ----
          active = Stream(buffers[bufferIndex]);
  
! 		if (active)
! 		{
! 			alSourceQueueBuffers(source, 1, &buffers[bufferIndex]);
  
! 			// fprintf(stdout,"Queued buffer: %d\n", bufferIndex);
  
! 			bufferIndex = (bufferIndex + 1) % NUM_BUFFERS;
! 			nFreeBuffers--;
! 		}
  
          Check();
***************
*** 299,330 ****
  bool tcOggStreamer::Stream(ALuint buffer)
  {
-     char pcm[BUFFER_SIZE];
      int  size = 0;
      int  section;
      int  result;
  
!     while(size < BUFFER_SIZE)
      {
!         result = ov_read(&oggStream, pcm + size, BUFFER_SIZE - size, 0, 2, 1, &section);
      
!         if(result > 0)
              size += result;
!         else
!             if(result < 0)
!                 throw ErrorString(result);
!             else
!             {
!                 if (queuedSong.size() > 2)
!                 {
!                     Open(queuedSong);
!                     queuedSong = "";
!                     return true;
!                 }
!                 else
!                 {
!                     result = ov_time_seek(&oggStream, 0.0); // loop if no queued song
!                 }
!                 break;
!             }
      }
      
--- 314,348 ----
  bool tcOggStreamer::Stream(ALuint buffer)
  {
      int  size = 0;
      int  section;
      int  result;
  
!     while (size < BUFFER_SIZE)
      {
!         result = ov_read(&oggStream, 
! 			streamBuffer + size, BUFFER_SIZE - size, 0, 2, 1, &section);
      
!         if (result > 0)
! 		{
              size += result;
! 		}
! 		else if (result < 0)
! 		{
! 			fprintf(stderr, "%s\n", ErrorString(result).c_str());
! 		}
! 		else
! 		{
! 			if (queuedSong.size() > 2)
! 			{
! 				Open(queuedSong);
! 				queuedSong = "";
! 				return false;
! 			}
! 			else
! 			{
! 				result = ov_time_seek(&oggStream, 0.0); // loop if no queued song
! 			}
! 			break;
! 		}
      }
      
***************
*** 332,336 ****
          return false;
          
!     alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
      Check();
      
--- 350,354 ----
          return false;
          
!     alBufferData(buffer, format, streamBuffer, size, vorbisInfo->rate);
      Check();
      
***************
*** 355,358 ****
--- 373,379 ----
          Check();
      }
+ 
+ 	bufferIndex = 0;
+ 	nFreeBuffers = NUM_BUFFERS;
  }
  
***************
*** 407,410 ****
--- 428,432 ----
      volume = 0.2f;
      bufferIndex = 0;
+ 	nFreeBuffers = NUM_BUFFERS;
      queuedSong == "";
      paused = false;

Index: tcSound.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSound.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcSound.cpp	9 Apr 2004 14:15:18 -0000	1.15
--- tcSound.cpp	5 Aug 2004 02:22:35 -0000	1.16
***************
*** 105,108 ****
--- 105,109 ----
      LoadWavDataFromFile("intercom.wav",SEFFECT_INTERCOM);
      LoadWavDataFromFile("fslide.wav",SEFFECT_FSLIDE);
+ 	LoadWavDataFromFile("NavalGun1.wav", SEFFECT_NAVALGUN);
  
      if((alGetError())!=AL_NO_ERROR)

Index: simmath.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** simmath.cpp	27 Jul 2004 00:16:23 -0000	1.13
--- simmath.cpp	5 Aug 2004 02:22:35 -0000	1.14
***************
*** 492,496 ****
  * @return range in km including range due to altitude difference
  */
! float tcKinematics::RangeToKmAlt(tcKinematics& k) {
     return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
        (float)k.mfLat_rad,(float)k.mfLon_rad,
--- 492,497 ----
  * @return range in km including range due to altitude difference
  */
! float tcKinematics::RangeToKmAlt(tcKinematics& k) 
! {
     return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
        (float)k.mfLat_rad,(float)k.mfLon_rad,
***************
*** 498,506 ****
  }
  
! float tcKinematics::RangeToKm(const tsGeoPoint *apGeoPoint) {
     return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
        apGeoPoint->mfLat_rad,apGeoPoint->mfLon_rad);
  }
  
  /**
  * @return approximate range in km, altitude difference is neglected
--- 499,509 ----
  }
  
! float tcKinematics::RangeToKm(const tsGeoPoint *apGeoPoint) 
! {
     return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
        apGeoPoint->mfLat_rad,apGeoPoint->mfLon_rad);
  }
  
+ 
  /**
  * @return approximate range in km, altitude difference is neglected
***************
*** 515,518 ****
--- 518,530 ----
  
  /**
+ * @return approximate range in km, altitude difference is neglected
+ */
+ float tcKinematics::RangeToKm(float lon_rad, float lat_rad)
+ {
+    return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
+       lat_rad, lon_rad);
+ }
+ 
+ /**
  * Load state from stream
  */

[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.87,1.88 tcBallisticWeapon.cpp,1.2,1.3 tcLauncher.cpp,1.3,1.4 tcLauncherState.cpp,1.14,1.15 tcSimState.cpp,1.49,1.50

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

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

Modified Files:
	Game.cpp tcBallisticWeapon.cpp tcLauncher.cpp 
	tcLauncherState.cpp tcSimState.cpp 
Log Message:


Index: tcSimState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSimState.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** tcSimState.cpp	29 Jul 2004 00:14:19 -0000	1.49
--- tcSimState.cpp	5 Aug 2004 02:22:35 -0000	1.50
***************
*** 1320,1327 ****
--- 1320,1337 ----
  	{
  		missile->LaunchFrom(launchingPlatform, nLauncher);
+ 
+ 		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
+ 		{
+ 			tcSound::Get()->PlayEffect(SEFFECT_MISSILELAUNCH);
+ 		}
  	}
  	else if (tcBallisticWeapon* ballistic = dynamic_cast<tcBallisticWeapon*>(launched))
  	{
  		ballistic->LaunchFrom(launchingPlatform, nLauncher);
+ 
+ 		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
+ 		{
+ 			tcSound::Get()->PlayEffect(SEFFECT_NAVALGUN);
+ 		}
  	}
  	else
***************
*** 1334,1341 ****
  
      
!     if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
!     {
!         tcSound::Get()->PlayEffect(SEFFECT_MISSILELAUNCH);
!     }
  
  }
--- 1344,1348 ----
  
      
! 
  
  }
***************
*** 1406,1410 ****
      }
  
!     if (obj->mnModelType != MTYPE_MISSILE) 
      {
          tcString s;
--- 1413,1417 ----
      }
  
!     if (dynamic_cast<tcWeaponObject*>(obj) == 0) 
      {
          tcString s;

Index: tcLauncher.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLauncher.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcLauncher.cpp	27 Jul 2004 23:26:07 -0000	1.3
--- tcLauncher.cpp	5 Aug 2004 02:22:35 -0000	1.4
***************
*** 147,152 ****
  }
  
! 
! 
  
  #if 0
--- 147,158 ----
  }
  
! /**
! * Accessor for database cycle time parameter
! * @return cycle time for launcher in seconds
! */
! float tcLauncher::GetCycleTime() const
! {
! 	return mpLauncherDBObj->cycleTime;
! }
  
  #if 0

Index: tcLauncherState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLauncherState.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcLauncherState.cpp	29 Jul 2004 00:14:19 -0000	1.14
--- tcLauncherState.cpp	5 Aug 2004 02:22:35 -0000	1.15
***************
*** 1,5 ****
! /** @file tcLauncherState.cpp
! **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved. 
  **
--- 1,6 ----
! /** 
! **  @file tcLauncherState.cpp
! */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved. 
  **
***************
*** 25,28 ****
--- 26,30 ----
  #include "tcLauncherDBObject.h"
  #include "tcMissileDBObject.h"
+ #include "tcBallisticDBObject.h"
  #include "tcRadar.h"
  #include "tcSimState.h"
***************
*** 320,324 ****
                      key = pLauncher->mnChildDBKey;
                      nLauncher = n;
!                     pLauncher->mfTimeToReady = 2.0f; // TODO: add db parameter for this
                      return;
                  }
--- 322,326 ----
                      key = pLauncher->mnChildDBKey;
                      nLauncher = n;
! 					pLauncher->mfTimeToReady = pLauncher->GetCycleTime(); 
                      return;
                  }
***************
*** 404,407 ****
--- 406,426 ----
          return false;
      }
+ 
+ 	// do not set datum if not in range of launcher (only check for guns for now)
+ 	if (tcBallisticDBObject* ballDB = dynamic_cast<tcBallisticDBObject*>
+ 		(launchers[nLauncher].mpChildDBObj))
+ 	{
+ 		float maxRange_km = ballDB->GetMaxLevelGunRangeKm();
+ 		if (maxRange_km == 0) maxRange_km = 20.0f; // hack for non-guns for now
+ 
+ 		if (parent->mcKin.RangeToKm(lon_rad, lat_rad) > maxRange_km)
+ 		{
+ 			wxString msg = wxString::Format("Out of range (%.1f km)",
+ 				maxRange_km);
+ 			tcGame::DisplayMessage(msg.c_str());
+ 			return false;
+ 		}
+ 	}
+ 
      launchers[nLauncher].msDatum.Set(lon_rad, lat_rad, alt_m);
      commandObj.SetNewCommand(GetLauncherFlag(nLauncher)); 

Index: tcBallisticWeapon.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcBallisticWeapon.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcBallisticWeapon.cpp	29 Jul 2004 00:14:18 -0000	1.2
--- tcBallisticWeapon.cpp	5 Aug 2004 02:22:35 -0000	1.3
***************
*** 50,80 ****
  }
  
- /**
- * Gets elevation for ballistic shell to hit (non-moving) target at a 
- * horizontal range of range_m and altitude difference of dz_m
- * (Altitude difference is ignored for now.)
- */
- float tcBallisticWeapon::GetGunneryElevation(float range_m, float dz_m)
- {
- 	wxASSERT(mpDBObject);
- 
- 	float launchSpeed = mpDBObject->launchSpeed_mps;
- 	float c = 0.25f * range_m * range_m * C_G * C_G;
- 	float b = -launchSpeed * launchSpeed;
- 
- 	float b2 = b * b;
- 	float fac = 4.0f * c;
- 	if (b2 < fac)
- 	{
- 		fprintf(stdout, "Warning - Gun out of range\n");
- 		return 0.25f * C_PI;
- 	}
- 
- 	float vz = sqrtf( 0.5f * (-b + sqrt(b2 - fac)) );
- 	
- 	float elevation_rad = asinf(vz / launchSpeed);
- 
- 	return elevation_rad;
- }
  
  /**
--- 50,53 ----
***************
*** 105,110 ****
  		float range_m = 1000.0f * obj->mcKin.RangeToKm(&targetDatum);
  		float dz_m = targetDatum.mfAlt_m - obj->mcKin.mfAlt_m;
  
- 		mcKin.mfPitch_rad = GetGunneryElevation(range_m, dz_m);
  	}
  
--- 78,93 ----
  		float range_m = 1000.0f * obj->mcKin.RangeToKm(&targetDatum);
  		float dz_m = targetDatum.mfAlt_m - obj->mcKin.mfAlt_m;
+ 		float tti_s;
+ 
+ 		mcKin.mfPitch_rad = mpDBObject->GetGunneryElevation(range_m, dz_m, tti_s);
+ 
+ 		/*
+ 		fprintf(stdout, "Gun launched from (%.3f, %.3f) to (%.3f, %.3f), "
+ 		"range %.1f m, spd %.1f m/s\n",
+ 		obj->mcKin.mfLat_rad * C_180OVERPI, obj->mcKin.mfLon_rad * C_180OVERPI,
+ 		targetDatum.mfLat_rad * C_180OVERPI, targetDatum.mfLon_rad * C_180OVERPI,
+ 		range_m, mpDBObject->launchSpeed_mps);
+ 		*/
  
  	}
  
***************
*** 121,124 ****
--- 104,110 ----
  	// This is a tcWeaponObject method
  	SetIntendedTarget(pLauncher->mnTargetID);
+ 
+ 
+ 
  }
  

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** Game.cpp	18 Jul 2004 03:18:01 -0000	1.87
--- Game.cpp	5 Aug 2004 02:22:35 -0000	1.88
***************
*** 473,477 ****
          if (tcOptions::Get()->mbPlayMusic)
          {
!             tcSound::Get()->PlayMusic("loop1");
          }
  
--- 473,477 ----
          if (tcOptions::Get()->mbPlayMusic)
          {
!             tcSound::Get()->PlayMusic("gcb_theme2");
          }
  

[Gcblue-commits] gcb_wx/src/database tcBallisticDBObject.cpp,1.1,1.2 tcLauncherDBObject.cpp,1.6,1.7

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

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

Modified Files:
	tcBallisticDBObject.cpp tcLauncherDBObject.cpp 
Log Message:


Index: tcBallisticDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcBallisticDBObject.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcBallisticDBObject.cpp	29 Jul 2004 00:14:17 -0000	1.1
--- tcBallisticDBObject.cpp	5 Aug 2004 02:22:35 -0000	1.2
***************
*** 1,3 ****
! /*  
  **  @file tcBallisticDBObject.cpp
  */
--- 1,3 ----
! /**  
  **  @file tcBallisticDBObject.cpp
  */
***************
*** 37,115 ****
  {
  
! void tcBallisticDBObject::PrintToFile(tcFile& file) 
! { 
!    tcWeaponDBObject::PrintToFile(file);
! }
  
! int tcBallisticDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) 
! {
!    tcWeaponDBObject::Serialize(file,mbLoad,anVersion);
  
!    if (mbLoad) 
!    {
!      
!    }
!    else 
!    {
!      
!    }
!    return true;
! }
  
! int tcBallisticDBObject::SerializeCSV(CsvTranslator *csv, bool mbLoad)
! {
! 	tcWeaponDBObject::SerializeCSV(csv, mbLoad);
  
! 	if (mbLoad)
  	{
  
  	}
! 	else 
  	{
! 		csv->WriteLine(); 
  	}
- 	return 1;
- }
  
! /**
! * Loads/saves XML data for database object
! * @param load true to load, false to save
! */
! void tcBallisticDBObject::SerializeXml(TiXmlElement* node, bool load)
! {
!     if (load) return; // write only for now
!     wxASSERT(node);
  
!     TiXmlElement* localNode = node->InsertEndChild(TiXmlElement("sensor"))->ToElement();
  
!     //localNode->SetAttribute("maxRange_km" ,mfMaxRange_km);
  
!     tcWeaponDBObject::SerializeXml(node, load);
! }
  
! int tcBallisticDBObject::WriteCSVHeader(Database::CsvTranslator *csv)
! {
!     tcWeaponDBObject::WriteCSVHeader(csv);
!     
!     csv->WriteLine(); // write line since this is a leaf class
  
!     return 1;
! }
  
! tcBallisticDBObject::tcBallisticDBObject() : tcWeaponDBObject() 
! {
!    mzClass = "Default Ballistic";
!    mnClassID = DTYPE_BALLISTIC;
! }
  
! tcBallisticDBObject::tcBallisticDBObject(tcBallisticDBObject& obj) 
! : tcWeaponDBObject(obj) 
! {
  
! }
  
! tcBallisticDBObject::~tcBallisticDBObject() 
! {
! }
  
  }
--- 37,152 ----
  {
  
! 	/**
! 	* Gets elevation for ballistic shell to hit (non-moving) target at a 
! 	* horizontal range of range_m and altitude difference of dz_m
! 	* (Altitude difference is ignored for now.)
! 	*
! 	* @param tti_s this field is set to time to impact target in seconds
! 	*/
! 	float tcBallisticDBObject::GetGunneryElevation(float range_m, float dz_m, float& tti_s)
! 	{
! 		float launchSpeed = launchSpeed_mps;
! 		float fac = range_m * range_m * C_G * C_G; // 4 * 0.25  = 1
! 		float b = -launchSpeed * launchSpeed;
  
! 		float b2 = b * b;
! 		if (b2 < fac)
! 		{
! 			tti_s = 0;
! 			return 0.25f * C_PI;
! 		}
  
! 		float vz = sqrtf( 0.5f * (-b - sqrt(b2 - fac)) ); // -b + for lofted trajectory
  
! 		tti_s = 2 * vz / C_G;
  
! 		float elevation_rad = asinf(vz / launchSpeed);
! 
! 		return elevation_rad;
! 	}
! 
!     /**
! 	* @return max level gun range in km
! 	*/
! 	float tcBallisticDBObject::GetMaxLevelGunRangeKm()
  	{
+ 		return 0.001f * launchSpeed_mps * launchSpeed_mps / C_G;
+ 	}
  
+ 	void tcBallisticDBObject::PrintToFile(tcFile& file) 
+ 	{ 
+ 		tcWeaponDBObject::PrintToFile(file);
  	}
! 
! 	int tcBallisticDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) 
  	{
! 		tcWeaponDBObject::Serialize(file,mbLoad,anVersion);
! 
! 		if (mbLoad) 
! 		{
! 
! 		}
! 		else 
! 		{
! 
! 		}
! 		return true;
  	}
  
! 	int tcBallisticDBObject::SerializeCSV(CsvTranslator *csv, bool mbLoad)
! 	{
! 		tcWeaponDBObject::SerializeCSV(csv, mbLoad);
  
! 		if (mbLoad)
! 		{
  
! 		}
! 		else 
! 		{
! 			csv->WriteLine(); 
! 		}
! 		return 1;
! 	}
  
! 	/**
! 	* Loads/saves XML data for database object
! 	* @param load true to load, false to save
! 	*/
! 	void tcBallisticDBObject::SerializeXml(TiXmlElement* node, bool load)
! 	{
! 		if (load) return; // write only for now
! 		wxASSERT(node);
  
! 		TiXmlElement* localNode = node->InsertEndChild(TiXmlElement("sensor"))->ToElement();
  
! 		//localNode->SetAttribute("maxRange_km" ,mfMaxRange_km);
  
! 		tcWeaponDBObject::SerializeXml(node, load);
! 	}
  
! 	int tcBallisticDBObject::WriteCSVHeader(Database::CsvTranslator *csv)
! 	{
! 		tcWeaponDBObject::WriteCSVHeader(csv);
  
! 		csv->WriteLine(); // write line since this is a leaf class
  
! 		return 1;
! 	}
! 
! 	tcBallisticDBObject::tcBallisticDBObject() : tcWeaponDBObject() 
! 	{
! 		mzClass = "Default Ballistic";
! 		mnClassID = DTYPE_BALLISTIC;
! 	}
! 
! 	tcBallisticDBObject::tcBallisticDBObject(tcBallisticDBObject& obj) 
! 		: tcWeaponDBObject(obj) 
! 	{
! 
! 	}
! 
! 	tcBallisticDBObject::~tcBallisticDBObject() 
! 	{
! 	}
  
  }

Index: tcLauncherDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcLauncherDBObject.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcLauncherDBObject.cpp	30 Mar 2004 01:15:21 -0000	1.6
--- tcLauncherDBObject.cpp	5 Aug 2004 02:22:35 -0000	1.7
***************
*** 1,6 ****
! /*  
! **  tcLauncherDBObject.cpp
! **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,6 ----
! /**   
! **  @file tcLauncherDBObject.cpp
! */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
***************
*** 39,204 ****
  {
  
! void tcLauncherDBObject::PrintToFile(tcFile& file) 
! {
!    tcString s;
!    
!    tcDatabaseObject::PrintToFile(file);
!    
!    s.Format("   child class:%s mnCapacity:%d\n",mzChildClass.mz,mnCapacity);
!    file.WriteString(s.GetBuffer());
! }
  
! int tcLauncherDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) {
!    tcDatabaseObject::Serialize(file,mbLoad, anVersion);
!    if (mbLoad) {
!       file.Read(&mnCapacity,sizeof(mnCapacity));
!       mzChildClass.Serialize(file,mbLoad);
!       file.Read(&mnConfigurations,sizeof(mnConfigurations));
!       for(unsigned i=0;i<mnConfigurations;i++) {
!          maChildClass[i].Serialize(file,mbLoad);
!          file.Read(&maCapacity[i],sizeof(maCapacity[0]));
!       }
!    }
!    else {
!       file.Write(&mnCapacity,sizeof(mnCapacity));
!       mzChildClass.Serialize(file,mbLoad);  
!       file.Write(&mnConfigurations,sizeof(mnConfigurations));
!       for(unsigned i=0;i<mnConfigurations;i++) {
!          maChildClass[i].Serialize(file,mbLoad);
!          file.Write(&maCapacity[i],sizeof(maCapacity[0]));
!       }
!    }
!    return true;
! }
  
! int tcLauncherDBObject::SerializeCSV(CsvTranslator *csv, bool mbLoad)
! {
!     tcDatabaseObject::SerializeCSV(csv, mbLoad);
!     if (mbLoad)
!     {
!         std::string s;
  
!         *csv >> mnCapacity;
!         *csv >> s; mzChildClass = s.c_str();
!         *csv >> fireControlSensorClass;
!         int i;
!         mnConfigurations = 0;
!         for(i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
!         {
!             int cap;
!             *csv >> cap;
!             *csv >> s;
!             if ((s.size() > 0) &&(cap > 0))
!             {
!                 maCapacity[mnConfigurations] = cap;
!                 maChildClass[mnConfigurations++] = s.c_str();
!             }
!         }
!     }
!     else 
!     {
!         *csv << (long)mnCapacity;
!         *csv << mzChildClass.mz;
!         *csv << fireControlSensorClass;
  
!         for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++)
!         {
!             if (i < mnConfigurations)
!             {
!                 *csv << (long)maCapacity[i];
!                 *csv << maChildClass[i].mz;
!             }
!             else
!             {
!                 *csv << "";
!                 *csv << "";
!             }
!         }
!         csv->WriteLine();
!     }
!     return 1;
! }
  
! /**
! * Loads/saves XML data for database object
! * @param load true to load, false to save
! */
! void tcLauncherDBObject::SerializeXml(TiXmlElement* node, bool load)
! {
!     if (load) return; // write only for now
!     wxASSERT(node);
  
!     TiXmlElement* localNode = node->InsertEndChild(TiXmlElement("launcher"))->ToElement();
  
!     localNode->SetAttribute("capacity", (int)mnCapacity);
!     localNode->SetAttribute("childClass", mzChildClass.mz);
!     localNode->SetAttribute("fcSensorClass", fireControlSensorClass);
  
!     for(unsigned int i=0;(i<mnConfigurations)&&(i<MAX_LAUNCHER_CONFIGURATIONS);i++) 
!     {
!         TiXmlElement* childNode = node->InsertEndChild(TiXmlElement("config"))->ToElement();
!         childNode->SetAttribute("capacity", (int)maCapacity[i]);
!         childNode->SetAttribute("childClass",  maChildClass[i].mz);
!     }
  
  
-     tcDatabaseObject::SerializeXml(node, load);
- }
  
  
- int tcLauncherDBObject::WriteCSVHeader(Database::CsvTranslator *csv)
- {
-     tcDatabaseObject::WriteCSVHeader(csv);
  
!     *csv << "Basic capacity";
!     *csv << "Basic class";
!     *csv << "Fire control sensor class";
!     for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
!     {
!         tcString s;
!         s.Format("Cap%d",i+1);
!         *csv << s.GetBuffer();
!         s.Format("Class%d",i+1);
!         *csv << s.GetBuffer();
!     }
  
!     csv->WriteLine();
!     return 1;
! }
  
  
- tcLauncherDBObject::tcLauncherDBObject() : tcDatabaseObject() 
- {
-    mzClass = "Default Launcher";
-    mnClassID = DTYPE_LAUNCHER;
-    mnCapacity = 0;
-    mzChildClass = "NOCHILDCLASS";
-    fireControlSensorClass = "";
-    for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
-    {
-       maChildClass[i] = "";
-       maCapacity[i] = 0;
-    }
-    mnConfigurations = 0;
- }
  
! tcLauncherDBObject::tcLauncherDBObject(tcLauncherDBObject& obj) 
! : tcDatabaseObject(obj) 
! {
!     mzChildClass = obj.mzChildClass;
!     mnCapacity = obj.mnCapacity;
!     for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
!     {
!         maChildClass[i] = obj.maChildClass[i];
!         maCapacity[i] = obj.maCapacity[i];
!     }
!     mnConfigurations = obj.mnConfigurations;
!     fireControlSensorClass = obj.fireControlSensorClass;
! }
  
  
! tcLauncherDBObject::~tcLauncherDBObject() 
! {
! }
  
  
--- 39,216 ----
  {
  
! 	void tcLauncherDBObject::PrintToFile(tcFile& file) 
! 	{
! 		tcString s;
  
! 		tcDatabaseObject::PrintToFile(file);
  
! 		s.Format("   child class:%s mnCapacity:%d\n",mzChildClass.mz,mnCapacity);
! 		file.WriteString(s.GetBuffer());
! 	}
  
! 	int tcLauncherDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) 
! 	{
! 		tcDatabaseObject::Serialize(file,mbLoad, anVersion);
! 		if (mbLoad) 
! 		{
! 			file.Read(&cycleTime, sizeof(cycleTime));
! 			file.Read(&mnCapacity,sizeof(mnCapacity));
! 			mzChildClass.Serialize(file,mbLoad);
! 			file.Read(&mnConfigurations,sizeof(mnConfigurations));
! 			for(unsigned i=0;i<mnConfigurations;i++) {
! 				maChildClass[i].Serialize(file,mbLoad);
! 				file.Read(&maCapacity[i],sizeof(maCapacity[0]));
! 			}
! 		}
! 		else 
! 		{
! 			file.Write(&cycleTime, sizeof(cycleTime));
! 			file.Write(&mnCapacity,sizeof(mnCapacity));
! 			mzChildClass.Serialize(file,mbLoad);  
! 			file.Write(&mnConfigurations,sizeof(mnConfigurations));
! 			for(unsigned i=0;i<mnConfigurations;i++) 
! 			{
! 				maChildClass[i].Serialize(file,mbLoad);
! 				file.Write(&maCapacity[i],sizeof(maCapacity[0]));
! 			}
! 		}
! 		return true;
! 	}
  
! 	int tcLauncherDBObject::SerializeCSV(CsvTranslator *csv, bool mbLoad)
! 	{
! 		tcDatabaseObject::SerializeCSV(csv, mbLoad);
! 		if (mbLoad)
! 		{
! 			std::string s;
! 			
! 			*csv >> cycleTime;
! 			*csv >> mnCapacity;
! 			*csv >> s; mzChildClass = s.c_str();
! 			*csv >> fireControlSensorClass;
! 			int i;
! 			mnConfigurations = 0;
! 			for(i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
! 			{
! 				int cap;
! 				*csv >> cap;
! 				*csv >> s;
! 				if ((s.size() > 0) &&(cap > 0))
! 				{
! 					maCapacity[mnConfigurations] = cap;
! 					maChildClass[mnConfigurations++] = s.c_str();
! 				}
! 			}
! 		}
! 		else 
! 		{
! 			*csv << cycleTime;
! 			*csv << (long)mnCapacity;
! 			*csv << mzChildClass.mz;
! 			*csv << fireControlSensorClass;
  
! 			for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++)
! 			{
! 				if (i < mnConfigurations)
! 				{
! 					*csv << (long)maCapacity[i];
! 					*csv << maChildClass[i].mz;
! 				}
! 				else
! 				{
! 					*csv << "";
! 					*csv << "";
! 				}
! 			}
! 			csv->WriteLine();
! 		}
! 		return 1;
! 	}
  
! 	/**
! 	* Loads/saves XML data for database object
! 	* @param load true to load, false to save
! 	*/
! 	void tcLauncherDBObject::SerializeXml(TiXmlElement* node, bool load)
! 	{
! 		if (load) return; // write only for now
! 		wxASSERT(node);
  
! 		TiXmlElement* localNode = node->InsertEndChild(TiXmlElement("launcher"))->ToElement();
  
! 		localNode->SetAttribute("cycleTime", cycleTime);
! 		localNode->SetAttribute("capacity", (int)mnCapacity);
! 		localNode->SetAttribute("childClass", mzChildClass.mz);
! 		localNode->SetAttribute("fcSensorClass", fireControlSensorClass);
  
+ 		for(unsigned int i=0;(i<mnConfigurations)&&(i<MAX_LAUNCHER_CONFIGURATIONS);i++) 
+ 		{
+ 			TiXmlElement* childNode = node->InsertEndChild(TiXmlElement("config"))->ToElement();
+ 			childNode->SetAttribute("capacity", (int)maCapacity[i]);
+ 			childNode->SetAttribute("childClass",  maChildClass[i].mz);
+ 		}
  
  
+ 		tcDatabaseObject::SerializeXml(node, load);
+ 	}
  
  
! 	int tcLauncherDBObject::WriteCSVHeader(Database::CsvTranslator *csv)
! 	{
! 		tcDatabaseObject::WriteCSVHeader(csv);
  
! 		*csv << "Cycle time";
! 		*csv << "Basic capacity";
! 		*csv << "Basic class";
! 		*csv << "Fire control sensor class";
! 		for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
! 		{
! 			tcString s;
! 			s.Format("Cap%d",i+1);
! 			*csv << s.GetBuffer();
! 			s.Format("Class%d",i+1);
! 			*csv << s.GetBuffer();
! 		}
  
+ 		csv->WriteLine();
+ 		return 1;
+ 	}
  
  
! 	tcLauncherDBObject::tcLauncherDBObject() : tcDatabaseObject() 
! 	{
! 		mzClass = "Default Launcher";
! 		mnClassID = DTYPE_LAUNCHER;
! 		cycleTime = 0;
! 		mnCapacity = 0;
! 		mzChildClass = "NOCHILDCLASS";
! 		fireControlSensorClass = "";
! 		for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
! 		{
! 			maChildClass[i] = "";
! 			maCapacity[i] = 0;
! 		}
! 		mnConfigurations = 0;
! 	}
! 
! 	tcLauncherDBObject::tcLauncherDBObject(tcLauncherDBObject& obj) 
! 		: tcDatabaseObject(obj) 
! 	{
! 		cycleTime = obj.cycleTime;
! 		mzChildClass = obj.mzChildClass;
! 		mnCapacity = obj.mnCapacity;
! 		for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
! 		{
! 			maChildClass[i] = obj.maChildClass[i];
! 			maCapacity[i] = obj.maCapacity[i];
! 		}
! 		mnConfigurations = obj.mnConfigurations;
! 		fireControlSensorClass = obj.fireControlSensorClass;
! 	}
  
  
! 	tcLauncherDBObject::~tcLauncherDBObject() 
! 	{
! 	}
  
  

[Gcblue-commits] gcb_wx/docs CHANGES.txt,1.29,1.30

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

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

Modified Files:
	CHANGES.txt 
Log Message:


Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/docs/CHANGES.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** CHANGES.txt	29 Jul 2004 00:14:16 -0000	1.29
--- CHANGES.txt	5 Aug 2004 02:22:34 -0000	1.30
***************
*** 3,6 ****
--- 3,17 ----
  0.6
  ---------------------------------------------------------------------
+ *** 2004-08-04 Dewitt Colclough ***
+ - Fixed bug in auto music that caused music to freeze at the end of
+   the title screen. This may have introduced a bug where the music
+   will stall during a very slow startup.
+ 
+ *** 2004-07-29 Dewitt Colclough ***
+ - Fixed bug in approx distance calculation
+ - Added naval gun sound
+ - Added cycle time field to launcher database (dead time between launches)
+ - Added range check for guns
+ 
  *** 2004-07-28 Dewitt Colclough ***
  - Added ballistic database object and file

[Gcblue-commits] gcb_wx/include/database tcBallisticDBObject.h,1.1,1.2 tcLauncherDBObject.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-serv29972/include/database

Modified Files:
	tcBallisticDBObject.h tcLauncherDBObject.h 
Log Message:


Index: tcBallisticDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcBallisticDBObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcBallisticDBObject.h	29 Jul 2004 00:14:16 -0000	1.1
--- tcBallisticDBObject.h	5 Aug 2004 02:22:34 -0000	1.2
***************
*** 33,52 ****
  namespace Database
  {
!    class tcBallisticDBObject : public tcWeaponDBObject 
!    {
!    public:
  
!       virtual const char* GetClassName() {return "Sensor";} ///< returns class name of database object
!       virtual void PrintToFile(tcFile& file);
!       int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);
!       int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization
!       virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization
!       static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings
  
!       tcBallisticDBObject(tcBallisticDBObject& obj); ///< copy constructor
!       tcBallisticDBObject();
!       virtual ~tcBallisticDBObject();
  
!    };
  
  } // namespace Database
--- 33,54 ----
  namespace Database
  {
! 	class tcBallisticDBObject : public tcWeaponDBObject 
! 	{
! 	public:
! 		float GetGunneryElevation(float range_m, float dz_m, float& tti_s);
! 		float GetMaxLevelGunRangeKm();
  
! 		virtual const char* GetClassName() {return "Sensor";} ///< returns class name of database object
! 		virtual void PrintToFile(tcFile& file);
! 		int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);
! 		int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization
! 		virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization
! 		static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings
  
! 		tcBallisticDBObject(tcBallisticDBObject& obj); ///< copy constructor
! 		tcBallisticDBObject();
! 		virtual ~tcBallisticDBObject();
  
! 	};
  
  } // namespace Database

Index: tcLauncherDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcLauncherDBObject.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcLauncherDBObject.h	24 May 2004 00:14:45 -0000	1.6
--- tcLauncherDBObject.h	5 Aug 2004 02:22:34 -0000	1.7
***************
*** 38,41 ****
--- 38,42 ----
     {
     public:
+       float cycleTime;   ///< down time between shots
        tcDBString mzChildClass;  ///< class of platform to launch (simple model)
        UINT mnCapacity; ///< max number of launch objects held (simple model)

[Gcblue-commits] gcb_wx/include/common simmath.h,1.16,1.17 tcOggStreamer.h,1.4,1.5 tcSound.h,1.12,1.13

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

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

Modified Files:
	simmath.h tcOggStreamer.h tcSound.h 
Log Message:


Index: tcOggStreamer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcOggStreamer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcOggStreamer.h	22 Dec 2003 02:32:37 -0000	1.4
--- tcOggStreamer.h	5 Aug 2004 02:22:34 -0000	1.5
***************
*** 77,81 ****
  
      private:
- 
          FILE*           oggFile;
          OggVorbis_File  oggStream;
--- 77,80 ----
***************
*** 84,91 ****
          float volume; ///< linear gain for source, 0.5f = -6 dB
          
!         int bufferIndex; ///< index for buffers played by OpenAL
          ALuint buffers[NUM_BUFFERS];
          ALuint source;
          ALenum format;
          std::string queuedSong; ///< complete file path of song to queue
          bool paused;
--- 83,95 ----
          float volume; ///< linear gain for source, 0.5f = -6 dB
          
! 		// when bufferFreeIndex == bufferBusyIndex, no buffers are available
!         int bufferIndex; ///< index of next buffer to use (when free)
! 		int nFreeBuffers; ///< number of free buffers
! 
          ALuint buffers[NUM_BUFFERS];
          ALuint source;
          ALenum format;
+ 		char streamBuffer[BUFFER_SIZE];
+ 
          std::string queuedSong; ///< complete file path of song to queue
          bool paused;

Index: simmath.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** simmath.h	27 Jul 2004 00:16:22 -0000	1.16
--- simmath.h	5 Aug 2004 02:22:34 -0000	1.17
***************
*** 181,184 ****
--- 181,185 ----
      float RangeToKm(tcKinematics& k);
      float RangeToKm(const tcTrack& track);
+ 	float RangeToKm(float lon_rad, float lat_rad);
      float RangeToKmAlt(tcKinematics& k);
      //float InterceptHeadingToTrack(tcTrack& track, float& afTimeToIntercept);

Index: tcSound.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSound.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcSound.h	28 Mar 2004 11:30:14 -0000	1.12
--- tcSound.h	5 Aug 2004 02:22:34 -0000	1.13
***************
*** 61,65 ****
  #define SEFFECT_INTERCOM 20
  #define SEFFECT_FSLIDE 21
! #define N_SEFFECT 22
  
  #define N_EFFECT_BUFFERS 16
--- 61,66 ----
  #define SEFFECT_INTERCOM 20
  #define SEFFECT_FSLIDE 21
! #define SEFFECT_NAVALGUN 22
! #define N_SEFFECT 23
  
  #define N_EFFECT_BUFFERS 16

[Gcblue-commits] gcb_wx ReleaseInstallScript.nsi,1.4,1.5

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

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

Modified Files:
	ReleaseInstallScript.nsi 
Log Message:


Index: ReleaseInstallScript.nsi
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/ReleaseInstallScript.nsi,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReleaseInstallScript.nsi	26 Jul 2004 01:44:40 -0000	1.4
--- ReleaseInstallScript.nsi	5 Aug 2004 02:22:34 -0000	1.5
***************
*** 12,16 ****
  
  ; The file to write
! OutFile "gcb_06x23JUL_.exe"
  
  ; The default installation directory
--- 12,16 ----
  
  ; The file to write
! OutFile "gcb_06x29JUL.exe"
  
  ; The default installation directory