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
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
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
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