Jeongseok Lee
f263ad29db
Update CMakeModules/FindCOLLADA.cmake
...
Keeping old style operator to align with OSG CMake 2.8.0 support.
Co-Authored-By: eknabe <44489094+eknabe@users.noreply.github.com>
2019-03-26 08:05:06 +00:00
Robert Osfield
dd32ee2945
Added basic load and compile stats collection enabled by --stats command line.
2019-03-25 14:09:04 +00:00
Robert Osfield
0b5cb65cdd
Added a call to the CullSetting::readCommnadLine(..) to make sure the --NO_CULLING and --VIEW_FRUSTUM, --VIEW_FRUSTUM_SIDES command line parameters are honoured
2019-03-25 12:42:28 +00:00
Robert Osfield
a8e78fde99
Added --NO_CULLING, --VIEW_FRSUTUM and --VIEW_FRUSTUM_SIDES/--vfs command line options for setting the Camera CullingMode value
2019-03-25 12:40:41 +00:00
Jeongseok Lee
43b274f65c
Update comments and fix cmake version check
2019-03-21 08:40:33 +00:00
OpenSceneGraph git repository
f97ea3577d
Merge pull request #727 from ccochran/OpenSceneGraph-3.6
...
Fixes Android build for osgViewer.
2019-03-19 14:33:42 +00:00
Colin Cochran
9726617b6e
Fixes osgViewer CMake build for Android.
...
Adds FORCE to overwrite the cached OWG_WINDOWING_SYSTEM variable.
2019-03-18 08:55:05 -06:00
Colin Cochran
997276d359
Fixes Android build for osgViewer.
...
Previously, cmake attempted to build cocoa windowing system source even if MAKE_SYSTEM_NAME was set to ANDROID.
2019-03-16 11:59:28 -06:00
Capostrophic
dceb353fe6
Replace redundant asCullVisitor usage with a type check
2019-03-16 12:29:39 +00:00
OpenSceneGraph git repository
d8600411bd
Merge pull request #726 from Capostrophic/linearinterpolator
...
Override default behavior for linear vector interpolations
2019-03-16 11:30:21 +00:00
Capostrophic
066c272f7a
Override default behavior for linear vector interpolations
2019-03-15 21:29:13 +03:00
Chris Djali
7ebe56291f
Resolve OpenGL error caused by confusion between geometry shader implementations.
...
There are two types of Geometry Shaders in OpenGL. One is provided by `GL_EXT_geometry_shader4` and `GL_ARB_geometry_shader4` and requires that certain parameters are set with calls to `glProgramParameteri` before the program is linked. The other is provided by OpenGL 3.2 as a core feature and by the GLES extensions `GL_EXT_geometry_shader` and `GL_OES_geometry_shader` and requires these parameters to be set in the GLSL source itself.
The value of `isGeometryShader4Supported` is being used to determine if the `glProgramParameteri` calls should occur, so it should only be `true` when one of the extensions requiring them is present.
2019-03-14 13:51:44 +00:00
flashk
c89a7fe67c
Update StackedTransform.cpp
2019-03-14 11:25:11 +00:00
Capostrophic
b14bb21801
Avoid unnecessary matrix type conversion in osgParticle
2019-03-14 10:47:08 +00:00
Robert Osfield
37eae8c719
Removed the optional code path hack
2019-03-14 10:46:59 +00:00
Capostrophic
12b298130a
Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions
2019-03-14 10:46:42 +00:00
OpenSceneGraph git repository
c548289ac1
Merge pull request #724 from AnyOldName3/more-gitignore
...
Add missing files to .gitignore
2019-03-14 09:39:40 +00:00
AnyOldName3
2ebde09aff
Add Visual Studio cache/options directory to .gitignore
2019-03-13 23:13:41 +00:00
AnyOldName3
049f88325a
Add missing documentation build files to .gitignore
2019-03-13 23:13:00 +00:00
Robert Osfield
cc68d7f151
Streamline the animation path completion message
2019-02-25 15:09:12 +00:00
Daniel Trstenjak
5770774e00
OcclusionQueryNode: reset the test result of the invalid geometry
...
There're cases that the occlusion test result has been retrieved
after the query geometry has been changed, it's the result of the
geometry before the change.
2019-02-25 15:08:38 +00:00
Daniel Trstenjak
5624a22fe4
OcclusionQueryNode: ensure a valid query geometry
...
If the query geometry is invalid then don't do any occlusion queries and
never traverse the subgraphs.
2019-02-21 17:34:26 +00:00
Björn Blissing
9905b90a18
Add search location for textures in FBX plugin
...
The FBX plugin may fail texture lookup even if the texture is located in
the same folder as the model file. This change tries, as a last resort,
to check if the texture filename is available in the same folder as the
model.
2019-02-20 17:19:04 +00:00
OpenSceneGraph git repository
6d5c6ad6cc
Merge pull request #704 from mp3butcher/patch-24
...
uncomment INLINE_DRAWABLE_DRAW
2019-02-20 16:54:23 +00:00
Robert Osfield
971eba37ad
Added override for broken bindings
2019-02-20 16:31:58 +00:00
Julien Valentin
43574b52c1
uncomment INLINE_DRAWABLE_DRAW
2019-01-28 01:40:35 +01:00
Robert Osfield
625c771641
Updates for 3.6.4-rc3
2019-01-26 19:36:30 +00:00
OpenSceneGraph git repository
1504a54cd8
Merge pull request #702 from mp3butcher/fix36
...
add MeshReindexation flag
2019-01-26 18:21:47 +00:00
Robert Osfield
0f2e9e6557
Added missing {} to fix getPassed() bug introducted by previus commit
2019-01-26 18:10:44 +00:00
Daniel Trstenjak
cd150cbe96
OcclusionQueryNode: ensure a consistent value for '_passed'
2019-01-26 17:42:20 +00:00
Robert Osfield
02d7d980a7
Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels().
2019-01-26 16:33:23 +00:00
Daniel Trstenjak
c8521068a5
OcclusionQueryNode: add resetting of queries
...
If there's a big view change then it might not be appropriate to wait
for '_queryFrameCount' till the next query is issued, because then
geometry might pop into the view after '_queryFrameCount'.
This is especially important for applications not having a constant
frame rate, but just issue a new frame on demand.
2019-01-26 15:22:08 +00:00
mp3butcher
832d8d5228
fix variable name
2019-01-23 17:06:04 +01:00
OpenSceneGraph git repository
bdd0be2f8f
Changed member variable name to be consistent with header
2019-01-23 17:03:27 +01:00
OpenSceneGraph git repository
968a427e00
Changed the member variable to be consistent with the method name.
2019-01-23 17:03:11 +01:00
mp3butcher
b8f9249bea
add a bool parameter to allow forced reindexation of a mesh
2019-01-23 17:02:53 +01:00
Robert Osfield
e2fb88e187
Commented out the reset of the _vertexArrayObject = 0 as it was break later State::resetCurrentVertexArrayStateOnMatch() calls ability to reset the State::_currentVAO when required.
2019-01-23 15:40:13 +00:00
Robert Osfield
749dc86dd3
Fixed typo
2019-01-23 08:52:11 +00:00
Robert Osfield
84bae01643
Added separate test and rest of _currentVAO to State::resetCurrentVertexArrayStateOnMatch(..) method
2019-01-22 20:21:56 +00:00
Robert Osfield
8a5d1b9f44
Changed resetCurrentVertexArrayStateOnMatch() to reset _vas tp _globalVertexArrayState and currentVAO to 0.
2019-01-21 18:15:02 +00:00
Robert Osfield
488b4854b2
Added reset of the State::CurrentVertexArrayState() to prevent the State::_vas becoming a dangling pointer when VertexArrayState objects are deleted.
2019-01-21 17:36:40 +00:00
Robert Osfield
6455159757
Added calling of releaseGLObjects() and resizeGLObjects() to the Camera DrawCallback's to enable the draw callbacks to clean up their own GL objects.
2019-01-19 16:16:53 +00:00
OpenSceneGraph git repository
2e68db5b55
Merge pull request #693 from LaurensVoerman/glObj_C4250
...
fix MSVC warning C4250: inherits 'X' via dominance (94x)
2019-01-17 17:24:22 +00:00
Laurens Voerman
2e29085669
fix MSVC warning C4250: inherits 'X' via dominance (94x)
2019-01-17 16:22:51 +01:00
Robert Osfield
f223fec92d
Added derpecated and thread unsafe warning message to docs of ObjectCache::getgetFromObjectCache()
2019-01-14 11:56:23 +00:00
OpenSceneGraph git repository
cc3cb92ddc
Merge pull request #691 from LaurensVoerman/clrObjCache
...
clear temp objectCache in databaseRequest
2019-01-14 10:23:05 +00:00
Robert Osfield
4dcb2bbf3c
Added using to quieten VS warnings
2019-01-14 09:55:00 +00:00
Laurens Voerman
eeb13d1efc
clear temp objectCache in databaseRequest
2019-01-14 10:24:30 +01:00
Robert Osfield
fe98c3d7f5
Moved resizeGLObjects/releaseGLObjects out of Referenced to avoid multiple inheritance warnings
2019-01-12 11:27:18 +00:00
Robert Osfield
46b07141e8
Added read/writeObject() entry point to FBX plugin.
2019-01-10 09:45:32 +00:00
