8a15f23c15
Merge pull request #1059 from eligovision/OpenSceneGraph-3.6_freetype_otf
...
FreeType plugin: 'otf' extension added
4 years ago
f29af50b76
FreeType plugin: 'otf' extension added
4 years ago
8b2e02b71d
Ensure global Mutex is initialized before Registry
...
A Registry instance may be accessed before the global mutex, e.g. here:
e77f50371c/src/osgText/Font.cpp (L49)#1048 .
Fixes #1048 .
4 years ago
5faae0e52e
Moved Widget case to later.
4 years ago
5d51e5bf2a
Fixed META_ macro usage
4 years ago
159c0271b7
Fixed osgWidget event handling
4 years ago
94d5211f43
Ran dos2unix to fix line endings
4 years ago
219adb7419
Ran dos2unix to fix line endings
4 years ago
b8862d0420
Merge pull request #1041 from glebm/3.6-cherry-pick-android-fix
...
3.6 cherry-pick: CMakeLists.txt: OSG_FIND_3RD_PARTY_DEPS option
4 years ago
8a0114a46a
Replaced std::mem_fun_ref usage to avoid compatiblity with modern compilers.
4 years ago
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.
4 years ago
23b4345517
Merge pull request #1032 from glebm/3.6-backport-deprecations-fix
...
Back-port (cherry-pick) warnings fixes into 3.6
4 years ago
b5b0bed7c3
Merge pull request #1039 from unelsson/clocaletodae
...
Use c-locale with std::istream
4 years ago
a531f2bd13
Use c-locale with std::istream
4 years ago
f36e9f2a4a
include/osgViewer: Fix typo
...
Follow-up to #1027
4 years ago
b7c186f6d3
Fixed warnings reported by gcc-9.3.0
...
Note from glebm@:
Back-ported from e0d5e4b0ff
4 years ago
644251db98
Fixed warnings
4 years ago
295bfffc17
Added 0 to end of array.
4 years ago
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;
| ^~~~~~~~
```
4 years ago
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.
4 years ago
4093860c32
cmake: Allow passing LTO option
4 years ago
0161b8ab46
include/osg/Callback: nullptr -> NULL
...
Fixes travis, which explictly requires c++98
4 years ago
417f78ac5e
Update unzip.cpp
4 years ago
8195b9c8e7
Merge pull request #1015 from eligovision/OpenSceneGraph-3.6_state_arg_rename
...
Wrong argument name rename: uniformMap -> defineMap
4 years ago
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
4 years ago
9c7cde1db4
updated cmake to properly disable debug iterators on windows
4 years ago
aed9fd74f6
Wrong argument name rename: uniformMap -> defineMap
4 years ago
ddbed23537
fix for typo in windows branch of delimiter definition
4 years ago
a13f8cf4b4
Merge pull request #973 from arnauddgbes/OpenSceneGraph-3.6
...
fixed installation of PDB files on Windows with Ninja generator.
4 years ago
fab1431e59
Merge pull request #989 from eligovision/OpenSceneGraph-3.6_shader_composer
...
ShaderComposition mechanism on the osg::State fixed
4 years ago
073cfab166
Added support for sRGB texture formats
4 years ago
bf279a59fa
Merged from master "Declare "result" as LONG for Mingw build"
4 years ago
4ad410969e
Added Node::accept() usage from IntersectionVisitor to IntersectVisitor
4 years ago
f50d32547d
Changed to using Node::accept() to handled children of Geode/Billboard to enable scene graphs with non drawables as children
4 years ago
8406442a96
Merge pull request #976 from MeyerFabian/build/windows_clang_3.6_target
...
build/windows_clang 3.6
4 years ago
7994bfa767
Merge branch 'OpenSceneGraph-3.6' into build/windows_clang_3.6_target
4 years ago
b8982224c3
Merge pull request #969 from unelsson/daeremoveprotcheck
...
Remove "file" protocol check
4 years ago
8178b51956
Merge pull request #968 from unelsson/getdaenamesbonesskel
...
Get names of bones and skeleton to osg nodes
4 years ago
a7a7c0de8b
Merge pull request #967 from unelsson/daepluginoptionsfix
...
Clone pluginOptions.options
4 years ago
2ade061ced
Code comments, log strings and some variable spell fixes.
4 years ago
0415b7df84
ShaderComposition mechanism on the osg::State fixed: condition improved
4 years ago
43724f004e
ShaderComposition mechanism on the osg::State fixed
4 years ago
300ba7aa02
Merge pull request #983 from rhabacker/update-so-version
...
Updated SO version as osgDB::ReaderWriter changes from #981 change the ABI
4 years ago
97a4094d76
Updated SO version as osgDB::ReaderWriter changes from #981 change the ABI
4 years ago
6b95718d65
Merge pull request #981 from rhabacker/3.6-add-plugin-env-support
...
Add support for showing environment variables provided by osg plugins
4 years ago
47ab799168
Use new method supportsEnvironment() from class ReaderWriter in client code
4 years ago
c3108697de
Add support for showing environment variables provided by osg plugins
4 years ago
ba70c7d543
build/windows_clang
4 years ago
855212548d
fixed installation of PDB files on Windows with Ninja generator.
...
Also added installation of PDB files for OpenThreads
4 years ago
47207248d4
Selected USE_NEW_DELETE allocation mode to fix memory leak
4 years ago
Robert Osfield