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 |
|
Robert Osfield
|
4447190dd6
|
Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition.
|
2018-03-14 08:22:45 +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 |
|
Daniel Emminizer
|
28544a4e29
|
Minor typo fix on osg::StateAttribute
|
2018-03-05 10:26:54 -05:00 |
|
Robert Osfield
|
1b8567e11e
|
Added deprecated comments for ShaderComposer
|
2018-03-05 14:39:07 +00: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
|
351e8e3fe1
|
Merge branch 'master' into shader_pipeline
|
2018-02-19 11:23:29 +00:00 |
|
OpenSceneGraph git repository
|
56baa7bf04
|
Merge pull request #479 from LaurensVoerman/submit_vc14WarnC4800_v2
move Get/SetScalarvalue out of ValueObject and provide specialization…
|
2018-02-19 10:14:36 +00:00 |
|
OpenSceneGraph git repository
|
c52ae4f99f
|
Changed the doxygen control characters and clarifications
|
2018-02-19 08:39:23 +00:00 |
|
Hartwig Wiesmann
|
f01383c02a
|
Addition of comments for ClusterCullingCallback
|
2018-02-18 08:49:41 +03: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 |
|
Laurens Voerman
|
b79d680580
|
move Get/SetScalarvalue out of ValueObject and provide specialization for GetScalarValue<bool> fixing MSVC waring C4800
|
2018-02-15 14:59:24 +01:00 |
|
Laurens Voerman
|
ec4881da5a
|
bugfix: GetScalarValue returns inverted values for booleans; SetScalarValue needs to be a SetValueVisitor
|
2018-02-13 17:38:35 +01:00 |
|
Robert Osfield
|
91f3e8fa59
|
Merge branch 'master' into shader_pipeline
|
2018-02-13 12:24:26 +00:00 |
|
Robert Osfield
|
b8e5f22cb7
|
Added virtual bool Texture::isDirty(contextID) method to help determine whether a GL texture object is likely to be out of date and needs updating
|
2018-02-13 12:01:57 +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
|
0c35541fc5
|
Merge branch 'master' into shader_pipeline
|
2018-01-27 10:56:09 +00:00 |
|
Julien Valentin
|
f4663b0e32
|
add ARB_BufferStorage extensions
|
2018-01-25 16:22:33 +01:00 |
|
Robert Osfield
|
368dd5dd92
|
Merge branch 'master' into shader_pipeline
|
2018-01-23 10:39:05 +00:00 |
|
OpenSceneGraph git repository
|
022d1df97d
|
Merge pull request #454 from mp3butcher/imagebinding
BindingTextureImage: a more complex condition for _texture->apply ?
|
2018-01-23 10:26:20 +00:00 |
|
Robert Osfield
|
1e8879f2e2
|
Merge branch 'master' into shader_pipeline
|
2018-01-23 10:08:27 +00:00 |
|
OpenSceneGraph git repository
|
3b2b2d762c
|
Merge pull request #456 from PissedCapslock/patch-2
Fixing typos in comments
|
2018-01-23 09:56:26 +00:00 |
|
Robin Stevens
|
dcbaa3e64a
|
Fixing typos in comments
|
2018-01-23 10:25:32 +01:00 |
|
Robin Stevens
|
5810d2ba18
|
Typo in comment
|
2018-01-23 10:20:49 +01:00 |
|
Robert Osfield
|
2f65456dd4
|
Merge branch 'master' into shader_pipeline
|
2018-01-21 13:11:51 +00:00 |
|
Robert Osfield
|
18d5a9159f
|
Restructured the system() fallback to be usable for C and C++
|
2018-01-21 12:09:49 +00:00 |
|
Julien Valentin
|
0aa8008f0a
|
add a virtual getBufferData to Texture
|
2018-01-21 01:23:38 +01:00 |
|
Robert Osfield
|
41e3b723a7
|
Merge branch 'master' into shader_pipeline
|
2018-01-15 16:52:10 +00:00 |
|
OpenSceneGraph git repository
|
6b9235f185
|
Merge pull request #449 from LaurensVoerman/submit_toLower
fix vc2017 compile warning 'unsigned int' to 'const char'
|
2018-01-15 16:28:54 +00:00 |
|
Robert Osfield
|
6a5afd63e7
|
Merge branch 'master' into shader_pipeline
|
2018-01-15 16:03:21 +00:00 |
|
Robert Osfield
|
5ad1a652a0
|
Moved defined into GLDefines header to avoid compile issues under Windows
|
2018-01-15 16:02:44 +00:00 |
|
Laurens Voerman
|
33f99e9c70
|
fix vc2017 compile warning 'unsigned int' to 'const char'
|
2018-01-15 16:42:31 +01:00 |
|
Robert Osfield
|
9fdc713b97
|
Merge branch 'master' into shader_pipeline
|
2018-01-14 13:28:45 +00:00 |
|
Julien Valentin
|
4c0a861f91
|
add static helper func in order to generate Samplers of a Samplerless StateSet
+fix ident
|
2018-01-13 21:25:47 +01:00 |
|
Julien Valentin
|
d2b8468bf4
|
add MinLOD MaxLOD and LODBias to Texture
|
2018-01-13 21:16:16 +01:00 |
|
Robert Osfield
|
26b06a8daa
|
Merge branch 'master' into shader_pipeline
|
2018-01-12 19:55:34 +00:00 |
|
Robert Osfield
|
ae57f3cd46
|
Added ability to toggle on/off use of C system() function call, using OSG_SYSTEM_SUPPORTED Cmake option
|
2018-01-12 19:52:31 +00:00 |
|
Robert Osfield
|
a7cc9664c0
|
Renamed EnvVar header to os_utils in prep for adding more OS related calls to it
|
2018-01-12 16:48:17 +00:00 |
|
Robert Osfield
|
903b0895f7
|
Added non const variants of State::getDisplaySettings/getActiveDisplaySettings().
|
2018-01-09 12:16:32 +00:00 |
|
Robert Osfield
|
3e676f67ff
|
Removed inappropriate //
|
2018-01-06 13:09:16 +00:00 |
|
Robert Osfield
|
230ee49428
|
Added ValueObject::get/setScaleValue(..) convinient methods
|
2018-01-06 12:54:14 +00:00 |
|
Robert Osfield
|
339b7ffa7c
|
Removed inappropriate //
|
2018-01-06 12:52:34 +00:00 |
|
Robert Osfield
|
6a413da143
|
Merge branch 'master' into shader_pipeline
|
2018-01-05 11:35:11 +00:00 |
|
OpenSceneGraph git repository
|
eca7831281
|
Merge pull request #424 from mp3butcher/osgSampler
GL3.3 SamplerObject as StateAttribute
|
2018-01-05 09:43:16 +00:00 |
|
OpenSceneGraph git repository
|
6ef90054bc
|
Merge pull request #425 from mp3butcher/callbacks
Support for multiple nest Camera DrawCallbacks
|
2018-01-05 09:18:39 +00:00 |
|
OpenSceneGraph git repository
|
73689caa5f
|
Had to fix positioning of { and spacing to be consistent with the rest of the OSG
|
2018-01-04 15:28:45 +00:00 |
|