Menu
▾
▴
[Csp-commits] svn:csp r950 - in trunk/CSP/CSPSim: . Data Include Source VisualStudio/CSPSimDLL
|
From: <sv...@ww...> - 2004-05-10 04:35:53
|
Author: delta
Date: 2004-05-09 04:08:16 -0700 (Sun, 09 May 2004)
New Revision: 950
Modified:
trunk/CSP/CSPSim/CHANGES.current
trunk/CSP/CSPSim/Data/CSPSim.ini
trunk/CSP/CSPSim/Include/CSPSim.h
trunk/CSP/CSPSim/Source/CSPSim.cpp
trunk/CSP/CSPSim/Source/FlightModel.cpp
trunk/CSP/CSPSim/Source/ObjectModel.cpp
trunk/CSP/CSPSim/Source/Sky.cpp
trunk/CSP/CSPSim/Source/VirtualScene.cpp
trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
Log:
Try for a temporary fix on ATI hardware.
Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/CHANGES.current 2004-05-09 11:08:16 UTC (rev 950)
@@ -1,8 +1,21 @@
Version 0.4.0 (in progress)
===========================
+2004-05-09
+ * Minor cleanings in Include/CSPSim.h.
+
+ * Commented out glFinish() in Source/VirtualScene.cpp which can be
+ responsible of performance hits. Must be tested.
+
+ * Decreased Radius of the skydome (Source/Sky.cpp) to provide a quick
+ and dirty hack of the "black sky" symptom on ATI hardware.
+
+ * Minor changes to VisualStudio/CSPSimDLL.vcproj.
+
+ * Changed the date in Data/CSPSim.ini.
+
2004-05-08: Wolverine
- * more updates to networking. Including changes so both windows and unix
+ * More updates to networking. Including changes so both windows and unix
can compile.
2004-05-02: wolverine
Modified: trunk/CSP/CSPSim/Data/CSPSim.ini
===================================================================
--- trunk/CSP/CSPSim/Data/CSPSim.ini 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/Data/CSPSim.ini 2004-05-09 11:08:16 UTC (rev 950)
@@ -1,7 +1,7 @@
; CSP configuration settings
[Debug]
-LoggingLevel = 0
+LoggingLevel = 0
Battlefield = 1
Demeter = true
@@ -33,20 +33,18 @@
MudBubbleRadius = 40000
AirBubbleRadius = 80000
VisualRadius = 40000
-Date = 2000-01-01 00:00:00.0
+Date = 2004-05-09 12:00:00
[Networking]
LocalMessagePort = 3150
LocalMessageHost = 127.0.0.1
RemoteMessagePort = 3160
RemoteMessageHost = 127.0.0.1
-Theater = sim:theater.balkan
-Date = 2003-05-15 07:19:30
; balkan theater (demeter)
+Theater = sim:theater.balkan
+
; northern CA theater (chunkedLod)
;Theater = sim:theater.nca
;Date = 2003-05-15 14:19:30
-
-
Modified: trunk/CSP/CSPSim/Include/CSPSim.h
===================================================================
--- trunk/CSP/CSPSim/Include/CSPSim.h 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/Include/CSPSim.h 2004-05-09 11:08:16 UTC (rev 950)
@@ -44,10 +44,6 @@
#undef min
#undef max
-
-// Uncomment this line if you are using OSG version 0.9.4 or older.
-//#define CSP_OSG_094
-
struct SDL_Surface;
class PyShell;
@@ -186,10 +182,7 @@
NetworkMessenger * m_NetworkMessenger;
NetworkNode * m_RemoteServerNode;
-#ifndef CSP_OSG_094
osg::ref_ptr<Producer::RenderSurface> m_RenderSurface;
-#endif
-
};
#endif // __CSPSIM_H__
Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/CSPSim.cpp 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/Source/CSPSim.cpp 2004-05-09 11:08:16 UTC (rev 950)
@@ -236,13 +236,6 @@
simdata::ospath::addpath(search_path, font_path);
osgDB::setDataFilePathList(search_path);
- // we don't need this on Linux since libs are usually
- // installed in /usr/local/lib/osgPlugins or /usr/lib/osgPlugins.
- // OSG can find itself the plugins.
-//#ifdef _WIN32
-// osgDB::setLibraryFilePathList(".");
-//#endif
-
// open the primary data archive
std::string cache_path = getCachePath();
std::string archive_file = simdata::ospath::join(cache_path, "sim.dar");
Modified: trunk/CSP/CSPSim/Source/FlightModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/FlightModel.cpp 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/Source/FlightModel.cpp 2004-05-09 11:08:16 UTC (rev 950)
@@ -32,8 +32,6 @@
#define NOMINMAX
#endif
-#include <algorithm>
-
#include "CSPSim.h"
#include "Log.h"
#include "FlightModel.h"
@@ -207,4 +205,3 @@
-
Modified: trunk/CSP/CSPSim/Source/ObjectModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ObjectModel.cpp 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/Source/ObjectModel.cpp 2004-05-09 11:08:16 UTC (rev 950)
@@ -24,8 +24,6 @@
#include <vector>
-#include <osg/ShapeDrawable>
-
#include "ObjectModel.h"
#include "Animation.h"
#include "Log.h"
@@ -38,15 +36,17 @@
#include <osgUtil/SmoothingVisitor>
#include <osgUtil/DisplayListVisitor>
#include <osgUtil/Optimizer>
+#include <osg/CullFace>
#include <osg/NodeVisitor>
#include <osg/Geometry>
#include <osg/Texture>
#include <osg/Geode>
#include <osg/Depth>
+#include <osg/ShapeDrawable>
#include <osgText/Text>
#include <osg/PolygonOffset>
-#include <osg/CullFace>
+
#include <SimData/FileUtility.h>
#include <SimData/osg.h>
Modified: trunk/CSP/CSPSim/Source/Sky.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Sky.cpp 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/Source/Sky.cpp 2004-05-09 11:08:16 UTC (rev 950)
@@ -1157,7 +1157,8 @@
int i, j;
float x, y, z;
float alpha, theta;
- float radius = 1100000.0f;
+ //float radius = 1100000.0f;
+ float radius = 64000.0f;
m_Horizon = new FalseHorizon;
#ifdef TEXDOME
m_Horizon->init(192);
Modified: trunk/CSP/CSPSim/Source/VirtualScene.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/VirtualScene.cpp 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/Source/VirtualScene.cpp 2004-05-09 11:08:16 UTC (rev 950)
@@ -370,7 +370,7 @@
m_NearView->draw();
}
- glFinish();
+ //glFinish();
if (m_Terrain.valid()) m_Terrain->endDraw();
Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
===================================================================
--- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2004-05-08 16:25:45 UTC (rev 949)
+++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2004-05-09 11:08:16 UTC (rev 950)
@@ -44,7 +44,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="ws2_32.lib OpenThreadsWin32d.lib osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib ccgnu2.lib ccext2.lib"
+ AdditionalDependencies="OpenThreadsWin32d.lib osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib ccgnu2.lib ccext2.lib"
OutputFile="../../Bin/_cCSP.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
@@ -121,7 +121,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="ws2_32.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib ccgnu2.lib ccext2.lib"
+ AdditionalDependencies="ws2_32.lib ccgnu2.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib ccext2.lib"
OutputFile="../../Bin/_cCSP.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
|
