[Csp-commits] SF.net SVN: csp:[2348] trunk/csp

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

Revision: 2348
          http://csp.svn.sourceforge.net/csp/?rev=2348&view=rev
Author:   nsmoooose
Date:     2009-04-29 16:02:57 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
Merged the osg_2.6_vs2008 branch to trunk.

Modified Paths:
--------------
    trunk/csp/SConstruct
    trunk/csp/bin/sim.ini
    trunk/csp/bin/sim.py
    trunk/csp/csplib/data/InterfaceProxy.h
    trunk/csp/csplib/data/Matrix3.h
    trunk/csp/csplib/data/Quat.h
    trunk/csp/csplib/data/Vector3.h
    trunk/csp/csplib/data/test/test_Quat.cpp
    trunk/csp/csplib/data/test/test_Vector3.cpp
    trunk/csp/csplib/util/Math.h
    trunk/csp/csplib/util/Modules.cpp
    trunk/csp/csplib/util/StringTools.cpp
    trunk/csp/csplib/util/StringTools.h
    trunk/csp/csplib/util/Testing.h
    trunk/csp/cspsim/AircraftObject.h
    trunk/csp/cspsim/Animation.cpp
    trunk/csp/cspsim/Animation.h
    trunk/csp/cspsim/BaseScreen.cpp
    trunk/csp/cspsim/BaseScreen.h
    trunk/csp/cspsim/CSPSim.cpp
    trunk/csp/cspsim/CSPSim.h
    trunk/csp/cspsim/ChannelMirror.h
    trunk/csp/cspsim/ChunkLodTerrain.h
    trunk/csp/cspsim/CockpitInterface.cpp
    trunk/csp/cspsim/CockpitInterface.h
    trunk/csp/cspsim/DoubleChannelMirror.cpp
    trunk/csp/cspsim/DynamicObject.cpp
    trunk/csp/cspsim/DynamicObject.h
    trunk/csp/cspsim/FlightControlSystem.cpp
    trunk/csp/cspsim/GameScreen.cpp
    trunk/csp/cspsim/GameScreen.h
    trunk/csp/cspsim/MenuScreen.cpp
    trunk/csp/cspsim/MenuScreen.h
    trunk/csp/cspsim/SConscript
    trunk/csp/cspsim/System.h
    trunk/csp/cspsim/SystemsModel.cpp
    trunk/csp/cspsim/SystemsModel.h
    trunk/csp/cspsim/VirtualScene.cpp
    trunk/csp/cspsim/VirtualScene.h
    trunk/csp/cspsim/cspsim.i
    trunk/csp/cspsim/f16/F16INS.cpp
    trunk/csp/cspsim/f16/F16System.cpp
    trunk/csp/cspsim/f16/FLCS.cpp
    trunk/csp/cspsim/f16/FuelSystem.cpp
    trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp
    trunk/csp/cspsim/f16/SpecialFonts.cpp
    trunk/csp/cspsim/f16/SpecialFonts.h
    trunk/csp/cspsim/f16/UpFrontControls.cpp
    trunk/csp/cspsim/hud/DisplayTools.cpp
    trunk/csp/cspsim/sky/Colorspace.cpp
    trunk/csp/cspsim/sky/SkyShader.cpp
    trunk/csp/cspsim/sound/Sample.cpp
    trunk/csp/cspsim/sound/SoundEngine.cpp
    trunk/csp/cspsim/swig/CSPSim.i
    trunk/csp/cspsim/swig/Screens.i
    trunk/csp/cspsim/systems/AircraftInputSystem.cpp
    trunk/csp/cspsim/systems/AircraftInputSystem.h
    trunk/csp/cspsim/test/test_PhysicsModel.cpp
    trunk/csp/cspwf/ControlGeometryBuilder.cpp
    trunk/csp/cspwf/ResourceLocator.cpp
    trunk/csp/cspwf/ResourceLocator.h
    trunk/csp/cspwf/SConscript
    trunk/csp/cspwf/Serialization.cpp
    trunk/csp/cspwf/Serialization.h
    trunk/csp/cspwf/Style.h
    trunk/csp/cspwf/WindowManager.cpp
    trunk/csp/cspwf/WindowManager.h
    trunk/csp/cspwf/WindowManagerViewer.cpp
    trunk/csp/cspwf/WindowManagerViewer.h
    trunk/csp/cspwf/cspwf.i
    trunk/csp/data/ui/scripts/gamescreenmanager.py
    trunk/csp/data/ui/scripts/startup.py
    trunk/csp/data/ui/scripts/windows/mainmenu.py
    trunk/csp/data/ui/tutorials/takeoff/takeoff.py
    trunk/csp/examples/README
    trunk/csp/examples/wf-window/Program.cpp
    trunk/csp/modules/chunklod/SConscript
    trunk/csp/modules/demeter/SConscript
    trunk/csp/modules/demeter/Terrain.h
    trunk/csp/tools/build/libconf.py
    trunk/csp/tools/layout2/layout.py
    trunk/csp/tools/layout2/scripts/ui/controls/DocumentNotebook.py

Added Paths:
-----------
    trunk/csp/bin/sim2.py
    trunk/csp/cspsim/CSPViewer.cpp
    trunk/csp/cspsim/CSPViewer.h
    trunk/csp/cspsim/FlightControlSystem.h
    trunk/csp/cspsim/RegisterObjectInterfaces.cpp
    trunk/csp/cspsim/RegisterObjectInterfaces.h
    trunk/csp/cspsim/SDLViewer.cpp
    trunk/csp/cspsim/SDLViewer.h
    trunk/csp/cspsim/ScreenInfoNode.cpp
    trunk/csp/cspsim/ScreenInfoNode.h
    trunk/csp/cspsim/f16/F16INS.h
    trunk/csp/cspsim/f16/FLCS.h
    trunk/csp/cspsim/f16/FuelSystem.h
    trunk/csp/cspsim/f16/RegisterF16Objects.cpp
    trunk/csp/cspsim/f16/RegisterF16Objects.h
    trunk/csp/cspsim/input/
    trunk/csp/cspsim/input/EventMapIndex.cpp
    trunk/csp/cspsim/input/EventMapIndex.h
    trunk/csp/cspsim/input/EventMapping.cpp
    trunk/csp/cspsim/input/EventMapping.h
    trunk/csp/cspsim/input/HID.cpp
    trunk/csp/cspsim/input/HID.h
    trunk/csp/cspsim/input/InputEvent.cpp
    trunk/csp/cspsim/input/InputEvent.h
    trunk/csp/cspsim/input/InputEventChannel.h
    trunk/csp/cspsim/input/InputInterface.cpp
    trunk/csp/cspsim/input/InputInterface.h
    trunk/csp/cspsim/input/InputInterfaceWfAdapter.cpp
    trunk/csp/cspsim/input/InputInterfaceWfAdapter.h
    trunk/csp/cspsim/input/MapEvent.h
    trunk/csp/cspsim/swig/CSPViewer.i
    trunk/csp/cspwf/WindowManagerEventHandler.cpp
    trunk/csp/cspwf/WindowManagerEventHandler.h
    trunk/csp/cspwf/WindowManagerViewerNode.cpp
    trunk/csp/cspwf/WindowManagerViewerNode.h
    trunk/csp/examples/sdl-viewer/
    trunk/csp/examples/sdl-viewer/Program.cpp
    trunk/csp/examples/sdl-viewer/SConscript
    trunk/csp/examples/sdl-viewer/SDLViewer.cpp
    trunk/csp/examples/sdl-viewer/SDLViewer.h
    trunk/csp/examples/sdl-viewer/SkyGroup.cpp
    trunk/csp/examples/sdl-viewer/SkyGroup.h
    trunk/csp/examples/sdl-viewer/readme
    trunk/csp/examples/sdl-viewer/sdl-viewer.ini
    trunk/csp/examples/wf-python/
    trunk/csp/examples/wf-python/hello_world.xml
    trunk/csp/examples/wf-python/wf-python.py
    trunk/csp/modules/chunklod/Module.cpp
    trunk/csp/modules/demeter/Module.cpp

Removed Paths:
-------------
    trunk/csp/cspsim/EventMapIndex.cpp
    trunk/csp/cspsim/EventMapIndex.h
    trunk/csp/cspsim/EventMapping.cpp
    trunk/csp/cspsim/EventMapping.h
    trunk/csp/cspsim/HID.cpp
    trunk/csp/cspsim/HID.h
    trunk/csp/cspsim/InputEvent.cpp
    trunk/csp/cspsim/InputEvent.h
    trunk/csp/cspsim/InputEventChannel.h
    trunk/csp/cspsim/InputInterface.cpp
    trunk/csp/cspsim/InputInterface.h
    trunk/csp/cspsim/InputInterfaceWfAdapter.cpp
    trunk/csp/cspsim/InputInterfaceWfAdapter.h
    trunk/csp/cspsim/MapEvent.h
    trunk/csp/cspsim/input/EventMapIndex.cpp
    trunk/csp/cspsim/input/EventMapIndex.h
    trunk/csp/cspsim/input/EventMapping.cpp
    trunk/csp/cspsim/input/EventMapping.h
    trunk/csp/cspsim/input/HID.cpp
    trunk/csp/cspsim/input/HID.h
    trunk/csp/cspsim/input/InputEvent.cpp
    trunk/csp/cspsim/input/InputEvent.h
    trunk/csp/cspsim/input/InputEventChannel.h
    trunk/csp/cspsim/input/InputInterface.cpp
    trunk/csp/cspsim/input/InputInterface.h
    trunk/csp/cspsim/input/InputInterfaceWfAdapter.cpp
    trunk/csp/cspsim/input/InputInterfaceWfAdapter.h
    trunk/csp/cspsim/input/MapEvent.h
    trunk/csp/examples/sdl-viewer/Program.cpp
    trunk/csp/examples/sdl-viewer/SConscript
    trunk/csp/examples/sdl-viewer/SDLViewer.cpp
    trunk/csp/examples/sdl-viewer/SDLViewer.h
    trunk/csp/examples/sdl-viewer/SkyGroup.cpp
    trunk/csp/examples/sdl-viewer/SkyGroup.h
    trunk/csp/examples/sdl-viewer/readme
    trunk/csp/examples/sdl-viewer/sdl-viewer.ini
    trunk/csp/examples/wf-python/hello_world.xml
    trunk/csp/examples/wf-python/wf-python.py

Property Changed:
----------------
    trunk/csp/
    trunk/csp/examples/
    trunk/csp/examples/clouds/
    trunk/csp/examples/objectmodel/
    trunk/csp/examples/sky/
    trunk/csp/examples/terrain-demeter/
    trunk/csp/examples/wf-window/

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