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

16203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Svensson
8d9101b852 removes invalid glReadBuffer calls 2021-10-08 15:36:52 +01:00
Robert Osfield
dfbd5f7b72 Added alias from asc to 3dc 2021-08-31 16:22:22 +01:00
Robert Osfield
7707ca5e35 Merge branch 'OpenSceneGraph-3.6' into MeshShaders 2021-06-24 12:22:26 +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
af9c89d8e6 Added mesh and task shader support 2021-05-06 10:47:37 +01:00
Robert Osfield
462a7555d7 Removed unnedded include 2021-05-06 10:39:11 +01:00
elsid
a57db8a4f8 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:39:11 +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
Robert Osfield
426af58c3b Merge branch 'OpenSceneGraph-3.6' into MeshShaders 2021-04-14 11:52:41 +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
4599a86bc9 Added osg::MultiDrawMeshTasksIndirectCount class to wrap glMultiDrawMeshTasksIndirectCountNV call. 2021-04-01 08:45:42 +01:00
Robert Osfield
27a664a4e3 Added osg::MultiDrawMeshTasksIndirect class 2021-03-31 18:36:45 +01:00
Robert Osfield
874c9ac691 Added osg::DrawMeshTasksIndirect class 2021-03-31 18:09:07 +01:00
Robert Osfield
64404e9de3 Added osg::DrawMeshTasks implementaton. 2021-03-31 17:34:39 +01:00
Robert Osfield
0612b03eab Simplified code using GLEXtensions. 2021-03-31 15:54:07 +01:00
Robert Osfield
e9ab9ca108 Changed the Linux code path for osg::getGLExtensionFuncPtr(..) to use glXGetProcess or glXGetProcessARB when available 2021-03-31 15:38:33 +01:00
Robert Osfield
fd80861510 Test of using glXGetProcAddress(). 2021-03-31 13:50:13 +01:00
Robert Osfield
675be3efe1 Added comment section about configuring cmake build for GL3 core profile under Linux 2021-03-29 16:26:55 +01:00
Robert Osfield
3160481c25 Added MESH and TASK shader enums to osg::Shader. 
Added beginings of osgmeshshader example.
 2021-03-29 16:12:15 +01:00
Robert Osfield
49071a627f Added cast to void* in debug output. 2021-03-29 13:49:54 +01:00
Robert Osfield
95486bd392 Implemented GL defines and extensions for NV mesh shaders 2021-03-29 13:07:42 +01:00
Robert Osfield
6e728811da Merge branch 'OpenSceneGraph-3.6' into MultiView 2021-03-29 11:22:44 +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
Robert Osfield
df15baf50f Merge branch 'OpenSceneGraph-3.6' into MultiView 2021-03-14 17:58:59 +00: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
b218d91ea1 Revmoed debug output 2021-02-22 18:18:14 +00:00
Robert Osfield
a74dd06243 Removed dbug output 2021-02-22 18:17:09 +00:00
Robert Osfield
8cefee572a Merge branch 'MultiView' of https://github.com/openscenegraph/OpenSceneGraph into MultiView 2021-02-19 12:58:08 +00:00
Robert Osfield
d1649aeed6
Merge pull request #1047 from tomhog/th-MultiView 
Setting numViews value in glFramebufferTextureMultiviewOVR call
 2021-02-19 12:57:49 +00:00
tomhog
a39f877566 Setting numViews value in glFramebufferTextureMultiviewOVR call, same as standard texture2d arrays 2021-02-19 12:39:13 +00:00
Robert Osfield
518c4f7cbc Merge branch 'OpenSceneGraph-3.6' into MultiView 2021-02-19 12:20:47 +00:00
Robert Osfield
5faae0e52e Moved Widget case to later. 2021-02-19 12:03:07 +00:00
Robert Osfield
8873381f66 Merge branch 'OpenSceneGraph-3.6' into MultiView 2021-02-18 16:26:22 +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