Robert Osfield
e753be1b20
Changed debug info to use DEBUG_INFO
2010-05-28 09:12:07 +00:00
Robert Osfield
d26a8474e7
Changed the ref_ptr<T> observer_ptr<>::lock() method to be
...
bool observer_ptr<>::lock(ref_ptr<T>&) to avoid the temporary ref_ptr<>'s
being created and destroyed on the stack along with the associated ref/unref() operations
2010-05-28 08:57:48 +00:00
Robert Osfield
2d9e469afa
Refactored the expiry and PagedLOD counting so that it's now done in single CountPagedLODsVisitor::removeExpiredChildrenAndCountPagedLODs method
2010-05-27 18:46:58 +00:00
Robert Osfield
d746f11650
Renamed osgGA::MatrixManipualtor to osgGA::CameraManipulator so its name better reflects it's function
2010-05-27 15:54:37 +00:00
Robert Osfield
e8f3625ddf
From Michael Platings, "Minor ffmpeg build fix, Replaced
...
IF (${FFMPEG_STDINT_INCLUDE_DIR})
with
IF (FFMPEG_STDINT_INCLUDE_DIR)"
2010-05-27 14:35:10 +00:00
Robert Osfield
2cf3224dd3
From Jan Pecvia, improvements to manipulators and added new manipulator to osgviewer
2010-05-27 13:59:34 +00:00
Robert Osfield
72663ec3df
Moved across to using more flexible dirtyMark when dirtying tiles
2010-05-27 13:58:46 +00:00
Robert Osfield
2c77b3d637
Re-enabled boundary equalization support.
2010-05-26 16:10:16 +00:00
Robert Osfield
72d699e2b3
Fixed warnings
2010-05-26 08:34:15 +00:00
Robert Osfield
ee78e70d78
Fixed 3 space indenting
2010-05-25 17:02:22 +00:00
Robert Osfield
db003c12c0
Fixed 3 space indenting in headers.
2010-05-25 17:02:11 +00:00
Robert Osfield
f5661e0461
Updated wrappers
2010-05-25 16:27:21 +00:00
Robert Osfield
72931ceb96
Removed export
2010-05-25 15:52:11 +00:00
Robert Osfield
d0f48a2712
From Jan Perciva with changes from Robert Osfield, "I am submitting improved osgGA camera manipulators.
...
Changes:
- new mouse wheel zoom/movement/center functionality
- ability to fix vertical axis (important for CAD)
- possibility to specify values as absolute values or relative to model size
- kind of backward compatibility by flags passed to constructor
- and much more
- restructuring classes to use kind of hierarchy and standard way of event processing (handle methods). This way, there is much more code reusability and it is more easy to develop new kinds of manipulators.
Briefly, the new architecture keeps MatrixManipulator as base abstract class. StandardManipulator is the feature-rich standard manipulator with two main descendant classes: OrbitManipulator and FirstPersonManipulator. OrbitManipulator is base class for all trackball style manipulators, based on center, rotation and distance from center. FirstPersonManipulator is base for walk or fly style manipulators, using position and rotation for camera manipulation.
"
Changes by Robert: Replaced osg::Vec3 by osg::Vec3d, introduced DEFAULT_SETTINGS enum and usage. Added frame time member variables in prep for improving throw animation when vysync is off.
2010-05-25 12:05:13 +00:00
Robert Osfield
fce49ae02a
Quitened down debug output
2010-05-24 14:16:31 +00:00
Robert Osfield
9fd01f78a5
Updated wrappers
2010-05-24 09:44:38 +00:00
Robert Osfield
e826bfeb3c
Refactored osgQt so that QWebViewImage is now entirely implementated in the header, and osgQt itself no longer compiles it,
...
leaving it to only applications that require it to include the header and it's implementation and with ith the QWebKit dependency.
2010-05-22 15:45:02 +00:00
Robert Osfield
0165862701
From Wojciech Lewandowski, "Reading and Writing of Texture2DArrays for IVE format."
2010-05-21 09:56:59 +00:00
Robert Osfield
a79a13955a
From Wojciech Lewandowski, "Support for compressed texture arrays + mipmaps + auto mipmap generation. Changes vs OSG trunk. Thanks to Ricardo Corsi I was able to add last time tweaks and remove few issues. This version was so well tested that it has to be posted for inclusion into OSG ;-)
...
"
2010-05-21 09:34:25 +00:00
Robert Osfield
338edd0a71
From Hartwig Wiesmann, fixed setup of texture coordinates for applying a contour layer.
2010-05-21 09:23:41 +00:00
Robert Osfield
332cea9c5a
Fixed warning
2010-05-21 09:00:19 +00:00
Robert Osfield
0d2723b984
From Hartwig Wiesmann, "I have added some doxygen documentation to the plane class.
...
"
2010-05-20 17:02:45 +00:00
Robert Osfield
02dc850aac
From Terry Welsh, added missing static_cast in Referenced.cpp
2010-05-20 17:00:10 +00:00
Robert Osfield
5b84e5b254
Updated wrappers
2010-05-20 15:25:40 +00:00
Robert Osfield
9cf330d7ff
Introduced a alternative implementation of observer_ptr<> that uses ObserverSet rather than an local WeakReference object.
2010-05-20 13:38:28 +00:00
Robert Osfield
858d52364e
From Alok Priyadarshi, build fix for gcc.
2010-05-19 16:43:37 +00:00
Robert Osfield
2996dc8244
Introduction an ADD_FUNCTION macro to simply the set up of the static function mappings
2010-05-19 13:40:46 +00:00
Robert Osfield
b979b585f2
From Tim Moore, fix for deadlock
2010-05-19 13:14:57 +00:00
Robert Osfield
62d69c686f
Fixed warning
2010-05-19 08:22:10 +00:00
Robert Osfield
b3ac6484c1
From Martin Naylor, "Please find attached the modified observer_ptr include for fixing a compiler
...
issue for Windows and VS2008."
2010-05-19 08:08:49 +00:00
Robert Osfield
7ed822fd79
From Tim Moore, typo fix.
2010-05-18 18:01:02 +00:00
Robert Osfield
0fb865bc4f
Fixed typo
2010-05-18 17:58:35 +00:00
Robert Osfield
07e43822e6
Added better invalidation of the inactive and active PageLOD lists when children are invalidated when parents are removed.
2010-05-18 15:33:59 +00:00
Robert Osfield
4a0c21a5fc
From Wang Rui, serializers for osgSim and osgVolume
2010-05-18 11:00:06 +00:00
Robert Osfield
f5587bad3d
Fixed typos in method names
2010-05-18 10:12:30 +00:00
Robert Osfield
61121daaab
Updated wrappers
2010-05-17 18:37:32 +00:00
Robert Osfield
65c09c8e0d
From Tim Moore, improved doxygen comments
2010-05-17 14:43:41 +00:00
Robert Osfield
ccd9f31309
Removed signalUnreffed interface
2010-05-17 14:21:53 +00:00
Robert Osfield
f832198128
From Tim Moore, refactore WeakReference/Referenced to avoid signalling the observers when do a unref_nodelete.
2010-05-17 09:03:44 +00:00
Robert Osfield
4d88ba6efe
Re-ordered the inclusion of platform specific headers to fix compile error under Windows
2010-05-17 08:29:35 +00:00
Robert Osfield
a0eb7de060
From Alok Priyadarshi, support for statically linking to GLES2.lib
2010-05-14 19:47:50 +00:00
Robert Osfield
554adfc8e6
Refactored Observer/ObserverNodePath and DatabasePager to improve their robustness.
2010-05-14 12:24:13 +00:00
Robert Osfield
2b2ea4487a
From Tim Moore, new more robust observer_ptr<> implementation
2010-05-14 12:14:14 +00:00
Robert Osfield
4e8f0561ad
From Farshid Lashkari, "I modified some plugins to use the osgDB file stream functions in order to support UTF-8 encoded filenames."
2010-05-13 11:01:06 +00:00
Robert Osfield
29ea65c12b
From Gunter Huber, fixes for better GLES2 support
2010-05-13 10:01:07 +00:00
Robert Osfield
42527fe859
From Wang Rui, "I'd like to submit my inbuilt schema data support of
...
the OutputStream/InputStream implementations, which was just finished
last weekend with a few tests on Windows and Ubuntu. Hope it could
work and get more feedbacks soon.
I've added a new option "SchemaData" to the osg2 plugin. Developers
may test the new feature with the command line:
# osgconv cow.osg cow.osgb -O SchemaData
It will record all serializer properties used in the scene graph, at
the beginning of the generated file. And when osgviewer and user
applications is going to read the osgb file, the inbuilt data will be
automatically read and applied first, to keep backwards compatibility
partly. This will not affect osgb files generated with older versions.
"
2010-05-12 20:02:31 +00:00
Robert Osfield
a04d83efa7
From Mathias Froehlich, fixed memory leak when using OpenThread::Mutex based reference counting.
2010-05-12 15:11:15 +00:00
Robert Osfield
046b6a4bfd
Removed inappropriate code which was causing a memory leak. This code was clearly a copy and paste error. The mistake was spotted by Robin Bourianes, with code changes made by Robert Osfield.
2010-05-12 14:34:18 +00:00
Robert Osfield
cfd4c514cb
Improved the indentation/replaced tabs
2010-05-12 11:58:01 +00:00
Robert Osfield
688323fbed
From Sukender, "Here is a tiny fix about texture wrap mode not being written correctly in 3DS files."
2010-05-12 11:44:30 +00:00
