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-02 21:51:36
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv12370
Modified Files:
Makefile.in
Log Message:
added default hid creation
Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in 2 Jul 2003 10:09:08 -0000 1.5
--- Makefile.in 2 Jul 2003 21:46:02 -0000 1.6
***************
*** 19,22 ****
--- 19,23 ----
$(MAKE) -C $${dir} $@ || exit 1; \
done
+ @$(MAKE) InputMaps
#default:
***************
*** 29,32 ****
--- 30,44 ----
./configure
+ InputMaps: aircraft.hid gamescreen.hid
+
+
+ %.hid:
+ @test -e Data/Input/$@ || \
+ ( cd Tools/HID && \
+ python map2hid Examples/$(@:%.hid=%.map) ../../Data/Input/$@ && \
+ echo "Default input map created for $@; see Tools/HID/README for details." \
+ )
+ @test -e Data/Input/$@ || \
+ echo "Unable to create default input map for $@; see Tools/HID/README for details."
|
|
From: <mk...@us...> - 2003-07-02 21:49:50
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv13523
Modified Files:
CHANGES.current
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** CHANGES.current 2 Jul 2003 21:32:05 -0000 1.41
--- CHANGES.current 2 Jul 2003 21:49:47 -0000 1.42
***************
*** 4,7 ****
--- 4,18 ----
2003-07-02: onsight
+ Added an automatic build target to the main Makefile to
+ generate default hid mappings for aircraft.hid and
+ gamescreen.hid if they don't already exist. These are
+ created from the examples in Tools/HID/Examples, and
+ include reasonably up-to-date mappings for the keyboard
+ commands. The joystick mappings may or may not work on
+ any given system, and this is not meant as a substitute
+ for reading Tools/HID/README and building your own custom
+ map files. A similar step should be added to the Windows
+ build if possible.
+
Added backface culling to model debug markers so that
the initial view is not obstructed by the view placement
|
|
From: <de...@us...> - 2003-07-02 21:32:08
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv9536 Modified Files: CHANGES.current Log Message: no message Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** CHANGES.current 2 Jul 2003 20:05:49 -0000 1.40 --- CHANGES.current 2 Jul 2003 21:32:05 -0000 1.41 *************** *** 37,42 **** Added SWIG_NOINCLUDE on ccSP_wrap.cpp to enable log level from python scripts ! Merged Onsight changes; can t find a bug in Sky class ! when TEXDOME is defined on windows. 2003-06-25: onsight --- 37,43 ---- Added SWIG_NOINCLUDE on ccSP_wrap.cpp to enable log level from python scripts ! Merged Onsight changes. ! When TEXDOME is defined, sky color is not correctly updated; ! this happens only on windows. 2003-06-25: onsight |
|
From: <mk...@us...> - 2003-07-02 20:05:53
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv24465 Modified Files: CHANGES.current Log Message: Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** CHANGES.current 30 Jun 2003 22:37:18 -0000 1.39 --- CHANGES.current 2 Jul 2003 20:05:49 -0000 1.40 *************** *** 2,5 **** --- 2,20 ---- =========================== + 2003-07-02: onsight + + Added backface culling to model debug markers so that + the initial view is not obstructed by the view placement + marker. + + Changed ScreenInfo font to use screeninfo.ttf instead of + ltype.ttf (which is cannot be freely distributed). A new + supplemental data pack CSPSim-Data-Supplement-0.2.1.tgz + is available from the SF project page that includes a + GPL'd screeninfo.ttf font as well as other needed data + files that are missing from the older 0.2.tgz data release. + The fps info character spacing is slightly changed to + accomodate the new font, but this needs is just a bandaid + and needs additional work. 2003-07-01: delta |
|
From: <mk...@us...> - 2003-07-02 20:02:01
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv23554
Modified Files:
ObjectModel.cpp ScreenInfo.cpp
Log Message:
Index: ObjectModel.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ObjectModel.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ObjectModel.cpp 26 Jun 2003 09:25:23 -0000 1.15
--- ObjectModel.cpp 2 Jul 2003 20:01:58 -0000 1.16
***************
*** 312,315 ****
--- 312,318 ----
void ObjectModel::addContactMarkers() {
m_ContactMarkers = new osg::Group;
+ osg::CullFace *cf = new osg::CullFace;
+ cf->setMode(osg::CullFace::BACK);
+ m_ContactMarkers->getOrCreateStateSet()->setAttributeAndModes(cf, osg::StateAttribute::ON);
for (unsigned i = 0; i < m_Contacts.size(); i++) {
osg::Geode *diamond = new osg::Geode;
Index: ScreenInfo.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfo.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ScreenInfo.cpp 30 Jun 2003 22:27:57 -0000 1.16
--- ScreenInfo.cpp 2 Jul 2003 20:01:58 -0000 1.17
***************
*** 68,74 ****
ScreenInfo::ScreenInfo(float pos_x, float pos_y, std::string const &name, std::string const &text):
! m_TTFPath("ltype.ttf"),
! m_FontSize(15),
! m_CharacterSize(11),
m_Text(0) {
m_Text = makeText(pos_x,pos_y - m_CharacterSize, text);
--- 68,74 ----
ScreenInfo::ScreenInfo(float pos_x, float pos_y, std::string const &name, std::string const &text):
! m_TTFPath("screeninfo.ttf"),
! m_FontSize(20),
! m_CharacterSize(14),
m_Text(0) {
m_Text = makeText(pos_x,pos_y - m_CharacterSize, text);
***************
*** 99,114 ****
m_Text->setUseDisplayList(false);
! osgText::Text *s1 = makeText(posx + 4 * m_CharacterSize, posy - m_CharacterSize, "fps min: max: av:");
! addDrawable(s1);
! m_MinFps = makeText(posx + (4 + 6) * m_CharacterSize, posy - m_CharacterSize);
m_MinFps->setUseDisplayList(false);
addDrawable(m_MinFps);
! m_MaxFps = makeText(posx + (4 + 6 + 4 + 4) * m_CharacterSize, posy - m_CharacterSize);
m_MaxFps->setUseDisplayList(false);
addDrawable(m_MaxFps);
! m_Av = makeText(posx + (4 + 6 + 4 + 4 + 4 + 3) * m_CharacterSize, posy - m_CharacterSize);
m_Av->setUseDisplayList(false);
addDrawable(m_Av);
--- 99,126 ----
m_Text->setUseDisplayList(false);
! // FIXME
! // this is clearly not the right thing to do, but just happens
! // to be too expedient to resist. need to look more deeply into
! // the osg::Text implementation to figure out how to detect mono
! // spaced fonts and get the character width of a string prior to
! // and update/draw passes.
! float width = m_CharacterSize * 0.7;
!
! osgText::Text *s1_0 = makeText(posx + 6 * width, posy - m_CharacterSize, "fps min:");
! addDrawable(s1_0);
! osgText::Text *s1_1 = makeText(posx + 21 * width, posy - m_CharacterSize, "max:");
! addDrawable(s1_1);
! osgText::Text *s1_2 = makeText(posx + 33 * width, posy - m_CharacterSize, "avg:");
! addDrawable(s1_2);
! m_MinFps = makeText(posx + (6 + 9) * width, posy - m_CharacterSize);
m_MinFps->setUseDisplayList(false);
addDrawable(m_MinFps);
! m_MaxFps = makeText(posx + (21 + 5) * width, posy - m_CharacterSize);
m_MaxFps->setUseDisplayList(false);
addDrawable(m_MaxFps);
! m_Av = makeText(posx + (33 + 5) * width, posy - m_CharacterSize);
m_Av->setUseDisplayList(false);
addDrawable(m_Av);
***************
*** 117,121 ****
addDrawable(s2);
! m_Date = makeText(posx + 4 * m_CharacterSize, posy - 2 * m_CharacterSize);
m_Date->setUseDisplayList(false);
addDrawable(m_Date);
--- 129,133 ----
addDrawable(s2);
! m_Date = makeText(posx + 6 * width, posy - 2 * m_CharacterSize);
m_Date->setUseDisplayList(false);
addDrawable(m_Date);
|
|
From: <mk...@us...> - 2003-07-02 10:21:35
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater In directory sc8-pr-cvs1:/tmp/cvs-serv351 Modified Files: objectives.xml Log Message: Index: objectives.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/objectives.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** objectives.xml 3 May 2003 11:32:44 -0000 1.1 --- objectives.xml 2 Jul 2003 10:21:32 -0000 1.2 *************** *** 3,7 **** <Object class="FeatureGroupList"> <List name="feature_groups"> ! <Object class="Objective"> <Path name="model">airbase</Path> <Float name="x">483010</Float> --- 3,13 ---- <Object class="FeatureGroupList"> <List name="feature_groups"> ! <!-- the format for specify objective locations ! has changed from local grid coordinates to ! latitude/longitude (or UTM). the following ! test objects must be updated to use simdata ! LLA tags before they can be added back into ! the theater. --> ! <!--Object class="Objective"> <Path name="model">airbase</Path> <Float name="x">483010</Float> *************** *** 23,27 **** <Float name="orientation">-0.1744</Float> <Int name="strategic_value_modifier">0</Int> ! </Object> </List> </Object> --- 29,33 ---- <Float name="orientation">-0.1744</Float> <Int name="strategic_value_modifier">0</Int> ! </Object--> </List> </Object> |
|
From: <mk...@us...> - 2003-07-02 10:12:44
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1:/tmp/cvs-serv31743 Modified Files: Makefile.in Log Message: Index: Makefile.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.in 27 Jun 2003 08:14:09 -0000 1.17 --- Makefile.in 2 Jul 2003 10:12:41 -0000 1.18 *************** *** 9,14 **** DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp ! CHUNKLOD_LIBRARY = -L$(BIN) -losgChunkLod ! CHUNKLOD_INCLUDE = -I$(TOPDIR)/../../THIRDPARTYLIBS/CSPChunkLod/include LIBS = $(DEMETER_LIBRARY) $(CHUNKLOD_LIBRARY) --- 9,15 ---- DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp ! CHUNKLOD_PREFIX = $(TOPDIR)/$(CHUNKLOD_RELATIVE) ! CHUNKLOD_LIBRARY = -L$(CHUNKLOD_PREFIX)/lib -losgChunkLod_csp ! CHUNKLOD_INCLUDE = -I$(CHUNKLOD_PREFIX)/include LIBS = $(DEMETER_LIBRARY) $(CHUNKLOD_LIBRARY) |
|
From: <mk...@us...> - 2003-07-02 10:09:11
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv31436 Modified Files: Makefile.in Log Message: Index: Makefile.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 21 Mar 2003 20:09:16 -0000 1.4 --- Makefile.in 2 Jul 2003 10:09:08 -0000 1.5 *************** *** 2,5 **** --- 2,6 ---- export DEMETER_RELATIVE = ../../THIRDPARTYLIBS/demeter + export CHUNKLOD_RELATIVE = ../../THIRDPARTYLIBS/CSPChunkLod export GDEBUGF = -g -Wall |
|
From: <mk...@us...> - 2003-07-02 10:05:16
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod In directory sc8-pr-cvs1:/tmp/cvs-serv31078/src/osgChunkLod Modified Files: Makefile Log Message: changed lib name Index: Makefile =================================================================== RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 19 Jun 2003 17:50:55 -0000 1.2 --- Makefile 2 Jul 2003 10:05:13 -0000 1.3 *************** *** 85,95 **** #all: Makefile build-subdirs _cCSP.so #CSPapp ! all: libosgChunkLod.so libosgChunkLod.a #CSPapp ! libosgChunkLod.so: $(OBJECTS) $(CXX) $(LDOPTS) -o $@ $^ #cp $@ $(TOPDIR)/../../APPLICATIONS/CSPSim/Bin ! libosgChunkLod.a: $(OBJECTS) $(AR) rc $@ $^ cp $@ $(LIBDIR) --- 85,95 ---- #all: Makefile build-subdirs _cCSP.so #CSPapp ! all: libosgChunkLod_csp.so libosgChunkLod_csp.a #CSPapp ! libosgChunkLod_csp.so: $(OBJECTS) $(CXX) $(LDOPTS) -o $@ $^ #cp $@ $(TOPDIR)/../../APPLICATIONS/CSPSim/Bin ! libosgChunkLod_csp.a: $(OBJECTS) $(AR) rc $@ $^ cp $@ $(LIBDIR) |
|
From: <mk...@us...> - 2003-07-02 09:50:22
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv28802
Added Files:
README
Log Message:
--- NEW FILE: README ---
The most up-to-date instructions for building CSP can be found at
http://csp.sourceforge.net/wiki/BuildingCSP
Any questions, comments, or suggestions should be directed to the
forums at
http://csp.sourceforge.net/forum
|
|
From: <de...@us...> - 2003-07-01 16:01:11
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv9026 Modified Files: CSPSimDLL.vcproj Log Message: Disabled ChunkLod Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CSPSimDLL.vcproj 30 Jun 2003 22:31:35 -0000 1.11 --- CSPSimDLL.vcproj 1 Jul 2003 16:01:08 -0000 1.12 *************** *** 42,46 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLodd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSPd.dll" LinkIncremental="2" --- 42,46 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSPd.dll" LinkIncremental="2" *************** *** 104,108 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLod.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" --- 104,108 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" *************** *** 158,161 **** --- 158,173 ---- <File RelativePath="..\..\Source\ChunkLodTerrain.cpp"> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> </File> <File |
|
From: <de...@us...> - 2003-07-01 16:00:39
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv8933 Modified Files: CSPSimAppli.vcproj Log Message: Disabled ChunkLod Index: CSPSimAppli.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CSPSimAppli.vcproj 30 Jun 2003 22:31:47 -0000 1.9 --- CSPSimAppli.vcproj 1 Jul 2003 16:00:36 -0000 1.10 *************** *** 41,45 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLod.lib SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/CSPSim.exe" LinkIncremental="1" --- 41,45 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/CSPSim.exe" LinkIncremental="1" *************** *** 102,106 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLodd.lib DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib odbc32.lib odbccp32.lib" OutputFile="..\..\Bin\CSPSimd.exe" LinkIncremental="1" --- 102,106 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib odbc32.lib odbccp32.lib" OutputFile="..\..\Bin\CSPSimd.exe" LinkIncremental="1" *************** *** 159,162 **** --- 159,174 ---- <File RelativePath="..\..\Source\ChunkLodTerrain.cpp"> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> </File> <File |
|
From: <de...@us...> - 2003-06-30 23:17:23
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv26576
Modified Files:
CHANGES.current
Log Message:
*** see CHANGES.current ***
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** CHANGES.current 20 Jun 2003 02:37:19 -0000 1.40
--- CHANGES.current 30 Jun 2003 22:36:25 -0000 1.41
***************
*** 2,5 ****
--- 2,8 ----
===========================
+ 2003-07-01: delta
+ Added a SWIG_GLOBAL define on cSimData_wrap.cpp to enable log level.
+
2003-06-19: onsight
Fixed a bug in Link::unpack(). The Object::postCreate() method
|
|
From: <de...@us...> - 2003-06-30 22:48:13
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater In directory sc8-pr-cvs1:/tmp/cvs-serv25408 Modified Files: FeatureModel.h Log Message: *** see CHANGES.current *** Index: FeatureModel.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureModel.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FeatureModel.h 26 Jun 2003 09:25:45 -0000 1.1 --- FeatureModel.h 30 Jun 2003 22:29:27 -0000 1.2 *************** *** 28,32 **** ! #include "Theater/Feature.h" #include <SimData/Path.h> --- 28,32 ---- ! class Feature; #include <SimData/Path.h> |
|
From: <de...@us...> - 2003-06-30 22:48:12
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Theater In directory sc8-pr-cvs1:/tmp/cvs-serv25189 Modified Files: Feature.cpp DamageModifier.cpp Log Message: *** see CHANGES.current *** Index: Feature.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Theater/Feature.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Feature.cpp 26 Jun 2003 09:25:23 -0000 1.1 --- Feature.cpp 30 Jun 2003 22:28:41 -0000 1.2 *************** *** 26,29 **** --- 26,31 ---- #include "Theater/FeatureObjectModel.h" + #include "ObjectModel.h" + Feature::Feature(FeatureObjectModel const *model, char value_) : m_Damage(0), Index: DamageModifier.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Theater/DamageModifier.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DamageModifier.cpp 26 Jun 2003 09:25:23 -0000 1.1 --- DamageModifier.cpp 30 Jun 2003 22:28:41 -0000 1.2 *************** *** 23,26 **** --- 23,28 ---- **/ + #include "DamageModifier.h" + SIMDATA_REGISTER_INTERFACE(DamageModifier) |
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv25353
Modified Files:
VirtualScene.h Theater.h StaticObject.h Projection.h
NumericalMethod.h DynamicalSystem.h
Log Message:
*** see CHANGES.current ***
Index: VirtualScene.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VirtualScene.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** VirtualScene.h 26 Jun 2003 09:25:45 -0000 1.6
--- VirtualScene.h 30 Jun 2003 22:29:15 -0000 1.7
***************
*** 82,86 ****
void addFeatureCell(osg::Node *feature);
void removeFeatureCell(osg::Node *feature);
! void setNearObject(simdata::Ref<DynamicObject> object, bool near);
void setLookAt(simdata::Vector3 & eyePos, simdata::Vector3 & lookPos, simdata::Vector3 & upVec);
--- 82,86 ----
void addFeatureCell(osg::Node *feature);
void removeFeatureCell(osg::Node *feature);
! void setNearObject(simdata::Ref<DynamicObject> object, bool isNear);
void setLookAt(simdata::Vector3 & eyePos, simdata::Vector3 & lookPos, simdata::Vector3 & upVec);
Index: Theater.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Theater.h 26 Jun 2003 09:25:45 -0000 1.4
--- Theater.h 30 Jun 2003 22:29:15 -0000 1.5
***************
*** 42,46 ****
class TerrainObject;
class FeatureGroup;
! class FeatureGroupList;
--- 42,47 ----
class TerrainObject;
class FeatureGroup;
!
! #include "Theater/FeatureGroupList.h"
Index: StaticObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/StaticObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StaticObject.h 3 May 2003 09:47:54 -0000 1.5
--- StaticObject.h 30 Jun 2003 22:29:15 -0000 1.6
***************
*** 54,58 ****
virtual void initialize() {}
virtual unsigned int onRender() { return 0; }
! virtual simdata::Vector3 const & getGlobalPosition() const { return simdata::Vector3::ZERO; }
virtual void setGlobalPosition(simdata::Vector3 const & position) {}
virtual void updateScene(simdata::Vector3 const &origin) {}
--- 54,58 ----
virtual void initialize() {}
virtual unsigned int onRender() { return 0; }
! virtual simdata::Vector3 getGlobalPosition() const { return simdata::Vector3::ZERO; }
virtual void setGlobalPosition(simdata::Vector3 const & position) {}
virtual void updateScene(simdata::Vector3 const &origin) {}
Index: Projection.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Projection.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Projection.h 26 Jun 2003 09:25:45 -0000 1.1
--- Projection.h 30 Jun 2003 22:29:15 -0000 1.2
***************
*** 38,41 ****
--- 38,42 ----
#include <cstdio>
+ using simdata::Normalized;
/**
Index: NumericalMethod.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/NumericalMethod.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NumericalMethod.h 19 Jun 2003 18:07:51 -0000 1.6
--- NumericalMethod.h 30 Jun 2003 22:29:15 -0000 1.7
***************
*** 34,37 ****
--- 34,38 ----
class VectorField
{
+ protected:
unsigned short const m_dimension;
public:
Index: DynamicalSystem.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/DynamicalSystem.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DynamicalSystem.h 19 Jun 2003 18:07:51 -0000 1.5
--- DynamicalSystem.h 30 Jun 2003 22:29:15 -0000 1.6
***************
*** 32,36 ****
! class DynamicalSystem: protected VectorField {
NumericalMethod* _numericalMethod;
public:
--- 32,36 ----
! class DynamicalSystem: public VectorField {
NumericalMethod* _numericalMethod;
public:
|
|
From: <de...@us...> - 2003-06-30 22:37:21
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv26701 Modified Files: CHANGES.current Log Message: *** see CHANGES.current *** Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** CHANGES.current 30 Jun 2003 22:34:27 -0000 1.38 --- CHANGES.current 30 Jun 2003 22:37:18 -0000 1.39 *************** *** 3,7 **** ! 2003-06-21: delta ==========> VC USERS: you need to reinstall simdata. --- 3,7 ---- ! 2003-07-01: delta ==========> VC USERS: you need to reinstall simdata. |
|
From: <de...@us...> - 2003-06-30 22:34:33
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv26173
Modified Files:
CHANGES.current
Log Message:
*** see CHANGES.current ***
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** CHANGES.current 27 Jun 2003 08:17:28 -0000 1.37
--- CHANGES.current 30 Jun 2003 22:34:27 -0000 1.38
***************
*** 1,5 ****
! Version 0.3.3 (in progress)
===========================
2003-06-25: onsight
--- 1,28 ----
! Version 0.3.3 (in progress)
===========================
+
+ 2003-06-21: delta
+
+ ==========> VC USERS: you need to reinstall simdata.
+
+ Changed VectorField::m_dimension to protected and
+ class DynamicalSystem now publicly inherites from
+ VectorField.
+ Changed general stats implementation to use some
+ "static" texts.
+ Corrected a bug in ScreenInfo ctor (m_Text allocated
+ 2 times).
+ Added a conditional test in PrimaryAeroDynamics::updateAngles()
+ to check for a division by 0 (!).
+ Changed updating m_InfoView every 3 frame.
+ Changed ObjectStats implementation to use osg::ref_ptr
+ and clean up data when changin object.
+ Changed XML/Data/m2k/fm.xml.
+ Added SWIG_NOINCLUDE on ccSP_wrap.cpp to enable log
+ level from python scripts
+ Merged Onsight changes; can t find a bug in Sky class
+ when TEXDOME is defined on windows.
+
2003-06-25: onsight
***************
*** 99,104 ****
--- 122,129 ----
course.
+ >>>>>>> 1.34
2003-06-20: delta
Moved updateNearGround() outside loop in AircraftPhysicModel::doSimStep.
+ Corrected kinetic parameters update in AircraftPhysicModel::doSimStep.
Reenabled position update in _f.
Changed RungeKuttaCK::MAXSTP = 16.
|
|
From: <de...@us...> - 2003-06-30 22:32:38
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv25961 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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SimData.vcproj 10 Jun 2003 23:42:53 -0000 1.8 --- SimData.vcproj 30 Jun 2003 22:32:35 -0000 1.9 *************** *** 218,221 **** --- 218,233 ---- <File RelativePath="..\Source\cSimData_wrap.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="SWIG_GLOBAL"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="SWIG_GLOBAL"/> + </FileConfiguration> </File> </Filter> |
|
From: <de...@us...> - 2003-06-30 22:31:50
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv25873 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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CSPSimAppli.vcproj 19 Jun 2003 19:15:16 -0000 1.8 --- CSPSimAppli.vcproj 30 Jun 2003 22:31:47 -0000 1.9 *************** *** 23,27 **** AdditionalOptions="/Zm200" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" PreprocessorDefinitions="CSP_NDEBUG;WIN32,NDEBUG,_WINDOWS,__CSPSIM_EXE__" StringPooling="TRUE" --- 23,27 ---- AdditionalOptions="/Zm200" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include;../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" PreprocessorDefinitions="CSP_NDEBUG;WIN32,NDEBUG,_WINDOWS,__CSPSIM_EXE__" StringPooling="TRUE" *************** *** 41,45 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/CSPSim.exe" LinkIncremental="1" --- 41,45 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLod.lib SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/CSPSim.exe" LinkIncremental="1" *************** *** 82,86 **** AdditionalOptions="/Zm200" Optimization="0" ! AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,__CSPSIM_EXE__" BasicRuntimeChecks="3" --- 82,86 ---- AdditionalOptions="/Zm200" Optimization="0" ! AdditionalIncludeDirectories="..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\Demeter;C:\Python22\include" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,__CSPSIM_EXE__" BasicRuntimeChecks="3" *************** *** 102,110 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib odbc32.lib odbccp32.lib" ! OutputFile="../../Bin/CSPSimd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="C:\Python22\Lib\site-packages\SimData,C:/Python22/libs,../../../../THIRDPARTYLIBS/lib" IgnoreDefaultLibraryNames="msvcrt.lib" GenerateDebugInformation="TRUE" --- 102,110 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLodd.lib DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib odbc32.lib odbccp32.lib" ! OutputFile="..\..\Bin\CSPSimd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="C:\Python22\Lib\site-packages\SimData,C:\Python22\libs,..\..\..\..\THIRDPARTYLIBS\lib" IgnoreDefaultLibraryNames="msvcrt.lib" GenerateDebugInformation="TRUE" *************** *** 140,162 **** Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="..\..\Source\AircraftModel.cpp"> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - </File> - <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicModel.cpp"> </File> <File --- 140,147 ---- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicsModel.cpp"> </File> <File *************** *** 173,176 **** --- 158,164 ---- </File> <File + RelativePath="..\..\Source\ChunkLodTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\Collision.cpp"> </File> *************** *** 188,191 **** --- 176,182 ---- </File> <File + RelativePath="..\..\Source\DemeterTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\DynamicObject.cpp"> </File> *************** *** 206,212 **** </File> <File - RelativePath="..\..\Source\F16Model.cpp"> - </File> - <File RelativePath="..\..\Source\GameScreen.cpp"> </File> --- 197,200 ---- *************** *** 239,243 **** </File> <File ! RelativePath="..\..\Source\PhysicModel.cpp"> </File> <File --- 227,231 ---- </File> <File ! RelativePath="..\..\Source\PhysicsModel.cpp"> </File> <File *************** *** 257,260 **** --- 245,251 ---- </File> <File + RelativePath="..\..\Source\Sky.cpp"> + </File> + <File RelativePath="..\..\Source\SmokeEffects.cpp"> </File> *************** *** 285,288 **** --- 276,291 ---- <File RelativePath="..\..\Source\cCSP_wrap.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="SWIG_NOINCLUDE"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="SWIG_NOINCLUDE"/> + </FileConfiguration> </File> <File *************** *** 290,298 **** </File> <File - RelativePath="..\..\Source\sky.cpp"> - </File> - <File RelativePath="..\..\Source\trees.cpp"> </File> </Filter> <Filter --- 293,344 ---- </File> <File RelativePath="..\..\Source\trees.cpp"> </File> + <Filter + Name="Theater" + Filter=""> + <File + RelativePath="..\..\Source\Theater\CustomLayoutModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\DamageModifier.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\ElevationCorrection.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\Feature.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureGroup.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureGroupList.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureLayout.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureObjectModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureQuad.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureSceneModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\LayoutTransform.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\Objective.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\RandomBillboardModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\RandomForestModel.cpp"> + </File> + </Filter> </Filter> <Filter *************** *** 303,309 **** </File> <File - RelativePath="..\..\Include\AircraftPhysicModel.h"> - </File> - <File RelativePath="..\..\Include\Atmosphere.h"> </File> --- 349,352 ---- *************** *** 375,379 **** </File> <File ! RelativePath="..\..\Include\LogStream.h"> </File> <File --- 418,422 ---- </File> <File ! RelativePath="..\..\Include\Log.h"> </File> <File *************** *** 396,403 **** </File> <File ! RelativePath="..\..\Include\PhysicModel.h"> </File> <File ! RelativePath="..\..\Include\PrimaryAeroDynamics.h"> </File> <File --- 439,446 ---- </File> <File ! RelativePath="..\..\Include\PrimaryAeroDynamics.h"> </File> <File ! RelativePath="..\..\Include\Profile.h"> </File> <File |
|
From: <de...@us...> - 2003-06-30 22:31:38
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv25850 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.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CSPSimDLL.vcproj 19 Jun 2003 19:15:28 -0000 1.10 --- CSPSimDLL.vcproj 30 Jun 2003 22:31:35 -0000 1.11 *************** *** 23,27 **** AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories="C:/Python22/include,../../../SimData/Include,../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/demeter" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" --- 23,27 ---- AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories="C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" *************** *** 42,47 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib" ! OutputFile=".\Debug/CSPSimDLL.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" --- 42,47 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLodd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib" ! OutputFile="../../Bin/_cCSPd.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" *************** *** 86,90 **** AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../../Include,C:/Python22/include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/demeter" PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" --- 86,90 ---- AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" *************** *** 104,108 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" --- 104,108 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLod.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" *************** *** 139,161 **** Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="..\..\Source\AircraftModel.cpp"> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - </File> - <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicModel.cpp"> </File> <File --- 139,146 ---- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicsModel.cpp"> </File> <File *************** *** 172,175 **** --- 157,163 ---- </File> <File + RelativePath="..\..\Source\ChunkLodTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\Collision.cpp"> </File> *************** *** 187,190 **** --- 175,181 ---- </File> <File + RelativePath="..\..\Source\DemeterTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\DynamicObject.cpp"> </File> *************** *** 205,211 **** </File> <File - RelativePath="..\..\Source\F16Model.cpp"> - </File> - <File RelativePath="..\..\Source\GameScreen.cpp"> </File> --- 196,199 ---- *************** *** 238,242 **** </File> <File ! RelativePath="..\..\Source\PhysicModel.cpp"> </File> <File --- 226,230 ---- </File> <File ! RelativePath="..\..\Source\PhysicsModel.cpp"> </File> <File *************** *** 256,259 **** --- 244,250 ---- </File> <File + RelativePath="..\..\Source\Sky.cpp"> + </File> + <File RelativePath="..\..\Source\SmokeEffects.cpp"> </File> *************** *** 284,294 **** <File RelativePath="..\..\Source\cCSP_wrap.cpp"> ! </File> ! <File ! RelativePath="..\..\Source\sky.cpp"> </File> <File RelativePath="..\..\Source\trees.cpp"> </File> </Filter> <Filter --- 275,340 ---- <File RelativePath="..\..\Source\cCSP_wrap.cpp"> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> ! <FileConfiguration ! Name="Release|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> </File> <File RelativePath="..\..\Source\trees.cpp"> </File> + <Filter + Name="Theater" + Filter=""> + <File + RelativePath="..\..\Source\Theater\CustomLayoutModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\DamageModifier.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\ElevationCorrection.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\Feature.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureGroup.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureGroupList.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureLayout.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureObjectModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureQuad.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureSceneModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\LayoutTransform.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\Objective.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\RandomBillboardModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\RandomForestModel.cpp"> + </File> + </Filter> </Filter> <Filter *************** *** 299,302 **** --- 345,351 ---- </File> <File + RelativePath="..\..\Include\AircraftPhysicsModel.h"> + </File> + <File RelativePath="..\..\Include\Atmosphere.h"> </File> *************** *** 317,320 **** --- 366,372 ---- </File> <File + RelativePath="..\..\Include\ChunkLodTerrain.h"> + </File> + <File RelativePath="..\..\Include\Collision.h"> </File> *************** *** 329,332 **** --- 381,387 ---- </File> <File + RelativePath="..\..\Include\DemeterTerrain.h"> + </File> + <File RelativePath="..\..\Include\DynamicObject.h"> </File> *************** *** 362,366 **** </File> <File ! RelativePath="..\..\Include\LogStream.h"> </File> <File --- 417,421 ---- </File> <File ! RelativePath="..\..\Include\Log.h"> </File> <File *************** *** 383,387 **** </File> <File ! RelativePath="..\..\Include\PhysicModel.h"> </File> <File --- 438,442 ---- </File> <File ! RelativePath="..\..\Include\PhysicsModel.h"> </File> <File *************** *** 389,392 **** --- 444,450 ---- </File> <File + RelativePath="..\..\Include\Profile.h"> + </File> + <File RelativePath="..\..\Include\ScreenInfo.h"> </File> *************** *** 436,439 **** --- 494,549 ---- RelativePath="..\..\Include\stdinc.h"> </File> + <Filter + Name="Theater" + Filter=""> + <File + RelativePath="..\..\Include\Theater\CustomLayoutModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\ElevationCorrection.h"> + </File> + <File + RelativePath="..\..\Include\Theater\Feature.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureGroup.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureGroupList.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureGroupModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureLayout.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureObjectModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureQuad.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureSceneGroup.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureSceneModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\LayoutTransform.h"> + </File> + <File + RelativePath="..\..\Include\Theater\Objective.h"> + </File> + <File + RelativePath="..\..\Include\Theater\RandomBillboardModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\RandomForestModel.h"> + </File> + </Filter> </Filter> <Filter *************** *** 447,451 **** <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"/> --- 557,561 ---- <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"/> |
|
From: <de...@us...> - 2003-06-30 22:20:33
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k In directory sc8-pr-cvs1:/tmp/cvs-serv23718 Modified Files: fm.xml Log Message: *** see CHANGES.current *** Index: fm.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fm.xml 20 Jun 2003 17:45:27 -0000 1.5 --- fm.xml 30 Jun 2003 22:20:30 -0000 1.6 *************** *** 54,58 **** <Float name="cy_beta">-0.29</Float> <Float name="cy_p">0.11</Float> ! <Float name="cy_r">-0.81</Float> <Float name="cy_da">0.0</Float> <Float name="cy_dr">-0.15</Float> --- 54,58 ---- <Float name="cy_beta">-0.29</Float> <Float name="cy_p">0.11</Float> ! <Float name="cy_r">0.81</Float> <Float name="cy_da">0.0</Float> <Float name="cy_dr">-0.15</Float> *************** *** 60,66 **** <!-- Roll moment parameters --> <Float name="ci_beta">-0.17</Float> ! <Float name="ci_p">-1.86</Float><!-- <0 --> ! <Float name="ci_r">0.33</Float> ! <!--Float name="ci_da">0.29</Float--> <Float name="ci_da">1.46</Float> <Float name="ci_dr">-0.03</Float> --- 60,68 ---- <!-- Roll moment parameters --> <Float name="ci_beta">-0.17</Float> ! <!--Float name="ci_p">-1.86</Float--><!-- <0 --> ! <Float name="ci_p">-9.5</Float><!-- <0 --> ! <!--Float name="ci_r">0.33</Float--> ! <Float name="ci_r">-0.33</Float> ! <!--Float name="ci_da">0.29</Float--> <Float name="ci_da">1.46</Float> <Float name="ci_dr">-0.03</Float> *************** *** 68,75 **** <!-- Yaw Moment Parameters --> <Float name="cn_beta">0.36</Float> ! <Float name="cn_p">0.11</Float> ! <Float name="cn_r">-0.81</Float><!-- <0 --> <Float name="cn_da">-0.03</Float> <Float name="cn_dr">0.15</Float> </Object> --- 70,86 ---- <!-- Yaw Moment Parameters --> <Float name="cn_beta">0.36</Float> ! <Float name="cn_p">-0.11</Float> ! <Float name="cn_r">-8.17</Float><!-- <0 --> <Float name="cn_da">-0.03</Float> <Float name="cn_dr">0.15</Float> + + <!-- g limiter (based on a F16 cat III)> + <Curve="limiter_g_aoa"> + <Breaks spacing='0.03'> + 0.27 0.31 0.35 0.44 3.14 + </Break> + <Values> + 1.0 8.0 7.4 1.0 1.0 + </Values--> </Object> |
|
From: <de...@us...> - 2003-06-28 10:24:21
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv10500
Added Files:
VisualStudio.vcproj VisualStudio.sln
Log Message:
*** First project file for .net ***
(binaries not tested yet)
--- NEW FILE: VisualStudio.vcproj ---
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.00"
Name="osgChunkLod"
ProjectGUID="{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}"
Keyword="ManagedCProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="2"
CharacterSet="2"
ManagedExtensions="TRUE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include;..\include"
PreprocessorDefinitions="WIN32;_DEBUG;OSGCHUNKLOD_LIBRARY"
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
WarningLevel="3"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib osgNVd.lib libjpeg.lib osgDBd.lib osgd.lib"
OutputFile="..\..\..\APPLICATIONS\CSPSim\Bin\osgChunkLodd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib"
IgnoreDefaultLibraryNames="msvcrtd.lib"
GenerateDebugInformation="TRUE"
ImportLibrary="..\..\lib\osgChunkLodd.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="2"
CharacterSet="2"
ManagedExtensions="TRUE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include;..\include"
PreprocessorDefinitions="WIN32;NDEBUG;OSGCHUNKLOD_LIBRARY"
MinimalRebuild="FALSE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
WarningLevel="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="osg.lib osgDB.lib osgNV.lib opengl32.lib libjpeg.lib"
OutputFile="..\..\..\APPLICATIONS\CSPSim\Bin\osgChunkLod.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib"
IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="TRUE"
ImportLibrary="..\..\lib\osgChunkLod.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
</Configurations>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
<File
RelativePath="..\src\osgChunkLod\ChunkLod.cpp">
</File>
<File
RelativePath="..\src\osgChunkLod\ChunkLodDrawable.cpp">
</File>
<File
RelativePath="..\src\osgChunkLod\ChunkLodLoader.cpp">
</File>
<File
RelativePath="..\src\osgChunkLod\RayStrip.cpp">
</File>
<File
RelativePath="..\src\osgChunkLod\RegisterCombinerDetails.cpp">
</File>
<File
RelativePath="..\src\osgChunkLod\TextureQuadTree.cpp">
</File>
<File
RelativePath="..\src\osgChunkLod\Version.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc">
<File
RelativePath="..\include\osgChunkLod\ChunkLod">
</File>
<File
RelativePath="..\include\osgChunkLod\ChunkLodDrawable">
</File>
<File
RelativePath="..\include\osgChunkLod\ChunkLodLoader">
</File>
<File
RelativePath="..\include\osgChunkLod\Export">
</File>
<File
RelativePath="..\include\osgChunkLod\MmapFile">
</File>
<File
RelativePath="..\include\osgChunkLod\MultiTextureDetails">
</File>
<File
RelativePath="..\include\osgChunkLod\RayStrip">
</File>
<File
RelativePath="..\include\osgChunkLod\TextureQuadTree">
</File>
<File
RelativePath="..\include\osgChunkLod\Version">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;r">
</Filter>
<File
RelativePath="..\src\osgChunkLod\ChunkVertexMorph.cg">
</File>
<File
RelativePath="..\src\osgChunkLod\nvMorph.cg">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
--- NEW FILE: VisualStudio.sln ---
Microsoft Visual Studio Solution File, Format Version 7.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualStudio", "VisualStudio.vcproj", "{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}"
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
ConfigName.0 = Debug
ConfigName.1 = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}.Debug.ActiveCfg = Debug|Win32
{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}.Debug.Build.0 = Debug|Win32
{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}.Release.ActiveCfg = Release|Win32
{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
|
|
From: <de...@us...> - 2003-06-28 10:22:56
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv10345/VisualStudio Log Message: Directory /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio added to the repository |
|
From: <mk...@us...> - 2003-06-27 08:17:31
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv5697 Modified Files: CHANGES.current Log Message: Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** CHANGES.current 26 Jun 2003 10:12:01 -0000 1.36 --- CHANGES.current 27 Jun 2003 08:17:28 -0000 1.37 *************** *** 3,6 **** --- 3,13 ---- 2003-06-25: onsight + + Small but important fixes to Source/Makefile.in: + Added a line to create .deps/Theater if it doesn't + exist, and commented the gnucc2 flags since these + aren't part of autoconf yet. + + 2003-06-25: onsight ==========> GCC: Large parts of ChunkLodTerrain are checked in |
