FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,023 Commits 1 Branch 26 Tags 73 MiB
228fd04a19
Commit Graph

135 Commits

Author SHA1 Message Date
Robert Osfield
228fd04a19 Removed the exclusion of CullSettings from the genwrapper.conf, and then changed the CullStack RefMatrix& methods to RefMatrix* 
as the RefMatrix& versions caused the wrappers to fail.
 2007-02-21 13:48:01 +00:00
Robert Osfield
416e6486f7 Added inhertCullSettings before SceneView::cull() calls 2007-02-20 16:46:53 +00:00
Robert Osfield
d8e6436dc1 From Andre Garneau: 
* Fix for the aspect ratio not being properly set when screens have
different aspect ratios.
* Minor fix for makeCurrentImplementation being called directly instead of
makeCurrent() causing the owning thread pointer not being tracked
* Fix for osglauncher so that it sets its update text regions to DYNAMIC to
prevent multi-threading issues.
 2007-02-18 14:21:16 +00:00
Robert Osfield
526ba8c506 From Stephan Huber, "I added a bool to GraphicsContext::Traits to indicate wether to use the 
multithreaded-opengl-engine on os x or not. I set its default to false,
perhaps other os x users can test this setting with their data/apps, to
see if we can enable it by default.

I changed also the borderless-window-type, so expos?works correctly."
 2007-02-16 13:33:29 +00:00
Robert Osfield
644c92218d Addd an #ifdef _WIN32 to force SingleThreaded usage under Windows when no 
threading model is specified.
 2007-02-15 15:06:18 +00:00
Robert Osfield
ed01ae9387 From André Garneau, Win32 build fixes 2007-02-15 14:04:22 +00:00
Robert Osfield
3fe4be6e70 Added context sharing support. 2007-02-15 12:24:04 +00:00
Robert Osfield
4f2474ece8 Fixed handling of warp pointer for when its called at startup and the 
event queue isn't yet initialized the window range.
 2007-02-15 12:11:16 +00:00
Robert Osfield
91ab187ee1 Added checks into Viewer set up of Camera stats so that stats are reused if already present. 
Added use of ref_ptr<osg::Stats> into StatsHandler's callbacks
 2007-02-15 01:45:44 +00:00
Robert Osfield
87ff8e2b55 Added support for sharing context to GraphicsWindowX11 2007-02-14 20:14:45 +00:00
Robert Osfield
f82c34ff11 Added getState()->setGraphicsContext(this); to the various GrpahicsWindow implementations 2007-02-14 17:28:33 +00:00
Robert Osfield
d81d579f07 Changed the report of lack of WGL_SWAP_METHOD_ARB so that it is INFO rather than WARN. 2007-02-14 14:58:46 +00:00
Robert Osfield
ff126c3d1d Added OSG_RUN_FRAME_COUNT env var which enables a limited run of specified 
frame numbers when Viewer::run is called.
 2007-02-14 14:36:38 +00:00
Robert Osfield
115cf528a1 Removed debugging run method. 2007-02-14 12:00:33 +00:00
Robert Osfield
89c99a88fa Added computeDataVariance method into osg::Object and implementations in Drawable and StateSet, 
and calling of osgUtil::StaticObjectDetectionVisitor in osgViewer::Viewer
 2007-02-14 11:24:42 +00:00
Robert Osfield
1138c312b7 Changed the DeleteHandler so by default it doesn't cache objects 2007-02-13 17:39:42 +00:00
Robert Osfield
fe67a91e83 Added OSG_THREADING environmental variable to osgViewer::Viewer::suggestBestThreadingModel 2007-02-13 16:03:35 +00:00
Robert Osfield
d5f2a35a20 Added automatic scaling and translation of help to make sure it always 
fits on screen
 2007-02-12 13:51:24 +00:00
Robert Osfield
fe177e42d5 Added osgViewer::HelpHandler 2007-02-12 13:39:18 +00:00
Robert Osfield
2a9d2bb25a Changed GraphicsWindowX11 so that it creates two Display* connextions to the Xserver, 
one for the graphics thread, one for the main thread that querries events
 2007-02-09 13:51:28 +00:00
Robert Osfield
162d08f541 Added #if #else #endif blocks to Viewer::realize() and run() for the purposes of testing 2007-02-09 13:36:44 +00:00
Robert Osfield
4f79634bcd From André Garneau, "Attached is a fix for the hang occuring on Win32 when the thread model is changed. 
The issue was caused by the mutex in the ViewerDoubleBufferRenderingOperation being released even though they were not owned. This was causing the underlying critical section object lock count values becoming negative; the next time the lock was acquired it would block because of that."
 2007-02-08 22:36:16 +00:00
Robert Osfield
19608966d0 Added the threading model to stats 2007-02-08 12:47:35 +00:00
Robert Osfield
0c59589038 Added check in setThreadingModel so that it only sets up threading if the viewer is realized 2007-02-08 12:21:37 +00:00
Robert Osfield
9eb4beea52 Fixed setThreadModel method so that is doesn't try to set up threading unless 
the viewer is realized
 2007-02-08 12:20:40 +00:00
Robert Osfield
b3b420de5d Updated the handling of closing of windows 2007-02-08 12:14:26 +00:00
Robert Osfield
34847e4135 Added better clean up of paramters on X display in GraphicsWindowX11:closeImplementation 2007-02-08 11:30:57 +00:00
Robert Osfield
10593edfd0 From Stefan Eilemann, addd more extensive XErrorHandler output 2007-02-08 11:26:04 +00:00
Robert Osfield
6d323f235a Added setting of the DatabasePager's affinity. 2007-02-08 11:24:29 +00:00
Robert Osfield
2826dafa80 From Stephan Huber, "thomas kirk schrieb: 
> I put this at the end of realizeImplementation; someone with better knowledge
> of Carbon programming may see a more appropriate place for the call.

I moved your code into the ctor of the OSXCarbonWindowingSystemInterface
so it get called only once. Can you test it again, if it works on your side?

I also disabled multithreaded-rendering because it slowed down the
rendering on my machine by a factor of 3. Perhaps we can make it
optional to test it on other machines.

I had some problems implementing pbuffer-support for os x and stopped it
for now until I have more time to investigate the issues.
"
 2007-02-06 20:03:13 +00:00
Robert Osfield
e0163c6ae5 From André Garneau, "Attached is an improved Win32 keyboard handler that should now map key events similarly to the X11 implementation: 
* Key event handler now reports left or right SHIFT, CTRL and ALT key variants on key press and release events."
 2007-02-06 17:34:28 +00:00
Robert Osfield
c5776b1bf3 From Stefan Eileman, fixes for OSX gmake build to allow AGL or X11 implementation of osgViewer 2007-02-06 17:01:20 +00:00
Robert Osfield
2236c0576e Re-enabled processor affinity 2007-02-06 16:23:19 +00:00
Robert Osfield
3de205ec45 Added new Viewer threading model options 2007-02-06 14:38:08 +00:00
Robert Osfield
bad2a4cc7c Further work on support for ThreadPerCamera, and improved the efficiency of SingleThraeded 2007-02-06 11:03:13 +00:00
Robert Osfield
cfe737c552 Tweak API and updated wrappers to get wrappers to build 2007-02-05 14:56:41 +00:00
Robert Osfield
69da91620f Convert GraphicsThread/GraphicsOperation to more generic OperationsThread/Operation. 
This paves the way to running cull traversals in seperate threads.

Updated wrappers
 2007-02-02 22:30:36 +00:00
Robert Osfield
6d9641a78b Added a concrete osg::DeleteHandler implementation which provides support for 
retain objects for several frames before deleting them.  Also added RenderStageCache
into CullVistor.cpp that is used for handling RTT osg::Camera's that are being
used in double buffered SceneView usage.
 2007-02-02 12:41:13 +00:00
Robert Osfield
158921574c Improved the toggling on/off of thrading modes 2007-02-01 11:07:53 +00:00
Robert Osfield
8dfc5155f4 Further work on new threading model. 2007-01-31 22:24:20 +00:00
Robert Osfield
019cdd9116 Removed old #if #else #end block 2007-01-31 11:12:58 +00:00
Robert Osfield
493f799a6e Refactored the ViewerRenderingOperation so that the timer querry code is in a separate ViewerQuerySupport class 2007-01-30 17:38:02 +00:00
Robert Osfield
03dbbd5048 Added automatic aspect ratio adjustmeent to View::setUpViewAcrossAllScreens() and setUpViewOnSingleScreen. 2007-01-30 15:37:30 +00:00
Robert Osfield
b8d98a2cfe Added support for compute average stats attributes in inverse space to improve 
the quality of frame rate reporting.
 2007-01-30 13:48:04 +00:00
Robert Osfield
ecedc8d86a Added Stats::collectStats(string,bool) controls, getAveragedAttribute methods into osg::Stats class, and 
related support into osgViewer::Viewer and osgViewer::StatsHandler.

Added lazy updating of text in StatsHandler HUD to minimize the impact of
slow text updating on observed frame rates.
 2007-01-30 11:40:23 +00:00
Robert Osfield
b887226775 Made _useMainThreadForRenderingalTraversal(false) 2007-01-29 22:59:04 +00:00
Robert Osfield
fd0ea388c2 Began work on providing support for threading camera cull traversals in parallel with 
the previous frames draw traversal.  Changes range from osg::State, through osgUtil::RenderBin, through to osgViewer
 2007-01-29 22:44:29 +00:00
Robert Osfield
6835996c21 Added very simple relaxing of traits by dividing required red, green, blue, alpha and depth by 2. 2007-01-28 17:32:41 +00:00
Robert Osfield
af6de09ab4 Added set/getRealizeOperation() to Viewer and CompositeViewer 2007-01-28 17:11:21 +00:00
Robert Osfield
689578c13a Added osg::PolygonMode to local StateSet to protect it from being affected by 
stateset manipulator.
 2007-01-27 17:57:58 +00:00