FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,228 Commits 1 Branch 26 Tags 73 MiB
ba5f3ce99a
Commit Graph

907 Commits

Author SHA1 Message Date
Robert Osfield
adba6fa559 Added RemoveLoadedProxyNodes pass to Optimizer, set on by default at present. 2005-04-30 15:16:05 +00:00
Robert Osfield
a5fcddc5e5 From Mike Weiblen, Progra/Shader fixes 2005-04-30 07:02:02 +00:00
Robert Osfield
7117ff4bd3 Added support for controlling the frequency of checking for OpenGL errors 
via:

        enum CheckForGLErrors
        {
            /** NEVER_CHECK_GL_ERRORS hints that OpenGL need not be checked for, this
                is the fastest option since checking for errors does incurr a small overhead.*/
            NEVER_CHECK_GL_ERRORS,
            /** ONCE_PER_FRAME means that OpenGl errors will be checked for once per
                frame, the overhead is still small, but at least OpenGL errors that are occurring
                will be caught, the reporting isn't fine grained enough for debugging purposes.*/
            ONCE_PER_FRAME,
            /** ONCE_PER_ATTRIBUTE means that OpenGL errors will be checked for after
                every attribute is applied, allow errors to be directly associated with
                particular operations which makes debugging much easier.*/
            ONCE_PER_ATTRIBUTE
        };

        /** Set whether and how often OpenGL errors should be checked for.*/
        void setCheckForGLErrors(CheckForGLErrors check) { _checkGLErrors = check; }

        /** Get whether and how often OpenGL errors should be checked for.*/
        CheckForGLErrors getCheckForGLErrors() const { return _checkGLErrors; }
 2005-04-29 20:56:20 +00:00
Robert Osfield
0b34ab9cb7 Added version number #define's 2005-04-28 12:45:55 +00:00
Robert Osfield
a1bda0dab8 Added support for per context extension string. 
Note, this required adding a unsigned int context ID to the osg::isGLUExtensionSupported(,)
and osg::isGLExtensionSupported(,) functions.  This may require reimplementation
of end user code to accomodate the new calling convention.
 2005-04-26 13:15:27 +00:00
Robert Osfield
3c90a5f694 Added support notification of Drawable parents of StateSet that event/update callbacks have been called. 2005-04-26 09:58:19 +00:00
Robert Osfield
e24cfa0370 Futher work on supporting update and event callbacks in StateSet, Uniform and StateAttribute 2005-04-25 13:37:12 +00:00
Robert Osfield
bc83e63bb4 Futher work on adding event and update callbacks to StateSet, Uniform and StateAttributes 2005-04-25 11:05:02 +00:00
Robert Osfield
193c83cb9c Added ParentList's into StateSet, Uniform and StateAttribute in preparation for 
providing update and event handling.
 2005-04-24 21:04:54 +00:00
Robert Osfield
f91efb7f31 Added missing bodes of Uniform::operator = and setEvent/UpdateCallback in StateSet. 2005-04-23 10:41:30 +00:00
Robert Osfield
819d2c6c56 Preliminary steps to adding update and event callbacks to StateSet, StateAttribute 
and Uniform.
 2005-04-22 22:45:39 +00:00
Robert Osfield
2914f7c342 Improved handling of invalid imagery in BufferObject 2005-04-22 15:43:34 +00:00
Robert Osfield
af70cd8801 Removed unusaged methods 2005-04-22 14:40:22 +00:00
Robert Osfield
8b4f9dce60 From Mike Weiblen, added support for samplers and mat4 to .osg 2005-04-22 07:13: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
62994ac4a2 From Tony Horrobin, fix for VS6.0 2005-04-17 09:41:48 +00:00
Robert Osfield
8bf4a98a91 From Marco Jez, added operator >> for Plane and Quat to io_utils, and added 
OSG_EXPORT to PerContextProgram.
 2005-04-16 17:44:11 +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
0503712fe4 Removed osgGL2 from CVS, osgGL2 now can be found on the Community/NodeKits section on the OSG website. 2005-04-15 08:35:06 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
869548bafb Uniforms open for business :) 2005-04-14 20:14:53 +00:00
Robert Osfield
e7ce7c0529 Fixed getUniformLocation and getAttribLocation methods 2005-04-14 20:05:16 +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
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
195b63dc65 From Olaf Flebbe, compile fix for Sun. 2005-04-11 15:22:29 +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
d0097718e1 Added friend class PerContextProgram; 2005-04-11 08:15:43 +00:00
Robert Osfield
864817d0d0 From Randall Hopper, fixed typo of setRedMask. 2005-04-10 21:26:49 +00:00
Robert Osfield
f46858c49b Moved UByte4 i/ostream support into io_utils. 2005-04-08 14:10:22 +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
f417974f5b Added iostream operators 2005-04-07 21:28:57 +00:00
Robert Osfield
d006ce627f From Olaf Flebbe, removed supporios BufferObject:: 2005-04-07 20:28:36 +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
7a27a0bef7 From Marco Jez, improvements to osgIntrospection, and new automatically generated 
osgWrappers/osg set.
 2005-04-07 20:00:17 +00:00
Don BURNS
5b4482c70d Set PagedLOD::removeExpiredSubgraph() to be virtual 2005-04-07 17:15:48 +00:00
Don BURNS
af3ac699aa Rolled in Olaf's changes for HP-UX build 2005-04-05 19:08:48 +00:00
Robert Osfield
097c8f18f9 Fixed comment 2005-04-04 13:22:24 +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
Don BURNS
5d10547ac5 Added getCameraByName method to viewer and home(double currentTime) to 
MatrixManipulator, UFO, Trackball and ANimation manipulator.
 2005-03-20 23:57:17 +00:00
Robert Osfield
b0c36076fb From Marco Jez, added OSGNVEXT_ prefex to StateAttribute enums. 2005-03-18 09:48:09 +00:00
Robert Osfield
f8426a8ad8 Made supports(..) methods use support(const ...) 2005-03-18 02:42:59 +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
a72845cfc4 Sebastien Grignard, fixed getMember methods to properly use const type. 2005-03-07 14:38:43 +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
6772a1deb6 From Paul Melis, fixed typo of setFunctionMask. 2005-02-26 21:44:16 +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
b40fe170c7 From Igor Kravtchenko, add #define's for OpenGL float internal texture formats. 2005-02-22 10:16:22 +00:00
Robert Osfield
355ee7a785 Put pixel buffer define's into their own block. 2005-02-10 20:14:22 +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
b7bd8075de From, Leandro Motta Barros, Doxygen comments. 
Ammendments by Robert Osfield, a few comment rewrites to better reflect API functionality/usage.
 2005-02-02 15:08:55 +00:00
Robert Osfield
7be056275b Added red, green, blue and alpha values. 2005-02-01 09:00:32 +00:00
Robert Osfield
c3c3ed8519 Added support for 8 parameters. 2005-02-01 09:00:10 +00:00
Robert Osfield
203133bb3f Added definitation for GL_COMPRESSED_* tokens for case where early OpenGL headers 
don't provide them.
 2005-01-28 11:01:11 +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
d0f42c9231 From Chris Hanson, minor tweaks to docs on getDescriptions. 2005-01-27 13:23:46 +00:00
Robert Osfield
7e75997db0 From Leandro Motta Barros, doxygen comments 2005-01-27 13:15:21 +00:00
Robert Osfield
75175ecb48 Changed template<class> instances to template<typename> 2005-01-27 11:18:33 +00:00
Robert Osfield
fd8f62f941 build fix 2005-01-21 19:31:56 +00:00
Robert Osfield
341267d898 Tweaked the #define's of GL_ALPHA_MIN_SGIX and GL_ALPHA_MAX_SGIX to ensure compilation across 
OGL drivers.
 2005-01-08 10:21:49 +00:00
Robert Osfield
40632c97b0 From Tree, moved GL_ #define's out of osg namespaces 2005-01-07 19:00:40 +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
88234ea31f Removed redundent cont qualification 2004-12-14 03:12:18 +00:00
Robert Osfield
fa4eaae122 From Frederic Marmond, add osg::LogicOp for support for glLogicOp. 2004-12-13 04:54:20 +00:00
Robert Osfield
66396e9452 Teaks to API to make it easier to generate wrappers automatically 2004-12-13 01:07:24 +00:00
Robert Osfield
71a1a96883 Added extra set methods to match get's to make then symetric proporties 2004-12-10 03:37:33 +00:00
Robert Osfield
c3fd271dc4 Addd high level introductory docs for all the libs 2004-11-26 16:01:04 +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
e378e3da8f From Loic Dachary, changes to Timer for PowerPC support, with small re-arrangement 
by Robert Osfield to make tick() code block mode readable.
 2004-11-16 09:03:24 +00:00
Robert Osfield
84d3746e8a From Tree, fixes for Java bindings 2004-11-15 13:02:43 +00:00
Don BURNS
ff92aef6fe PowerPC fix for Timer by Guillaume Morin 2004-11-13 22:04:26 +00:00
Robert Osfield
91af37573a Added public access to VertexProgram's LocalParamters and added .osg support 
for these.
 2004-11-08 17:12:36 +00:00
Robert Osfield
72330d33ee Added a clear() into the RefNodePath operator = (NodePath) method. 2004-11-04 20:25:35 +00:00
Robert Osfield
d548d77010 From Tree chagenes required for Java Wrappers 2004-11-01 16:14:53 +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
b79337d7f8 From Bob Kuehne, addition of Vec3f(Vec2f,float) and Vec3d(Vec2d,double) 
constructors.
 2004-10-18 18:36:40 +00:00
Robert Osfield
8770309da9 Added osgNV enum Types 2004-10-15 10:35:09 +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