Commit Graph

16217 Commits

Author SHA1 Message Date
James Turner
0081c71cde macOS support for this extension with legacy GL
In compatibility mode (OpenGL 2.1), glVertexAttribDivisor is available
via glVertexAttribDivisorARB on macOS.
2019-04-11 09:25:15 +01:00
flashk
c0b046ead9
Update fbxRMesh.cpp 2019-04-05 14:31:21 -07:00
Wei Lisi
249a60c328 clean up 2019-03-26 22:37:50 +08:00
Wei Lisi
97ce560f72 fix fbx hierarchy issue 2019-03-26 21:01:24 +08:00
Robert Osfield
c07d5c07c4 Fixed line ending 2019-03-26 08:06:15 +00:00
OpenSceneGraph git repository
efd8ef9e7e
Merge pull request #733 from eknabe/master
Collada (DAE) support recognized for VisualStudio 2017
2019-03-26 08:01:31 +00:00
Jeongseok Lee
36cceb6930
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 06:52:09 +01:00
Robert Osfield
b988e690bb Added basic load and compile stats collection enabled by --stats command line. 2019-03-25 14:10:25 +00:00
Robert Osfield
50d1517833 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 14:10:25 +00:00
Robert Osfield
e0d90fb4c2 Added --NO_CULLING, --VIEW_FRSUTUM and --VIEW_FRUSTUM_SIDES/--vfs command line options for setting the Camera CullingMode value 2019-03-25 14:10:13 +00:00
Emil Knabe
32db1d04a0 Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph 2019-03-23 13:21:14 +01:00
Emil Knabe
8bd4d9ef49 Updating DAE support for vc141 (VisualStudio2017), aligned with 3rdParty package 2019-03-23 13:14:24 +01:00
OpenSceneGraph git repository
c9e2bda0d7
Merge pull request #729 from jslee02/gnu_install_dirs
Use GNUInstallDirs for library installation path
2019-03-21 07:07:47 +00:00
Jeongseok Lee
8fc039d352 Update comments and fix cmake version check 2019-03-20 09:09:56 -07:00
Jeongseok Lee
ce61fc413a Use GNUInstallDirs only for CMake >= 2.8.5 2019-03-20 08:56:17 -07:00
OpenSceneGraph git repository
3ba6f3d682
Merge pull request #725 from Capostrophic/dynamiccast
Get rid of some type conversions
2019-03-16 11:33:42 +00:00
Capostrophic
de64d58e06 Override default behavior for linear vector interpolations 2019-03-16 11:31:26 +00:00
Capostrophic
35f256a9a1 Replace redundant asCullVisitor usage with a type check 2019-03-15 18:09:13 +03:00
Capostrophic
da16693b4a Add asOccluderNode method to avoid dynamic casts in group child handling 2019-03-15 18:09:13 +03:00
Jeongseok Lee
3285bdc8d8 Use GNUInstallDirs for library installation path 2019-03-14 08:46:46 -07:00
OpenSceneGraph git repository
d3174bd36c
Merge pull request #716 from AnyOldName3/patch-2
Resolve OpenGL error caused by confusion between geometry shader implementations
2019-03-14 13:51:05 +00:00
OpenSceneGraph git repository
cad7418eb2
Merge pull request #718 from flashk/patch-10
Fix osgAnimation transform not updating in some cases
2019-03-14 11:24:19 +00:00
OpenSceneGraph git repository
7b61419891
Merge pull request #722 from Capostrophic/matrix
Avoid unnecessary matrix type conversion in osgParticle
2019-03-14 10:34:37 +00:00
Robert Osfield
f6acb80357 Removed the optional code path hack 2019-03-14 10:13:15 +00:00
OpenSceneGraph git repository
4e9762ddd0
Merge pull request #723 from Capostrophic/quat
Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions
2019-03-14 09:47:22 +00:00
AnyOldName3
7de007ca3e Add Visual Studio cache/options directory to .gitignore 2019-03-14 09:45:37 +00:00
Capostrophic
52fe3679a3 Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions 2019-03-13 22:08:19 +03:00
Capostrophic
7c71d8dc16 Avoid unnecessary matrix type conversion in osgParticle 2019-03-10 15:51:44 +03:00
flashk
22c8c669e7
Update StackedTransform.cpp 2019-03-05 09:32:55 -08:00
Chris Djali
fbb5839298
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-02-26 17:19:06 +00:00
Robert Osfield
572e1d75a4 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-02-25 15:07:38 +00:00
Robert Osfield
08ea80c904 Streamline the animation path completion message 2019-02-25 15:06:54 +00:00
OpenSceneGraph git repository
66a0168353
Merge pull request #714 from dan-t/reset_occlusion_query_test_result
OcclusionQueryNode: reset the test result of the invalid geometry
2019-02-25 15:06:17 +00:00
Daniel Trstenjak
b431c29d44 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 11:31:12 +01:00
OpenSceneGraph git repository
0614896c12
Merge pull request #713 from dan-t/ensure_valid_query_geometry
Ensure valid occlusion query geometry
2019-02-21 17:33:18 +00:00
Daniel Trstenjak
71997fa747 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 14:42:35 +01:00
OpenSceneGraph git repository
862788e14e
Merge pull request #711 from uhertlein/macos_10_14
Cleanups and support for macOS 10.14
2019-02-20 17:20:35 +00:00
OpenSceneGraph git repository
742b0607d5
Merge pull request #710 from bjornblissing/fbx-filename
Add search location for textures in FBX plugin
2019-02-20 17:17:34 +00:00
OpenSceneGraph git repository
af32a24cf2
Merge pull request #707 from dquam/patch-1
Undo small change to FindOpenCascade.cmake
2019-02-20 17:01:38 +00:00
Julien Valentin
91c6b80020 uncomment INLINE_DRAWABLE_DRAW 2019-02-20 16:55:08 +00:00
Robert Osfield
552ecb7674 Added override for broken bindings 2019-02-20 16:38:11 +00:00
Ulrich Hertlein
10af927260 Support for macOS 10.14
- 10.14 drops libstdc++
- drops support for Carbon :-)
- drops support for macOS < 10.9
2019-02-07 19:18:11 +01:00
Ulrich Hertlein
eac4c9df60 Minor cmake cleanups and formatting 2019-02-07 19:16:00 +01:00
Björn Blissing
3284d0545c 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-04 14:46:42 +01:00
dquam
389d55a98a
Undo small change to FindOpenCascade.cmake
Re-add FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXCAF TKXCAF) to the cmake file.
2019-01-29 10:07:05 -06:00
Robert Osfield
070e55e8e0 Added missing {} to fix getPassed() bug introducted by previus commit 2019-01-26 18:12:19 +00:00
Daniel Trstenjak
733f78a0b4 OcclusionQueryNode: ensure a consistent value for '_passed' 2019-01-26 18:12:19 +00:00
Robert Osfield
6eb0da3a16 Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels(). 2019-01-26 18:12:19 +00:00
Daniel Trstenjak
f21ca61476 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 18:12:19 +00:00
Robert Osfield
c6eb63d529 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:42:41 +00:00