Commit Graph

16114 Commits

Author SHA1 Message Date
Robert Osfield
d77a08bfe7 Fixed format 2020-11-12 18:05:12 +00:00
Robert Osfield
b244e658d6 Removed debug code path 2020-11-12 17:22:03 +00:00
Robert Osfield
9e161a5559 Removed the copyright notices as the code is new and doesn't require the standar OSGPL license. 2020-11-12 17:19:23 +00:00
Robert Osfield
0b0457f46b Added uniform arrays for left and right view and projection matrix offsets 2020-11-12 17:04:22 +00:00
Robert Osfield
e93753e261 Added ovr related shader variables 2020-11-12 15:53:38 +00:00
Robert Osfield
c4c0577726 Selected single threading to avoid multibuffering of multiview structures 2020-11-12 15:52:24 +00:00
Robert Osfield
39dc12fb6b Set up the number of views to be the size of the texture array 2020-11-12 15:49:11 +00:00
Robert Osfield
efe358048b Updated shaders for GL_OVR_multiview2 usage 2020-11-12 15:13:29 +00:00
Robert Osfield
a4f838e9a4
Merge pull request #995 from tomhog/th-MultiView
Fix for FileUtils.cpp not compiling under windows
2020-11-12 12:54:27 +00:00
tomhog
88385c3598 Merge branch 'MultiView' of https://github.com/openscenegraph/OpenSceneGraph into MultiView 2020-11-12 12:40:24 +00:00
tomhog
8a783eedb0 fix for typo in windows branch of delimiter definition 2020-11-12 12:40:22 +00:00
Robert Osfield
c1b3a30e7c Copied StandardStereo class renamed to MultivewOVR to use as base of multiviewOVR work. 2020-11-12 12:36:24 +00:00
Robert Osfield
d6ce7550e3 Added standard side by side stereo config to use as a comparison to multviewOVR implementation 2020-11-12 12:22:40 +00:00
Robert Osfield
6831e072e4 Moved osgmultiviewpaging to osgcustompager to avoid name confusion with new multiview extension example 2020-11-11 14:32:28 +00:00
John W. Terrell
3ecd94babc thogarth - merged multiview branch to add multisampling support to texture2d arrays 2020-11-11 10:51:01 +00:00
John W. Terrell
7d34a54a3b thogarth - added ovr_multiview support to FrameBufferObject and const to camera to enable the extension on attachments 2020-11-10 17:12:37 +00:00
Robert Osfield
a13f8cf4b4
Merge pull request #973 from arnauddgbes/OpenSceneGraph-3.6
fixed installation of PDB files on Windows with Ninja generator.
2020-11-10 16:41:46 +00:00
Robert Osfield
fab1431e59
Merge pull request #989 from eligovision/OpenSceneGraph-3.6_shader_composer
ShaderComposition mechanism on the osg::State fixed
2020-11-10 16:19:40 +00:00
Matthew Reid
073cfab166 Added support for sRGB texture formats 2020-11-10 16:05:56 +00:00
Robert Osfield
bf279a59fa Merged from master "Declare "result" as LONG for Mingw build" 2020-11-10 15:56:39 +00:00
Robert Osfield
4ad410969e Added Node::accept() usage from IntersectionVisitor to IntersectVisitor 2020-11-10 15:44:51 +00:00
Robert Osfield
f50d32547d Changed to using Node::accept() to handled children of Geode/Billboard to enable scene graphs with non drawables as children 2020-11-10 15:34:32 +00:00
Robert Osfield
8406442a96
Merge pull request #976 from MeyerFabian/build/windows_clang_3.6_target
build/windows_clang 3.6
2020-11-10 14:45:22 +00:00
Robert Osfield
7994bfa767
Merge branch 'OpenSceneGraph-3.6' into build/windows_clang_3.6_target 2020-11-10 14:41:56 +00:00
Robert Osfield
b8982224c3
Merge pull request #969 from unelsson/daeremoveprotcheck
Remove "file" protocol check
2020-11-10 14:13:26 +00:00
Robert Osfield
8178b51956
Merge pull request #968 from unelsson/getdaenamesbonesskel
Get names of bones and skeleton to osg nodes
2020-11-10 14:04:29 +00:00
Robert Osfield
a7a7c0de8b
Merge pull request #967 from unelsson/daepluginoptionsfix
Clone pluginOptions.options
2020-11-10 13:51:18 +00:00
Alberto Luaces
2ade061ced Code comments, log strings and some variable spell fixes. 2020-10-29 15:14:29 +00:00
valid-ptr
0415b7df84 ShaderComposition mechanism on the osg::State fixed: condition improved 2020-10-28 15:13:47 +03:00
valid-ptr
43724f004e ShaderComposition mechanism on the osg::State fixed 2020-10-27 17:24:28 +03:00
OpenSceneGraph git repository
300ba7aa02
Merge pull request #983 from rhabacker/update-so-version
Updated SO version as osgDB::ReaderWriter changes from #981 change the ABI
2020-08-19 10:45:54 +01:00
Ralf Habacker
97a4094d76 Updated SO version as osgDB::ReaderWriter changes from #981 change the ABI 2020-08-19 11:19:08 +02:00
OpenSceneGraph git repository
6b95718d65
Merge pull request #981 from rhabacker/3.6-add-plugin-env-support
Add support for showing environment variables provided by osg plugins
2020-08-19 09:57:43 +01:00
Ralf Habacker
47ab799168 Use new method supportsEnvironment() from class ReaderWriter in client code 2020-08-19 10:35:54 +02:00
Ralf Habacker
c3108697de Add support for showing environment variables provided by osg plugins 2020-08-19 10:35:54 +02:00
MeyerFabian
ba70c7d543 build/windows_clang 2020-07-21 17:37:24 +02:00
Arnaud Huck
855212548d fixed installation of PDB files on Windows with Ninja generator.
Also added installation of PDB files for OpenThreads
2020-07-14 12:09:53 +02:00
Robert Osfield
47207248d4 Selected USE_NEW_DELETE allocation mode to fix memory leak 2020-07-09 10:14:02 +01:00
Nelsson Huotari
e1e6e07de3 Remove protocol check 2020-07-01 12:44:43 +03:00
Nelsson Huotari
508cf89f9c get names of bones and skeleton to osg nodes 2020-07-01 12:42:03 +03:00
Nelsson Huotari
f29ecc10a8 clone pluginOptions.options 2020-07-01 12:39:24 +03:00
OpenSceneGraph git repository
46505f66d3
Merge pull request #965 from gramnation/patch-1
comment out cmake internal help markup
2020-06-23 17:54:38 +01:00
Graham Stewart
fb63c5b0a5
comment out cmake internal help markup
cmake 2.8.12 cannot parse it. From the looks of it this sort of markup only needs to be parsable when building cmake v3 itself.
2020-06-23 11:51:58 -05:00
Calum Robinson
2b64d30fca Return early in osgText::Text property setters
Matches what the rest of the properties are doing & avoids unnecessary
computation.
2020-05-29 11:12:35 +01:00
Mathias Nährig
e0b288fe37 Update GLExtensions.cpp
GLExtensions::glTexStorage2DMultisample in fact called glTextureStorage2DMultisample which expects texture object instead of texture target
2020-05-18 09:44:58 +01:00
Conrad Poelman
91cfc02700 Remove register keyword (deprecated in C++17/20)
The "register" keyword is deprecated as of C++17. (https://en.cppreference.com/w/cpp/keyword/register) Removing it is necessary to build with clang10+.
2020-05-18 09:44:40 +01:00
Robert Osfield
b29fb0b870 Added ZLIB as a build depdency to PNG plugin build 2020-05-07 11:28:53 +01:00
OpenSceneGraph git repository
6ca2487362
Merge pull request #934 from mp3butcher/orphanalreadyimmutable
[osg3.6] prevent immutability setting when textureobject is taken from orphans
2020-05-03 09:37:44 +01:00
Julien Valentin
197fc401b4 prevent immutability resetting when textureobject is taken from orphans 2020-05-02 16:01:16 +02:00
Robert Osfield
16cd192562 Updated shaders from OpenSceneGraph-Data. 2020-04-29 12:02:52 +01:00