Robert Osfield
7f8183f64c
Merged changes to OpenSceneGraph-2.6 into trunk using :
...
svn merge -r 8729:8734 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.6 .
2008-08-05 11:17:48 +00:00
Robert Osfield
fe207a09c1
From Sherman Wilcox, "Minor change to bool setGLExtensionFuncPtr(T& t, const char* str1) and
...
setGLExtensionFuncPtr(T& t, const char* str1, const char* str2) -
functions returned false even on success."
2008-08-04 17:08:28 +00:00
Robert Osfield
02f131c7fe
From Philip Lowman, workaround of Centos 5's missing definition of GL_MAX_SAMPLES_EXT.
2008-08-04 14:01:42 +00:00
Robert Osfield
f81ff952a2
merged 2.6 branch changes back into trunk using : svn merge -r 8699:8706 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.6 .
2008-08-03 16:57:09 +00:00
Robert Osfield
5b5e3e5f78
Updated version numbers to 2.6.0
2008-07-25 21:01:57 +00:00
Robert Osfield
5cac386fa6
Renamed enums in osgWidget from ALLCAPITALS to normal OSG conventional of AllCapital
2008-07-25 20:50:42 +00:00
Robert Osfield
f4d74b66cf
Added OSGPL Copyright notices
2008-07-25 20:04:41 +00:00
Robert Osfield
ff5da51dcb
Restructured classes to better fit with style of the rest of the OSG.
2008-07-25 19:57:17 +00:00
Robert Osfield
727925a1c2
Added include to help wrapper building
2008-07-25 19:53:18 +00:00
Robert Osfield
65d5ef608d
Reverted back to using std::list<std::String>
2008-07-25 17:42:37 +00:00
Robert Osfield
d0890ab250
Updated wrappers, and further refined the ImageSequence API
2008-07-25 16:11:51 +00:00
Robert Osfield
ec4d189b64
Added ImageSequence to .ive plugin, added support for multiple ImageThreads in osgDB::ImagePager
2008-07-25 13:45:07 +00:00
Robert Osfield
0d1656055c
Moved PluginQuery from osgconv into osgDB
2008-07-25 10:18:36 +00:00
Robert Osfield
2cf44741d7
Added getCurrentCamera/getCurrentRenderStage methods
2008-07-24 12:47:55 +00:00
Robert Osfield
ec9218ad1f
Refactored OverlayData so that its possible to subclass OverlayNode/OverlayData.
2008-07-23 22:19:29 +00:00
Robert Osfield
dc05f2ef95
Moved helper classes into Protected section
2008-07-23 21:49:07 +00:00
Robert Osfield
daa3d2381a
Implemented ImagePager internals
2008-07-23 19:04:46 +00:00
Robert Osfield
6488ff23a5
Fixed unitialized variable
2008-07-23 15:42:02 +00:00
Robert Osfield
cc2af85c96
Further work on ImageSequence
2008-07-22 20:20:16 +00:00
Robert Osfield
c9dc578186
Added support for pruning old images, recording the Duration in the .osg file, and -o filename output support in osgimagesequence.
2008-07-22 16:44:49 +00:00
Robert Osfield
5ab73e9f80
Added support for ImageSequence to all Texture classes
2008-07-22 12:28:46 +00:00
Robert Osfield
19e3b1624d
Moved osgViewer::ScreenCaptureHandler's WindowCaptureCallback from head into .cpp
...
to clean up headers and avoid wrapper build issues.
Updated wrappers
2008-07-21 23:42:59 +00:00
Robert Osfield
e8344a614d
Removed the reducent non const get methods
2008-07-21 22:38:11 +00:00
Robert Osfield
cad2f6d4fc
From Jean-Sebastien Guay, "Changes attached so that the CaptureOperation is passed in the constructor of the ScreenCaptureHandler (default 0 = default CaptureOperation). This way, you can do:
...
viewer.addEventHandler(new osgViewer::ScreenCaptureHandler(
new osgViewer::WriteToFileCaptureOperation("filename", "jpg")));
and the filename will be what you want. The WriteToFileCaptureOperation will add the context ID and the file number (if in SEQUENTIAL_NUMBER mode) to the file name.
(The attached also clarifies some notify messages, and corrects the comment when adding the handler in osgviewer.cpp)
I also remembered, the current architecture could allow a different CaptureOperation for each context, but currently the API only allows setting one CaptureOperation for all contexts. This could be improved if need be.
"
2008-07-21 21:28:48 +00:00
Robert Osfield
5e80c3856f
From Ruth Lang, "using osg version 2.5.5 and compiling my program under OpenSUSE 11.0
...
with gcc (version 4.3.1) I got the following error message in
include/osgUtil/TriStripVisitor and Tessellator
error: type qualifiers ignored on function return type
The errors belong all to a INLINE function definition. Find attached my
modified version."
2008-07-21 21:20:21 +00:00
Robert Osfield
041a06b89d
Further work on osg::ImageSequence/osgDB::ImagePager
2008-07-21 21:00:57 +00:00
Robert Osfield
73bcc2613c
Upated version number for dev release
2008-07-21 20:44:37 +00:00
Robert Osfield
acd7e65687
Added basic image sequencing
2008-07-21 17:28:22 +00:00
Robert Osfield
f088d113f6
Added non const getAuthenticationMap().
2008-07-21 17:27:59 +00:00
Robert Osfield
ac61676368
Initial cut of osgimagesequence example
2008-07-21 10:57:06 +00:00
Robert Osfield
09e7bcdf4e
Added ImagePager first cut, and updated wrappers
2008-07-21 10:10:01 +00:00
Robert Osfield
d12708e6f6
First cut of osgDB::ImagePager for updating osg::ImageSequence
2008-07-21 09:47:39 +00:00
Robert Osfield
d17a255d8e
First cut of osg::ImageSequence class
2008-07-21 09:46:53 +00:00
Robert Osfield
46796978fd
From Jean-Sebastien Guay and Robert Osfiled, osgViewer::ScreenCaptureHandler for
...
taking screenshots
2008-07-17 16:12:39 +00:00
Robert Osfield
4aed0a7eac
From Ulrich Hertlein, "attached are some minor tweaks:
...
- fixed typos in osgViewer/ViewerBase
- const-ness in include/osg/View findSlaveIndexForCamera
- supported options for STL reader, fixed return values to reflect proper errors
- supported options for DirectX reader, fixed return values
- normals pseudo-loader: scaling normals to a const (but variable) fraction of the bounding sphere radius
"
2008-07-17 13:51:14 +00:00
Robert Osfield
969884e6c2
Moved AuthenticalMap/AuthenticationDetails out in their own files
2008-07-17 12:13:04 +00:00
Robert Osfield
adaf71fa19
Added osgDB::AuthenticationMap/Details to osgDB and curl plugin to add the ability
...
to authenticate http transfers
2008-07-17 11:55:55 +00:00
Robert Osfield
5f0f80cab2
Changed int's to unsigned int's to avoid warnings
2008-07-16 13:26:06 +00:00
Robert Osfield
e9368c6fa3
Moved the private sections int protected to allow subclasses acces to all methods/members.
...
Moved public section to top of the class definition to make it more consistent with the rest of the OSG.
2008-07-15 20:30:56 +00:00
Robert Osfield
f4cb039a3c
Updated version number to 2.5.5 in prep for dev release
2008-07-15 19:24:48 +00:00
Robert Osfield
abe16fa571
Changed the version setup code to be consistent with the rest of the OSG
2008-07-15 19:24:22 +00:00
Robert Osfield
c2b77aa08e
From Jeremy Moles, import of the osgWidget NodeKit, sourced from the original http://osgwidget.googlecode.com/svn/trunk
...
Notes from Robert Osfield, I've merged osgWidget trunk, and added/changed CMakeLists.txt file to make it suitable for inclusion in the core OSG, and moved imagery/scripts/shaders out into OpenSceneGraph-Data
2008-07-15 17:21:25 +00:00
Robert Osfield
35bc9c7dd2
From Art Trevs, Removed GLeunm version setAttachment() to avoid ambigiuity with
...
whether to enable MRT.
2008-07-15 14:24:21 +00:00
Robert Osfield
c88d34ee97
Renamed Archive::ArchiveStatus to ReaderWriter::ArchiveStatus
2008-07-15 14:15:42 +00:00
Robert Osfield
3e96a9d448
Missing check-ins
2008-07-15 09:55:33 +00:00
Robert Osfield
cb98cddc31
Added new ReaderWriter methods for recording what protocols, extensions and options are
...
support by ReaderWriters
2008-07-13 15:24:45 +00:00
Robert Osfield
a3e28a795f
Added an OSG_EXPORT
2008-07-12 17:30:17 +00:00
Robert Osfield
de33a031d4
Updated version numbers for dev release
2008-07-11 20:01:12 +00:00
Robert Osfield
a856459a86
Moved the building and intersecting of the KdTree into the .cpp, and cleaned up
...
the header to ready it for wider usage
2008-07-11 16:48:39 +00:00
Robert Osfield
d3fd43cc6f
Streamlined KdTree implementation
2008-07-10 15:50:10 +00:00