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

16305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
1b557a4ec0
Merge pull request #1055 from glebm/namespace-std 
Fix C++17 MSVC compilation error
 2021-03-29 09:30:53 +01:00
Gleb Mazovetskiy
a2927adc03 Fix C++17 MSVC compilation error 
With C++17, Windows headers must not be included after `using namespace std;`.

Windows headers define a `byte` type internally and `using namespace std`
causes it to conflict with `std::byte`:

    error C2872: 'byte': ambiguous symbol

MSVC thread: https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889
 2021-03-16 21:49:44 +00:00
Robert Osfield
34a1d8bc9b
Merge pull request #1053 from glebm/fix-crash-on-exit-3 
Ensure global Mutex is initialized before Registry
 2021-03-07 10:27:36 +00:00
Gleb Mazovetskiy
da7a6ca02e 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)

This leads to the Mutex being destroyed before the Registry is destroyed.

This causes a crash at exit, as described in #1048.

Fixes #1048.
 2021-03-07 04:25:22 +00:00
Robert Osfield
e77f50371c Moved Widget case to later. 2021-02-19 12:03:53 +00:00
Robert Osfield
faad64256f Fixed META_ macro usage 2021-02-18 16:15:00 +00:00
Robert Osfield
9147d30515 Fixed osgWidget event handling 2021-02-18 16:14:49 +00:00
Robert Osfield
711d69d2fd
Merge pull request #1037 from glebm/3rd-party-deps 
CMakeLists.txt: OSG_FIND_3RD_PARTY_DEPS option
 2021-01-23 17:03:47 +00:00
Nelsson Huotari
2415a8d138 Use c-locale with std::istream 2021-01-23 15:58:01 +00:00
Robert Osfield
cfe83cffd1
Merge pull request #1038 from glebm/patch-1 
include/osgViewer: Fix typo
 2021-01-23 10:48:54 +00:00
Gleb Mazovetskiy
8f202a6ee4
include/osgViewer: Fix typo 
Follow-up to #1027
 2021-01-22 22:34:00 +00:00
Gleb Mazovetskiy
df0c312d99 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-22 15:21:47 +00:00
Robert Osfield
df901fba7a Fixed warnings 2021-01-18 16:34:16 +00:00
Robert Osfield
e8a9064eac Added 0 to end of array. 2021-01-18 15:39:45 +00:00
Robert Osfield
a7360d6a40
Merge pull request #1029 from glebm/fix-shadow-warning 
osgAnimation/Keyframe: Fix -Wshadow warning
 2021-01-18 14:51:20 +00:00
Robert Osfield
ce5efa9505
Merge pull request #1027 from glebm/fix-windowing-system 
Fix osgViewer `USE_GRAPHICSWINDOW` without a windowing system
 2021-01-18 14:47:47 +00:00
Robert Osfield
b330920c11
Merge pull request #1026 from glebm/patch-1 
cmake: Allow passing LTO option
 2021-01-18 14:44:07 +00:00
Robert Osfield
eb09720c1f
Merge pull request #1025 from glebm/fix-travis 
include/osg/Callback: nullptr -> NULL
 2021-01-18 14:15:51 +00:00
Robert Osfield
657842d60b
Merge pull request #1023 from ankurverma85/master 
Fix Duplicate symbols when linking OSG as a static library
 2021-01-18 14:07:21 +00:00
valid-ptr
1b9c6e524c Wrong argument name rename: uniformMap -> defineMap 2021-01-18 13:59:26 +00:00
Robert Osfield
a6b5aefdb8
Merge pull request #1014 from pelicanmapping/fix-texture2darray 
Fix for #1013 - Texture2DArray fails to regenerate after a releaseGLO…
 2021-01-18 13:55:17 +00:00
Robert Osfield
c49c0e023d
Merge pull request #1010 from sbrkopac/disable_iterator_win 
updated cmake to properly disable debug iterators on windows
 2021-01-18 13:42:06 +00:00
Gleb Mazovetskiy
c06c80ece4 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-15 17:55:33 +00:00
Gleb Mazovetskiy
0968256923 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-14 21:44:42 +00:00
Gleb Mazovetskiy
f6505a0f84 cmake: Allow passing LTO option 2021-01-14 01:30:25 +00:00
Gleb Mazovetskiy
f59ab840f1 include/osg/Callback: nullptr -> NULL 
Fixes travis, which explictly requires c++98
 2021-01-14 00:19:02 +00:00
ankurverma85
565da2467b
Update unzip.cpp 2021-01-13 14:01:00 -08:00
Glenn Waldron
ebca7bb462 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 2020-12-24 10:32:44 -05:00
Sam Brkopac
56d3dd0e4c updated cmake to properly disable debug iterators on windows 2020-12-10 14:17:36 -07:00
Robert Osfield
40bddd8d95
Merge pull request #998 from jpabst0/fix_delimiter_compilation 
fix variable name "delimiter"/compilation for win32
 2020-11-17 08:35:51 +00:00
Hannes Pabst
6d4f808434 fix variable name "delimiter"/compilation for win32 2020-11-17 08:13:57 +01:00
Robert Osfield
ec79ef6f79
Merge pull request #979 from matthew-reid/supportSrgbTextureFormats 
sRGB compressed texture formats are now supported
 2020-11-10 16:03:35 +00:00
Robert Osfield
9c33a49f23
Merge pull request #977 from poelmanc/patch-3 
Declare "result" as LONG for Mingw build
 2020-11-10 15:51:03 +00:00
Robert Osfield
0c029c8840
Merge branch 'master' into patch-3 2020-11-10 15:49:52 +00:00
Robert Osfield
324750fded Changed to using Node::accept() to handled children of Geode/Billboard to enable scene graphs with non drawables as children 2020-11-10 15:26:21 +00:00
Robert Osfield
21bb0e1a0c
Merge pull request #974 from MeyerFabian/build/windows_clang 
Enabled windows clang builds.
 2020-11-10 14:34:51 +00:00
Robert Osfield
75f77dec64
Merge branch 'master' into build/windows_clang 2020-11-10 14:34:40 +00:00
Robert Osfield
3572199cb8 Moved GLExtensions changes from 3.6 branch into master 2020-11-10 12:50:58 +00:00
Robert Osfield
cc835694e3
Merge pull request #955 from timoore/extension-observer-ptr 
Fix GLExtensions static order of deletion bug
 2020-11-10 11:14:47 +00:00
OpenSceneGraph git repository
9dad0b4148
Merge pull request #990 from aluaces/code-spell-3 
Code comments, log strings and some variable spell fixes.
 2020-10-29 15:08:30 +00:00
Alberto Luaces
d64ad2e654 Code comments, log strings and some variable spell fixes. 2020-10-28 17:05:06 +01:00
Matthew Reid
6d207e2d8d Added support for sRGB texture formats 2020-10-12 15:13:38 +11:00
Robert Osfield
e0d5e4b0ff Fixed warnings reported by gcc-9.3.0 2020-08-26 15:19:23 +01:00
Robert Osfield
50de0c25f7 Updated SO version number 2020-08-19 16:09:41 +01:00
Ralf Habacker
64cb9cfa15 Use new method supportsEnvironment() from class ReaderWriter in client code 2020-08-19 12:03:42 +01:00
Ralf Habacker
b0a25ce364 Add support for showing environment variables provided by osg plugins 2020-08-19 12:03:42 +01:00
Conrad Poelman
67468cce34
Declare "result" as LONG for Mingw build 
Win32's ChangeDisplaySettingsEx() API function is documented as returning `LONG`, which evidently is not always the same as `unsigned int` (Mingw64.)
This cause a compile error on Mingw with clang10.
 2020-08-03 18:26:24 -04:00
MeyerFabian
07836619b2 Enabled windows clang builds. 2020-07-17 18:01:05 +02:00
Robert Osfield
d5225ea534 Selected USE_NEW_DELETE allocation mode to fix memory leak 2020-07-09 10:15:37 +01:00
Graham Stewart
63bb537132 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 17:55:37 +01:00