Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mk...@us...> - 2003-07-22 07:43:31
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv3754
Modified Files:
CHANGES.current
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** CHANGES.current 22 Jul 2003 07:41:13 -0000 1.49
--- CHANGES.current 22 Jul 2003 07:43:26 -0000 1.50
***************
*** 22,25 ****
--- 22,27 ----
Added missing license statement to Colorspace.cpp.
+ Added missing license statement to cCSP.i.
+
Added missing license statements to Bin/CSPSim.py,
Bin/CompileData.py, Bin/RebuildData.py, Bin/Shell.py,
***************
*** 28,31 ****
--- 30,34 ----
Removed Include/OGLText.h, which seemed to have been
misplaced (part of TerrainTools?).
+
2003-07-21: onsight
|
|
From: <mk...@us...> - 2003-07-22 07:43:02
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1:/tmp/cvs-serv3615/Source Modified Files: cCSP.i Log Message: Index: cCSP.i =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/cCSP.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cCSP.i 26 Jun 2003 09:25:23 -0000 1.3 --- cCSP.i 22 Jul 2003 07:42:59 -0000 1.4 *************** *** 1,2 **** --- 1,20 ---- + // Combat Simulator Project - CSPSim + // Copyright (C) 2002 The Combat Simulator Project + // http://csp.sourceforge.net + // + // This program is free software; you can redistribute it and/or + // modify it under the terms of the GNU General Public License + // as published by the Free Software Foundation; either version 2 + // of the License, or (at your option) any later version. + // + // This program 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 this program; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + %module cCSP %{ *************** *** 30,31 **** --- 48,50 ---- %include "TerrainObject.i" */ + |
|
From: <mk...@us...> - 2003-07-22 07:41:18
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv3417
Modified Files:
CHANGES.current
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** CHANGES.current 21 Jul 2003 08:04:56 -0000 1.48
--- CHANGES.current 22 Jul 2003 07:41:13 -0000 1.49
***************
*** 3,6 ****
--- 3,33 ----
2003-07-21: onsight
+ Moved a couple accessor methods in Theater and
+ FeatureLayout out of the class declarations. This
+ fixes two compiler errors under GCC 3.3 related to
+ the use of simdata::Ref<T> where T is a forward class
+ declaration. CSPSim now builds correctly with 3.3.
+
+ Added GPL license in COPYING
+
+ Removed nommgr.h, mmgr.h, and mmgr.cpp. These libraries
+ were not being used and are incompatible with the GPL.
+
+ Removed stdinc.h which wasn't being used.
+
+ Removed compiler.h, which had some compiler-specific
+ portability macros which were only minimally used
+ by SimpleConfig.cpp.
+
+ Added missing license statement to Colorspace.cpp.
+
+ Added missing license statements to Bin/CSPSim.py,
+ Bin/CompileData.py, Bin/RebuildData.py, Bin/Shell.py,
+ Bin/ShellEnvironment.py, and Bin/TestObjects.py
+
+ Removed Include/OGLText.h, which seemed to have been
+ misplaced (part of TerrainTools?).
+
+ 2003-07-21: onsight
Added Tools/Terrain directory for terrain tools used in
processing DEM data to ChunkLod and other formats.
|
|
From: <mk...@us...> - 2003-07-22 07:41:06
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/XML In directory sc8-pr-cvs1:/tmp/cvs-serv3392/Tools/XML Modified Files: falcon_acdata.py Log Message: Index: falcon_acdata.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/XML/falcon_acdata.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** falcon_acdata.py 20 Jun 2003 17:46:25 -0000 1.2 --- falcon_acdata.py 22 Jul 2003 07:41:03 -0000 1.3 *************** *** 1,2 **** --- 1,21 ---- + # Combat Simulator Project - CSPSim + # Copyright (C) 2002 The Combat Simulator Project + # http://csp.sourceforge.net + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program 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 this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + import sys |
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Bin In directory sc8-pr-cvs1:/tmp/cvs-serv2659 Modified Files: CSPSim.py CompileData.py RebuildData.py Shell.py ShellEnvironment.py TestObjects.py Log Message: Index: CSPSim.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/CSPSim.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CSPSim.py 26 Jun 2003 09:26:21 -0000 1.5 --- CSPSim.py 22 Jul 2003 07:36:36 -0000 1.6 *************** *** 1,4 **** --- 1,23 ---- #!/usr/bin/python -O + # Combat Simulator Project - CSPSim + # Copyright (C) 2002 The Combat Simulator Project + # http://csp.sourceforge.net + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program 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 this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + import sys, os, os.path *************** *** 7,12 **** # enable lazy loading of shared library modules if available ! if hasattr(sys, "setdlopenflags"): ! sys.setdlopenflags(0x101) # is the SDL joystick environment variable isn't set, try a standard value --- 26,35 ---- # enable lazy loading of shared library modules if available ! if os.name == 'posix': ! import dl ! sys.setdlopenflags(dl.RTLD_GLOBAL|dl.RTLD_LAZY) ! ! #if hasattr(sys, "setdlopenflags"): ! # sys.setdlopenflags(0x101) # is the SDL joystick environment variable isn't set, try a standard value Index: CompileData.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/CompileData.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CompileData.py 11 Apr 2003 18:46:29 -0000 1.3 --- CompileData.py 22 Jul 2003 07:36:36 -0000 1.4 *************** *** 1,4 **** --- 1,23 ---- #!/usr/bin/python + # Combat Simulator Project - CSPSim + # Copyright (C) 2002 The Combat Simulator Project + # http://csp.sourceforge.net + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program 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 this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + import sys Index: RebuildData.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/RebuildData.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RebuildData.py 11 Apr 2003 18:46:29 -0000 1.3 --- RebuildData.py 22 Jul 2003 07:36:36 -0000 1.4 *************** *** 1,4 **** --- 1,23 ---- #!/usr/bin/python + # Combat Simulator Project - CSPSim + # Copyright (C) 2002 The Combat Simulator Project + # http://csp.sourceforge.net + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program 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 this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + import sys Index: Shell.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/Shell.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Shell.py 27 Mar 2003 22:59:39 -0000 1.1 --- Shell.py 22 Jul 2003 07:36:36 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + # Combat Simulator Project - CSPSim + # Copyright (C) 2002 The Combat Simulator Project + # http://csp.sourceforge.net + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program 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 this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + import traceback, sys Index: ShellEnvironment.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/ShellEnvironment.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ShellEnvironment.py 27 Mar 2003 22:59:39 -0000 1.1 --- ShellEnvironment.py 22 Jul 2003 07:36:36 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + # Combat Simulator Project - CSPSim + # Copyright (C) 2002 The Combat Simulator Project + # http://csp.sourceforge.net + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program 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 this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + import cCSP as CSP Index: TestObjects.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/TestObjects.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestObjects.py 26 Jun 2003 09:26:21 -0000 1.2 --- TestObjects.py 22 Jul 2003 07:36:36 -0000 1.3 *************** *** 1,2 **** --- 1,19 ---- + # Combat Simulator Project - CSPSim + # Copyright (C) 2002 The Combat Simulator Project + # http://csp.sourceforge.net + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program 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 this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import SimData *************** *** 6,10 **** m = SimData.LLA() vehicle = app.createVehicle ! # vehicle("sim:vehicles.aircraft.m2k", v(10, 10, 1000.2), v(0, 100.0, 0), v(2.0, 2.0, 140.0)) # vehicle("sim:vehicles.aircraft.m2k", v(483010, 499010, 190.2), v(0, 100.0, 0), v(2.0, 2.0, 140.0)) --- 23,27 ---- m = SimData.LLA() vehicle = app.createVehicle ! vehicle("sim:vehicles.aircraft.f16", v(10, 10, 1000.2), v(0, 100.0, 0), v(2.0, 2.0, 140.0)) # vehicle("sim:vehicles.aircraft.m2k", v(483010, 499010, 190.2), v(0, 100.0, 0), v(2.0, 2.0, 140.0)) |
|
From: <mk...@us...> - 2003-07-22 06:39:51
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv20924 Removed Files: stdinc.h Log Message: --- stdinc.h DELETED --- |
|
From: <mk...@us...> - 2003-07-22 06:35:55
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv27739 Removed Files: OGLText.h Log Message: --- OGLText.h DELETED --- |
|
From: <mk...@us...> - 2003-07-22 05:59:51
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv22595 Removed Files: compiler.h Log Message: --- compiler.h DELETED --- |
|
From: <mk...@us...> - 2003-07-22 05:43:32
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1:/tmp/cvs-serv20646 Removed Files: mmgr.cpp Log Message: --- mmgr.cpp DELETED --- |
|
From: <mk...@us...> - 2003-07-22 05:42:56
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv20547 Removed Files: nommgr.h mmgr.h Log Message: --- nommgr.h DELETED --- --- mmgr.h DELETED --- |
|
From: <mk...@us...> - 2003-07-21 08:05:00
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/tile In directory sc8-pr-cvs1:/tmp/cvs-serv29790/Tools/Terrain/tile Added Files: tile.cpp tile.ini Log Message: --- NEW FILE: tile.cpp --- // Combat Simulator Project - Terrain Tools // Copyright (C) 2002, 2003 The Combat Simulator Project // http://csp.sourceforge.net // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program 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 this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** [...1316 lines suppressed...] help(); ::exit(0); } usage(); } else { ini = arg; } } if (ini == 0) { help(); ::exit(0); } Tiler tiler; if (tiler.initialize(ini)) { tiler.run(); } if (LOG != 0) fclose(LOG); } --- NEW FILE: tile.ini --- center_latitude = 38.5 center_longitude = -118.5 width = 70000.0 height = 70000.0 x_tiles = 1 y_tiles = 1 tile_width = 512 tile_height = 512 prefix = nevada |
|
From: <mk...@us...> - 2003-07-21 08:05:00
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv29790 Modified Files: CHANGES.current Log Message: Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** CHANGES.current 21 Jul 2003 07:45:09 -0000 1.47 --- CHANGES.current 21 Jul 2003 08:04:56 -0000 1.48 *************** *** 7,13 **** Added Tools/Terrain/dem2dat which has a utility for ! convertind DEM to an intermediate binary format. This format is similar to .bt but preserves additional ! metadata. 2003-07-19: delta --- 7,23 ---- Added Tools/Terrain/dem2dat which has a utility for ! converting DEM to an intermediate binary format. This format is similar to .bt but preserves additional ! metadata. This is just an initial check in of the code; ! the Makefile is very immature and no msvc project files ! exist yet. ! ! Added Tools/Terrain/tile which has a utility for combining ! many DEM quads (in DAT format) into a large terrain ! elevation map, using a secant gnomonic projection. The ! output can either be 16-bit image tiles (for use with ! Demeter) or a .bt format terrain map that can be converted ! to the .chu format of osgChunkLod using tools in TU's ! original ChunkLod package. 2003-07-19: delta |
|
From: <mk...@us...> - 2003-07-21 08:04:13
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/tile In directory sc8-pr-cvs1:/tmp/cvs-serv29695/Tools/Terrain/tile Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/tile added to the repository |
|
From: <mk...@us...> - 2003-07-21 07:45:12
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv26792 Modified Files: CHANGES.current Log Message: Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** CHANGES.current 19 Jul 2003 14:10:45 -0000 1.46 --- CHANGES.current 21 Jul 2003 07:45:09 -0000 1.47 *************** *** 2,5 **** --- 2,14 ---- =========================== + 2003-07-21: onsight + Added Tools/Terrain directory for terrain tools used in + processing DEM data to ChunkLod and other formats. + + Added Tools/Terrain/dem2dat which has a utility for + convertind DEM to an intermediate binary format. This + format is similar to .bt but preserves additional + metadata. + 2003-07-19: delta Commented out setTextureAttributeAndModes in SCreenInfo class. |
|
From: <mk...@us...> - 2003-07-21 07:41:13
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/dem2dat In directory sc8-pr-cvs1:/tmp/cvs-serv26179/Terrain/dem2dat Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain/dem2dat added to the repository |
|
From: <mk...@us...> - 2003-07-21 07:41:03
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain In directory sc8-pr-cvs1:/tmp/cvs-serv26134/Terrain Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/Terrain added to the repository |
|
From: <mk...@us...> - 2003-07-19 14:43:49
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source In directory sc8-pr-cvs1:/tmp/cvs-serv2320 Modified Files: Interpolate.cpp Log Message: Index: Interpolate.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Interpolate.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Interpolate.cpp 19 Jul 2003 13:56:50 -0000 1.10 --- Interpolate.cpp 19 Jul 2003 14:02:05 -0000 1.11 *************** *** 190,195 **** int i = find(_breaks, v); double h = _breaks[i+1] - _breaks[i]; ! double f1 = 1.0 - (v - _breaks[i]) / h;// 1.0 - t; ? ! double f2 = 1.0 - (_breaks[i+1] - v) / h; // t = (v - _breaks[i]) / h; ? double d1 = _sd[i]; double d2 = _sd[i+1]; --- 190,195 ---- int i = find(_breaks, v); double h = _breaks[i+1] - _breaks[i]; ! double f2 = (v - _breaks[i]) / h; ! double f1 = 1.0 - f2; double d1 = _sd[i]; double d2 = _sd[i+1]; *************** *** 197,201 **** double y2 = _data[i+1]; double s = h * h / 6.0; ! v = static_cast<value_t>(y1*f1 + y2*f2 + (f1*(f1*f1 - 1.0)*d1 + f2*(f2*f2 - 1.0)*d2) * s); return v; } --- 197,201 ---- double y2 = _data[i+1]; double s = h * h / 6.0; ! v = static_cast<value_t>(y1*f1 + y2*f2 + (f1*(f1*f1 - 1.0)*d1 + f2*(f2*f2 - 1.0)*d2) * s); return v; } |
|
From: <de...@us...> - 2003-07-19 14:26:29
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv2225
Modified Files:
CHANGES.current
Log Message:
no message
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** CHANGES.current 18 Jul 2003 20:44:04 -0000 1.46
--- CHANGES.current 19 Jul 2003 14:01:49 -0000 1.47
***************
*** 2,5 ****
--- 2,9 ----
===========================
+ 2003-07-19: delta
+ Merged Onsight changes.
+ Updated vc project.
+
2003-07-18: onsight
Separated the __PTS_SIM__ definition into PTS.h. Partial
***************
*** 84,88 ****
2003-05-24: delta
Added help methods to convert feet to meters and pounds to newtons
! in math.h.
2003-05-14: onsight
--- 88,92 ----
2003-05-24: delta
Added help methods to convert feet to meters and pounds to newtons
! in Math.h.
2003-05-14: onsight
|
|
From: <mk...@us...> - 2003-07-19 14:14:40
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv3576/Source
Modified Files:
CSPSim.cpp
Log Message:
Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** CSPSim.cpp 19 Jul 2003 14:08:03 -0000 1.32
--- CSPSim.cpp 19 Jul 2003 14:14:37 -0000 1.33
***************
*** 208,212 ****
void CSPSim::init()
{
! //try {
CSP_LOG(APP, INFO, "Starting CSPSim...");
--- 208,212 ----
void CSPSim::init()
{
! try {
CSP_LOG(APP, INFO, "Starting CSPSim...");
***************
*** 236,240 ****
m_DataManager.addArchive(sim);
}
-
catch (simdata::Exception &e) {
CSP_LOG(APP, ERROR, "Error opening data archive " << archive_file);
--- 236,239 ----
***************
*** 243,246 ****
--- 242,246 ----
//::exit(0);
}
+
// initialize SDL
initSDL();
***************
*** 260,263 ****
--- 260,265 ----
m_Clean = false;
+ CSP_LOG(APP, DEBUG, "INIT:: interface maps");
+
// load all interface maps and create a virtual hid for the active object
m_InterfaceMaps = new EventMapIndex();
***************
*** 265,268 ****
--- 267,272 ----
m_Interface = new VirtualHID();
+ CSP_LOG(APP, DEBUG, "INIT:: theater");
+
std::string theater = g_Config.getPath("Testing", "Theater", "sim:theater.balkan", false);
m_Theater = m_DataManager.getObject(theater.c_str());
***************
*** 272,278 ****
m_Terrain->activate();
! // eventually this will be set in an entirely different way...
! //m_ActiveTerrain = m_DataManager.getObject("sim:terrain.balkan");
! //m_ActiveTerrain->activate();
m_Scene = new VirtualScene();
--- 276,280 ----
m_Terrain->activate();
! CSP_LOG(APP, DEBUG, "INIT:: scene");
m_Scene = new VirtualScene();
***************
*** 280,283 ****
--- 282,287 ----
m_Scene->setTerrain(m_Terrain);
+ CSP_LOG(APP, DEBUG, "INIT:: battlefield");
+
m_Battlefield = new VirtualBattlefield();
m_Battlefield->create();
***************
*** 285,288 ****
--- 289,294 ----
m_Battlefield->setTheater(m_Theater);
+ CSP_LOG(APP, DEBUG, "INIT:: scene configuration");
+
// get view parameters from configuration file. ultimately there should
// be an in-game ui for this and probably a separate config file.
***************
*** 300,303 ****
--- 306,311 ----
// create a test object (other objects can be created via TestObjects.py)
+ CSP_LOG(APP, DEBUG, "INIT:: test vehicle");
+
std::string vehicle = g_Config.getPath("Testing", "Vehicle", "sim:vehicles.aircraft.m2k", false);
simdata::Ref<AircraftObject> ao = m_DataManager.getObject(vehicle.c_str());
***************
*** 324,328 ****
--- 332,341 ----
+ CSP_LOG(APP, DEBUG, "INIT:: activate test vehicle");
+
m_Battlefield->addUnit(ao);
+ setActiveObject(ao);
+
+ CSP_LOG(APP, DEBUG, "INIT:: gamescreen");
// Following variables should be set before calling GameScreen.init()
***************
*** 333,339 ****
//m_Paused = true;
- // start in the aircraft
- setActiveObject(ao);
-
// create and initialize screens
m_GameScreen = new GameScreen;
--- 346,349 ----
***************
*** 349,353 ****
changeScreen(m_GameScreen);
logoScreen.onExit();
- /*
}
catch(csp::Exception & pEx) {
--- 359,362 ----
***************
*** 363,367 ****
csp::OtherFatalException("initialization");
}
- */
}
--- 372,375 ----
|
|
From: <mk...@us...> - 2003-07-19 14:14:25
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv3557
Modified Files:
DynamicalSystem.h
Log Message:
Index: DynamicalSystem.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/DynamicalSystem.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DynamicalSystem.h 19 Jul 2003 14:08:25 -0000 1.7
--- DynamicalSystem.h 19 Jul 2003 14:14:23 -0000 1.8
***************
*** 31,40 ****
#include "NumericalMethod.h"
! class DynamicalSystem: public VectorField {
NumericalMethod* _numericalMethod;
public:
DynamicalSystem(unsigned short dimension = 0);
virtual ~DynamicalSystem();
void setNumericalMethod(NumericalMethod* pnumericalMethod);
std::vector<double> const& flow(std::vector<double>& y0, double t0, double dt) const;
};
--- 31,63 ----
#include "NumericalMethod.h"
!
! /**
! * DynamicalSystem is a base class for physics models that can
! * be solved by numerical integration. The dynamical variables
! * are stored in a vector field, and are integrated by an
! * associated numerical method (e.g. Runge-Kutta). The _f()
! * function of VectorField provides the driving term, which
! * must be implemented in derived classes. Implementations of
! * _f() typically involve evaluation of one or more BaseDynamics
! * instances to determine the total force and moment acting on
! * the body at each instant.
! *
! */
! class DynamicalSystem: protected VectorField {
NumericalMethod* _numericalMethod;
public:
DynamicalSystem(unsigned short dimension = 0);
virtual ~DynamicalSystem();
+
+ /**
+ * Set the numerical integration method used to integrate
+ * the equations of motion.
+ */
void setNumericalMethod(NumericalMethod* pnumericalMethod);
+
+ /**
+ * Integrate the model over a specified time interval (dt) given
+ * a set of initial conditions (y0, t0).
+ */
std::vector<double> const& flow(std::vector<double>& y0, double t0, double dt) const;
};
|
|
From: <de...@us...> - 2003-07-19 14:10:47
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv3210
Modified Files:
CHANGES.current
Log Message:
no message
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** CHANGES.current 19 Jul 2003 13:56:17 -0000 1.45
--- CHANGES.current 19 Jul 2003 14:10:45 -0000 1.46
***************
*** 2,5 ****
--- 2,13 ----
===========================
+ 2003-07-19: delta
+ Commented out setTextureAttributeAndModes in SCreenInfo class.
+ Reenabled TEXDOME with those lines commented out.
+ Added back ltype.ttf (and commented out screeninfo.ttf lines).
+ Added mapping for rudder.
+ Updated .net project (CSPSimAppli is not yet updated).
+ Fix two forward declaration causing error on .net 2002.
+
2003-07-17: onsight
Added speedbrake and data recording bindings
***************
*** 270,274 ****
course.
- >>>>>>> 1.34
2003-06-20: delta
Moved updateNearGround() outside loop in AircraftPhysicModel::doSimStep.
--- 278,281 ----
|
|
From: <de...@us...> - 2003-07-19 14:09:05
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv3015 Modified Files: CSPSimAppli.vcproj Log Message: *** see CHANGES.current *** Index: CSPSimAppli.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CSPSimAppli.vcproj 1 Jul 2003 16:00:36 -0000 1.10 --- CSPSimAppli.vcproj 19 Jul 2003 14:09:03 -0000 1.11 *************** *** 394,397 **** --- 394,400 ---- </File> <File + RelativePath="..\..\Include\DemeterTerrain.h"> + </File> + <File RelativePath="..\..\Include\DirVectorDrawable.h"> </File> |
|
From: <de...@us...> - 2003-07-19 14:08:55
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv2993 Modified Files: CSPSimDLL.vcproj Log Message: *** see CHANGES.current *** Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CSPSimDLL.vcproj 1 Jul 2003 16:01:08 -0000 1.12 --- CSPSimDLL.vcproj 19 Jul 2003 14:08:52 -0000 1.13 *************** *** 145,148 **** --- 145,151 ---- </File> <File + RelativePath="..\..\Source\Animation.cpp"> + </File> + <File RelativePath="..\..\Source\Atmosphere.cpp"> </File> *************** *** 208,211 **** --- 211,220 ---- </File> <File + RelativePath="..\..\Source\FlightDynamics.cpp"> + </File> + <File + RelativePath="..\..\Source\FlightModel.cpp"> + </File> + <File RelativePath="..\..\Source\GameScreen.cpp"> </File> *************** *** 360,363 **** --- 369,375 ---- </File> <File + RelativePath="..\..\Include\Animation.h"> + </File> + <File RelativePath="..\..\Include\Atmosphere.h"> </File> *************** *** 393,396 **** --- 405,411 ---- </File> <File + RelativePath="..\..\Include\DataRecorder.h"> + </File> + <File RelativePath="..\..\Include\DemeterTerrain.h"> </File> *************** *** 414,417 **** --- 429,438 ---- </File> <File + RelativePath="..\..\Include\FlightDynamics.h"> + </File> + <File + RelativePath="..\..\Include\FlightModel.h"> + </File> + <File RelativePath="..\..\Include\GameScreen.h"> </File> *************** *** 569,573 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DSWIG_NOINCLUDE -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> --- 590,594 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> |
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv2942
Modified Files:
TerrainObject.h PhysicsModel.h ObjectModel.h NumericalMethod.h
DynamicalSystem.h AircraftObject.h
Log Message:
*** see CHANGES.current ***
Index: TerrainObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/TerrainObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TerrainObject.h 26 Jun 2003 09:25:45 -0000 1.8
--- TerrainObject.h 19 Jul 2003 14:08:25 -0000 1.9
***************
*** 92,100 ****
protected:
bool _hit;
! float _ratio;
! simdata::Vector3 _start;
! simdata::Vector3 _end;
! simdata::Vector3 _point;
! simdata::Vector3 _normal;
};
--- 92,100 ----
protected:
bool _hit;
! float _ratio;
! simdata::Vector3 _start;
! simdata::Vector3 _end;
! simdata::Vector3 _point;
! simdata::Vector3 _normal;
};
Index: PhysicsModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/PhysicsModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhysicsModel.h 26 Jun 2003 09:25:45 -0000 1.1
--- PhysicsModel.h 19 Jul 2003 14:08:25 -0000 1.2
***************
*** 112,121 ****
/**
! * Extract kinematic variables from the vector field.
*/
void YToBody(std::vector<double> const &y);
/**
! * Assemble the vector field from individual kinematic variables.
*/
std::vector<double> const &bodyToY(simdata::Vector3 const &p,
--- 112,121 ----
/**
! * Extract kinematic variables from the vector field variable.
*/
void YToBody(std::vector<double> const &y);
/**
! * Assemble the vector field variable from individual kinematic variables.
*/
std::vector<double> const &bodyToY(simdata::Vector3 const &p,
Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ObjectModel.h 18 Jul 2003 21:05:14 -0000 1.11
--- ObjectModel.h 19 Jul 2003 14:08:25 -0000 1.12
***************
*** 41,47 ****
#include <SimData/InterfaceRegistry.h>
#include "SmokeEffects.h"
! class Animation;
class AnimationCallback;
class AnimationChannel;
--- 41,49 ----
#include <SimData/InterfaceRegistry.h>
+ //FIXME: or not FIXME? see below, forward declaration
+ #include "Animation.h"
#include "SmokeEffects.h"
! //class Animation;
class AnimationCallback;
class AnimationChannel;
Index: NumericalMethod.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/NumericalMethod.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NumericalMethod.h 18 Jul 2003 21:16:41 -0000 1.8
--- NumericalMethod.h 19 Jul 2003 14:08:25 -0000 1.9
***************
*** 83,87 ****
m_failed(false) {
}
! NumericalMethod(VectorField* pf, bool deleteVF = true):
m_bdeleteVF(deleteVF),
vectorField(pf),
--- 83,87 ----
m_failed(false) {
}
! NumericalMethod(VectorField* pf, bool deleteVF = false):
m_bdeleteVF(deleteVF),
vectorField(pf),
Index: DynamicalSystem.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/DynamicalSystem.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DynamicalSystem.h 30 Jun 2003 22:29:15 -0000 1.6
--- DynamicalSystem.h 19 Jul 2003 14:08:25 -0000 1.7
***************
*** 31,40 ****
#include "NumericalMethod.h"
-
class DynamicalSystem: public VectorField {
NumericalMethod* _numericalMethod;
public:
DynamicalSystem(unsigned short dimension = 0);
- DynamicalSystem(VectorField* pf);
virtual ~DynamicalSystem();
void setNumericalMethod(NumericalMethod* pnumericalMethod);
--- 31,38 ----
Index: AircraftObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/AircraftObject.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AircraftObject.h 18 Jul 2003 21:00:57 -0000 1.15
--- AircraftObject.h 19 Jul 2003 14:08:25 -0000 1.16
***************
*** 33,39 ****
//#include "PrimaryAeroDynamics.h"
#include "FlightDynamics.h"
! class FlightModel;
class AnimationValueChannel;
--- 33,40 ----
//#include "PrimaryAeroDynamics.h"
#include "FlightDynamics.h"
+ #include "FlightModel.h"
! //class FlightModel;
class AnimationValueChannel;
***************
*** 108,111 ****
--- 109,116 ----
ACTION_INTERFACE(AircraftObject, DecAileron);
ACTION_INTERFACE(AircraftObject, noDecAileron);
+ ACTION_INTERFACE(AircraftObject, IncRudder);
+ ACTION_INTERFACE(AircraftObject, noIncRudder);
+ ACTION_INTERFACE(AircraftObject, DecRudder);
+ ACTION_INTERFACE(AircraftObject, noDecRudder);
ACTION_INTERFACE(AircraftObject, IncThrottle);
ACTION_INTERFACE(AircraftObject, noIncThrottle);
|
|
From: <de...@us...> - 2003-07-19 13:57:57
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv1625 Modified Files: SimData.vcproj Log Message: *** see CHANGES.current *** Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SimData.vcproj 30 Jun 2003 22:32:35 -0000 1.9 --- SimData.vcproj 19 Jul 2003 13:57:54 -0000 1.10 *************** *** 172,175 **** --- 172,191 ---- </File> <File + RelativePath="..\Source\Key.cpp"> + </File> + <File + RelativePath="..\Source\LUT.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + </File> + <File RelativePath="..\Source\Link.cpp"> </File> *************** *** 260,263 **** --- 276,282 ---- </File> <File + RelativePath="..\Include\SimData\GeoPos.h"> + </File> + <File RelativePath="..\Include\SimData\GlibCsp.h"> </File> *************** *** 278,281 **** --- 297,306 ---- </File> <File + RelativePath="..\Include\SimData\Key.h"> + </File> + <File + RelativePath="..\Include\SimData\LUT.h"> + </File> + <File RelativePath="..\Include\SimData\Link.h"> </File> *************** *** 351,355 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> --- 376,380 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> *************** *** 359,363 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> --- 384,388 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> |
