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
5d51e5bf2a
Fixed META_ macro usage
2021-02-18 16:13:50 +00:00
Robert Osfield
94d5211f43
Ran dos2unix to fix line endings
2021-02-17 18:23:32 +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
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
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
0161b8ab46
include/osg/Callback: nullptr -> NULL
...
Fixes travis, which explictly requires c++98
2021-01-18 14:45:06 +00:00
valid-ptr
aed9fd74f6
Wrong argument name rename: uniformMap -> defineMap
2020-12-29 15:07:15 +03:00
Matthew Reid
073cfab166
Added support for sRGB texture formats
2020-11-10 16:05:56 +00:00
Robert Osfield
7994bfa767
Merge branch 'OpenSceneGraph-3.6' into build/windows_clang_3.6_target
2020-11-10 14:41:56 +00:00
Ralf Habacker
c3108697de
Add support for showing environment variables provided by osg plugins
2020-08-19 10:35:54 +02:00
MeyerFabian
ba70c7d543
build/windows_clang
2020-07-21 17:37:24 +02:00
OpenSceneGraph git repository
14e7bc5a17
Merge pull request #902 from mp3butcher/oqn
...
3.6 OQN API convergence
2020-01-21 09:32:57 +00:00
dedowsdi
a90a9a0a15
Add getPreRenderList getPostRenderList to RenderStage.
2020-01-21 11:00:25 +08:00
Daniel Trstenjak
ddb72691bc
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.
2020-01-20 16:44:48 +01:00
Daniel Trstenjak
817d92b703
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.
2020-01-20 16:42:38 +01:00
OpenSceneGraph git repository
3930621edc
Merge pull request #895 from openscenegraph/CurrentThreadId
...
Added commment explaining that OpenThreads::Thread::CurrentThread() r…
2020-01-13 14:14:48 +00:00
Robert Osfield
9305485a11
Added commment explaining that OpenThreads::Thread::CurrentThread() return NULL on non OpenThreads thread.
2020-01-13 14:12:54 +00:00
Robert Osfield
9e75926338
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 13:41:37 +00:00
Robert Osfield
d1ff16614c
Added Thread::CurrentThreadId() method to wrap up thread id functionality in a more platform appropriate way.
2020-01-06 18:39:51 +00:00
valid-ptr
51fee80224
glInvalidateFramebuffer added to GLExtensions
2019-12-13 12:09:06 +03:00
konstantin.matveyev
fefabb6c2b
glFramebufferTexture2DMultisample added to GLExtensions
2019-12-13 12:08:37 +03:00
Laurens Voerman
23b7c4d47d
fix apple carbon reference
2019-09-11 10:22:16 +02:00
Julien Valentin
0c142215b9
remove return of local pointer
2019-08-16 10:15:46 +01:00
Robert Osfield
149c04b0df
Added a _fontFallback to TextBase to cache any fallback font (usually DefaultFont) that is used when the Textbase::_font is null.
2019-07-31 14:11:59 +01:00
Robert Osfield
24d61c2df0
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:10:01 +01:00
Robert Osfield
079cf6c090
Added FrameBufferAttachment::resizeGLObjectBuffers(..) and releaseGLObjects(..) methods
2019-07-12 16:09:12 +01:00
Laurens Voerman
3ccdc66717
fix indentation for osgt files for windows dynamic library build.
2019-05-13 17:25:29 +02:00
Capostrophic
066c272f7a
Override default behavior for linear vector interpolations
2019-03-15 21:29:13 +03:00
Capostrophic
12b298130a
Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions
2019-03-14 10:46:42 +00:00
Daniel Trstenjak
5624a22fe4
OcclusionQueryNode: ensure a valid query geometry
...
If the query geometry is invalid then don't do any occlusion queries and
never traverse the subgraphs.
2019-02-21 17:34:26 +00:00
Julien Valentin
43574b52c1
uncomment INLINE_DRAWABLE_DRAW
2019-01-28 01:40:35 +01:00
OpenSceneGraph git repository
1504a54cd8
Merge pull request #702 from mp3butcher/fix36
...
add MeshReindexation flag
2019-01-26 18:21:47 +00:00
Robert Osfield
02d7d980a7
Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels().
2019-01-26 16:33:23 +00:00
Daniel Trstenjak
c8521068a5
OcclusionQueryNode: add resetting of queries
...
If there's a big view change then it might not be appropriate to wait
for '_queryFrameCount' till the next query is issued, because then
geometry might pop into the view after '_queryFrameCount'.
This is especially important for applications not having a constant
frame rate, but just issue a new frame on demand.
2019-01-26 15:22:08 +00:00
mp3butcher
832d8d5228
fix variable name
2019-01-23 17:06:04 +01:00
OpenSceneGraph git repository
968a427e00
Changed the member variable to be consistent with the method name.
2019-01-23 17:03:11 +01:00
mp3butcher
b8f9249bea
add a bool parameter to allow forced reindexation of a mesh
2019-01-23 17:02:53 +01:00
Robert Osfield
749dc86dd3
Fixed typo
2019-01-23 08:52:11 +00:00
Robert Osfield
84bae01643
Added separate test and rest of _currentVAO to State::resetCurrentVertexArrayStateOnMatch(..) method
2019-01-22 20:21:56 +00:00
Robert Osfield
8a5d1b9f44
Changed resetCurrentVertexArrayStateOnMatch() to reset _vas tp _globalVertexArrayState and currentVAO to 0.
2019-01-21 18:15:02 +00:00
Robert Osfield
488b4854b2
Added reset of the State::CurrentVertexArrayState() to prevent the State::_vas becoming a dangling pointer when VertexArrayState objects are deleted.
2019-01-21 17:36:40 +00:00
Robert Osfield
6455159757
Added calling of releaseGLObjects() and resizeGLObjects() to the Camera DrawCallback's to enable the draw callbacks to clean up their own GL objects.
2019-01-19 16:16:53 +00:00
Laurens Voerman
2e29085669
fix MSVC warning C4250: inherits 'X' via dominance (94x)
2019-01-17 16:22:51 +01:00
Robert Osfield
f223fec92d
Added derpecated and thread unsafe warning message to docs of ObjectCache::getgetFromObjectCache()
2019-01-14 11:56:23 +00:00
Robert Osfield
4dcb2bbf3c
Added using to quieten VS warnings
2019-01-14 09:55:00 +00:00
Robert Osfield
fe98c3d7f5
Moved resizeGLObjects/releaseGLObjects out of Referenced to avoid multiple inheritance warnings
2019-01-12 11:27:18 +00:00
Robert Osfield
bd83044c08
Introduced use of ref_ptr<> and private destructor to tighen up memory management and avoid users attempting to inappropriately delete TexCoordRange.
2019-01-09 09:51:21 +00:00