Commit Graph

888 Commits

Author SHA1 Message Date
Robert Osfield
a2974de978 Moved the istream and ostream support from Vec* and Matrix* into a seperate io_utils file. 2005-04-08 09:01:23 +00:00
Robert Osfield
84e8338be1 From Mike Weiblen, "adds sourcefiles for beginnings of .osg fileformat i/o support
> - enhancemens to core GLSL classes to support file i/o"
2005-04-07 20:23:58 +00:00
Robert Osfield
d160b4977b Fixed the MatrixTransform(Matrix&) constructor so that it correct sets _inverseDirty = true; 2005-04-07 15:27:53 +00:00
Robert Osfield
2e32a7cb78 From Carlo Camporesi,fixed for loop bug 2005-04-04 11:47:50 +00:00
Robert Osfield
aa8dbea11c From Mike Weiblen, updates to Shander Language support 2005-04-04 10:08:15 +00:00
Robert Osfield
60cecb8959 Added State::getActiveUnit and usage of it in the glTexCopyImage*() implementations 2005-03-25 11:07:48 +00:00
Robert Osfield
7883574d28 From Mike Weiblen,
"updates for GLSL core integration:
Code compiles and runs on win32.
Basic functionality of Program and Shader in place.
Program derived from StateAttribute.
Uniform value propagation is not yet functional (in development)
Includes some patches by Nathan Cournia.
includes example testcase to demo use of new classes."
2005-03-24 09:37:45 +00:00
Robert Osfield
2ab78cfe38 From Marco Jez, fixed constness of data return type 2005-03-23 21:00:28 +00:00
Robert Osfield
60597f4bbb Fixed the scaling in pixelSize computation and the autoscale usage of it. 2005-03-23 10:46:08 +00:00
Robert Osfield
667ecd91f1 From Alberto Farre, fixes to ProxyNode. 2005-03-18 10:00:16 +00:00
Robert Osfield
a2e8bc6267 Added support for set/getUniform and set/getProgram into osg::StateSet. 2005-03-11 20:29:21 +00:00
Robert Osfield
7bf72cd43b From Marco Jez, improved Texture2D and Image handling of compare(). 2005-03-07 14:30:55 +00:00
Robert Osfield
5684a130b7 From Alberto Farre, addition of ProxyNode, with support in .osg, .ive and .flt loaders 2005-03-07 14:06:09 +00:00
Robert Osfield
d0c79ea638 From Mike Weiblen, warning fix for VS7.1 2005-03-07 12:05:48 +00:00
Robert Osfield
a139d28a12 Added the use of pixel buffer object in ImageStream so that it is only
compiled in on non OSX platforms.
2005-03-07 12:05:22 +00:00
Don BURNS
678281f2f2 In osg::isGLUExtensionSupported, fixed gluGetString to call GLU_EXTENSIONS
rather than GL_EXTENSIONS.
2005-03-02 15:06:23 +00:00
Robert Osfield
0f61af08bd Added support for new event visitor type into osgGA and osgProducer::Viewer,
and event callback into Drawable.
2005-02-25 14:02:48 +00:00
Robert Osfield
96514b5077 New simplified timer implementation. 2005-02-25 08:38:05 +00:00
Robert Osfield
79833fa704 Added pause, rewind and play support into xine plugin. 2005-02-24 17:07:37 +00:00
Robert Osfield
5fbb1f11cd From Mike Weiblen, adding prelimimnary GL Shader Language support into core OSG lib.
with renaming and reordering by Robert Osfield,
2005-02-24 13:33:35 +00:00
Robert Osfield
164cb8216c Made Referenced::ref() and unref() inline methods. 2005-02-23 12:50:10 +00:00
Robert Osfield
e01990d419 Made the osg::Referenced Mutex be declared as a pointer to a Mutex, with the
Mutex allocated dynamically when required. Added the following methods to
help manage the usage of the mutex:

        void setThreadSafeRefUnref(bool threadSafe);

        bool getThreadSafeRefUnref() const;
2005-02-22 20:25:58 +00:00
Robert Osfield
feb06f7e4b Added improved PBO support. 2005-02-22 13:34:24 +00:00
Robert Osfield
25658ad31f Fixes from Marco Jez. 2005-02-22 11:55:30 +00:00
Robert Osfield
64e6b79340 Changed the Switch::addChild(Node*) behavior so it doesn't override the
any pre-exisitng _values value.
2005-02-22 10:08:01 +00:00
Robert Osfield
5215d43e14 warning fix 2005-02-10 20:21:01 +00:00
Robert Osfield
ec8624f185 Implemented the osg::Image::isImagTranslucent function. 2005-02-10 15:52:18 +00:00
Robert Osfield
021440b9a4 Commented out the debug messages, added back in the audio into the xine plugin 2005-02-09 12:29:09 +00:00
Robert Osfield
117c791a3b Added osg::BufferObject and a made a number associated to accomodate this
new class. osg::BufferObject wraps up OpenGL pixel and array buffer objects.
Currently implementation is work in progress.
2005-02-09 10:39:45 +00:00
Robert Osfield
46ce4c3df3 Added the full set of buffer object methods 2005-02-07 17:28:03 +00:00
Robert Osfield
c3c3ed8519 Added support for 8 parameters. 2005-02-01 09:00:10 +00:00
Robert Osfield
9a93d7ae06 Fixes to osg::Image's handling of compressed formats. 2005-01-27 20:18:49 +00:00
Robert Osfield
355650ac1d From Nicolas Brodu, new faster osg::Quat::makeRotate(Vec3d,Vec3d) implmentation.
From Robert Osfield, modes to osg::Quat to keep the original implmentation around
as makeRotate_original(,) and added tests into osgunittest to test the new
methods provide equivilant results to the original implemementation.  The
orignal implementation will be removed once the new method is more widely tested.
2005-01-27 14:39:58 +00:00
Robert Osfield
e2132cc62a Cleaned up the types. 2005-01-05 17:14:38 +00:00
Robert Osfield
c58f56adb6 From Fredric Mammond, fix for build using full extension checked mechansim 2005-01-05 16:16:52 +00:00
Robert Osfield
fab7c4d715 From Fredric Mammond, added new osg::BlendEquation state attribute wrapping
up glBlendEquation.
2005-01-03 16:39:28 +00:00
Don BURNS
3e96112b82 Added computeBound to osg::Switch, which now checks to see if a child is
enabled before computing its bound.
2004-12-17 20:51:55 +00:00
Robert Osfield
a0ba625cb0 Property API clean to smooth the task of generating wrappers. 2004-12-17 01:06:33 +00:00
Robert Osfield
fa4eaae122 From Frederic Marmond, add osg::LogicOp for support for glLogicOp. 2004-12-13 04:54:20 +00:00
Don BURNS
b84342c59a Spelling errors fixed by Brede Johansen 2004-12-07 00:42:21 +00:00
Don BURNS
3412c6811e Changed the strcmp() to use std::string instead. 2004-12-06 19:32:59 +00:00
Don BURNS
1771cdbcc7 Update version numbers in files 2004-12-04 23:38:24 +00:00
Robert Osfield
c5f5373e05 Added missing OSG_SCREEN_WIDTH docs 2004-11-26 21:35:36 +00:00
Robert Osfield
f213e473f3 From Fabien Dachicourt, bug fix to addChild(node,value) 2004-11-23 17:07:48 +00:00
Robert Osfield
5adff5c15e Added support for pixel based LOD's and set the default priority scale to 1.0 2004-11-20 12:08:33 +00:00
Robert Osfield
796b4cbe8d Added support for pixel range to PagedLOD 2004-11-20 11:48:28 +00:00
Robert Osfield
02ee5ff0cc Altered the path for Cygwin to set the _ticksPerSecond to the correct value. 2004-11-18 09:19:15 +00:00
Robert Osfield
7d43aee78d Made the use of the standard clock default instead of the RDTSC calls to avoid
problems with variable CPU frequency such as found on laptops.
2004-11-14 10:41:48 +00:00
Robert Osfield
a0fc9632b8 Fixed warnings. 2004-11-13 21:42:45 +00:00
Robert Osfield
b60304f8ad Improvements to support for archives 2004-11-12 08:55:11 +00:00
Robert Osfield
fd9063628a Added guard to testing _internalFormat in compareTexture(..) so that
a comparison would only be done if both the lhs and rhs had already been
set to a non zero value.
2004-11-08 16:39:10 +00:00
Robert Osfield
3fde44b5a5 Made fix to the setReferenceFrame method to properly disable culling
when reference frame is ABSOLUTE.
2004-11-06 10:18:55 +00:00
Robert Osfield
d548d77010 From Tree chagenes required for Java Wrappers 2004-11-01 16:14:53 +00:00
Robert Osfield
48191bb1ab From Anders Backman, unit tests to test matrix to quat compute. 2004-10-28 13:40:09 +00:00
Robert Osfield
fd327f68f6 From Tom Jolley, Added a new enum POINT_ROT_WORLD_Z_AXIS and a new section in computeMatrix for this enum.
With a small tweak from Robert Osfield to set _cacheMode.
2004-10-28 13:26:06 +00:00
Robert Osfield
df9c7e5031 From Tree, fixes for Java bindings 2004-10-25 19:16:57 +00:00
Robert Osfield
b70ff91eaf Changed ABSOLUTE and RELATIVE to ABSOLUTE_RF and RELATIVE_RF to avoid stooppid Win32 #define 2004-10-24 20:04:00 +00:00
Robert Osfield
63e4587a88 Added s/getEventCallback support into osg::Node, and an EVENT_VISITOR
type into NodeVisitor.
2004-10-24 13:51:44 +00:00
Robert Osfield
6821a80e14 Changed the ReferenceFrame enums to be RELEATIVE and ABSOLUTE, and
deprecated the RELATIVE_TO_ABSOLUTE and RELATIVE_TO_PARENTS.
2004-10-22 19:26:45 +00:00
Robert Osfield
93c439ba01 Generalised the osg::ClusterCullingCallback so that it coud be attached
to Node as well as Drawables.

Changed the osgTerrain::DataSet so that it moves the ClusterCullingCallback
up to the Node level.

Added support to the .ive plugin for attaching the ClusterCullingCallback to nodes.
2004-10-21 09:36:34 +00:00
Robert Osfield
2047ac250f From Frank Lichtenheld, compile fix to Linux powerpc build. 2004-10-18 18:59:05 +00:00
Robert Osfield
f86be80c20 Added support for hardware generated mipmaps into Textre2D::copy*() methods. 2004-10-18 18:31:04 +00:00
Robert Osfield
4c8e48c9e7 From Yuzhong Shen, fix to the image dimensions passed to allocImage in Image::copySubImage 2004-10-18 14:46:57 +00:00
Robert Osfield
cecaec4ed8 From Sohey Yamamoto, added support for GL_TEXTURE_FILTER_CONTROL/GL_TEXTURE_LOD_BIAS. 2004-10-13 19:52:39 +00:00
Robert Osfield
edb15e17bc Added new getMember() method and TypeMemberPair into StateAttribute and
support for the unsigned int member to be paired with types in osg::StateSet
so that lights, clipplanes and other attributes that have a type group but
then need to differentiate within that group via a member uint.
2004-10-13 11:15:50 +00:00
Robert Osfield
4192ef796b Added CullingSettngs::s/getInheritanceMask() and inheritCullSettings(,) method. 2004-10-12 09:54:03 +00:00
Robert Osfield
d77e6a0829 Added new clear, removeAttribute, removeMode, removeTextureAttribute and
removeTextureMode method and deprecated the setToInherit equivilants.
2004-10-07 09:40:03 +00:00
Robert Osfield
c27bf441e2 Improved the osg::Geometry::computeCorrectBindingsAndArraySizes() implemention
so that it produce more optimal settings.

Changed flt/GeoSetBuilder so that it doensn't merge geometry, as it was
merging geometry even when inappropriate.
2004-10-06 20:32:09 +00:00
Robert Osfield
7e4d34c57a Added :
osg::PagedLOD::s/getDatabasePath() and support in PagedLOD::traverse().
    osgDB::ReaderWriter::Options::s/getDatabasePath()
    osgDB::Input::s/getOptions()
    setting of osgDB::Input::setOptions() in ReaderWriterOSG.cpp
    src/osgPlugins/ive/DataInputStream::s/getOptions()
    setting of src/osgPlugins/ive/DataInputStream::setOptions() in ReaderWriterIVE.cpp
2004-10-06 09:31:34 +00:00
Robert Osfield
9af350eb41 From Lewis Harmon, fixes to the Node and NodeCallback constructors. 2004-10-01 22:05:40 +00:00
Robert Osfield
5ecfb11e1b Changed the argument parser to accept strings that start with a - as being
valid strings.
2004-10-01 18:32:42 +00:00
Robert Osfield
884544c52c Added setPlanesFromMatrix method 2004-10-01 15:48:58 +00:00
Robert Osfield
08d4fdefb0 Fixed newly introduced compressed mipmnap error. 2004-09-30 12:10:45 +00:00
Robert Osfield
d204a087c3 Added proper handling of 3d texture compression 2004-09-30 09:10:29 +00:00
Robert Osfield
e08328a449 Preliminary steps to support for compressed 3D textures. 2004-09-29 10:01:46 +00:00
Robert Osfield
7b826228bb From Brad Christiansen, fix expandBy(const BoundingSphere&) method to properly
handle the instance of when the two bounding sphere's have a coincident center.
2004-09-28 07:15:01 +00:00
Robert Osfield
de0e616433 Added new methods into osg::Referenced for controlling the use of thread safe
ref/unref:

        /** Set whether reference counting should be use a mutex to create thread reference counting.*/
        static void setThreadSafeReferenceCounting(bool enableThreadSafeReferenceCounting);

        /** Get whether reference counting is active.*/
        static bool getThreadSafeReferenceCounting();
2004-09-27 14:15:13 +00:00
Robert Osfield
7e5c87de6a Changed the version strings to use OpenSceneGaph rather than "Open Scene Graph" 2004-09-27 12:07:34 +00:00
Robert Osfield
1b31024cd5 Clean up of new DatabasePager code, and change of osgProducer so that
DatabasePager support is now integrated into the OsgSceneHandler.
2004-09-23 18:50:38 +00:00
Robert Osfield
5b0739bcf0 Updates for better DatabasePager peformance w.r.t constant frame rates. 2004-09-23 12:27:56 +00:00
Robert Osfield
54b45ce3bc Updated to DatabasePager support 2004-09-21 21:33:52 +00:00
Robert Osfield
0d884d66eb Various improvements to database paing. 2004-09-21 17:26:08 +00:00
Robert Osfield
63f8935afb From George Papagiannakis, added extra Quat length to catch case
where length is zero.
2004-09-13 14:33:41 +00:00
Robert Osfield
790da0776a Made the computeLocalToWorld etc method to use const NodePath's parameters. 2004-09-09 15:14:33 +00:00
Robert Osfield
a36b10ac24 From Marco Jez, added missing TexGenNode constructor. 2004-09-06 14:30:25 +00:00
Robert Osfield
d9af748b78 From Tom Jolly, add detection for whether multi-texturing is supported before
checking for number of texture units supported, using 1 as a fallback value
2004-09-01 10:41:50 +00:00
Robert Osfield
19bf7bb1ce From Eric Sokolsky, add support for recording default values for env vars 2004-09-01 09:48:17 +00:00
Robert Osfield
e5cfe0a27a From Marco Jez, addition of new interal texture formats to osg/Texture and Image.cpp 2004-09-01 08:49:48 +00:00
Robert Osfield
08017daf37 Added rescale of quaternion in Matrix::set(Quat), a copy operation in osg::Quat and
extra tracking options in NodeTrackerManipulator.
2004-08-31 09:20:31 +00:00
Robert Osfield
2733324701 Fixed the Matrix::get(Quat&) method 2004-08-30 18:51:42 +00:00
Robert Osfield
f15877f89b Changed the AnimationPathCallback::reset() to reset the _firstTime to DBL_MAX
so that it resets on the next update traversal.
2004-08-24 18:23:53 +00:00
Robert Osfield
b2d39d7f5b Added s/getLoopingMode() to ImageStream and MPEG plugin 2004-08-24 12:55:15 +00:00
Robert Osfield
1a455e1aad Rejigged the __int* definitions to try and get round Mingw compile errors 2004-08-18 06:06:02 +00:00
Robert Osfield
5460013a92 From Bruce Clay, fixes for VS6.0 build. 2004-08-17 19:42:45 +00:00
Robert Osfield
a1fc4b986c Changed sizeof(..) references to 1,2,4 respectively. 2004-08-17 18:56:24 +00:00
Robert Osfield
ca61c11134 From David Fries, "I added code to also check the local up vector, but
only if one of the rotation modes is selected, because autoscale isn't
affected by the camera rotations. "
2004-08-17 07:58:32 +00:00
Robert Osfield
a9cb803404 Added a handling of different hex long long handling for VS and non
VS.
2004-08-16 21:03:41 +00:00
Robert Osfield
cf99c3c9bd Added support in Image::flipVertical for flipping mipmapped imagery
and for flipping compressed imagery.
2004-08-16 20:57:24 +00:00
Robert Osfield
bb6fe74738 Fixed _MSC_VAR reference 2004-08-16 16:43:17 +00:00
Robert Osfield
8c1f1e05c8 Added fxtctool in prep for adding compressed imagery swap 2004-08-16 15:43:12 +00:00