Commit Graph

216 Commits

Author SHA1 Message Date
Robert Osfield
1fedab6b49 Fixed choice of display 2007-04-15 20:53:09 +00:00
Robert Osfield
84c4b86da8 Added an #include<unistd.h> and extern "C" around X11ErrorHandling to prevent Solaris build errros 2007-04-14 08:31:40 +00:00
Robert Osfield
9e8e07b373 Added usleep's to avoid X11 errors when doing X11 calls to close to changes in
window size or decoration.
2007-04-13 14:54:22 +00:00
Robert Osfield
934ed30314 Added setWindowRectangle implementation for GraphicsWindowWin32, and
place holder for setWindowRectangle implementation for GraphicsWindowCarbon.
2007-04-13 14:23:10 +00:00
Robert Osfield
035b98993f Added s/getWindowRectangle to GraphicsWindow and implementation in GraphicsWindowX11 2007-04-13 13:22:52 +00:00
Robert Osfield
2e6ee4bb39 Removed old gmake and VisualStudio build files 2007-04-10 13:10:25 +00:00
Robert Osfield
cc1ab2c711 Create new incliude/osgViewer/api directory to hold platform specific classes such as GraphicsWindow implementations.
Moved GraphicsWindowWin32,X11 and Carbon into their api/Win32, api/X11 and api/Carbon directories.
2007-04-10 11:03:37 +00:00
Robert Osfield
6d7b5e7ebd From Eric Wing, pedantic warning fixes 2007-04-06 15:36:13 +00:00
Robert Osfield
acee7ccaee From Laurens Voerman, "I've added the code to set up quad_stereo properly. I have tested with
WinXP / VC8, stereo is working. I also added code to set sampleBuffers
and samples. These cannot yet be properly set, tested (windows only ) by
changing _numMultiSamples in DisplaySettings::setDefaults() and
recompiling."
2007-04-06 14:40:39 +00:00
Robert Osfield
511bc9d571 From Laurens Voerman, "attached is OpenSceneGraph\src\osgViewer\GraphicsWindowWin32.cpp
I've added the code to get the osgViewer working on windows displays
with less than 32 bit color. Only tested with 16 bit color."
2007-04-06 14:36:59 +00:00
Robert Osfield
ee563ee5c3 Added -lgdi32 to CYGWIN path 2007-03-27 08:40:25 +00:00
Robert Osfield
8dc2a28945 Removed WindowData parameter from init(). 2007-03-26 16:28:26 +00:00
Robert Osfield
1cdda0654f Added Locator and layer setting to osgterrain example 2007-03-26 15:52:22 +00:00
Robert Osfield
b419fa93ef From Luigi Calori, "when we link against something that comes out from a Find... we ususally have a variable <LINK_VAR_NAME>available like OPENTHREADS_LIBRARY,
so I' ve set up a macro that uses the variable name expanded for linking, and  test if a variable ${LINK_VAR_NAME}_DEBUG
like OPENTHREADS_LIBRARY_DEBUG exists and in case uses it for linking in debug mode.
I' ve also set up FindOpenThreads to set up these variables.
I had to edit the core libraries CMakeLists to add the calls to the macros used.
I' ve tested under MSVC"
2007-03-26 13:02:38 +00:00
Robert Osfield
7039ff4af4 From Andreas Goebel, build fix 2007-03-19 19:05:18 +00:00
Robert Osfield
6d49904170 From Andreas Goebel, add -lgdi to GNUmakefile 2007-03-19 11:35:36 +00:00
Robert Osfield
ed9aa1c6bf Removed now redundent method 2007-03-18 11:04:12 +00:00
Robert Osfield
aa28f60357 Added WindowData structures to GraphicsWindowX11,Win32 and Carbon to help support
GraphicsWindow inheriting their window handles from an external toolkit
2007-03-16 13:22:05 +00:00
Robert Osfield
d4db767ec5 From Philip Lowman, added gdi32 entry fro Mingw build 2007-03-15 13:17:05 +00:00
Robert Osfield
4173095f0b From Bob Kuehne, fix for AGL build of osgViewer 2007-03-10 17:29:32 +00:00
Robert Osfield
db6f07f1d6 Ran dos2unx of CMakeLists.txt files 2007-03-08 15:31:36 +00:00
Robert Osfield
f50ed9667a From Eric Wing and others, first cut of CMake build support 2007-03-04 13:05:33 +00:00
Robert Osfield
7f8f4e331a Completed changes to osgManipulator to make it more flexible w.r.t viewer usage, and
ported osgmanipulator example across of osgViewer
2007-02-26 13:01:17 +00:00
Robert Osfield
f43cd7332c Further work on add serialization support for osgViewer configurations 2007-02-25 20:05:23 +00:00
Robert Osfield
96f567eff3 Added bool View::Slave::_useMastersSceneData to help manage HUD's and RTT
cameras that are embedded in the Viewer's View
2007-02-23 11:53:45 +00:00
Robert Osfield
2d05286dc2 Clean up the handling of views without camera manipulators, and cameras that
don't allow camera focus
2007-02-23 11:51:52 +00:00
Robert Osfield
03c198da4d Removed the compile objects in init in the SceneView::setDefaults() setup. 2007-02-22 10:56:36 +00:00
Robert Osfield
b9eb2fcdee Fixed calculation of inverted coordindates 2007-02-22 10:31:09 +00:00
Robert Osfield
455b046433 Removed debugging info 2007-02-21 20:47:32 +00:00
Robert Osfield
987fe5d93b Added ability to discount Camera's that arn't appropriate for event focus 2007-02-21 19:41:53 +00:00
Robert Osfield
35a466f400 Removed debug messages 2007-02-21 14:17:15 +00:00
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
Robert Osfield
7232a831da Added osg::FrameStamp::set/getSimulationTime().
Added setting of osg_SimulationTime and osg_DeltaSimulationTime to the uniforms set by SceneView

Added frame(double simulationTime) and advance(double simulationTime) parameters to
osgViewer::SimpleViewer, Vewer and CompositeViewer.

Updated various examples and Nodes to use SimulationTime where appropriate.
2007-01-25 12:02:51 +00:00
Robert Osfield
fd6f5c87b8 Added support for GUIEventAdapter::setHandled 2007-01-24 12:28:18 +00:00
Robert Osfield
056ce866b0 From André Garneau, "
* Setup proper pixel format for ATI boards (removal of WGL_SWAP_METHOD_ARB specification from the requested pixel format since unsupported by the ATI driver)

    * Fix to create sample OpenGL window on the proper display device. This is the temporary window used to choose the desired pixel format. In the previous version, this window was always created on the primary display device, even though it had potentially different pixel formats compared to the target display device containing the window to be created.

    * Implementation of WindowingSystemInterface::setScreenResolution() method

    * Implementation of WindowingSystemInterface::setScreenRefreshRate() method

    * Implementation of GraphicsWindow::requestWarpPointer() method

    * Implementation of GraphicsWindow::useCursor() method and associated trait support. This can be used in two ways; first, when the graphics trait requested indicates that no cursor should be present, a new cursor-less window class is used to create the window. When a cursor-enabled window creation is requested, another window class is used. After creation of a window, it is also possible to toggle the cursor state by using the GraphicsWindow::useCursor method.

    * The way the mouse behaves is now compatible with the behaviour seen on X11; i.e. when pressing a mouse button, the window where the pointer is located will capture the mouse input and release it only after the button has been released. This results in all mouse movement events being dispatched to the window where the button was pressed initially until it is released. This improves the interaction with graphics windows.



    * Preparation work has been done to support the ability of moving a window from one screen to another screen and recreating its rendering context when this happens. This has been tested with a mix of NVIDIA and ATI cards and works properly. For the moment being, this feature is commented out due to changes in the core OSG libraries that have been done but need to be submitted later this week for approval by Robert.



Upcoming features



    * Support for moving windows from one screen to another screen seamlessly



    * Ability to set the window (i.e. the application itself creates the rendering window and passes it to the GraphicsWindowWin32 class)



    * Other miscellaneous items"

---------------------------------------------------
2007-01-24 10:02:04 +00:00
Robert Osfield
a7dcd3e9b6 Adde osgText dependency to osgViewer 2007-01-23 13:54:32 +00:00
Robert Osfield
781b3bd5c9 Made stats bars transparent and improved positioning 2007-01-23 13:28:49 +00:00
Robert Osfield
691e4d7b88 Added ability to customize the keys used to control stats 2007-01-23 11:56:10 +00:00
Robert Osfield
affb8f1289 Moved StatsHandler into its own seperate header/source in osgViewer. 2007-01-23 11:01:20 +00:00
Robert Osfield
71f307c5b2 Further work on GPU stats 2007-01-22 21:16:51 +00:00
Robert Osfield
52e86aaea3 Further work on stats 2007-01-22 17:39:32 +00:00
Robert Osfield
d6ecce6f5f Improvements to stats 2007-01-22 11:22:37 +00:00
Robert Osfield
8e20956511 Changed the camera with focus code to only accept cameras with valid views
as ones that can recieve focus.
2007-01-21 18:34:26 +00:00
Robert Osfield
b47ef11d74 Initial on screen stats support 2007-01-21 18:24:54 +00:00
Robert Osfield
41a0226a8f Added stats for update, event and rendering traversals 2007-01-19 20:25:17 +00:00
Robert Osfield
f0e2404541 Added new osg::Stats class for collecting frame stats of different sorts.
Added s/getStats() to osg::View and osg::Camera.
Added population of View::getStats() with frame stats in osgViewer/Viewer.
Added Basic StatsHandler to osgviewer example.
2007-01-19 19:53:23 +00:00
Robert Osfield
d60d04c8c4 From André Garneau, "Attached is a fix in the GraphicsWindowWin32 class to allow the following usage pattern to work properly; create window, delete window, create window, etc. In all the tests I made I was always creating-deleting and then shutting down the application so this pattern was untested. The osgtexture3d & osgsimulation examples were also using this pattern so would not work. They are working fine now." 2007-01-18 09:56:23 +00:00
Robert Osfield
552293eb03 Added extra methods WindowSystemInterface for controlling frame rate and resolution, and adde useCursor flag. 2007-01-17 21:11:57 +00:00
Robert Osfield
3ce53da0e1 From André Garneau, Implementation osg GraphicsWindowWin32 2007-01-17 14:21:18 +00:00
Robert Osfield
6cf85cb953 Cleaned up CompositeViewer interface and added event traversal of views 2007-01-16 19:18:32 +00:00
Robert Osfield
dad3deec38 Added debug messages 2007-01-16 17:08:47 +00:00