Commit Graph

16181 Commits

Author SHA1 Message Date
OpenSceneGraph git repository
38807c4bb8
Merge pull request #851 from LaurensVoerman/submitCpSubImg
fix copySubImage crash on compressed files
2019-12-12 10:08:32 +00:00
DCFennell
987521ba9c GL_CLAMP_VERTEX_COLOR and GL_CLAMP_FRAGMENT_COLOR deprecated in GL core profile according to OpenGL 4.5 specification. 2019-12-12 09:40:02 +00:00
Johannes Pabst
6776cc2c63 Fix: LuaCallbackObject could form circular references to LuaScriptEngine that prevented its destruction. Destruction of LuaScriptEngine now disarms all callbacks into Lua. 2019-12-12 09:24:19 +00:00
Riccardo Corsi
3fe2e5a9e0 Fbx Plugin: added plugin option to set the target axis system. Default left to OpenGL. 2019-12-12 09:19:59 +00:00
grdowns
0d94d8e5a6 Add vcpkg installation instructions 2019-12-12 09:14:26 +00:00
OpenSceneGraph git repository
c8e283cfe9
Merge pull request #837 from LaurensVoerman/carbonFix
fix apple carbon reference
2019-12-11 17:51:02 +00:00
OpenSceneGraph git repository
b1314c0fb8
Merge pull request #833 from cj-mcdonald/osga-fix
Update ReaderWriterOSGA.cpp
2019-12-11 17:07:27 +00:00
Guilhem Saurel
a86b90ca4a fix dae readme 2019-12-11 17:01:02 +00:00
OpenSceneGraph git repository
bc3372fda0
Merge pull request #828 from eligovision/OpenSceneGraph-3.6_ios_build_fix
Fix build iOS: when using Toolchain or building with Makefiles (not X…
2019-12-11 16:58:50 +00:00
OpenSceneGraph git repository
6477397b95
Merge pull request #822 from mp3butcher/patch-32
optimize indexed color DDS conversion
2019-12-11 16:47:44 +00:00
Alberto Luaces
8f6eff9de5 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-04 22:16:25 +01:00
Laurens Voerman
c4e7a07367 fix copySubImage crash on compressed files 2019-11-01 16:45:16 +01:00
Laurens Voerman
23b7c4d47d fix apple carbon reference 2019-09-11 10:22:16 +02:00
Colin McDonald
a9900712a4
Update ReaderWriterOSGA.cpp
Fix typo in osga archives which stops node files working
2019-09-02 17:43:38 +01:00
Konstantin S. Matveyev
6774f77779 Fix build iOS: when using Toolchain or building with Makefiles (not Xcode) 2019-08-23 18:35:49 +03:00
Julien Valentin
5516f86f9e use memcpy instead of union 2019-08-22 18:16:43 +02:00
Julien Valentin
a9546da368 optimize conversion with a union 2019-08-22 18:15:46 +02:00
Robert Osfield
415925b024 Removed exlict keyword to address build problems with VS older than 2015. 2019-08-22 14:50:56 +01:00
Remo E
30aae63c3b 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-22 13:48:01 +01:00
Robert Osfield
694b1c3d32 Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6 2019-08-17 20:04:38 +01:00
OpenSceneGraph git repository
a2436fa8b5
Merge pull request #820 from Capostrophic/dds
DDS plugin: add support for DDPF_PALETTEINDEXED8 pixel format reading
2019-08-17 20:04:30 +01:00
Björn Blissing
64d9b51f91 Fixed spelling error in warning message 2019-08-17 19:50:59 +01:00
capostrophic
a3b507bb01 Fix memory leaks 2019-08-17 15:28:09 +03:00
capostrophic
cbac09902d Add support for DDPF_PALETTEINDEXED8 pixel format reading 2019-08-17 04:15:23 +03:00
Robert Osfield
515a0bbe65 Added TKXCAF to find package list 2019-08-16 10:27:28 +01:00
Julien Valentin
0c142215b9 remove return of local pointer 2019-08-16 10:15:46 +01:00
OpenSceneGraph git repository
dcc6dce8e3
Merge pull request #818 from mp3butcher/patch-31
fix comment block CMake syntax
2019-08-16 09:35:00 +01:00
Julien Valentin
7b3d1dff25
fix cmake block comment syntax 2019-08-15 20:46:52 +02:00
Julien Valentin
842b334803
remove unproperly parsed CMake comment
https://github.com/openscenegraph/OpenSceneGraph/issues/812
2019-08-15 20:27:05 +02:00
OpenSceneGraph git repository
8f5695eafb
Merge pull request #808 from 640kb/OpenSceneGraph-3.6
las plugin: fix linking against static boost library under windows
2019-08-07 10:56:59 +01:00
Daniel Wendt
0a704161fe las plugin: fix linking against static boost library under windows
Signed-off-by: Daniel Wendt <daniel.wendt@linux.com>
2019-08-07 10:36:03 +02: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
92abaca210 Replaced GL_QUADS usage with GL_TRIANGLE_STRIP 2019-07-29 13:01:00 +01:00
Robert Osfield
0e5bb43841 Refactored the mesh setup to use GL_TRIANGLE_STIP instead of GL_QUADS 2019-07-29 12:30:41 +01:00
Robert Osfield
b3808ef89c Updated version to 3.6.5 2019-07-29 09:59:57 +01:00
OpenSceneGraph git repository
99847c3ef2
Merge pull request #804 from eligovision/OpenSceneGraph-3.6_GLQUADS
[*] ParticleSystem: Use GL_TRIANGLES instead if GL_QUADS when GL{1,2}…
2019-07-29 08:57:56 +01:00
Konstantin S. Matveyev
0a6bea870c [*] ParticleSystem: Use GL_TRIANGLES instead if GL_QUADS when GL{1,2} or GLES1 are unavailable 2019-07-26 21:26:31 +03:00
OpenSceneGraph git repository
312f640a4a
Merge pull request #802 from eligovision/OpenSceneGraph-3.6_osgtext_fc
OSG_TEXT_USE_FONTCONFIG cmake option added: Set to ON to enable attem…
2019-07-26 12:54:16 +01:00
konstantin.matveyev
2b0105f875 OSG_TEXT_USE_FONTCONFIG additional check needed 2019-07-26 14:40:47 +03:00
konstantin.matveyev
b0c89b137d 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:09:36 +03:00
Robert Osfield
b2daa32420 UPdated for 3.6.3-rc9 2019-07-25 15:10:36 +01:00
Robert Osfield
bf208e1d10 Changed the #extension enable 2019-07-25 14:58:17 +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
e6f6de640a Added readObject() implementations 2019-07-25 12:48:21 +01:00
Robert Osfield
00679c7631 Added ReaderWriterOBJ::readObject(..) implementations to address issue with using osgconv 2019-07-25 10:39:34 +01:00
Robert Osfield
4e126469fc Updates for 3.6.4-rc8 2019-07-22 19:22:16 +01:00
Robert Osfield
ccbc632afc Added handling of iOS and Android to make sure FontConfig is only used for Desktop builds 2019-07-22 17:20:10 +01:00
Robert Osfield
060a641c2b Updated for rc7 2019-07-19 09:20:50 +01:00
OpenSceneGraph git repository
cd124228fd
Merge pull request #797 from wangii/OpenSceneGraph-3.6
fix u64 and i64 allocation, setArray bug
2019-07-19 09:10:02 +01:00
Linan Wang
4ad34877d2 fix typo 2019-07-19 14:06:20 +08:00