Commit Graph

2260 Commits

Author SHA1 Message Date
OpenSceneGraph git repository
c19b271586 Merge pull request #119 from LaurensVoerman/Submissions2c
Fixed clone osgVolume::Scalarproperty and osg::TextureBuffer crash
2016-09-02 17:47:37 +01:00
Laurens Voerman
d0020b7dfc bugfix: osg::TextureBuffer::clone() crash 2016-08-29 10:01:48 +02:00
Robert Osfield
2e6f0d7aab Quitened unused parameter warnings 2016-08-26 19:28:36 +01:00
Robert Osfield
0ad09d6dad Fixed unused variable warnings 2016-08-26 19:18:00 +01:00
Robert Osfield
322adc266c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2016-08-26 18:00:52 +01:00
Robert Osfield
11ddd53eb4 Removed redundent Referenced::s/getThreadSafeReferenceCounting() and associated static and env vars as there are now inapprorpiate and no longer supported 2016-08-26 17:59:30 +01:00
scrawl
0b450a5113 Remove an unneeded const_cast 2016-08-14 19:30:55 +02:00
Anish Thomas
2b9dfab1fc GLSL 1.3 support for vertex-attrib aliasing 2016-08-10 14:12:27 +01:00
Juan Hernando Vieites
b3c242e270 Added missing GL enums to Texture::computeInternalFormatType 2016-08-04 17:03:51 +02:00
scrawl
5b70f208e3 Fix RenderBuffer not being attached (bug introduced with commit 55b3becb7c ) 2016-08-01 17:48:14 +02:00
Robert Osfield
0876677fb2 Removed check against changed flag as check is aleady done outside the method so no need for a duplicate check 2016-06-29 16:07:39 +01:00
Julien Valentin
98b81821fb fix in StateSet.cpp
the State::DefineMap::changed flag is not resetted to false after currentDefines are updated
2016-06-29 16:05:14 +01:00
Robert Osfield
00b1173e70 Added osg::ScissorIndexed that wraps up glScissorIndexed function 2016-06-29 15:11:02 +01:00
Robert Osfield
412e9fc3dd Added osg::DepthRangeIndexed class to wrap up glDepthRangeIndexed functionality. 2016-06-29 12:28:28 +01:00
Robert Osfield
54dbf438cc Fixed cast 2016-06-29 11:36:44 +01:00
Robert Osfield
e932c8e5e8 Added build of new osg::ViewportIndexed 2016-06-29 11:35:56 +01:00
Robert Osfield
e30b570b1f Revert "Fixed incorrect cast" as commit contained more changes than intended.
This reverts commit 2897ab13cb.
2016-06-29 11:34:20 +01:00
Robert Osfield
8d7d5d12a1 Added osg::ViewportIndexed that adds support for glViewportIndexed 2016-06-29 11:26:54 +01:00
Robert Osfield
2897ab13cb Fixed incorrect cast 2016-06-29 11:25:08 +01:00
Laurens Voerman
ec74518868 Added glViewerArray, glSissorArray, glDepthRangeArray etc. GL extension support 2016-06-29 09:53:04 +01:00
Robert Osfield
949aca196d Refactored handling of StateAttiribute's that override the StateAttiribute::getMember() so that when they change their Member value they update the StateSet parents that own them to keep the StateSet's maps coherent. 2016-06-25 12:24:19 +01:00
Robert Osfield
07137f4111 Fixed unitialized variables 2016-06-23 16:32:02 +01:00
Robert Osfield
5c9b66a48d Added initializer 2016-06-23 12:35:07 +01:00
Robert Osfield
1298ede4d5 Added initializer 2016-06-23 12:34:08 +01:00
Robert Osfield
ff38f84d04 Added initializer 2016-06-23 12:32:15 +01:00
Robert Osfield
8f7f6141e7 Added initializer 2016-06-23 12:30:36 +01:00
Robert Osfield
9c80078c07 Added initializer 2016-06-23 12:25:27 +01:00
Robert Osfield
e0d26ba1f5 Added copying of _syncSwapBuffers 2016-06-23 12:23:31 +01:00
Robert Osfield
1f73376476 Restructed the GLExtensions(..) constructor so that it now intializes all the variables to NULL if there is not a valid graphics context present 2016-06-23 12:19:59 +01:00
Robert Osfield
bc8452512f Added initializers and handling of null case 2016-06-23 11:03:38 +01:00
Robert Osfield
79f174aee4 Fixed return value 2016-06-23 10:52:16 +01:00
Robert Osfield
55b3becb7c Restructured to avoid NULL reference 2016-06-23 10:50:25 +01:00
Robert Osfield
5e73f0bb35 Removed dead code 2016-06-23 10:45:48 +01:00
Robert Osfield
46750d6b17 Removed dead code 2016-06-23 10:41:58 +01:00
Robert Osfield
25e04b8463 Fixed typo 2016-06-22 15:53:37 +01:00
Robert Osfield
011d60ec03 Fixed memory leak. 2016-06-21 17:04:22 +01:00
Robert Osfield
17bd80329a Fixed line endings 2016-06-21 17:03:33 +01:00
Julien Valentin
e236acfed5 Added OpenGL extensions related to shader subroutine 2016-06-17 10:35:25 +01:00
Robert Osfield
aea83494c1 Removed deprecated_osg::Geometry and cleaned up the deprecated Geometry::set*Binding() calls 2016-06-17 10:12:11 +01:00
Robert Osfield
234d6cf431 Added if (texture) to fix bug when the dynamic_cast<> returns NULL. 2016-06-17 09:24:13 +01:00
Robert Osfield
0696e49f2d Changed dyanmic_cast<> to static_cast<> as code is written in a way that the type is always known. 2016-06-17 08:53:38 +01:00
Julien Valentin
78b99c7143 Refactored osg::TextureBuffer to support assigning any type of osg::BufferData rather than just osg::Image as was previously required.
Refactored osgforest and osggpucull examples to take account of changes to TextureBuffer.

Added osg::DrawIndirectBufferBinding.
2016-06-15 19:05:35 +01:00
Robert Osfield
819ce6c0d1 Removed redundent _boundingBoxComputed 2016-06-14 18:27:27 +01:00
Robert Osfield
6d18b3d74e Fixed memory leak detected by Coverity 2016-06-10 15:49:24 +01:00
Robert Osfield
6a65b935fa Fixed uninitialized member variable. 2016-06-10 14:16:49 +01:00
Robert Osfield
69046511de Fixed iterator invalidation bug picked by Covertiy scan. 2016-06-10 12:03:48 +01:00
Julien Valentin
ac26ba7e5b Shader subroutine related funcs added 2016-06-09 10:48:05 +01:00
Robert Osfield
ef73d2449e Fixed -Wextra warnings 2016-06-08 09:20:16 +01:00
Robert Osfield
0a95fd875d Removed the use of register hint and cleaned up indentation 2016-06-04 18:40:37 +01:00
Julien Valentin
71339906c0 Fixed little bug in DrawArraysLength (instancing not supported).
Corrected PrimitiveSet.cpp in order DrawArraysLength can be instanced.
It's the only pr missing code
if (_numInstances>=1)      glDrawXXXInstanced(...,_numInstances);
else glDrawXXX();
2016-06-03 17:57:04 +01:00