Gleb Mazovetskiy
199035ae51
CMakeLists.txt: OSG_FIND_3RD_PARTY_DEPS option
...
Android-specific macros aren't needed in some cases, e.g. if the NDK is
setup with all the needed dependencies a much easier way to find
packages is to simply specify the correct `CMAKE_FIND_ROOT_PATH`.
The `ANDROID_3RD_PARTY` macro interferes with this.
Adds an option to disable it.
WIN32 build is in a similar situation, the new option affects it also.
2021-01-23 17:25:45 +00:00
Robert Osfield
23b4345517
Merge pull request #1032 from glebm/3.6-backport-deprecations-fix
...
Back-port (cherry-pick) warnings fixes into 3.6
2021-01-23 16:15:35 +00:00
Robert Osfield
b5b0bed7c3
Merge pull request #1039 from unelsson/clocaletodae
...
Use c-locale with std::istream
2021-01-23 15:57:16 +00:00
Nelsson Huotari
a531f2bd13
Use c-locale with std::istream
2021-01-23 14:46:16 +02:00
Gleb Mazovetskiy
f36e9f2a4a
include/osgViewer: Fix typo
...
Follow-up to #1027
2021-01-23 10:53:44 +00:00
Robert Osfield
b7c186f6d3
Fixed warnings reported by gcc-9.3.0
...
Note from glebm@:
Back-ported from e0d5e4b0ff
Identical except for the changes to `MatrixTemplate`, which does not
exist in 3.6
2021-01-19 20:37:40 +00:00
Robert Osfield
644251db98
Fixed warnings
2021-01-18 16:33:34 +00:00
Robert Osfield
295bfffc17
Added 0 to end of array.
2021-01-18 15:38:43 +00:00
Gleb Mazovetskiy
b4663ded94
osgAnimation/Keyframe: Fix -Wshadow warning
...
```
include/osgAnimation/Keyframe:108:53: warning: declaration of 'iterator' shadows a member of 'osgAnimation::TemplateKeyframeContainer<osgAnimation::TemplateCubicBezier<double> >' [-Wshadow]
108 | for(std::vector<unsigned int>::iterator iterator = intervalSizes.begin() ; iterator != intervalSizes.end() ; ++ iterator) {
| ^~~~~~~~
include/osg/MixinVector:39:44: note: shadowed declaration is here
39 | typedef typename vector_type::iterator iterator;
| ^~~~~~~~
```
2021-01-18 14:51:48 +00:00
Gleb Mazovetskiy
44d3da02a9
Fix osgViewer USE_GRAPHICSWINDOW
without a windowing system
...
There is no way for the user to know whether OSG was compiled with a
windowing system.
This means calling USE_GRAPHICSWINDOW() in client libraries was unsafe
in the case of the "None" windowing system, as it would fail to link.
Turns the call into a no-op in that case.
2021-01-18 14:48:12 +00:00
Gleb Mazovetskiy
4093860c32
cmake: Allow passing LTO option
2021-01-18 14:45:41 +00:00
Gleb Mazovetskiy
0161b8ab46
include/osg/Callback: nullptr -> NULL
...
Fixes travis, which explictly requires c++98
2021-01-18 14:45:06 +00:00
ankurverma85
417f78ac5e
Update unzip.cpp
2021-01-18 14:07:47 +00:00
Robert Osfield
8195b9c8e7
Merge pull request #1015 from eligovision/OpenSceneGraph-3.6_state_arg_rename
...
Wrong argument name rename: uniformMap -> defineMap
2021-01-18 13:57:29 +00:00
Glenn Waldron
5ca6759a1f
Fix for #1013 - Texture2DArray fails to regenerate after a releaseGLObjects/dirtyTextureObject - remove the modified count condition on component images when subloading when there is no texture object
2021-01-18 13:55:53 +00:00
Sam Brkopac
9c7cde1db4
updated cmake to properly disable debug iterators on windows
2021-01-18 13:42:40 +00:00
valid-ptr
aed9fd74f6
Wrong argument name rename: uniformMap -> defineMap
2020-12-29 15:07:15 +03:00
tomhog
ddbed23537
fix for typo in windows branch of delimiter definition
2020-11-12 12:55:23 +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