Robert Osfield
3b192f5119
Added checked from the ARG version of glDraw*Instanced().
2009-01-08 11:19:21 +00:00
Robert Osfield
95ebf1fe71
From Andy Skinner, "I added a const_cast for a call to atomic_cas_ptr, which takes a void* and has been given a const void* const."
2009-01-08 11:16:56 +00:00
Robert Osfield
5275c11d06
From Blasius Czink, "It seems there is no atomic_xor_uint_nv(). I
...
attached a changed version of the Atomic header where a mutex fallback
is used for "xor" on solaris."
2009-01-08 11:15:14 +00:00
Robert Osfield
46eeac4514
Moved supression of VS warning C4706 from the include/osg/Export header into the CMake options list. Added suppression of C4127 as well.
2009-01-08 10:34:05 +00:00
Robert Osfield
fb75c50714
Fixed assingment operator
2009-01-07 15:35:28 +00:00
Robert Osfield
4add5f6fd1
Added supression VS warning "C4706: assignment within conditional expression" thanks gets spat out even for perfectly valid if ((variable=expression)) {} usage.
2009-01-07 15:33:24 +00:00
Robert Osfield
98bd058317
Fixed warnings
2009-01-07 10:32:59 +00:00
Robert Osfield
85c510ba27
Added a protected = operator
2009-01-07 09:49:49 +00:00
Robert Osfield
8745ec7d69
Removed the usage of assert to prevent associated compile warnings and to clean up code
2009-01-06 19:09:50 +00:00
Robert Osfield
4f3b1baee4
Added support for primitive instancing
2009-01-06 14:55:49 +00:00
Robert Osfield
85fffc2e76
From Roland Smeenk, "Attached you will find an improved Collada plugin to properly support camera's.
...
A Collada camera will be added to the scenegraph as osg::CameraView. This allows the user to create a set of predefined camera viewpoints. I also added a new MatrixManipulator to osgGA called CameraViewSwitchManipulator and added usage of this to the osgviewer example. This manipulator allows switching between the predefined camera viewpoints. The current design limition I ran into is that a MatrixManipulator only manipulates the ViewMatrix, but for this particular manipulator I also want to update the projectionMatrix of the camera when switching to a new viewpoint. This is not implemented because I don't know what would be the best way to design it. Any ideas?
Furthermore Collada also supports orthographic camera's, where an osg::CameraView only supports a perspective camera. Would it be useful to create a CameraView with customizable optics for this?"
2009-01-05 16:53:29 +00:00
Robert Osfield
375253ae8a
From Paul Martz, Correction to Timer method comment.
2009-01-05 11:58:08 +00:00
Robert Osfield
c8752d6c18
From Cedric Pinson, added non const getText() method
2009-01-05 11:31:38 +00:00
Robert Osfield
cedffd3adb
Introduced osgVolume::Layer and Locator classes mirrroring similar classes in osgTerrain.
2009-01-05 11:26:26 +00:00
Robert Osfield
f4c26f9cc8
Changed VolumeTile::setImage(Image*) to setImage(uint i, Image*) to allow multiple images to be attached to single tile
2008-12-21 20:42:29 +00:00
Robert Osfield
adb7a49c10
Renamed osgVolume::Brick to osgVolume::VolumeTile
2008-12-20 20:55:21 +00:00
Robert Osfield
2cc53e2256
Moved main setSceneData methods in osgViewer::View::setSceneData()
2008-12-19 17:50:58 +00:00
Robert Osfield
502eced994
From Jean-Sebastein Guay, I recently had to reimplement screen capture functionality into our framework (which was broken since the switch from OSG 1.2 to 2.2 over a year and a half ago). I used the ScreenCaptureHandler which I had contributed right before OSG 2.6 shipped, bit I had to trigger the screen capture programatically instead of by a key press in some cases, so I added a convenience method to do that.
...
It's a minimal change, it just calls an already existing protected method. It was trivial to subclass the handler to do it in our code, but pushing the change into OSG makes sense as it's generally useful to have it in the handler itself.
I also noticed that the handle() method was overridden from osgGA::GUIEventHandler but wasn't marked virtual. It wasn't intended that subclasses not be able to override it in turn, so I've added the keyword.""
2008-12-19 17:15:10 +00:00
Robert Osfield
0ea6cdeb96
Added ClipNode::set/getReferenceFrame();
2008-12-19 15:29:59 +00:00
Robert Osfield
8951acabb7
Fixed warning & error
2008-12-19 12:58:50 +00:00
Robert Osfield
c862344929
Fixed warning
2008-12-19 12:46:21 +00:00
Robert Osfield
4c6511fd50
Updated wrappers
2008-12-19 10:20:23 +00:00
Robert Osfield
4ad20a413a
Fixed warnings
2008-12-18 11:06:57 +00:00
Robert Osfield
2225339208
Fixed warnings
2008-12-17 16:13:23 +00:00
Robert Osfield
c85437e967
Fixed warnings
2008-12-17 15:32:35 +00:00
Robert Osfield
26c57f125d
Warning fixes
2008-12-17 13:14:17 +00:00
Robert Osfield
8a6e04b84d
Introduce NodeVisitor::className and libraryName()
2008-12-17 12:13:15 +00:00
Robert Osfield
a5c32da4ff
Warning fixes
2008-12-17 11:00:16 +00:00
Robert Osfield
d01fc6ab1b
From Jean-Sebastien Guay, added missing export
2008-12-17 10:01:52 +00:00
Robert Osfield
e7d8a2cfe6
Updated wrappers
2008-12-16 21:16:06 +00:00
Robert Osfield
60fc821764
From Cedric Pinson and Jeremey Moles, Changes to OpenSceneGraph-osgWidget-dev branch.
...
Notes from Robert Osfield, Merged changes to OpenSceneGraph-osgWidget-dev r9367 (prior to my botched attempt at merged svn/trunk into the branch).
2008-12-16 20:29:00 +00:00
Robert Osfield
bd4b6e9b8c
Updated version numbers for 2.8.8 dev release
2008-12-16 16:36:33 +00:00
Robert Osfield
4511281f04
From Sukender and Robert Osfield, introduced GraphicsContext::ScreenSettings & WindowingSystemInterface::enumerateScreenSettings.
2008-12-16 15:08:04 +00:00
Robert Osfield
3ce53b56c7
Added support for a Terrain::s/getTerrainTechniquePrototype()
2008-12-15 22:18:40 +00:00
Robert Osfield
528fdbb75c
Aded osg::isGLExtensionOrVersionSupported(uint contextID, char* extensionName, float minVersionRequired) method that
...
returns true if (the extension string is supported or GL version is greater than or equal to a specified version) and
non extension disable is used. This makes it possible to disable extensions that are now
available as parts of the core OpenGL spec.
Updated Texture.cpp is use this method.
2008-12-15 19:37:14 +00:00
Robert Osfield
993ec64657
Added deprecated messages to get/set methods of outgoing expiry schemes.
2008-12-15 16:10:26 +00:00
Robert Osfield
7d719d998e
Removed buildMipmaps method that had no implementation.
2008-12-15 12:16:31 +00:00
Robert Osfield
315aeeb557
Where possible moved redundent C header includes from headers to source files
2008-12-12 18:47:30 +00:00
Robert Osfield
946175385f
From Ulrich Hertlein, Typo fixes + "optional parameter to RecordCameraPathHandler to control the frame rate for record/playback. Default is 25.0, the environment variable takes preference if set."
2008-12-12 13:41:39 +00:00
Robert Osfield
b038baf676
Updated version number for 2.7.7 release
2008-12-12 10:19:19 +00:00
Robert Osfield
c3611c5875
Added mechanism for registering proxy objects in the .osg plugin in a way that is compatible with static linking.
2008-12-10 16:26:02 +00:00
Robert Osfield
5363736caa
Refactored computeIntersections() float x,float y, const osg::NodePath& nodePath.
2008-12-10 11:12:37 +00:00
Robert Osfield
905f3673d5
From Sukender, added missing inline keywords
2008-12-09 16:43:38 +00:00
Robert Osfield
c8190d9c54
Cleaned up osgWidget::VncClient and osgWidget::Browser so that their implementations are all more consitent with the osgWidget::PdfReader.
2008-12-09 11:05:04 +00:00
Robert Osfield
d8c17e4c4c
Added support for setting background colour of Pdf document.
2008-12-09 09:26:51 +00:00
Robert Osfield
c0ac01c576
Added setImageToColour function
2008-12-09 09:25:12 +00:00
Robert Osfield
6b3704ce09
Added asSwitch and asGeode convinience methods to Node
2008-12-09 09:24:47 +00:00
Robert Osfield
45160a2129
Added ability to customize keyboard events for controlling osgWidget::PdfImage/PdfReader
2008-12-07 17:37:26 +00:00
Robert Osfield
6f356aeb97
Intoduce new osgWidget::PdfReader and osgWidget::VncClient front ends to osgWidget,
...
with new pdf plugin and updated vnc plugin that now support these front ends.
Updated osgpdf and osgvnc examples to new these new interfaces.
2008-12-07 17:02:30 +00:00
Robert Osfield
bad3a92fc3
Added GL_ABGR_EXT to fix windows build
2008-12-05 16:41:12 +00:00