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
|
Author: nsmoooose Date: 2007-12-29 09:56:14 -0800 (Sat, 29 Dec 2007) New Revision: 2201 Added: branches/layout_tool_improvements/csp/csplib/util/PythonCasts.h branches/layout_tool_improvements/csp/csplib/util/PythonSignals.h branches/layout_tool_improvements/csp/csplib/util/PythonSwig.h branches/layout_tool_improvements/csp/csplib/util/swig/PythonSignals.i branches/layout_tool_improvements/csp/tools/layout2/axes.osg branches/layout_tool_improvements/csp/tools/python_signals/ branches/layout_tool_improvements/csp/tools/python_signals/pysiggen.py branches/layout_tool_improvements/csp/tools/python_signals/readme.txt Modified: branches/layout_tool_improvements/csp/csplib/SConscript branches/layout_tool_improvements/csp/tools/layout2/cpp/OsgGraphicsWindow.cpp branches/layout_tool_improvements/csp/tools/layout2/cpp/OsgGraphicsWindow.h branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/MainFrame.py branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/controls/SceneWindow.py branches/layout_tool_improvements/csp/tools/layout2/swig/OsgGraphicsWindow.i Log: Experiments with: * 3d scene in the layout tool is rendered within a wxPython control. (experiment is located in tools/layout2 and can be built using scons layout2) This should make it possible to have several controls viewing the same scene from different positions. * binding between sigc++ signals, swig and python. All source code contributed by onsight! See PythonCasts.h, PythonSignals.h, PythonSwig.h and PythonSignals.i. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2201 Diff omitted (100219 bytes). |
Author: nsmoooose Date: 2007-12-29 04:41:08 -0800 (Sat, 29 Dec 2007) New Revision: 2200 Added: trunk/csp/data/models/industry/cistern01/ trunk/csp/data/models/industry/cistern01/cistern01.blend trunk/csp/data/models/industry/cistern01/cistern01.osg trunk/csp/data/models/industry/cistern01/cistern01.png trunk/csp/data/models/industry/cistern01/readme.txt trunk/csp/data/xml/theater/balkan/cistern01.xml trunk/csp/data/xml/theater/balkan/cistern01/ trunk/csp/data/xml/theater/balkan/cistern01/model.xml Modified: trunk/csp/data/ui/ trunk/csp/data/xml/theater/balkan/airbase.xml trunk/csp/modules/ trunk/csp/tools/hid/ trunk/csp/tools/layout/ Log: First stumbling steps with Blender. Created a oil cistern model. Added 4 cisterns to the airbase. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2200 Diff omitted (21690 bytes). |
|
From: <sv...@ww...> - 2007-12-03 14:15:48
|
Author: nsmoooose Date: 2007-12-03 06:15:39 -0800 (Mon, 03 Dec 2007) New Revision: 2199 Added: branches/layout_tool_improvements/csp/tools/layout2/ branches/layout_tool_improvements/csp/tools/layout2/SConscript branches/layout_tool_improvements/csp/tools/layout2/__init__.py branches/layout_tool_improvements/csp/tools/layout2/cpp/ branches/layout_tool_improvements/csp/tools/layout2/cpp/DynamicGrid.cpp branches/layout_tool_improvements/csp/tools/layout2/cpp/DynamicGrid.h branches/layout_tool_improvements/csp/tools/layout2/cpp/OsgGraphicsWindow.cpp branches/layout_tool_improvements/csp/tools/layout2/cpp/OsgGraphicsWindow.h branches/layout_tool_improvements/csp/tools/layout2/layout.i branches/layout_tool_improvements/csp/tools/layout2/layout.py branches/layout_tool_improvements/csp/tools/layout2/scripts/ branches/layout_tool_improvements/csp/tools/layout2/scripts/__init__.py branches/layout_tool_improvements/csp/tools/layout2/scripts/data/ branches/layout_tool_improvements/csp/tools/layout2/scripts/data/__init__.py branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/ branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/LayoutApplication.py branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/MainFrame.py branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/__init__.py branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/controls/ branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/controls/SceneWindow.py branches/layout_tool_improvements/csp/tools/layout2/scripts/ui/controls/__init__.py branches/layout_tool_improvements/csp/tools/layout2/swig/ branches/layout_tool_improvements/csp/tools/layout2/swig/OsgGraphicsWindow.i Removed: branches/layout_tool_improvements/csp/tools/layout/SConstruct Modified: branches/layout_tool_improvements/csp/SConstruct branches/layout_tool_improvements/csp/data/ui/ branches/layout_tool_improvements/csp/data/ui/scripts/ branches/layout_tool_improvements/csp/data/ui/tutorials/ branches/layout_tool_improvements/csp/data/ui/tutorials/takeoff/ branches/layout_tool_improvements/csp/modules/ branches/layout_tool_improvements/csp/tools/hid/ branches/layout_tool_improvements/csp/tools/layout/ branches/layout_tool_improvements/csp/tools/layout/SConscript Log: Added svn:ignore on some common files that is generated during build and execution. These files should never be included in version control. Example: *.pyc, .bin etc. Removed tools/layout/SConstruct since it isn't used anymore. Added a wxPython experimentation project (csp/tools/layout2 folder). Used to test integration of osgViewer::GraphicsWindow and wx.glcanvas.GLCanvas. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2199 Diff omitted (28096 bytes). |
|
From: <sv...@ww...> - 2007-12-02 17:38:47
|
Author: Herkules Date: 2007-12-02 09:38:39 -0800 (Sun, 02 Dec 2007) New Revision: 2198 Added: doc/channel/ doc/channel/ChannelSystemClassOverview.jpg Log: +ChannelSystemClassOverview.jpg Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2198 Added: doc/channel/ChannelSystemClassOverview.jpg =================================================================== (Binary files differ) Property changes on: doc/channel/ChannelSystemClassOverview.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ww...> - 2007-12-01 11:06:43
|
Author: kondzik Date: 2007-12-01 03:06:34 -0800 (Sat, 01 Dec 2007) New Revision: 2197 Added: branches/mfd_to_xml/csp/cspsim/f16/DataEntry.cpp branches/mfd_to_xml/csp/data/xml/vehicles/aircraft/f16/ded/ branches/mfd_to_xml/csp/data/xml/vehicles/aircraft/f16/ded/cni.xml branches/mfd_to_xml/csp/data/xml/vehicles/aircraft/f16/ded/list.xml branches/mfd_to_xml/csp/data/xml/vehicles/aircraft/f16/ded/misc.xml Modified: branches/mfd_to_xml/csp/cspsim/SConscript branches/mfd_to_xml/csp/cspsim/f16/DataEntry.h branches/mfd_to_xml/csp/cspsim/f16/DataEntryPage.cpp branches/mfd_to_xml/csp/cspsim/f16/DataEntryPage.h branches/mfd_to_xml/csp/cspsim/f16/UpFrontControls.cpp branches/mfd_to_xml/csp/cspsim/f16/UpFrontControls.h branches/mfd_to_xml/csp/data/xml/vehicles/aircraft/f16/systems.xml Log: It is now possible to define simple data entry page through xml. For example check cni.xml and misc.xml. Added simple class for displaying plain or inversed text on DED display. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2197 Diff omitted (21997 bytes). |
|
From: <sv...@ww...> - 2007-11-30 18:50:56
|
Author: nsmoooose Date: 2007-11-30 10:50:48 -0800 (Fri, 30 Nov 2007) New Revision: 2196 Added: branches/mfd_to_xml/ Log: Branch for conversion of MFD and DED pages to xml. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2196 Copied: branches/mfd_to_xml (from rev 2195, trunk) |
|
From: <sv...@ww...> - 2007-11-26 11:33:21
|
Author: nsmoooose Date: 2007-11-26 03:33:14 -0800 (Mon, 26 Nov 2007) New Revision: 2195 Added: branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi01.xml branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi02.xml Modified: branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi.xml Log: Layout tool isn't handling vasi.xml file correct. Extracted two of the objects declared into their own files. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2195 Modified: branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi.xml =================================================================== --- branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi.xml 2007-11-05 20:06:42 UTC (rev 2194) +++ branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi.xml 2007-11-26 11:33:14 UTC (rev 2195) @@ -1,19 +1,14 @@ <?xml version="1.0" standalone="no"?> - <Object class="CustomLayoutModel"> <List name="layout"> <Object class="FeatureLayout"> - <Object class="FeatureObjectModel" name="model"> - <Path name="model">vasi.vasi-lo</Path> - </Object> + <Path name="model">vasi01</Path> <Float name="x">0</Float> <Float name="y">0</Float> <Float name="orientation">0.0</Float> </Object> <Object class="FeatureLayout"> - <Object class="FeatureObjectModel" name="model"> - <Path name="model">vasi.vasi-hi</Path> - </Object> + <Path name="model">vasi02</Path> <Float name="x">0</Float> <Float name="y">236</Float> <Float name="orientation">0.0</Float> Added: branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi01.xml =================================================================== --- branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi01.xml (rev 0) +++ branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi01.xml 2007-11-26 11:33:14 UTC (rev 2195) @@ -0,0 +1,4 @@ +<?xml version="1.0" standalone="no"?> +<Object class="FeatureObjectModel" name="model"> + <Path name="model">vasi.vasi-lo</Path> +</Object> Added: branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi02.xml =================================================================== --- branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi02.xml (rev 0) +++ branches/layout_tool_improvements/csp/data/xml/theater/balkan/vasi02.xml 2007-11-26 11:33:14 UTC (rev 2195) @@ -0,0 +1,4 @@ +<?xml version="1.0" standalone="no"?> +<Object class="FeatureObjectModel" name="model"> + <Path name="model">vasi.vasi-hi</Path> +</Object> |
|
From: <sv...@ww...> - 2007-11-05 20:06:50
|
Author: nsmoooose Date: 2007-11-05 12:06:42 -0800 (Mon, 05 Nov 2007) New Revision: 2194 Modified: branches/layout_tool_improvements/csp/tools/layout/UI.py Log: Modified all calls to wxPython to use the new wx.Xyyy namespace. In the past all wxPython classes was named like wx.wxXyyy. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2194 Diff omitted (21063 bytes). |
|
From: <sv...@ww...> - 2007-11-05 19:10:18
|
Author: nsmoooose Date: 2007-11-05 11:10:10 -0800 (Mon, 05 Nov 2007) New Revision: 2193 Modified: branches/layout_tool_improvements/csp/tools/layout/cLayout.i Log: Fixed swig warnings caused by using deprecated %typemap syntax Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2193 Modified: branches/layout_tool_improvements/csp/tools/layout/cLayout.i =================================================================== --- branches/layout_tool_improvements/csp/tools/layout/cLayout.i 2007-11-05 06:55:42 UTC (rev 2192) +++ branches/layout_tool_improvements/csp/tools/layout/cLayout.i 2007-11-05 19:10:10 UTC (rev 2193) @@ -34,7 +34,8 @@ %feature("director") GraphCallback; %feature("director") LayoutNodeVisitor; -%typemap(python, in) (int argc, char **argv) +#if defined(SWIGPYTHON) +%typemap(in) (int argc, char **argv) { /* Check if is a list */ if (PyList_Check($input)) @@ -64,8 +65,10 @@ return NULL; } } +#endif -%typemap(python, out) (osg::Vec3) +#if defined(SWIGPYTHON) +%typemap(out) (osg::Vec3) { PyObject* target = PyTuple_New(3); PyTuple_SetItem(target, 0, PyFloat_FromDouble($1.x())); @@ -73,6 +76,7 @@ PyTuple_SetItem(target, 2, PyFloat_FromDouble($1.z())); $result = target; } +#endif namespace osg { class Referenced { |
|
From: <sv...@ww...> - 2007-11-05 06:55:54
|
Author: nsmoooose Date: 2007-11-04 22:55:42 -0800 (Sun, 04 Nov 2007) New Revision: 2192 Removed: branches/osg_2_0/ Log: Deleted the branch since all changes has been merged back into the trunk. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2192 |
|
From: <sv...@ww...> - 2007-11-05 06:53:37
|
Author: nsmoooose Date: 2007-11-04 22:53:30 -0800 (Sun, 04 Nov 2007) New Revision: 2191 Added: branches/layout_tool_improvements/ Modified: branches/layout_tool_improvements/csp/SConstruct branches/layout_tool_improvements/csp/tools/layout/PickHandler.cpp branches/layout_tool_improvements/csp/tools/layout/PickHandler.h branches/layout_tool_improvements/csp/tools/layout/SConstruct branches/layout_tool_improvements/csp/tools/layout/View.cpp branches/layout_tool_improvements/csp/tools/layout/View.h branches/layout_tool_improvements/csp/tools/layout/ViewEventHandler.cpp branches/layout_tool_improvements/csp/tools/layout/ViewEventHandler.h branches/layout_tool_improvements/csp/tools/layout/ViewManipulator.h Log: A branch for fixes to the layout tool. Convert from Producer to osgViewer. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2191 Diff omitted (16479 bytes). |
|
From: <sv...@ww...> - 2007-11-04 09:22:42
|
Author: nsmoooose Date: 2007-11-04 01:22:30 -0700 (Sun, 04 Nov 2007) New Revision: 2190 Modified: trunk/csp/tools/layout/layout Log: Made it possible to start the theater layout tool with the --pause option. This makes it possible to attach the debugger during the startup procedure of the tool. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2190 Modified: trunk/csp/tools/layout/layout =================================================================== --- trunk/csp/tools/layout/layout 2007-10-27 22:52:21 UTC (rev 2189) +++ trunk/csp/tools/layout/layout 2007-11-04 08:22:30 UTC (rev 2190) @@ -38,6 +38,12 @@ def main(args): print "Combat Simulator Project Theater Layout Tool" print "============================================" + + options = app.options + + if options.pause: + pauseForDebugger() + view = cLayout.View() argv = [app.programName()] + list(args) if view.init(argv): @@ -48,6 +54,27 @@ ui.MainLoop() view.quit() +def pauseForDebugger(): + """ + Print a help message for attaching gdb to this process and wait for keyboard + input. Should be called after the cspsim module has been loaded if requested. + """ + print + print "All extension modules have been loaded and the simulation is now paused" + print "to give you an opportunity to attach a debugging session. Under GNU/Linux" + print "run the following command from a separate shell to attach a debug session:" + print + print " gdb python %d" % os.getpid() + print + print "This will run gdb and attach to the simulation process. Once gdb finishes" + print "loading symbols for all the modules, you can set breakpoints as needed" + print "and then enter 'c' to continue." + print + print "Finally, return to this window and press <enter> to resume." + print + sys.stdin.readline() + + # find the root of the CSP workspace base = csp.dir #os.path.dirname(os.path.dirname(app.__file__)) # default Data directory for CSPSim in the current workspace @@ -59,5 +86,6 @@ app.addOption('--xml', default=xml_path, type='string', help='path to theater data') app.addOption('--model', default=model_path, type='string', help='path to 3d models') +app.addOption('--pause', action='store_true', default=False, help='pause on startup for attaching a debugger') app.start() print 'end' |
|
From: <sv...@ww...> - 2007-10-27 22:52:30
|
Author: nsmoooose Date: 2007-10-27 15:52:21 -0700 (Sat, 27 Oct 2007) New Revision: 2189 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/cspsim/wf/WindowManager.cpp trunk/csp/modules/chunklod/ChunkLodDrawable trunk/csp/modules/chunklod/ChunkLodDrawable.cpp trunk/csp/modules/demeter/DemeterDrawable.cpp trunk/csp/modules/demeter/DemeterDrawable.h Log: Upgraded source code and build system to use Open Scene Graph 2.0. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2189 Diff omitted (12778 bytes). |
|
From: <sv...@ww...> - 2007-10-26 14:34:19
|
Author: nsmoooose Date: 2007-10-26 07:33:59 -0700 (Fri, 26 Oct 2007) New Revision: 2188 Modified: branches/osg_2_0/csp/cspsim/VirtualScene.cpp branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp Log: The scene views rendered was overwriting each other. This was fixed by calling: sceneView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT); instead of: sceneView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT); Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2188 Modified: branches/osg_2_0/csp/cspsim/VirtualScene.cpp =================================================================== --- branches/osg_2_0/csp/cspsim/VirtualScene.cpp 2007-10-25 19:05:48 UTC (rev 2187) +++ branches/osg_2_0/csp/cspsim/VirtualScene.cpp 2007-10-26 14:33:59 UTC (rev 2188) @@ -478,7 +478,7 @@ void VirtualScene::createFarView() { m_FarView = makeSceneView(SceneMasks::FAR); // clear the depth buffer (but not the color buffer) - m_FarView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT); + m_FarView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT); m_FarGroup = new osg::Group; m_FarGroup->setName("far_group"); m_FarView->setSceneData(m_FarGroup.get()); @@ -487,7 +487,7 @@ void VirtualScene::createNearView() { m_NearView = makeSceneView(SceneMasks::NEAR); // clear the depth buffer (but not the color buffer) - m_NearView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT); + m_NearView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT); m_NearView->getCullVisitor()->setImpostorsActive(false); m_NearGroup = new osg::Group; m_NearGroup->setName("near_group"); @@ -498,7 +498,7 @@ m_InfoView = makeSceneView(0); // clear the depth buffer (but not the color buffer) - m_InfoView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT); + m_InfoView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT); m_InfoGroup = new osg::Group; m_InfoGroup->setName("info_group"); @@ -511,8 +511,6 @@ void VirtualScene::createWindowView() { m_WindowManager = new wf::WindowManager(m_GlobalState.get()); - osg::ref_ptr<osgUtil::SceneView> windowView = m_WindowManager->getSceneView(); - windowView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT); } void VirtualScene::buildScene() { Modified: branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp =================================================================== --- branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp 2007-10-25 19:05:48 UTC (rev 2187) +++ branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp 2007-10-26 14:33:59 UTC (rev 2188) @@ -102,7 +102,7 @@ sv->getCullVisitor()->setCullingMode(osgUtil::CullVisitor::ENABLE_ALL_CULLING); sv->setCullMask(SceneMasks::CULL_ONLY | SceneMasks::NORMAL); sv->getUpdateVisitor()->setTraversalMask(SceneMasks::UPDATE_ONLY | SceneMasks::NORMAL); - sv->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT); + sv->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT); m_View = sv; |
|
From: <sv...@ww...> - 2007-10-25 19:05:56
|
Author: nsmoooose Date: 2007-10-25 12:05:48 -0700 (Thu, 25 Oct 2007) New Revision: 2187 Modified: branches/osg_2_0/csp/cspsim/sound/OggLoader.cpp Log: In windows it isn't safe to send a FILE structure between dll:s (ov_open). Usually because of different versions of vc runtime. Using the manually built devpack this call isn't succeeding. By using the much simpler ov_fopen method this issue is solved. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2187 Modified: branches/osg_2_0/csp/cspsim/sound/OggLoader.cpp =================================================================== --- branches/osg_2_0/csp/cspsim/sound/OggLoader.cpp 2007-10-07 17:46:29 UTC (rev 2186) +++ branches/osg_2_0/csp/cspsim/sound/OggLoader.cpp 2007-10-25 19:05:48 UTC (rev 2187) @@ -37,13 +37,12 @@ class OggLoader: public SoundFileLoader { public: static bool loadOgg(std::string const &filename, std::string &data, ALenum &format, ALsizei &freq) { - FILE *f = fopen(filename.c_str(), "rb"); - if (!f) { + OggVorbis_File ogg; + int open_result = ov_fopen(const_cast<char*>(filename.c_str()), &ogg); + if(open_result < 0) { CSPLOG(ERROR, AUDIO) << "error opening file sound sample " << filename; return false; } - OggVorbis_File ogg; - ov_open(f, &ogg, NULL, 0); vorbis_info *info = ov_info(&ogg, -1); format = (info->channels == 1) ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16; freq = info->rate; |
|
From: <sv...@ww...> - 2007-10-07 17:46:37
|
Author: nsmoooose Date: 2007-10-07 10:46:29 -0700 (Sun, 07 Oct 2007) New Revision: 2186 Modified: branches/osg_2_0/csp/SConstruct Log: Fixed some building issues when using a newer devpack from windows. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2186 Modified: branches/osg_2_0/csp/SConstruct =================================================================== --- branches/osg_2_0/csp/SConstruct 2007-09-30 09:34:44 UTC (rev 2185) +++ branches/osg_2_0/csp/SConstruct 2007-10-07 17:46:29 UTC (rev 2186) @@ -61,9 +61,9 @@ config = [ # 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=['libvorbis', 'libvorbisfile'], headers=[('vorbis', 'vorbisfile.h')]), - build.DevpackConfig(dlls='libogg', headers=[('ogg', 'ogg.h')]), + build.DevpackConfig(dlls='oalpp', headers=[('openalpp', 'sounddata')]), + build.DevpackConfig(dlls=['vorbis', 'vorbisfile'], headers=[('vorbis', 'vorbisfile.h')]), + build.DevpackConfig(dlls='ogg', headers=[('ogg', 'ogg.h')]), ]) build.ExternalLibrary( @@ -85,10 +85,9 @@ 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.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', 'osgViewer', 'osgText', 'osgUtil', 'OpenThreads'], headers=[('osg', 'Depth'), ('osgText', 'Font')]), ]) build.ExternalLibrary( |
|
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); |
|
From: <sv...@ww...> - 2007-09-30 09:31:29
|
Author: nsmoooose Date: 2007-09-30 02:31:16 -0700 (Sun, 30 Sep 2007) New Revision: 2184 Modified: branches/osg_2_0/csp/SConstruct branches/osg_2_0/csp/cspsim/VirtualScene.cpp branches/osg_2_0/csp/cspsim/hud/DisplayTools.cpp branches/osg_2_0/csp/cspsim/sky/StarDome.cpp branches/osg_2_0/csp/cspsim/sky/StarDome.h branches/osg_2_0/csp/cspsim/sound/Loader.cpp branches/osg_2_0/csp/cspsim/sound/OggLoader.cpp branches/osg_2_0/csp/cspsim/sound/Sample.cpp branches/osg_2_0/csp/cspsim/sound/Sample.h branches/osg_2_0/csp/modules/chunklod/ChunkLodDrawable branches/osg_2_0/csp/modules/chunklod/ChunkLodDrawable.cpp branches/osg_2_0/csp/modules/demeter/DemeterDrawable.cpp branches/osg_2_0/csp/modules/demeter/DemeterDrawable.h Log: switched to OpenSceneGraph 2.0 and osgAl 0.6.1, there are some problems with scons config command but it should be possible to build source Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2184 Diff omitted (10413 bytes). |
|
From: <sv...@ww...> - 2007-09-30 09:17:55
|
Author: kondzik Date: 2007-09-30 02:17:47 -0700 (Sun, 30 Sep 2007) New Revision: 2183 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: switched to OpenSceneGraph 2.0 and osgAl 0.6.1, there are some problems with scons config command but it should be possible to build source Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2183 Modified: trunk/csp/SConstruct =================================================================== --- trunk/csp/SConstruct 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/SConstruct 2007-09-30 09:17:47 UTC (rev 2183) @@ -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='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.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.DevpackConfig(dlls='osgal', headers=[('osgAL', 'SoundNode')]), - build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgProducer', 'osgText', 'osgUtil', 'OpenThreadsWin32', 'Producer'], headers=[('osg', 'Depth'), ('osgText', 'Font')]), + build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgViewer', 'osgText', 'osgUtil', 'OpenThreadsWin32'], headers=[('osg', 'Depth'), ('osgText', 'Font')]), ]) build.ExternalLibrary( Modified: trunk/csp/cspsim/VirtualScene.cpp =================================================================== --- trunk/csp/cspsim/VirtualScene.cpp 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/VirtualScene.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -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 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/hud/DisplayTools.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -185,7 +185,7 @@ #if OSG_VERSION_MAJOR == 1 && OSG_VERSION_MINOR > 0 geode()->removeDrawables(0, geode()->getNumDrawables()); #else - geode()->removeDrawable(0, geode()->getNumDrawables()); + geode()->removeDrawables(0, geode()->getNumDrawables()); #endif } Modified: trunk/csp/cspsim/sky/StarDome.cpp =================================================================== --- trunk/csp/cspsim/sky/StarDome.cpp 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/sky/StarDome.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -173,7 +173,7 @@ assert(0); } -void StarDome::drawImplementation(osg::State&) const { +void StarDome::drawImplementation(osg::RenderInfo&) 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 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/sky/StarDome.h 2007-09-30 09:17:47 UTC (rev 2183) @@ -41,7 +41,7 @@ virtual ~StarDome(); - virtual void drawImplementation(osg::State&) const; + virtual void drawImplementation(osg::RenderInfo&) 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 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/sound/Loader.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -26,7 +26,7 @@ #include <csp/csplib/util/Log.h> #include <csp/csplib/util/FileUtility.h> -#include <openalpp/sample.h> +#include <openalpp/Sample> #include <csp/csplib/util/undef.h> #include <map> Modified: trunk/csp/cspsim/sound/OggLoader.cpp =================================================================== --- trunk/csp/cspsim/sound/OggLoader.cpp 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/sound/OggLoader.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -27,7 +27,7 @@ #include <csp/csplib/util/Log.h> #include <csp/csplib/util/Uniform.h> -#include <openalpp/sample.h> +#include <openalpp/Sample> #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 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/sound/Sample.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -30,7 +30,7 @@ #include <csp/csplib/util/osg.h> #include <osgAL/SoundState> -#include <openalpp/sample.h> +#include <openalpp/Sample> #include <csp/csplib/util/undef.h> Modified: trunk/csp/cspsim/sound/Sample.h =================================================================== --- trunk/csp/cspsim/sound/Sample.h 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/cspsim/sound/Sample.h 2007-09-30 09:17:47 UTC (rev 2183) @@ -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 openalpp::ref_ptr<openalpp::Sample> m_Sample; + mutable osg::ref_ptr<openalpp::Sample> m_Sample; void loadSample() const; }; Modified: trunk/csp/modules/chunklod/ChunkLodDrawable =================================================================== --- trunk/csp/modules/chunklod/ChunkLodDrawable 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/modules/chunklod/ChunkLodDrawable 2007-09-30 09:17:47 UTC (rev 2183) @@ -57,7 +57,7 @@ void setChunkLodTree(ChunkLodTree *tree); ChunkLodTree* getChunkLodTree() { return _tree; } const ChunkLodTree* getChunkLodTree() const { return _tree; } - virtual void drawImplementation(osg::State &) const; + virtual void drawImplementation(osg::RenderInfo &) const; protected: virtual osg::BoundingBox computeBound() const; Modified: trunk/csp/modules/chunklod/ChunkLodDrawable.cpp =================================================================== --- trunk/csp/modules/chunklod/ChunkLodDrawable.cpp 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/modules/chunklod/ChunkLodDrawable.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -104,7 +104,7 @@ } } -void ChunkLodDrawable::drawImplementation(osg::State& state) const { +void ChunkLodDrawable::drawImplementation(osg::RenderInfo& info) const { static int frame = 0; _triangles_rendered = 0; @@ -117,21 +117,21 @@ } ChunkLodTree *tree = const_cast<ChunkLodTree*>(_tree); - osg::Matrix mv = state.getModelViewMatrix(); + osg::Matrix mv = info.getState()->getModelViewMatrix(); mv.invert(mv); osg::Vec3 viewpoint = mv.getTrans(); - state.disableTexCoordPointersAboveAndIncluding(0); // NEW - state.disableAllVertexArrays(); + info.getState()->disableTexCoordPointersAboveAndIncluding(0); // NEW + info.getState()->disableAllVertexArrays(); - _details->enable(state); + _details->enable(*info.getState()); osg::Timer t; osg::Timer_t update_t = t.tick(); - tree->update(viewpoint, state); + tree->update(viewpoint, *info.getState()); //osg::Timer_t render_t = t.tick(); - _triangles_rendered = tree->render(state, *_details); + _triangles_rendered = tree->render(*info.getState(), *_details); _triangle_count += _triangles_rendered; @@ -153,11 +153,11 @@ } - _details->disable(state); + _details->disable(*info.getState()); - state.disableAllVertexArrays(); - state.dirtyTexCoordPointersAboveAndIncluding(0); - state.setActiveTextureUnit(0); + info.getState()->disableAllVertexArrays(); + info.getState()->dirtyTexCoordPointersAboveAndIncluding(0); + info.getState()->setActiveTextureUnit(0); frame++; } Modified: trunk/csp/modules/demeter/DemeterDrawable.cpp =================================================================== --- trunk/csp/modules/demeter/DemeterDrawable.cpp 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/modules/demeter/DemeterDrawable.cpp 2007-09-30 09:17:47 UTC (rev 2183) @@ -89,7 +89,7 @@ return "DemeterDrawable"; } -void DemeterDrawable::drawImplementation(State& /*state*/) const +void DemeterDrawable::drawImplementation(RenderInfo& /*state*/) const { if (m_RefTerrain.valid()) { @@ -227,7 +227,7 @@ return "DemeterLatticeDrawable"; } -void DemeterLatticeDrawable::drawImplementation(State& /*state*/) const +void DemeterLatticeDrawable::drawImplementation(RenderInfo& /*state*/) const { if (m_RefTerrainLattice.valid()) { Modified: trunk/csp/modules/demeter/DemeterDrawable.h =================================================================== --- trunk/csp/modules/demeter/DemeterDrawable.h 2007-09-30 07:35:27 UTC (rev 2182) +++ trunk/csp/modules/demeter/DemeterDrawable.h 2007-09-30 09:17:47 UTC (rev 2183) @@ -58,7 +58,7 @@ Terrain* GetTerrain() { return m_RefTerrain.get(); } const Terrain* GetTerrain() const { return m_RefTerrain.get(); } - virtual void drawImplementation(osg::State&) const; + virtual void drawImplementation(osg::RenderInfo&) const; protected: @@ -103,7 +103,7 @@ void addTerrain( Terrain* pTerrain ); void removeTerrain( Terrain * pTerrain ); - virtual void drawImplementation(osg::State&) const; + virtual void drawImplementation(osg::RenderInfo&) const; virtual void SetCameraPosition(float, float, float); |
|
From: <sv...@ww...> - 2007-09-30 07:35:59
|
Author: nsmoooose Date: 2007-09-30 00:35:27 -0700 (Sun, 30 Sep 2007) New Revision: 2182 Added: branches/osg_2_0/ Log: A new branch for upgrading to OpenSceneGraph 2.0. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2182 Copied: branches/osg_2_0 (from rev 2181, trunk) |
|
From: <sv...@ww...> - 2007-09-26 17:41:17
|
Author: nsmoooose Date: 2007-09-26 10:41:00 -0700 (Wed, 26 Sep 2007) New Revision: 2181 Added: trunk/csp/cspsim/wf/ScrollBar.cpp trunk/csp/cspsim/wf/ScrollBar.h Modified: trunk/csp/cspsim/SConscript trunk/csp/cspsim/swig/wf.i trunk/csp/cspsim/wf/Button.cpp trunk/csp/cspsim/wf/Button.h trunk/csp/cspsim/wf/Check.cpp trunk/csp/cspsim/wf/Check.h trunk/csp/cspsim/wf/CheckBox.cpp trunk/csp/cspsim/wf/CheckBox.h trunk/csp/cspsim/wf/Container.cpp trunk/csp/cspsim/wf/Container.h trunk/csp/cspsim/wf/Control.cpp trunk/csp/cspsim/wf/Control.h trunk/csp/cspsim/wf/Image.cpp trunk/csp/cspsim/wf/Image.h trunk/csp/cspsim/wf/Label.cpp trunk/csp/cspsim/wf/Label.h trunk/csp/cspsim/wf/ListBox.cpp trunk/csp/cspsim/wf/ListBox.h trunk/csp/cspsim/wf/ListBoxItem.cpp trunk/csp/cspsim/wf/ListBoxItem.h trunk/csp/cspsim/wf/Model.cpp trunk/csp/cspsim/wf/Model.h trunk/csp/cspsim/wf/MultiControlContainer.cpp trunk/csp/cspsim/wf/MultiControlContainer.h trunk/csp/cspsim/wf/SingleControlContainer.cpp trunk/csp/cspsim/wf/SingleControlContainer.h trunk/csp/cspsim/wf/Tab.cpp trunk/csp/cspsim/wf/Tab.h trunk/csp/cspsim/wf/TableControlContainer.cpp trunk/csp/cspsim/wf/TableControlContainer.h trunk/csp/cspsim/wf/Window.cpp trunk/csp/cspsim/wf/Window.h trunk/csp/data/ui/scripts/utils.py Log: Removed the getName() method from all controls except Control base class. The class name is now sent as a parameter to the constructor of the Control base class. Started to implement scrollbar controls. (ScrollBar.h, ScrollBar.cpp) Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2181 Diff omitted (27015 bytes). |
|
From: <sv...@ww...> - 2007-09-15 20:43:32
|
Author: nsmoooose Date: 2007-09-15 13:43:24 -0700 (Sat, 15 Sep 2007) New Revision: 2180 Modified: trunk/csp/cspsim/battlefield/LocalBattlefield.cpp trunk/csp/cspsim/battlefield/LocalBattlefield.h trunk/csp/cspsim/stores/StoresManagementSystem.cpp trunk/csp/cspsim/swig/CSPSim.i trunk/csp/data/ui/scripts/windows/mainmenu.py trunk/csp/data/ui/tutorials/takeoff/takeoff.py Log: When you pressed the 'Instant Action' button the second time all aircrafts where computer controlled. Fixed this issue by: Changing this behavior by adding a new parameter to the __test__addLocalHumanUnit method. The new method takes a boolean indicating if it is a human or agent controlled object. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2180 Modified: trunk/csp/cspsim/battlefield/LocalBattlefield.cpp =================================================================== --- trunk/csp/cspsim/battlefield/LocalBattlefield.cpp 2007-09-11 17:55:09 UTC (rev 2179) +++ trunk/csp/cspsim/battlefield/LocalBattlefield.cpp 2007-09-15 20:43:24 UTC (rev 2180) @@ -559,7 +559,7 @@ _assignObjectId(object, id); } -void LocalBattlefield::__test__addLocalHumanUnit(Unit const &unit) { +void LocalBattlefield::__test__addLocalHumanUnit(Unit const &unit, bool human) { assert(!unit->isStatic()); assert(!unit->isHuman()); assert(unit->id() == 0); @@ -570,12 +570,8 @@ LocalUnitWrapper *wrapper = new LocalUnitWrapper(unit, 0); addUnit(wrapper); - // XXX hack to force the first object to be player controlled. - // all other objects default to agent controlled. - static bool first = true; - if (first) { - first = false; - setHumanUnit(wrapper, true); + if (human) { + setHumanUnit(wrapper, human); } unit->registerUpdate(m_UnitUpdateMaster.get()); Modified: trunk/csp/cspsim/battlefield/LocalBattlefield.h =================================================================== --- trunk/csp/cspsim/battlefield/LocalBattlefield.h 2007-09-11 17:55:09 UTC (rev 2179) +++ trunk/csp/cspsim/battlefield/LocalBattlefield.h 2007-09-15 20:43:24 UTC (rev 2180) @@ -82,7 +82,7 @@ void setCamera(Vector3 const &eye_point, const Vector3& look_pos, const Vector3& up_vec); // testing interface - void __test__addLocalHumanUnit(Unit const &unit); + void __test__addLocalHumanUnit(Unit const &unit, bool human); inline bool isConnectionActive() const { return m_ConnectionState == CONNECTION_ACTIVE; Modified: trunk/csp/cspsim/stores/StoresManagementSystem.cpp =================================================================== --- trunk/csp/cspsim/stores/StoresManagementSystem.cpp 2007-09-11 17:55:09 UTC (rev 2179) +++ trunk/csp/cspsim/stores/StoresManagementSystem.cpp 2007-09-15 20:43:24 UTC (rev 2180) @@ -194,7 +194,7 @@ object->setVelocity(parent->getVelocity() + (parent->getAngularVelocity() ^ parent->getAttitude().rotate(store_position)) + ejection_velocity); object->setAngularVelocity(parent->getAngularVelocity() + ejection_angular_velocity); - CSPSim::theSim->getBattlefield()->__test__addLocalHumanUnit(object); // XXX TOTAL HACK FOR NOW!!! + CSPSim::theSim->getBattlefield()->__test__addLocalHumanUnit(object, false); // XXX TOTAL HACK FOR NOW!!! } } Modified: trunk/csp/cspsim/swig/CSPSim.i =================================================================== --- trunk/csp/cspsim/swig/CSPSim.i 2007-09-11 17:55:09 UTC (rev 2179) +++ trunk/csp/cspsim/swig/CSPSim.i 2007-09-15 20:43:24 UTC (rev 2180) @@ -28,7 +28,7 @@ #include <iostream> void _createVehicleHelper(csp::CSPSim *self, const char *path, csp::Vector3 position, - csp::Vector3 velocity, csp::Vector3 attitude) { + csp::Vector3 velocity, csp::Vector3 attitude, bool human) { csp::Ref<csp::DynamicObject> obj = self->getDataManager().getObject(path); if (!obj) { std::cout << "WARNING: Failed to create object '" << path << "'\n"; @@ -40,7 +40,7 @@ attitude *= 3.1416 / 180.0; q_attitude.makeRotate(attitude.x(), attitude.y(), -attitude.z()); obj->setAttitude(q_attitude); - self->getBattlefield()->__test__addLocalHumanUnit(obj); + self->getBattlefield()->__test__addLocalHumanUnit(obj, human); if (!self->getActiveObject()) self->setActiveObject(obj); } @@ -100,14 +100,14 @@ %extend CSPSim { void createVehicle(const char *path, csp::Vector3 position, - csp::Vector3 velocity, csp::Vector3 attitude) { - _createVehicleHelper(self, path, position, velocity, attitude); + csp::Vector3 velocity, csp::Vector3 attitude, bool human) { + _createVehicleHelper(self, path, position, velocity, attitude, human); } void createVehicle(const char *path, csp::LLA lla, - csp::Vector3 velocity, csp::Vector3 attitude) { + csp::Vector3 velocity, csp::Vector3 attitude, bool human) { csp::Ref<const csp::Projection> map = csp::CSPSim::theSim->getTheater()->getTerrain()->getProjection(); csp::Vector3 position = map->convert(lla); - _createVehicleHelper(self, path, position, velocity, attitude); + _createVehicleHelper(self, path, position, velocity, attitude, human); } std::string const &getTerrainName() { return self->getTheater()->getTerrain()->getName(); } int getTerrainVersion() { return self->getTheater()->getTerrain()->getVersion(); } Modified: trunk/csp/data/ui/scripts/windows/mainmenu.py =================================================================== --- trunk/csp/data/ui/scripts/windows/mainmenu.py 2007-09-11 17:55:09 UTC (rev 2179) +++ trunk/csp/data/ui/scripts/windows/mainmenu.py 2007-09-15 20:43:24 UTC (rev 2180) @@ -63,8 +63,8 @@ vec = csp.csplib.Vector3 m2k = "sim:vehicles.aircraft.m2k" f16dj = "sim:vehicles.aircraft.f16dj" - self.cspsim.createVehicle(f16dj, vec(-29495, -10530, 91.3), vec(0, 0, 0), vec(0.0, 0.0, 180.0)) - self.cspsim.createVehicle(f16dj, vec(-29510, -10530, 91.3), vec(0, 0, 0), vec(0.0, 0.0, 180.0)) + self.cspsim.createVehicle(f16dj, vec(-29495, -10530, 91.3), vec(0, 0, 0), vec(0.0, 0.0, 180.0), True) + self.cspsim.createVehicle(f16dj, vec(-29510, -10530, 91.3), vec(0, 0, 0), vec(0.0, 0.0, 180.0), False) gameScreenManager = GameScreenManager(self.cspsim) Modified: trunk/csp/data/ui/tutorials/takeoff/takeoff.py =================================================================== --- trunk/csp/data/ui/tutorials/takeoff/takeoff.py 2007-09-11 17:55:09 UTC (rev 2179) +++ trunk/csp/data/ui/tutorials/takeoff/takeoff.py 2007-09-15 20:43:24 UTC (rev 2180) @@ -68,7 +68,7 @@ # We add a single aircraft at the airport. vec = csp.csplib.Vector3 f16dj = "sim:vehicles.aircraft.f16dj" - self.cspsim.createVehicle(f16dj, vec(-29495, -10530, 91.3), vec(0, 0, 0), vec(0.0, 0.0, 180.0)) + self.cspsim.createVehicle(f16dj, vec(-29495, -10530, 91.3), vec(0, 0, 0), vec(0.0, 0.0, 180.0), True) # Set the date and time. We want daylight for the first mission. date = csp.csplib.SimDate(2007,6,12,10,0,0) |
|
From: <sv...@ww...> - 2007-09-11 17:55:16
|
Author: nsmoooose Date: 2007-09-11 10:55:09 -0700 (Tue, 11 Sep 2007) New Revision: 2179 Modified: trunk/csp/cspsim/CSPSim.cpp trunk/csp/cspsim/CSPSim.h trunk/csp/cspsim/LogoScreen.cpp trunk/csp/cspsim/LogoScreen.h trunk/csp/cspsim/MenuScreen.cpp trunk/csp/cspsim/MenuScreen.h trunk/csp/cspsim/VirtualScene.cpp trunk/csp/cspsim/VirtualScene.h trunk/csp/cspsim/swig/Screens.i trunk/csp/cspsim/swig/wf.i trunk/csp/cspsim/wf/WindowManager.cpp trunk/csp/cspsim/wf/WindowManager.h Log: It is now possible to return to the main menu from the simulation. All osg::SceneView instances will use the same osg::State object. The osg::State object we use is stored in the CSPSim singleton since this singleton is responsible for starting the various screens (LogoScreen, MenuScreen, GameScreen) etc. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2179 Diff omitted (12551 bytes). |
|
From: <sv...@ww...> - 2007-09-10 20:33:54
|
Author: nsmoooose Date: 2007-09-10 13:29:39 -0700 (Mon, 10 Sep 2007) New Revision: 2178 Removed: branches/first_tutorial/ Log: Deleted the first_tutorial branch since it has been merged back to the trunk. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2178 |
|
From: <sv...@ww...> - 2007-09-02 09:51:31
|
Author: nsmoooose Date: 2007-09-02 02:51:22 -0700 (Sun, 02 Sep 2007) New Revision: 2177 Added: trunk/csp/cspsim/wf/Style.cpp trunk/csp/data/ui/scripts/windows/tutorials.py trunk/csp/data/ui/themes/default/css_help.xml trunk/csp/data/ui/themes/default/css_top.xml trunk/csp/data/ui/themes/default/images/input-keyboard-button-a.png trunk/csp/data/ui/themes/default/images/input-keyboard-button-arrowup.png trunk/csp/data/ui/themes/default/images/input-keyboard-button-arrowup.svg trunk/csp/data/ui/themes/default/images/input-keyboard-button-equals.png trunk/csp/data/ui/themes/default/images/input-keyboard-button-g.png trunk/csp/data/ui/themes/default/images/input-keyboard-button-minus.png trunk/csp/data/ui/themes/default/images/input-keyboard-button.svg trunk/csp/data/ui/tutorials/ trunk/csp/data/ui/tutorials/__init__.py trunk/csp/data/ui/tutorials/index.xml trunk/csp/data/ui/tutorials/takeoff/ trunk/csp/data/ui/tutorials/takeoff/__init__.py trunk/csp/data/ui/tutorials/takeoff/help.xml trunk/csp/data/ui/tutorials/takeoff/mission.xml trunk/csp/data/ui/tutorials/takeoff/takeoff.py trunk/csp/data/ui/tutorials/takeoff/takeoff_speed.png Removed: trunk/csp/data/ui/themes/default/images/Thumbs.db trunk/csp/data/ui/tutorials/__init__.py trunk/csp/data/ui/tutorials/index.xml trunk/csp/data/ui/tutorials/takeoff/ trunk/csp/data/ui/tutorials/takeoff/__init__.py trunk/csp/data/ui/tutorials/takeoff/help.xml trunk/csp/data/ui/tutorials/takeoff/mission.xml trunk/csp/data/ui/tutorials/takeoff/takeoff.py trunk/csp/data/ui/tutorials/takeoff/takeoff_speed.png Modified: trunk/csp/cspsim/CSPSim.cpp trunk/csp/cspsim/CSPSim.h trunk/csp/cspsim/GameScreen.cpp trunk/csp/cspsim/SConscript trunk/csp/cspsim/swig/CSPSim.i trunk/csp/cspsim/wf/CheckBox.cpp trunk/csp/cspsim/wf/Container.cpp trunk/csp/cspsim/wf/Container.h trunk/csp/cspsim/wf/Control.cpp trunk/csp/cspsim/wf/Control.h trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp trunk/csp/cspsim/wf/ControlGeometryBuilder.h trunk/csp/cspsim/wf/Image.h trunk/csp/cspsim/wf/Label.cpp trunk/csp/cspsim/wf/Label.h trunk/csp/cspsim/wf/ListBox.cpp trunk/csp/cspsim/wf/ListBox.h trunk/csp/cspsim/wf/ListBoxItem.cpp trunk/csp/cspsim/wf/ListBoxItem.h trunk/csp/cspsim/wf/ResourceLocator.h trunk/csp/cspsim/wf/Serialization.cpp trunk/csp/cspsim/wf/SingleControlContainer.cpp trunk/csp/cspsim/wf/Style.h trunk/csp/cspsim/wf/StyleBuilder.cpp trunk/csp/cspsim/wf/StyleBuilder.h trunk/csp/cspsim/wf/Tab.cpp trunk/csp/cspsim/wf/TableControlContainer.cpp trunk/csp/cspsim/wf/Window.cpp trunk/csp/cspsim/wf/Window.h trunk/csp/cspsim/wf/WindowManager.cpp trunk/csp/data/ui/help/aircraft_controls.xml trunk/csp/data/ui/help/f16_first_steps.xml trunk/csp/data/ui/help/index.xml trunk/csp/data/ui/help/joystick.xml trunk/csp/data/ui/help/mouse.xml trunk/csp/data/ui/help/view_controls.xml trunk/csp/data/ui/library/index.xml trunk/csp/data/ui/localization/english/global.xml trunk/csp/data/ui/localization/german/global.xml trunk/csp/data/ui/localization/svenska/global.xml trunk/csp/data/ui/scripts/gamescreenmanager.py trunk/csp/data/ui/scripts/windows/mainmenu.py trunk/csp/data/ui/themes/default/main_menu.xml trunk/csp/data/ui/themes/default/messagebox.xml trunk/csp/data/ui/themes/default/options.xml trunk/csp/data/ui/themes/default/pause.xml trunk/csp/data/ui/themes/default/quit_resume.xml trunk/csp/data/ui/themes/default/styles.xml trunk/csp/data/ui/themes/default/topmenu.xml trunk/csp/data/ui/window_document.xsd trunk/csp/tools/hid/maps/aircraft-core.map Log: Merged first_tutorial branch into the trunk. The following changes is included: * A very simple tutorial where you are required to take off. This tutorial is starting in the middle of the day and you have a help page docked to the right of the screen with needed information to complete it. * General and object statistics isn't displayed as default. They are still available using F12 key. Changes to the csp::wf::Style object: * Converted to a class from a struct. * Now inherits from the csp::Referenced * All style members are now accessed with set and get methods. * Added width and height. Height, width, top and left can be set with percentage. For example 30% width. * Uses the serialize method when comparing style objects. These changes makes it possible for the Style object to send signals when something change (not implemented yet). The Control that owns the style object can listen to these signals and rebuild the geometry when width, background color etc changes. Other changes: * Removed some common width, height and position from window xml files and placed them in css document. * The StyleBuilder class is also using the serialize method to build the new style object. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2177 Diff omitted (188190 bytes). |
