Commit Graph

854 Commits

Author SHA1 Message Date
Robert Osfield
496227d239 From Mike Weiblen, removed Uniform not quite ready notice,
and added .h files into osgshaders project file.
2005-04-20 18:50:50 +00:00
Robert Osfield
e2a85f6bc6 From Brede Johnansen, adding support for EXT, ARB and GL version 1.4 point parameters. 2005-04-20 12:32:43 +00:00
Robert Osfield
88e8477cbf Moved istream/ostream includes out of Vec3f, and reimpleted osg::Matrix*::compare. 2005-04-17 10:41:23 +00:00
Robert Osfield
1525a00e1f From Mike Weiblen,added debug info to osg::Program and changed shader uniform names to
avoid conflict with built in functions
2005-04-16 10:11:18 +00:00
Robert Osfield
f4be038d46 Moved Plane and Quat << operators into the io_utils headers 2005-04-15 20:59:24 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
086efcdff1 Removed setProgram from osg::StateSet as Program works just fine right now
as a standard osg::StateAttribute and set in a StateSet with setAttribute.
2005-04-14 15:53:28 +00:00
Robert Osfield
d6d764a729 From Terry Welsh, added copy texture support to TextureRectangle 2005-04-13 18:19:38 +00:00
Robert Osfield
789cb7dea7 Added applying of all parents uniforms 2005-04-13 14:31:25 +00:00
Robert Osfield
0015a31de8 Added basic support for applying uniforms to programs, non lazy state updating
is yet applied though.
2005-04-13 14:12:06 +00:00
Robert Osfield
2e10cffb4d Work in progress on shader language uniform support 2005-04-13 12:00:28 +00:00
Robert Osfield
d268cf46fa Renamed SG_LIBRARY and SG_EXPORT macro's to OSG_LIBRARY and OSG_EXPORT 2005-04-11 17:14:17 +00:00
Robert Osfield
4fec031e6c Moved #include <osg/State> from header into .cpp to clean up build. 2005-04-11 15:17:24 +00:00
Robert Osfield
2fb3d9aae5 Fixed warning, and sorted entries in GNUmakefile 2005-04-11 10:12:32 +00:00
Robert Osfield
d31cd3dce6 From Mike Weiblen, updates to GL Shadler Language support 2005-04-08 13:10:44 +00:00
Robert Osfield
7d24d9fdd5 Added #include <algorithm> 2005-04-08 12:22:03 +00:00
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