Commit Graph

4888 Commits

Author SHA1 Message Date
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
Laurens Voerman
27b295caa4 fix indentation for osgt files for windows dynamic library build. 2019-06-14 14:33:22 +01:00
OpenSceneGraph git repository
3ba6f3d682
Merge pull request #725 from Capostrophic/dynamiccast
Get rid of some type conversions
2019-03-16 11:33:42 +00:00
Capostrophic
de64d58e06 Override default behavior for linear vector interpolations 2019-03-16 11:31:26 +00:00
Capostrophic
da16693b4a Add asOccluderNode method to avoid dynamic casts in group child handling 2019-03-15 18:09:13 +03:00
Capostrophic
52fe3679a3 Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions 2019-03-13 22:08:19 +03:00
Daniel Trstenjak
71997fa747 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 14:42:35 +01:00
OpenSceneGraph git repository
862788e14e
Merge pull request #711 from uhertlein/macos_10_14
Cleanups and support for macOS 10.14
2019-02-20 17:20:35 +00:00
Julien Valentin
91c6b80020 uncomment INLINE_DRAWABLE_DRAW 2019-02-20 16:55:08 +00:00
Ulrich Hertlein
10af927260 Support for macOS 10.14
- 10.14 drops libstdc++
- drops support for Carbon :-)
- drops support for macOS < 10.9
2019-02-07 19:18:11 +01:00
Robert Osfield
6eb0da3a16 Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels(). 2019-01-26 18:12:19 +00:00
Daniel Trstenjak
f21ca61476 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 18:12:19 +00:00
Robert Osfield
276ca14376 Fixed typo 2019-01-23 08:52:44 +00:00
Robert Osfield
587c893f84 Added separate test and rest of _currentVAO to State::resetCurrentVertexArrayStateOnMatch(..) method 2019-01-22 20:22:49 +00:00
Robert Osfield
aee747885a Changed resetCurrentVertexArrayStateOnMatch() to reset _vas tp _globalVertexArrayState and currentVAO to 0. 2019-01-21 18:13:43 +00:00
Robert Osfield
336791ca35 Added reset of the State::CurrentVertexArrayState() to prevent the State::_vas becoming a dangling pointer when VertexArrayState objects are deleted. 2019-01-21 17:38:40 +00:00
Robert Osfield
68e4341cb4 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:18:48 +00:00
Laurens Voerman
664d597e20 fix MSVC warning C4250: inherits 'X' via dominance (94x) 2019-01-17 17:40:29 +00:00
Robert Osfield
cb90d269e4 Added derpecated and thread unsafe warning message to docs of ObjectCache::getgetFromObjectCache() 2019-01-14 11:55:24 +00:00
Robert Osfield
d01a262f84 Added using to quieten VS warnings 2019-01-14 10:13:41 +00:00
Robert Osfield
32db852c77 Moved resizeGLObjects/releaseGLObjects out of Referenced to avoid multiple inheritance warnings 2019-01-12 11:28:25 +00:00