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

16148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
fee977ac90 Added workaround to prevent building against new Asio headers 2021-12-08 14:28:47 +00:00
Robert Osfield
62dbe7b85e Added 's' write selected nodes to "saved_selected.osgt feature. 2021-12-08 14:28:47 +00:00
Bo Svensson
ecaca716e9 removes invalid glReadBuffer calls 2021-10-08 10:49:01 +01:00
Robert Osfield
df21f59779 Added alias from asc to 3dc 2021-08-31 16:21:18 +01:00
Robert Osfield
e28f789ffa Disabled the use of asio as the RestHttpDevice plugin no longer compiles with modern boost releases 2021-06-25 13:17:21 +01:00
Alexander "Ananace" Olofsson
b7fa2d7914 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-24 12:19:40 +01:00
Robert Osfield
51924943e2 Removed unnedded include 2021-05-06 10:21:16 +01:00
elsid
969c1821be Add move constructor and move assignment operator to ref_ptr 
Use conditional compilation to make it work only with C++11 support.
 2021-05-06 10:21:04 +01:00
Calum Robinson
2695f29be0 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:51:09 +01:00
Robert Osfield
78cb12b531
Merge pull request #1005 from eligovision/OpenSceneGraph-3.6_webgl_compr_tex 
ASTC Compression Support Added; GLExtensions improvements
 2021-03-29 10:32:13 +01:00
Robert Osfield
beb9bc3cf2 Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6 2021-03-29 10:07:02 +01:00
Robert Osfield
d11e84178f
Merge pull request #1046 from eligovision/OpenSceneGraph-3.6_timer_query_gles 
OpenSceneGraph 3.6 improvement: GL_EXT_disjoint_timer_query extension added
 2021-03-29 09:57:43 +01:00
Gleb Mazovetskiy
b14eecb3c7 Check GL_NV_framebuffer_multisample_coverage 
`isRenderbufferMultisampleCoverageSupported()` should not return true if
the extension is not supported.

Fixes #1028
 2021-03-29 09:43:50 +01:00
Gleb Mazovetskiy
9fb010fadd 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-29 09:31:55 +01:00
Robert Osfield
8a15f23c15
Merge pull request #1059 from eligovision/OpenSceneGraph-3.6_freetype_otf 
FreeType plugin: 'otf' extension added
 2021-03-29 09:26:46 +01:00
valid-ptr
e260dfb582 merged with upstream/OpenSceneGraph-3.6 2021-03-24 17:45:19 +03:00
valid-ptr
b728587fab conflict with upstream/OpenSceneGraph-3.6 resolved 2021-03-24 17:40:29 +03:00
valid-ptr
f29af50b76 FreeType plugin: 'otf' extension added 2021-03-24 17:01:00 +03:00
Gleb Mazovetskiy
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)

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-14 17:58:28 +00:00
Robert Osfield
5faae0e52e Moved Widget case to later. 2021-02-19 12:03:07 +00:00
Robert Osfield
5d51e5bf2a Fixed META_ macro usage 2021-02-18 16:13:50 +00:00
Robert Osfield
159c0271b7 Fixed osgWidget event handling 2021-02-18 16:08:25 +00:00
Robert Osfield
94d5211f43 Ran dos2unix to fix line endings 2021-02-17 18:23:32 +00:00
Robert Osfield
219adb7419 Ran dos2unix to fix line endings 2021-02-17 17:50:21 +00:00
valid-ptr
b101b4b4d2 GL_EXT_disjoint_timer_query extension added 2021-02-04 19:53:54 +03:00
Robert Osfield
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
 2021-01-23 18:33:39 +00:00
Robert Osfield
8a0114a46a Replaced std::mem_fun_ref usage to avoid compatiblity with modern compilers. 2021-01-23 18:27:58 +00:00
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
valid-ptr
927d2f0f10 Texture::TextureProfile::computeSize function fixed for ASTC compressed textures 2021-01-19 12:09:24 +03: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
valid-ptr
39a78e075f isTextureLODBiasSupported check added 2020-12-04 18:34:02 +03:00
valid-ptr
b4eb001d14 ASTC Texture compression support added 2020-12-04 18:33:18 +03:00
valid-ptr
6cd699e55f GLExtensions: isTextureCompressionASTCSupported (ASTC compression texture), isTextureLODBiasSupported (is needed for GL_TEXTURE_LOD_BIAS) flags added 2020-12-04 18:32:35 +03:00
konstantin.matveyev
4b0bed8161 GLExtensions improved: added support for WebGL compressed textures: S3TC, ETC{1,2}, PVRTC 2020-11-26 14:02:50 +03:00
tomhog
ddbed23537 fix for typo in windows branch of delimiter definition 2020-11-12 12:55:23 +00:00