Commit Graph

16299 Commits

Author SHA1 Message Date
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
a72fc3c9f4 Merge branch 'arnauddgbes-master' 2019-12-12 10:02:12 +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
OpenSceneGraph git repository
459bce74c3
Merge pull request #838 from grdowns/vcpkg-instructions
Add vcpkg installation instructions
2019-12-12 09:13:59 +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
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
OpenSceneGraph git repository
34f234ac03
Merge pull request #831 from nim65s/master
fix outdated dae readme
2019-12-11 17:00:39 +00:00
Konstantin S. Matveyev
f73ece7d1e Fix build iOS: when using Toolchain or building with Makefiles (not Xcode) 2019-12-11 16:59:26 +00:00
Robert Osfield
e48ee33a5c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-12-11 16:56:34 +00:00
OpenSceneGraph git repository
5ce9028bad
Merge pull request #827 from dan-t/fix_query_geometry_reset
OcclusionQueryNode: fix resetting to default query geometry
2019-12-11 16:55:47 +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
grdowns
f2b72fa465 Add vcpkg installation instructions 2019-09-12 13:54:28 -07: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
88a6868be5
Merge pull request #813 from dan-t/fix_custom_query_geometry
OcclusionQueryNode: fix use case of user defined query geometry
2019-08-22 14:18:09 +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