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

16329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
7fc36a5d05 Fixed copyright notice 2022-09-27 11:14:56 +01:00
Robert Osfield
683403244a
Merge pull request #1128 from mmurrian/patch-1 
Fix _shaderHint bug in DisplaySettings::setDisplaySettings
 2022-04-07 15:29:09 +01:00
mmurrian
2e04906c90
Update DisplaySettings.cpp 
DisplaySettings::setDisplaySettings sets _shaderHint from itself (potentially uninitialized)
 2022-04-07 09:37:36 -04:00
Robert Osfield
c53eae5dd7 Quietened down debug message 2021-12-09 15:45:33 +00:00
Robert Osfield
a7ce40d178 Fixed orientation of quad strips. 2021-12-09 12:37:00 +00:00
Robert Osfield
51b387c20c Renenabled Asio/RestHttpDevice plugin 2021-12-08 15:15:20 +00:00
Robert Osfield
21f5a0adfb Added workaround to prevent building against new Asio headers 2021-12-08 14:38:15 +00:00
Robert Osfield
aee5267677 Added 's' write selected nodes to "saved_selected.osgt feature. 2021-12-08 14:38:15 +00:00
Robert Osfield
88951bea4c
Merge pull request #1094 from bosvensson1/patch-1 
removes invalid glReadBuffer calls
 2021-10-08 10:48:09 +01:00
Bo Svensson
efde7273ee
removes invalid glReadBuffer calls 2021-10-07 13:57:01 +00:00
Robert Osfield
3e13fa031b Added alias from asc to 3dc 2021-08-31 16:22:44 +01:00
Robert Osfield
76a58ebaf4 Disabled the use of asio as the RestHttpDevice plugin no longer compiles with modern boost releases 2021-06-25 13:15:08 +01:00
Robert Osfield
7bb0dc8180
Merge pull request #1069 from ananace/patch-1 
Fix OpenThreads install on MSVC without a prefix
 2021-06-24 12:19:14 +01:00
Alexander "Ananace" Olofsson
6ccce2ebdd
Fix OpenThreads install on MSVC without a prefix 
All this change does is make the install config for OpenThreads identical to the one in ModuleInstall.cmake
 2021-06-10 17:12:50 +02:00
Robert Osfield
748dca7ee7 Removed unnedded include 2021-05-06 10:20:16 +01:00
Robert Osfield
ec22aeed5a
Merge pull request #1065 from elsid/ref_ptr_move 
Add move constructor and move assignment operator to ref_ptr
 2021-05-05 08:50:32 +01:00
elsid
61e04183ad
Add move constructor and move assignment operator to ref_ptr 
Use conditional compilation to make it work only with C++11 support.
 2021-05-03 12:57:38 +02:00
Robert Osfield
4dad4af47b
Merge pull request #1062 from calumr/empty-text-nodes-bounds 
Fix bounds for empty text nodes
 2021-04-14 11:49:58 +01:00
Calum Robinson
f84072c742 Fix bounds for empty text nodes 
_lineCount can be 0, so we get underflow if the alignment is one of
the *_BOTTOM_BASE_LINE.
 2021-04-14 11:03:41 +01:00
Robert Osfield
60f0dd7d14 Manually merged "ASTC Compression Support Added; GLExtensions improvements" from 3.6 into master 2021-03-29 11:21:37 +01:00
Robert Osfield
3141cea7c1
Merge pull request #1056 from glebm/renderbuffer-multisample 
Check GL_NV_framebuffer_multisample_coverage
 2021-03-29 09:42:43 +01:00
Robert Osfield
3adaff7f0f Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2021-03-29 09:31:01 +01:00
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
valid-ptr
8f42c1e53c FreeType plugin: 'otf' extension added 2021-03-29 09:28:16 +01:00
Gleb Mazovetskiy
713d6fc357 Check GL_NV_framebuffer_multisample_coverage 
`isRenderbufferMultisampleCoverageSupported()` should not return true if
the extension is not supported.

Fixes #1028
 2021-03-16 22:13:53 +00: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