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

2571 Commits

Author SHA1 Message Date
Jason Beverage
d53a74b1bb Quiet down shader compilation messages 2018-05-01 11:04:35 -04:00
Robert Osfield
e2e8e779e9 Renamed CMake variable + C++ #define to OSG_GL_CONTEXT_VERSION 2018-04-24 17:05:03 +01:00
Robert Osfield
ef3d672f8c Added OSG_GL_CONTEXT_STRING cmake variable to set include/osg/GL headers that sets Traits::glContextVersion. 2018-04-24 16:30:48 +01:00
Alberto Luaces
bc4f181d41 Fix typos and spelling. 2018-04-20 18:18:22 +02:00
Robert Osfield
0dd5230d82 Cleaned up inbludes and unused code 2018-04-20 14:01:21 +01:00
Robert Osfield
37e3c428b6 Fixed the set*Binding() methods so that they assign BufferObjects when required 2018-04-19 19:46:20 +01:00
Robert Osfield
0836fa602a Fixed the GLBufferObject size computation so that it takes into account padding. 2018-04-19 19:45:29 +01:00
Robert Osfield
675702d258 Fixed Geometry::drawImplmentation() handling of VBO's to prevent them from being used when display lists are used. 2018-04-16 15:05:11 +01:00
Robert Osfield
e884df59c7 Pulled in latest changes from 3.6 branch 2018-04-07 18:14:57 +01:00
Robert Osfield
decaf57fef Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation 2018-04-05 14:14:49 +01:00
Robert Osfield
b92158ed33 Changed DisplaySettings::setShaderHint(..) messages to INFO 2018-04-05 12:36:24 +01:00
Konstantin S. Matveyev
6cd00edd6c osg::Program's compileGLObjects and apply methods fixed for OSG without OSG_GL_FIXED_FUNCTION_AVAILABLE 2018-04-03 12:22:34 +01:00
Robert Osfield
5c48904626 Rewrote the handling of AutoTransform::setAutoScaleToScreen(bool) functionality so that is disabling CullingActive when switched on. 2018-04-02 18:26:26 +01:00
Konstantin S. Matveyev
c87c78bfdd VertexArrayState: typo fixed in log 2018-03-27 08:48:50 +01:00
Robert Osfield
deef029823 Fixed member variable names to avoid conflicts with osg::Node 2018-03-23 20:07:08 +00:00
Robert Osfield
b48db74fa3 Changed the isBufferObjectSupported flag so that it's true when either VBO or PBO's are supported 2018-03-23 12:55:00 +00:00
Robert Osfield
76c584ab25 Added osg::UnfiromBase* StateSet::getUniformBase(..) and osg::Uniform* StateSet::getUniform(..) methods to help with backwards compatibility 2018-03-19 12:08:28 +00:00
Robert Osfield
3585ecc28c Merge branch 'master' into shader_pipeline 2018-03-14 09:20:08 +00:00
Yaroslav Tarasov
f8199935fa Fixed renamed of _textureDepth. 2018-03-12 16:14:30 +00:00
Robert Osfield
5c8a5307d6 From Colin McDonald, "If the glCreateProgram in osg::Program fails for any reason, then subsequently 
Program::PerContextProgram::linkProgram would crash.  I've put in some
checks to prevent that."
 2018-03-12 15:55:35 +00:00
Robert Osfield
3f686d8719 Fixed indentation 2018-03-12 15:29:56 +00:00
Robert Osfield
7ce1938543 Improved indentation 2018-03-12 15:12:44 +00:00
Robert Osfield
1020bddb15 Fixed recursive call bug 2018-03-08 10:47:07 +00:00
Robert Osfield
4dac60540a Changed the default values of _drawBuffer and _readBuffer to make sure that the lazy state updating in State.glDrawBuffers(GLenum)/glReadBuffers(Glenum) doesn't ever ignore the first call. 2018-03-07 17:44:48 +00:00
Robert Osfield
98a7772fa7 Merge branch 'master' into shader_pipeline 2018-03-06 10:24:26 +00:00
Robert Osfield
64341cfb72 Added State::glDrawBuffer/glReadBuffer() method to implement lazy state updating for glDrawBuffer and glReadBuffer 2018-03-06 09:49:02 +00:00
Laurens Voerman
c81317b5b0 remove _EXT from GL_MAX_ARRAY_TEXTURE_LAYERS_EXT and GL_TEXTURE_BINDING_2D_ARRAY_EXT 2018-02-28 14:11:41 +01:00
Robert Osfield
1ae954f5c3 Merge branch 'master' into shader_pipeline 2018-02-28 09:11:29 +00:00
Robert Osfield
99bcd95756 Replaced GL_TEXTURE_2D_ARRAY_EXT with GL_TEXTURE_2D_ARRAY 2018-02-28 08:50:48 +00:00
Robert Osfield
3dec244d5b Changed GL enum to fix Windows build issue 2018-02-28 08:02:39 +00:00
Robert Osfield
2a56e2dda1 Changed GL enum to fix Windows build issue 2018-02-28 08:00:40 +00:00
Robert Osfield
d2939da39f Merge branch 'master' into shader_pipeline 2018-02-27 19:10:26 +00:00
Robert Osfield
6a4609c28f Fixed precision issue with filling in the last element of the TransferFunction1D's osg::Image. 2018-02-27 19:09:18 +00:00
Robert Osfield
140633adc1 Merge branch 'master' into shader_pipeline 2018-02-27 18:16:08 +00:00
Robert Osfield
7b6eedbdf4 Restructured the way that applyTexParameters() is applied to address issues with Intel drivers not handling mipmap generations unless the tex parameters are reapplied on new upload of data. 2018-02-27 17:35:13 +00:00
Robert Osfield
fc128db510 Merge branch 'master' into shader_pipeline 2018-02-23 09:58:16 +00:00
Konstantin S. Matveyev
e3df1e954d GLExtensions fix: No PBO on GLES2 by default 2018-02-22 16:43:14 +03:00
Robert Osfield
351e8e3fe1 Merge branch 'master' into shader_pipeline 2018-02-19 11:23:29 +00:00
Hartwig
73a36679df Addition of radius parameter for ClusterCullingCallback's constructor 
The radius parameter is already present in ClusterCullingCallback's set method but has been forgotten in the constructor.
 2018-02-15 21:10:59 +01:00
Robert Osfield
91f3e8fa59 Merge branch 'master' into shader_pipeline 2018-02-13 12:24:26 +00:00
Robert Osfield
68bb67312e Improved handling of updates to the Texture target that require the texture to be reapplied. 
Used State for applying Texture target to work better with lazy state updating.
 2018-02-13 12:12:34 +00:00
Robert Osfield
a7839d77cd Added support for PixelBufferObject to Texture2DArray 2018-02-10 17:55:50 +00:00
Robert Osfield
1306fe2611 Added support for PixelBufferObject to Texture2DArray 2018-02-10 17:50:39 +00:00
Robert Osfield
a0c23d914d Merge branch 'master' into shader_pipeline 2018-02-07 09:27:53 +00:00
OpenSceneGraph git repository
6d1d1bb000
Revert "BindingTextureImage: a more complex condition for _texture->apply ?" 2018-02-02 09:54:31 +00:00
Robert Osfield
e77be08e56 Maded CLAMP_TO_EDGE default clamp mode 2018-02-01 10:50:09 +00:00
Ilya Zhuravlev
92b45581af getGLExtensionFuncPtr: support gl4es wrapper on Android. 2018-01-29 16:07:13 -05:00
Robert Osfield
0c35541fc5 Merge branch 'master' into shader_pipeline 2018-01-27 10:56:09 +00:00
OpenSceneGraph git repository
8046ef5b6b
Merge pull request #459 from mp3butcher/bufferstorage 
add more extensions
 2018-01-27 09:20:12 +00:00
Philippe Renon
13d88c7fec os_utils: fix non portable use of "defined" 
see https://github.com/openscenegraph/OpenSceneGraph/issues/458
 2018-01-26 10:33:48 +01:00