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

4908 Commits

Author SHA1 Message Date
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
faad64256f Fixed META_ macro usage 2021-02-18 16:15:00 +00:00
Gleb Mazovetskiy
8f202a6ee4
include/osgViewer: Fix typo 
Follow-up to #1027
 2021-01-22 22:34:00 +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
eb09720c1f
Merge pull request #1025 from glebm/fix-travis 
include/osg/Callback: nullptr -> NULL
 2021-01-18 14:15:51 +00:00
valid-ptr
1b9c6e524c Wrong argument name rename: uniformMap -> defineMap 2021-01-18 13:59:26 +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
f59ab840f1 include/osg/Callback: nullptr -> NULL 
Fixes travis, which explictly requires c++98
 2021-01-14 00:19:02 +00: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
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
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
Ralf Habacker
b0a25ce364 Add support for showing environment variables provided by osg plugins 2020-08-19 12:03:42 +01:00
MeyerFabian
07836619b2 Enabled windows clang builds. 2020-07-17 18:01:05 +02:00
Daniel Trstenjak
048ece358a Camera: convenience methods to find nested callback by type 2020-05-26 19:05:34 +02:00
Tim Moore
97f955b2d4 Fix GLExtensions static order of deletion bug 
The s_glExtensionSetList could be deleted while pointers to
GLExtension objects were still held e.g., by
VertexArrayStateManager, causing a segfault. This patch uses an
observer pointer to not access already-deleted data.
 2020-05-20 18:21:49 +02:00
Robert Osfield
c29e2e4f40 Fixed handling of non Texture texture attributes. 2020-05-03 09:27:20 +01:00
Robert Osfield
3590e4c057 Added missing initializer 2020-04-29 10:04:46 +01:00
Laurens Voerman
9eaf257a67 move Win32GWUtils header from src to include. 2020-03-02 14:48:41 +01:00
dedowsdi
ad11fd06be Add getPreRenderList getPostRenderList to RenderStage. 2020-01-21 09:46:35 +00:00
Robert Osfield
5940ac3653 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2020-01-13 14:23:21 +00:00
OpenSceneGraph git repository
0dcfd23307
Merge pull request #894 from mp3butcher/patch-34 
Add GL4.4.1 defines
 2020-01-13 14:23:11 +00:00
Robert Osfield
481cb4f770 Added commment explaining that OpenThreads::Thread::CurrentThread() return NULL on non OpenThreads thread. 2020-01-13 14:18:45 +00:00
Robert Osfield
ccf6554d2d Added Thread::CurrentThreadId() method to wrap up thread id functionality in a more platform appropriate way. 2020-01-13 14:18:17 +00:00
Robert Osfield
037e0f3a12 Added support for using CurrentCodePage functionality with osgText::String 
To the DXF plugin added Option string support for using CurrentCodePage|WidePage, UTF8, UTF16, UTF32 and FontFile=filename
 2020-01-13 14:05:46 +00:00
Julien Valentin
ecc887bcbb
Add GL4.4.1 defines 2020-01-12 23:31:04 +01:00
Laurens Voerman
395c2677de add GL_MAP_PERSISTENT_BIT define for outdated gl.h users (like msvc). 2020-01-07 15:15:36 +01:00
OpenSceneGraph git repository
32bb3fd91e
Merge branch 'master' into bufferstorage 2020-01-07 11:21:42 +00:00
Julien Valentin
eaaf83329e Revert "merge _usage and bufferstorage bitfield utilization" 
This reverts commit 30e749ae54.
 2020-01-03 00:02:08 +01:00
Julien Valentin
3526292de3 typo fix 2019-12-27 02:46:35 +01:00
Julien Valentin
30e749ae54 merge _usage and bufferstorage bitfield utilization 2019-12-26 22:48:11 +01:00
mp3butcher
2c942f4771 persistance mapping proposal 2019-12-26 17:52:48 +01:00
Laurens Voerman
477dd3cda2 fix apple carbon reference 2019-12-11 18:31:44 +00:00
OpenSceneGraph git repository
480e4607a8
Merge pull request #832 from remoe/win_egl_port 
WIP: EGL support for Windows. Allow to run OSG with Google/Angle
 2019-12-11 17:06:38 +00:00
OpenSceneGraph git repository
938824450c
Replace tabs with spaces 2019-12-11 17:05:03 +00:00
OpenSceneGraph git repository
0e40e4e689
Replaced tab indentation ith spaces 2019-12-11 17:04:24 +00:00
remoe
2e395dce26 update: WGL 2019-09-19 17:43:31 +02:00
Remo E
0daef92522 update: PixelBuffer for EGL 
refactor
 2019-09-17 11:50:42 +02:00
Remo E
fbc31d9987 First implementation of EGL/Angle support. Tested with GLES3 on DirectX11 platform. 
Pixelbuffer currently not supported.
 2019-08-30 19:28:55 +02:00
Daniel Trstenjak
79f7727a59 OcclusionQueryNode: fix resetting to default query geometry 
When the query geometry gets reset to its default then its
vertices have to be updated by the bounding box dimensions of
the current children of the OcclusionQueryNode.
 2019-08-23 09:46:02 +02:00
OpenSceneGraph git repository
eb980136a0
Merge branch 'master' into fix_custom_query_geometry 2019-08-22 14:17:58 +01:00
Daniel Trstenjak
aff574b3ea OcclusionQueryNode: fix use case of user defined query geometry 
The user defined query geometry handling has been broken in several ways.

The previous way of defining a query geometry was using the non const
`getQueryGeometry` method and overriding its members. But then
`OcclusionQueryNode` wasn't aware of the geometry change and couldn't
internally handle it correctly.

The `computeBound` method never considered a user defined query geometry and
always just overrode the vertices of the geometry.

The member `_validQueryGeometry` wasn't correctly set.

This change should fix all this issues by introducing a small backward
compatibility break. The non const `getQueryGeometry` method is removed
forcing the user to use the `setQueryGeometry` method. But then `OcclusionQueryNode`
is aware of the user defined query geometry and can handle it correctly.
 2019-08-21 16:44:15 +02:00
Julien Valentin
c50235ba62
remove return of local pointer 2019-08-15 20:21:15 +02:00
Robert Osfield
fd8019c886 Merged TextBase fixed from OpenSceneGraph-3.6 commit 149c04b0df 2019-07-31 14:30:47 +01:00
Robert Osfield
2716c8a32b Change the DefaultFont so that it's managemed via the ObjectCache to enabl it to be release and cleared in a central manner. 
Added call to Registry::releaseGLObjects() to osgViewer/Renderer.cpp to enable automatic clean up of objects in the ObjectCache.
 2019-07-25 14:18:51 +01:00
Robert Osfield
edd0d3e35f Added FrameBufferAttachment::resizeGLObjectBuffers(..) and releaseGLObjects(..) methods 2019-07-12 16:11:45 +01:00