Commit Graph

11224 Commits

Author SHA1 Message Date
Philip Lamb
caf3167dbe png and tiff plugins do not depend on C++ exceptions. 2020-03-13 20:00:01 +13:00
Laurens Voerman
9eaf257a67 move Win32GWUtils header from src to include. 2020-03-02 14:48:41 +01:00
Robert Osfield
f0e89c41aa Added mutex lock to avoid threading issues when glyphs are added to a Font from multiple threads 2020-01-31 10:40:29 +00:00
Laurens Voerman
274938e3c5 Fix for older versions of fbxsdk without xml or zlib libraries, fix cmake multiconfig generators (msvc) with irrelevant CMAKE_BUILD_TYPE. 2020-01-30 16:37:36 +00:00
Robert Osfield
25868955d2 Added explicit clean up removeView 2020-01-30 16:23:47 +00:00
Stuart Mentzer
8643c0001f FBX plugin updates / PREFIX-NOTFOUND work-around 2020-01-27 10:25:34 +00:00
dedowsdi
32566420c9 Fix particle rotation. 2020-01-20 10:39:13 +00:00
Robert Osfield
25afb086ef Moved setting of isftream locale to Model::readOBJ(..) and Model::readMTL(..). 2020-01-17 09:07:58 +00:00
Robert Osfield
8f231c660a Added explict setting of local to classic to avoid local platform settings affecting parsing 2020-01-17 08:56:02 +00:00
Jerry
65d01832ce
Correct condition for copying openthreads PDB
Related to issue: https://github.com/openscenegraph/OpenSceneGraph/issues/898
2020-01-15 12:46:26 -05:00
Robert Osfield
4b857d9379 Fixed warnings 2020-01-14 16:35:00 +00:00
Robert Osfield
2ca6c55dad Fixed build warning due to auto_ptr<> 2020-01-14 14:57:15 +00:00
Robert Osfield
0405469bf0 Fixed workaround for invalid indices 2020-01-14 14:44:38 +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
Robert Osfield
a4054572b9 Added encoding and font setting to dxfText as a first step towards making these user controllable to enble handling of non default settings 2020-01-13 10:00:17 +00:00
Robert Osfield
fb1dff845f Added creation of image directories when required 2020-01-11 14:40:58 +00:00
OpenSceneGraph git repository
7b5eac73c8
Merge pull request #888 from longhuan2018/dxf-support-linewidth
Dxf support linewidth
2020-01-11 11:08:32 +00:00
Robert Osfield
a055579972 Fixed handling of _autoScaleTransitionWidthRatio<=0.0 2020-01-10 10:12:58 +00:00
Long Huan
58f1fa5f10 fix -Wreorder warning 2020-01-10 15:59:16 +08:00
Long Huan
a9399a49c8 Update scene.h 2020-01-10 15:22:51 +08:00
Long Huan
4995ae4c57 Update scene.h 2020-01-10 14:23:56 +08:00
OpenSceneGraph git repository
32bb3fd91e
Merge branch 'master' into bufferstorage 2020-01-07 11:21:42 +00:00
Robert Osfield
356e16e6c4 Implemented TextBase::compileGLObjects() with handling of VAO/VBOs to address bugs associated with VAO usage of Text. 2020-01-07 11:16:26 +00:00
Long Huan
5235811c47 add linewidth support 2020-01-07 09:16:18 +08:00
Julien Valentin
22473d0f7f add MappingBitField serializer and increment SO version 2020-01-06 20:11:23 +01: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
e605d6aa3d prevent persistance buffer leak 2019-12-26 23:01:13 +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
OpenSceneGraph git repository
aa94cd4fef
Merge pull request #878 from mike402/master
Fix #877 "Shift key stuck if both shifts switch keymap"
2019-12-23 14:56:44 +00:00
Robert Osfield
9cfad0a7bf Adopted CMake's FindDCMTK.cmake variables 2019-12-23 14:54:16 +00:00
Michael Danilov
75732c9387 Fix #877 "Shift key stuck if both shifts switch keymap"
Adapted the patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687332
2019-12-23 14:20:26 +01:00
blobfish
a051916e6e Plugins: OpenCasCade: Adding 'std' prefix where needed. See Following.
Prior to 7.4, occt had a 'using namespace std' in a header file that
was polluting dependent projects. They have since fixed it and so these
changes are required.
2019-12-22 12:30:55 +00:00
Robert Osfield
1968f3d6e1 Added classic locale setting to avoid local setting of locale affecting the GLSL code generated. 2019-12-18 14:26:33 +00:00
Robert Osfield
64b5397330 Added automatically removal from the OjbectCache when a object or it's subgraph contain Texture that no longer have an osg::Image. 2019-12-16 17:09:04 +00:00
Laurens Voerman
c8b0e11fe7 fix debug compile error for ReaderWriterTGA 2019-12-16 11:22:32 +01:00
PntAndCnt
86fac74229 Fontconfig should be external library.
Add Fontconfig to TARGET_LIBRARIES cause osg3::osgText target looking for
openscegraph-Fontconfig-import-targets.cmake, which doesn't exists.
2019-12-13 18:58:24 +08:00
OpenSceneGraph git repository
12084cd0e2
Merge pull request #834 from 0871087123/tif_bug_fix
getInternalTextureFormat() failed after reading a tiff file
2019-12-12 14:15:53 +00:00
OpenSceneGraph git repository
91dfe652b5
Merge pull request #865 from AMDmi3/freebsd-setaffinity
Add FreeBSD-specific code bits for pthread_setaffinity_np support
2019-12-12 13:57:30 +00:00
Robert Osfield
f4c4f76370 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-12-12 13:18:10 +00:00
OpenSceneGraph git repository
bb5620d926
Merge pull request #864 from AMDmi3/xinerama-lib
Fix linking with Xinerama
2019-12-12 13:17:27 +00:00
Alberto Luaces
1ed2d9348e Set ffmpeg as the default plugin for video files.
As xine is not used anymore, there is no plugin in charge of loading
video files, and osgmovie and other programs are not able to open
them.

If ffmpeg is present, it is registered for opening video files.
2019-12-12 13:10:43 +00:00
OpenSceneGraph git repository
f63b2e05c3
Merge pull request #856 from elsid/fix_build_with_libcxx
Fix clang 8 & libc++ build errors
2019-12-12 11:28:55 +00:00
Robert Osfield
69ebd7b323 Removed extraneous indentation 2019-12-12 11:14:39 +00:00
OpenSceneGraph git repository
4ebac62d05
Merge pull request #855 from dsfdeeeg/ffmpeg
Plugins ffmpeg
2019-12-12 10:57:10 +00:00
OpenSceneGraph git repository
653c0692b6
Fixed indentation, replacing tabs with spaces 2019-12-12 10:55:35 +00:00
OpenSceneGraph git repository
c976f045f4
Merge pull request #854 from timoore/transpose
Fix bug in matrix transpose() and transpose3x3
2019-12-12 10:40:17 +00:00
OpenSceneGraph git repository
e34f94fde8
Merge pull request #853 from flashk/patch-12
Support reading RGB float DDS images
2019-12-12 10:20:54 +00:00
OpenSceneGraph git repository
a87b6495ba
Merge pull request #852 from LaurensVoerman/submitCpSubImgMaster
fix copySubImage crash on compressed files
2019-12-12 10:08:35 +00:00
OpenSceneGraph git repository
f3cc67d5a4
Merge pull request #846 from dedowsdi/fixbug_pointsprite
Init isPointSpriteModeSupported correctly.
2019-12-12 10:04:24 +00:00
Robert Osfield
05224e7dac Merge branch 'master' of https://github.com/arnauddgbes/OpenSceneGraph into arnauddgbes-master 2019-12-12 10:00:08 +00:00
OpenSceneGraph git repository
60ba81a7e3
Merge pull request #843 from dchristopherfennell/master
GL_CLAMP_VERTEX_COLOR and GL_CLAMP_FRAGMENT_COLOR deprecated in GL co…
2019-12-12 09:37:39 +00:00
OpenSceneGraph git repository
3a430fd50e
Merge pull request #842 from jpabst0/fix_lua_destruction
Fix: Destruction of LuaScriptEngine
2019-12-12 09:23:39 +00:00
OpenSceneGraph git repository
dfc092c894
Merge pull request #839 from rickyviking/fbxAxisSystem
Fbx Plugin: added plugin option to set the target axis system.
2019-12-12 09:18:40 +00:00
Laurens Voerman
477dd3cda2 fix apple carbon reference 2019-12-11 18:31:44 +00:00
Colin McDonald
06ff29af09 Update ReaderWriterOSGA.cpp
Fix typo in osga archives which stops node files working
2019-12-11 17:38:59 +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
34f234ac03
Merge pull request #831 from nim65s/master
fix outdated dae readme
2019-12-11 17:00:39 +00:00
Robert Osfield
e48ee33a5c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-12-11 16:56:34 +00:00
Julien Valentin
16b5dd5115 use memcpy instead of union 2019-12-11 16:50:33 +00:00
Dmitry Marakasov
91e73a5e30 Fix linking with Xinerama 2019-12-10 15:11:27 +03:00
Dmitry Marakasov
043c3d8ddf Add FreeBSD-specific code bits for pthread_setaffinity_np support 2019-12-10 15:08:25 +03:00
elsid
2ffb1cb20a
Fix clang 8 & libc++ build errors
Replace operators for implicit type conversion by explicit data() method to
access implementation pointer and subscript operator to access element by
index just like in std::vector.

src/osgPlugins/tga/ReaderWriterTGA.cpp:455:22: error: use of overloaded operator '==' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'long')
        if (colormap == NULL)
            ~~~~~~~~ ^  ~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:525:16: error: use of overloaded operator '==' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'long')
    if (buffer == NULL || linebuf == NULL)
        ~~~~~~ ^  ~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:525:35: error: use of overloaded operator '==' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'long')
    if (buffer == NULL || linebuf == NULL)
                          ~~~~~~~ ^  ~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:548:30: error: use of overloaded operator '==' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'long')
            if (formattedMap == NULL)
                ~~~~~~~~~~~~ ^  ~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:574:40: error: use of overloaded operator '[]' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                        index = linebuf[x];
                                ~~~~~~~^~
src/osgPlugins/tga/ReaderWriterTGA.cpp:577:50: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                        index = getInt16(linebuf + x * 2);
                                         ~~~~~~~ ^ ~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:580:50: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                        index = getInt24(linebuf + x * 3);
                                         ~~~~~~~ ^ ~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:583:50: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                        index = getInt32(linebuf + x * 4);
                                         ~~~~~~~ ^ ~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:592:72: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                        (dest + adjustedX * format)[i] = (formattedMap + index * format)[i];
                                                          ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:626:30: error: use of overloaded operator '==' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'long')
            if (formattedMap == NULL)
                ~~~~~~~~~~~~ ^  ~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:642:21: error: use of overloaded operator '==' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'long')
            if (buf == NULL)
                ~~~ ^  ~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:664:44: error: use of overloaded operator '[]' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                            index = linebuf[x];
                                    ~~~~~~~^~
src/osgPlugins/tga/ReaderWriterTGA.cpp:667:54: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                            index = getInt16(linebuf + x * 2);
                                             ~~~~~~~ ^ ~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:670:54: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                            index = getInt24(linebuf + x * 3);
                                             ~~~~~~~ ^ ~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:673:54: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                            index = getInt32(linebuf + x * 4);
                                             ~~~~~~~ ^ ~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:688:76: error: use of overloaded operator '+' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'int')
                            (dest + adjustedX * format)[i] = (formattedMap + index * format)[i];
                                                              ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~
src/osgPlugins/tga/ReaderWriterTGA.cpp:708:21: error: use of overloaded operator '==' is ambiguous (with operand types 'SafeArray<unsigned char>' and 'long')
            if (buf == NULL)
                ~~~ ^  ~~~~
17 errors generated.
2019-11-22 21:16:30 +01:00
slllllala
ae341a8787
Pause problem
Pause for more than 10 seconds,_status = INVALID;
2019-11-07 14:51:32 +08:00
slllllala
04931ddb2d
Avoid reading pictures
After reading the video, use it to read the image, and the image does not display
2019-11-07 14:42:39 +08:00
Tim Moore
1c281a3def Fix bug in matrix transpose() and transpose3x3
The diagonal elements were not copied from the source matrix.
2019-11-04 05:37:37 +01:00
flashk
921d10a636
Support reading RGB float DDS images
The DDS plugin is not able to load floating point RGB images saved out by itself. There doesn't appear to be a fourcc code for RGB float/half-float data, so I added the appropriate entries to the RGBFormat table so the images can be loaded properly.
2019-11-01 09:26:28 -07:00
Laurens Voerman
9f6fdbc224 fix copySubImage crash on compressed files 2019-11-01 16:56:14 +01:00
PntAndCnt
b26d88ab78 Init isPointSpriteModeSupported correctly.
examples/osgpointsprite and examples/osgpoints are broken due to
incorrect isPointSpriteModeSupported state in legacy opengl.
2019-10-13 20:04:33 +08:00
Arnaud Huck
856acfdda4 fixed installation of PDB files on Windows with Ninja generator. Added installation of PDB files for OpenThreads 2019-10-04 09:53:57 +02:00
DCFennell
9d9c892bbb GL_CLAMP_VERTEX_COLOR and GL_CLAMP_FRAGMENT_COLOR deprecated in GL core profile according to OpenGL 4.5 specification. 2019-09-25 12:16:51 -05:00
Johannes Pabst
6bf4afa386 Fix: LuaCallbackObject could form circular references to LuaScriptEngine that prevented its destruction. Destruction of LuaScriptEngine now disarms all callbacks into Lua. 2019-09-23 15:05:54 +02: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
Riccardo Corsi
35ed188b02 Fbx Plugin: added plugin option to set the target axis system. Default left to OpenGL. 2019-09-13 12:50:29 +02:00
Kent
7bb44d7e18 emmmmmmm 2019-09-03 16:11:14 +08:00
Kent
df087b9524 may be better 2019-09-03 15:54:58 +08:00
Kent
880d002568 seems fixed this 2019-09-03 15:30:43 +08: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
Guilhem Saurel
297531e777 fix dae readme 2019-08-30 16:48:25 +02:00
Daniel Trstenjak
718383cac0 OcclusionQueryNode: make all usages of 'updateDefaultQueryGeometry' thread safe 2019-08-23 09:59:54 +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
Robert Osfield
bd50af117b Removed exlict keyword to address build problems with VS older than 2015. 2019-08-22 14:49:43 +01:00
Robert Osfield
3a17fd3e9c Fixed build regression 2019-08-22 14:27:17 +01:00
OpenSceneGraph git repository
eb980136a0
Merge branch 'master' into fix_custom_query_geometry 2019-08-22 14:17:58 +01:00
Robert Osfield
af7d6478e6 Added check aginst _enabled from the 3.6 branch 2019-08-22 14:11:29 +01:00
OpenSceneGraph git repository
f18dd05350
Merge pull request #823 from remoe/patch-4
Debugging: Hint to debug LoadLibrary issues
2019-08-22 13:47:25 +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
Remo E
822840bd1a
Debugging: Hint to debug LoadLibrary issues
This helps to debug loading dynamic libraries in an environment without implemented "dlopen". For example emscripten with static compiled OSG.
2019-08-18 20:14:17 +02:00
capostrophic
21828fe725 Fix memory leaks 2019-08-17 20:06:43 +01:00
capostrophic
4f3fce0254 Add support for DDPF_PALETTEINDEXED8 pixel format reading 2019-08-17 20:06:43 +01:00
Björn Blissing
844ec25948 Fixed spelling error in warning message 2019-08-16 13:52:56 +02:00
Robert Osfield
fd8019c886 Merged TextBase fixed from OpenSceneGraph-3.6 commit 149c04b0df 2019-07-31 14:30:47 +01:00
Robert Osfield
2b5e659973 Replaced GL_QUADS usage with GL_TRIANGLE_STRIP 2019-07-29 13:02:08 +01:00
Robert Osfield
8fad6bd039 Refactored the mesh setup to use GL_TRIANGLE_STIP instead of GL_QUADS 2019-07-29 12:29:25 +01:00
konstantin.matveyev
9d9273ca12 OSG_TEXT_USE_FONTCONFIG additional check needed 2019-07-26 14:52:56 +01:00
konstantin.matveyev
36a3c5f2b2 OSG_TEXT_USE_FONTCONFIG cmake option added: Set to ON to enable attempt to use FontConfig in osgText; Disabled by default for iOS and Android 2019-07-26 14:13:02 +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