FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,305 Commits 1 Branch 26 Tags 73 MiB
1b557a4ec0
Commit Graph

16305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
OpenSceneGraph git repository
5e93e6f0c3
Merge pull request #819 from bjornblissing/minor_fix/tiff_reader 
Fixed spelling error in warning message
 2019-08-17 19:50:06 +01:00
Björn Blissing
844ec25948 Fixed spelling error in warning message 2019-08-16 13:52:56 +02:00
Robert Osfield
da40a565bf Added TKXCAF to find package list 2019-08-16 10:28:38 +01:00
Julien Valentin
f87b6303a9 fix cmake block comment syntax 2019-08-16 10:00:49 +01:00
Julien Valentin
23371bf16e remove unproperly parsed CMake comment 
https://github.com/openscenegraph/OpenSceneGraph/issues/812
 2019-08-16 10:00:39 +01:00
Ralf Habacker
2a19d1ab22 cmake: Added find_package module for fontconfig which is not available with cmake < 3.14 
This file has been taken from cmake 3.14
 2019-08-16 10:00:12 +01:00
Robert Osfield
260c32940f Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-08-16 09:35:18 +01:00
OpenSceneGraph git repository
d38589ff7f
Merge pull request #817 from mp3butcher/patch-30 
remove return of local pointer
 2019-08-16 09:34:19 +01:00
Julien Valentin
c50235ba62
remove return of local pointer 2019-08-15 20:21:15 +02:00
Daniel Wendt
5fd35e87a2 las plugin: fix linking against static boost library under windows 
Signed-off-by: Daniel Wendt <daniel.wendt@linux.com>
 2019-08-07 10:58:14 +01: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
Robert Osfield
887ecf255c Added readObject() implementations 2019-07-25 12:50:22 +01:00
Robert Osfield
62a4be7aeb Added ReaderWriterOBJ::readObject(..) implementations to address issue with using osgconv 2019-07-25 10:40:33 +01:00
Robert Osfield
d6af3f7d79 Added handling of iOS and Android to make sure FontConfig is only used for Desktop builds 2019-07-22 18:07:37 +01:00
Linan Wang
d79cad7fd1 fix typo 2019-07-19 09:21:56 +01:00
Linan Wang
4b046c7562 fix u64 and i64 allocation, setArray bug 2019-07-19 09:21:56 +01:00
Ralf Habacker
cae16c5fd7 obj plugin: Fix not writing material shininess 2019-07-18 13:29:55 +01:00
Ralf Habacker
2f71260c5a obj plugin: add option "NsIfNotPresent=" for setting the specular exponent of a material if not present 2019-07-18 13:29:37 +01:00
Ralf Habacker
4c1349c658 obj plugin: Fix bug not using specular color (Ks) for illumination mode > 2 
See paragraph "Illumination models" at http://paulbourke.net/dataformats/mtl/ for details.
 2019-07-18 13:20:41 +01:00
Robert Osfield
e1dc169915 Fixed indentation 2019-07-18 12:44:59 +01:00
Robert Osfield
ebde0e0d7b Merge branch 'Fix-obj-export-texturefile' of https://github.com/longhuan2018/OpenSceneGraph into longhuan2018-Fix-obj-export-texturefile 2019-07-18 12:26:39 +01:00
Robert Osfield
772a65f282 Added handling of zero radius models 2019-07-18 12:19:38 +01:00
Robert Osfield
b957581342 Removed references OpenVRML plugin 2019-07-18 11:16:08 +01:00
Robert Osfield
d695ed816b Removed vrml plugin from build as OpenVRML plugin relies on no longer supported functionality 2019-07-18 11:14:10 +01:00
Robert Osfield
6e5ac900ea Added calls to curl_global_init and curl_global_cleanup to improve the robustness of threaded curl plugin usage 2019-07-18 10:38:10 +01:00
Long Huan
05b943a6ba Add OutputTextureFiles Option 
Add OutputTextureFiles Option support Write out the texture images to file
 2019-07-18 09:13:25 +08:00
Long Huan
59e372b05d Update OBJWriterNodeVisitor.cpp 2019-07-17 15:07:38 +08:00
Long Huan
3008b953e9 fix obj-Plugin export texture file 
Fix obj-plugin to support export texture file
 2019-07-17 14:52:10 +08:00
Ralf Habacker
58de37c9ff cmake: Add summary information to get an idea of what dependencies might be missing 2019-07-16 12:16:46 +01:00
Robert Osfield
8607ac24eb Merged Alberto Luaces commit "Avoid that mingw cross-compilation choosing X11 as the windowing system" from the OpenSceneGraph-3.6 branch 2019-07-16 11:49:32 +01:00
Robert Osfield
305210c417 Adopted the matrix transformation code from Text 2019-07-15 16:19:15 +01:00
Robert Osfield
a15ca9c8c4 Added test of picking 2019-07-15 16:19:15 +01:00
Robert Osfield
d24fd451b9 Cuietened down the reporting of failure to find fontconfig 2019-07-15 15:17:41 +01:00
Ralf Habacker
d08dbac902 obj plugin: Fix bug not adding first vertex index on writing GL_LINExxx array types 2019-07-15 14:26:36 +01:00
Robert Osfield
87597a7fff Added osg::Node associated limited to SO version 200 and higher 2019-07-15 12:22:11 +01:00
Ralf Habacker
4902fdfbd6 Fix 'Incorrect default location for true type fonts on openSUSE' 
https://github.com/openscenegraph/OpenSceneGraph/issues/778
 2019-07-15 11:48:25 +01:00
Robert Osfield
d562587858 Added check against any empty _segments to avoid undefined behaviour 2019-07-12 17:01:26 +01:00