Menu
▾
▴
[Csp-commits] svn:csp r2185 - in trunk/csp: . cspsim cspsim/hud cspsim/sky cspsim/sound modules/chunklod modules/demeter
|
From: <sv...@ww...> - 2007-09-30 09:34:55
|
Author: nsmoooose Date: 2007-09-30 02:34:44 -0700 (Sun, 30 Sep 2007) New Revision: 2185 Modified: trunk/csp/SConstruct trunk/csp/cspsim/VirtualScene.cpp trunk/csp/cspsim/hud/DisplayTools.cpp trunk/csp/cspsim/sky/StarDome.cpp trunk/csp/cspsim/sky/StarDome.h trunk/csp/cspsim/sound/Loader.cpp trunk/csp/cspsim/sound/OggLoader.cpp trunk/csp/cspsim/sound/Sample.cpp trunk/csp/cspsim/sound/Sample.h trunk/csp/modules/chunklod/ChunkLodDrawable trunk/csp/modules/chunklod/ChunkLodDrawable.cpp trunk/csp/modules/demeter/DemeterDrawable.cpp trunk/csp/modules/demeter/DemeterDrawable.h Log: Reverted r2183 since it should have gone into the osg_2_0 branch. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2185 Modified: trunk/csp/SConstruct =================================================================== --- trunk/csp/SConstruct 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/SConstruct 2007-09-30 09:34:44 UTC (rev 2185) @@ -59,9 +59,9 @@ build.ExternalLibrary( name = 'sound', config = [ -# build.PkgConfig(package='openalpp', version='0.2'), + build.PkgConfig(package='openalpp', version='0.2'), build.PkgConfig(package='vorbisfile', version='1.1.0'), -# build.DevpackConfig(dlls='openalpp', headers=[('openalpp', 'sounddata.h')]), + build.DevpackConfig(dlls='openalpp', headers=[('openalpp', 'sounddata.h')]), build.DevpackConfig(dlls=['libvorbis', 'libvorbisfile'], headers=[('vorbis', 'vorbisfile.h')]), build.DevpackConfig(dlls='libogg', headers=[('ogg', 'ogg.h')]), ]) @@ -83,12 +83,12 @@ build.ExternalLibrary( name = 'osg', config = [ - build.PkgConfig(package='openscenegraph', version='2.0.0'), - build.PkgConfig(package='openthreads', version='1.9'), -# build.PkgConfig(package='producer', version='0.9.9'), - build.PkgConfig(package='osgal', version='0.6.1'), + build.PkgConfig(package='openscenegraph', version='0.9.9'), + build.PkgConfig(package='openthreads', version='0.9.9'), + build.PkgConfig(package='producer', version='0.9.9'), + build.PkgConfig(package='osgal', version='0.3'), build.DevpackConfig(dlls='osgal', headers=[('osgAL', 'SoundNode')]), - build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgViewer', 'osgText', 'osgUtil', 'OpenThreadsWin32'], headers=[('osg', 'Depth'), ('osgText', 'Font')]), + build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgProducer', 'osgText', 'osgUtil', 'OpenThreadsWin32', 'Producer'], headers=[('osg', 'Depth'), ('osgText', 'Font')]), ]) build.ExternalLibrary( Modified: trunk/csp/cspsim/VirtualScene.cpp =================================================================== --- trunk/csp/cspsim/VirtualScene.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/VirtualScene.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -961,7 +961,7 @@ } void VirtualScene::getViewport(int& x, int& y, int& width, int& height) { - m_FarView->getViewport(/*x, y, width, height*/); + m_FarView->getViewport(x, y, width, height); } void VirtualScene::spinTheWorld(bool spin) { Modified: trunk/csp/cspsim/hud/DisplayTools.cpp =================================================================== --- trunk/csp/cspsim/hud/DisplayTools.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/hud/DisplayTools.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -185,7 +185,7 @@ #if OSG_VERSION_MAJOR == 1 && OSG_VERSION_MINOR > 0 geode()->removeDrawables(0, geode()->getNumDrawables()); #else - geode()->removeDrawables(0, geode()->getNumDrawables()); + geode()->removeDrawable(0, geode()->getNumDrawables()); #endif } Modified: trunk/csp/cspsim/sky/StarDome.cpp =================================================================== --- trunk/csp/cspsim/sky/StarDome.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/sky/StarDome.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -173,7 +173,7 @@ assert(0); } -void StarDome::drawImplementation(osg::RenderInfo&) const { +void StarDome::drawImplementation(osg::State&) const { const double atten = (10.0 / 255.0) * pow(10.0, m_SkyMagnitude); glPushAttrib(GL_ENABLE_BIT); glPushMatrix(); Modified: trunk/csp/cspsim/sky/StarDome.h =================================================================== --- trunk/csp/cspsim/sky/StarDome.h 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/sky/StarDome.h 2007-09-30 09:34:44 UTC (rev 2185) @@ -41,7 +41,7 @@ virtual ~StarDome(); - virtual void drawImplementation(osg::RenderInfo&) const; + virtual void drawImplementation(osg::State&) const; virtual osg::BoundingBox computeBound() const; osg::Geode *makeGeode(); Modified: trunk/csp/cspsim/sound/Loader.cpp =================================================================== --- trunk/csp/cspsim/sound/Loader.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/sound/Loader.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -26,7 +26,7 @@ #include <csp/csplib/util/Log.h> #include <csp/csplib/util/FileUtility.h> -#include <openalpp/Sample> +#include <openalpp/sample.h> #include <csp/csplib/util/undef.h> #include <map> Modified: trunk/csp/cspsim/sound/OggLoader.cpp =================================================================== --- trunk/csp/cspsim/sound/OggLoader.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/sound/OggLoader.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -27,7 +27,7 @@ #include <csp/csplib/util/Log.h> #include <csp/csplib/util/Uniform.h> -#include <openalpp/Sample> +#include <openalpp/sample.h> #include <vorbis/vorbisfile.h> #include <csp/csplib/util/undef.h> Modified: trunk/csp/cspsim/sound/Sample.cpp =================================================================== --- trunk/csp/cspsim/sound/Sample.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/sound/Sample.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -30,7 +30,7 @@ #include <csp/csplib/util/osg.h> #include <osgAL/SoundState> -#include <openalpp/Sample> +#include <openalpp/sample.h> #include <csp/csplib/util/undef.h> Modified: trunk/csp/cspsim/sound/Sample.h =================================================================== --- trunk/csp/cspsim/sound/Sample.h 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/cspsim/sound/Sample.h 2007-09-30 09:34:44 UTC (rev 2185) @@ -30,7 +30,7 @@ #include <csp/csplib/data/Object.h> #include <csp/csplib/data/Vector3.h> -//#include <openalpp/ref_ptr.h> +#include <openalpp/ref_ptr.h> #include <osg/ref_ptr> namespace openalpp { class Sample; } @@ -76,7 +76,7 @@ int m_Priority; mutable osg::ref_ptr<osgAL::SoundState> m_State; - mutable osg::ref_ptr<openalpp::Sample> m_Sample; + mutable openalpp::ref_ptr<openalpp::Sample> m_Sample; void loadSample() const; }; Modified: trunk/csp/modules/chunklod/ChunkLodDrawable =================================================================== --- trunk/csp/modules/chunklod/ChunkLodDrawable 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/modules/chunklod/ChunkLodDrawable 2007-09-30 09:34:44 UTC (rev 2185) @@ -57,7 +57,7 @@ void setChunkLodTree(ChunkLodTree *tree); ChunkLodTree* getChunkLodTree() { return _tree; } const ChunkLodTree* getChunkLodTree() const { return _tree; } - virtual void drawImplementation(osg::RenderInfo &) const; + virtual void drawImplementation(osg::State &) const; protected: virtual osg::BoundingBox computeBound() const; Modified: trunk/csp/modules/chunklod/ChunkLodDrawable.cpp =================================================================== --- trunk/csp/modules/chunklod/ChunkLodDrawable.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/modules/chunklod/ChunkLodDrawable.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -104,7 +104,7 @@ } } -void ChunkLodDrawable::drawImplementation(osg::RenderInfo& info) const { +void ChunkLodDrawable::drawImplementation(osg::State& state) const { static int frame = 0; _triangles_rendered = 0; @@ -117,21 +117,21 @@ } ChunkLodTree *tree = const_cast<ChunkLodTree*>(_tree); - osg::Matrix mv = info.getState()->getModelViewMatrix(); + osg::Matrix mv = state.getModelViewMatrix(); mv.invert(mv); osg::Vec3 viewpoint = mv.getTrans(); - info.getState()->disableTexCoordPointersAboveAndIncluding(0); // NEW - info.getState()->disableAllVertexArrays(); + state.disableTexCoordPointersAboveAndIncluding(0); // NEW + state.disableAllVertexArrays(); - _details->enable(*info.getState()); + _details->enable(state); osg::Timer t; osg::Timer_t update_t = t.tick(); - tree->update(viewpoint, *info.getState()); + tree->update(viewpoint, state); //osg::Timer_t render_t = t.tick(); - _triangles_rendered = tree->render(*info.getState(), *_details); + _triangles_rendered = tree->render(state, *_details); _triangle_count += _triangles_rendered; @@ -153,11 +153,11 @@ } - _details->disable(*info.getState()); + _details->disable(state); - info.getState()->disableAllVertexArrays(); - info.getState()->dirtyTexCoordPointersAboveAndIncluding(0); - info.getState()->setActiveTextureUnit(0); + state.disableAllVertexArrays(); + state.dirtyTexCoordPointersAboveAndIncluding(0); + state.setActiveTextureUnit(0); frame++; } Modified: trunk/csp/modules/demeter/DemeterDrawable.cpp =================================================================== --- trunk/csp/modules/demeter/DemeterDrawable.cpp 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/modules/demeter/DemeterDrawable.cpp 2007-09-30 09:34:44 UTC (rev 2185) @@ -89,7 +89,7 @@ return "DemeterDrawable"; } -void DemeterDrawable::drawImplementation(RenderInfo& /*state*/) const +void DemeterDrawable::drawImplementation(State& /*state*/) const { if (m_RefTerrain.valid()) { @@ -227,7 +227,7 @@ return "DemeterLatticeDrawable"; } -void DemeterLatticeDrawable::drawImplementation(RenderInfo& /*state*/) const +void DemeterLatticeDrawable::drawImplementation(State& /*state*/) const { if (m_RefTerrainLattice.valid()) { Modified: trunk/csp/modules/demeter/DemeterDrawable.h =================================================================== --- trunk/csp/modules/demeter/DemeterDrawable.h 2007-09-30 09:31:16 UTC (rev 2184) +++ trunk/csp/modules/demeter/DemeterDrawable.h 2007-09-30 09:34:44 UTC (rev 2185) @@ -58,7 +58,7 @@ Terrain* GetTerrain() { return m_RefTerrain.get(); } const Terrain* GetTerrain() const { return m_RefTerrain.get(); } - virtual void drawImplementation(osg::RenderInfo&) const; + virtual void drawImplementation(osg::State&) const; protected: @@ -103,7 +103,7 @@ void addTerrain( Terrain* pTerrain ); void removeTerrain( Terrain * pTerrain ); - virtual void drawImplementation(osg::RenderInfo&) const; + virtual void drawImplementation(osg::State&) const; virtual void SetCameraPosition(float, float, float); |
