[Csp-commits] SF.net SVN: csp:[2313] branches/osg_2.6_vs2008/csp

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2313
          http://csp.svn.sourceforge.net/csp/?rev=2313&view=rev
Author:   nsmoooose
Date:     2008-12-26 00:25:55 +0000 (Fri, 26 Dec 2008)

Log Message:
-----------
Merged r2295:2312 from trunk.

Modified Paths:
--------------
    branches/osg_2.6_vs2008/csp/SConstruct
    branches/osg_2.6_vs2008/csp/bin/sim.py
    branches/osg_2.6_vs2008/csp/csplib/data/External.cpp
    branches/osg_2.6_vs2008/csp/csplib/data/External.h
    branches/osg_2.6_vs2008/csp/cspsim/CSPSim.cpp
    branches/osg_2.6_vs2008/csp/cspsim/ChunkLodTerrain.h
    branches/osg_2.6_vs2008/csp/cspsim/Config.cpp
    branches/osg_2.6_vs2008/csp/cspsim/Config.h
    branches/osg_2.6_vs2008/csp/cspsim/Exception.cpp
    branches/osg_2.6_vs2008/csp/cspsim/GameScreen.h
    branches/osg_2.6_vs2008/csp/cspsim/MenuScreen.cpp
    branches/osg_2.6_vs2008/csp/cspsim/MenuScreen.h
    branches/osg_2.6_vs2008/csp/cspsim/ObjectModel.cpp
    branches/osg_2.6_vs2008/csp/cspsim/ObjectModel.h
    branches/osg_2.6_vs2008/csp/cspsim/TerrainObject.h
    branches/osg_2.6_vs2008/csp/cspsim/VirtualScene.cpp
    branches/osg_2.6_vs2008/csp/cspsim/VirtualScene.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/Magnitude.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/OrbitalBody.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/OrbitalBodyImposter.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/OrbitalBodyModel.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/PhaseShader.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/Sky.cpp
    branches/osg_2.6_vs2008/csp/cspsim/sky/Sky.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/SkyDome.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/SkyShader.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/SolarSystem.h
    branches/osg_2.6_vs2008/csp/cspsim/sky/StarDome.h
    branches/osg_2.6_vs2008/csp/cspsim/weather/clouds/Cloud.h
    branches/osg_2.6_vs2008/csp/cspsim/weather/clouds/CloudBox.h
    branches/osg_2.6_vs2008/csp/cspsim/weather/clouds/CloudMath.h
    branches/osg_2.6_vs2008/csp/cspsim/weather/clouds/CloudRegistry.h
    branches/osg_2.6_vs2008/csp/cspsim/weather/clouds/CloudTextureFactory.h
    branches/osg_2.6_vs2008/csp/cspsim/weather/clouds/CloudUtils.h
    branches/osg_2.6_vs2008/csp/cspwf/SConscript
    branches/osg_2.6_vs2008/csp/cspwf/WindowManager.cpp
    branches/osg_2.6_vs2008/csp/cspwf/WindowManager.h
    branches/osg_2.6_vs2008/csp/data/shaders/terrain-demeter.fragment
    branches/osg_2.6_vs2008/csp/modules/chunklod/SConscript
    branches/osg_2.6_vs2008/csp/modules/demeter/DemeterDrawable.cpp
    branches/osg_2.6_vs2008/csp/modules/demeter/DemeterDrawable.h
    branches/osg_2.6_vs2008/csp/modules/demeter/DemeterException.h
    branches/osg_2.6_vs2008/csp/modules/demeter/DemeterTerrain.h
    branches/osg_2.6_vs2008/csp/modules/demeter/Export.h
    branches/osg_2.6_vs2008/csp/modules/demeter/Module.cpp
    branches/osg_2.6_vs2008/csp/modules/demeter/SConscript
    branches/osg_2.6_vs2008/csp/modules/demeter/Terrain.cpp
    branches/osg_2.6_vs2008/csp/modules/demeter/Terrain.h
    branches/osg_2.6_vs2008/csp/modules/demeter/TerrainFileTextureFactory.cpp
    branches/osg_2.6_vs2008/csp/modules/demeter/TerrainFileTextureFactory.h
    branches/osg_2.6_vs2008/csp/modules/demeter/TerrainTextureFactory.cpp
    branches/osg_2.6_vs2008/csp/modules/demeter/TerrainTextureFactory.h
    branches/osg_2.6_vs2008/csp/tools/build/util.py
    branches/osg_2.6_vs2008/csp/tools/layout2/scripts/ui/LayoutApplication.py

Added Paths:
-----------
    branches/osg_2.6_vs2008/csp/cspwf/WindowManagerSceneView.cpp
    branches/osg_2.6_vs2008/csp/cspwf/WindowManagerSceneView.h
    branches/osg_2.6_vs2008/csp/cspwf/WindowManagerViewer.cpp
    branches/osg_2.6_vs2008/csp/cspwf/WindowManagerViewer.h
    branches/osg_2.6_vs2008/csp/examples/
    branches/osg_2.6_vs2008/csp/examples/README
    branches/osg_2.6_vs2008/csp/examples/clouds/
    branches/osg_2.6_vs2008/csp/examples/clouds/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/clouds/SConscript
    branches/osg_2.6_vs2008/csp/examples/objectmodel/
    branches/osg_2.6_vs2008/csp/examples/objectmodel/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/objectmodel/SConscript
    branches/osg_2.6_vs2008/csp/examples/sky/
    branches/osg_2.6_vs2008/csp/examples/sky/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/sky/SConscript
    branches/osg_2.6_vs2008/csp/examples/terrain-demeter/
    branches/osg_2.6_vs2008/csp/examples/terrain-demeter/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/terrain-demeter/SConscript
    branches/osg_2.6_vs2008/csp/examples/wf-window/
    branches/osg_2.6_vs2008/csp/examples/wf-window/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/wf-window/SConscript

Removed Paths:
-------------
    branches/osg_2.6_vs2008/csp/examples/README
    branches/osg_2.6_vs2008/csp/examples/clouds/
    branches/osg_2.6_vs2008/csp/examples/clouds/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/clouds/SConscript
    branches/osg_2.6_vs2008/csp/examples/objectmodel/
    branches/osg_2.6_vs2008/csp/examples/objectmodel/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/objectmodel/SConscript
    branches/osg_2.6_vs2008/csp/examples/sky/
    branches/osg_2.6_vs2008/csp/examples/sky/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/sky/SConscript
    branches/osg_2.6_vs2008/csp/examples/terrain-demeter/
    branches/osg_2.6_vs2008/csp/examples/terrain-demeter/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/terrain-demeter/SConscript
    branches/osg_2.6_vs2008/csp/examples/wf-window/Program.cpp
    branches/osg_2.6_vs2008/csp/examples/wf-window/SConscript
    branches/osg_2.6_vs2008/csp/tools/cloud_prototype/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.