Commit Graph

2374 Commits

Author SHA1 Message Date
Chris White
eb99df894a Make Array::className() support all Array::Type's
Array::className() had fallen out of date with respect to Array::Type.
This commit updates it, and adds documentation and a debug message to
serve as a reminder for future additions of values to Array::Type.
2017-06-16 11:02:14 -04:00
Jordi
8a2f1bc056 Fixes kdtree building 2017-05-31 13:33:37 +02:00
Robert Osfield
20ac472d1f Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config 2017-05-24 19:40:08 +01:00
Robert Osfield
a74b4b94a9 Fixes/clean up of KdTree/LineSegmentIntersector/PolytopeIntersector 2017-05-11 15:29:31 +01:00
Robert Osfield
6e1866ac18 Added --points and --lines command line options that do a very simplistic conversion of geometry primitives to points or lines respectively, used to aid testing of intersectors 2017-05-11 15:29:31 +01:00
Robert Osfield
1196e82587 Added missing header 2017-05-11 15:29:31 +01:00
Robert Osfield
c9545970ac Removed redudent bool parameter from TriangleFunctor::operator(Vec3, Vec3, Vec3, bool) so it's now simply TriangleFunctor::operator(Vec3, Vec3, Vec3) as the bool was always false in recently OSG versions. 2017-05-11 15:25:10 +01:00
Robert Osfield
e03d9f84c6 Moved the Polytope::contains(..) triangle test into PolytopeIntersector to enable customization and optimization. 2017-05-11 15:25:10 +01:00
Robert Osfield
8f5493e573 Implemented Polytope::contains(..) for triangle vertices and added support for using the results mask. 2017-05-11 15:25:10 +01:00
Robert Osfield
265efb85a1 Initial work on adding KdTree support for PolytopeIntersector. 2017-05-11 15:25:10 +01:00
Robert Osfield
728a7f2225 Merge branch 'MultiViewAutoTransform' 2017-05-11 14:35:50 +01:00
Thomas Hogarth
2ce5238cf7 Added more plugins to iOS example, Textures now working on GLES3 (missed so if defineds) 2017-05-04 18:17:30 +01:00
Thomas Hogarth
fe0b53d7f5 Added more plugins and texture shader to iOS example, fixed a couple of missed if defines for GLES3 2017-05-04 00:24:46 +01:00
Robert Osfield
a95d66a587 Replaced dynamoc_cast<osg::CullStack*> with asCullStack() to improve performance of AutoTransform, screen size based LOD and PagedLOD. 2017-04-26 17:10:58 +01:00
Robert Osfield
92092a56ae Refactored AutoTransform so that it dynamically computes the rotation, scale and matrices during the cull traversal to enable usage in multi-view, multi-threaded applications 2017-04-26 11:50:35 +01:00
Robert Osfield
a4b0dc7426 Added missing Node::asAutoTransform() + NodeVisitor::apply(AutoTransform&). 2017-04-25 18:04:04 +01:00
Alexander Roan
3dc3dd3bd6 GLExtenstions: fix checking of isFrameBufferObjectSupported flag for GLES2 2017-04-24 10:19:58 +01:00
mp3butcher
8d40323761 add Extensions 2017-04-05 18:11:50 +02:00
Robert Osfield
1f0515ceff Fix for GL3 2017-03-29 11:38:29 +01:00
Robert Osfield
cb7140aa04 Fixed windings 2017-03-29 10:02:03 +01:00
Robert Osfield
eb59590d77 Added handling of large shapes 2017-03-28 18:29:26 +01:00
Robert Osfield
10d87c40db Quiten down debug messages 2017-03-28 11:45:55 +01:00
Robert Osfield
6308b497f2 Replaced macro based selection of which shaders to use by default with DisplaySettings::setShaderHint() and OSG_SHADER=HINT=GL2|GL3|GLES2|GLES3|NONE controls 2017-03-27 11:44:41 +01:00
Robert Osfield
ec5cbe18d5 Restructed the marco to resolve Windows build issues 2017-03-25 16:05:57 +00:00
Robert Osfield
b4152d9634 Added simple fallback from osg::Material::apply() when fixed function pipeline is disabled 2017-03-23 14:53:08 +00:00
Robert Osfield
7ccd25a4d5 Fixed missing initializer for _color and assignment of color to ShapeDrawable 2017-03-23 14:40:44 +00:00
Robert Osfield
9848c1d264 First pass at default shader for GLES2,GLES3 and GL3. 2017-03-23 11:09:49 +00:00
Robert Osfield
48aa852f42 Replaced GL_QUADS and GL_QUAD_STRIP usage with indexed GL_TRIANGLES 2017-03-22 09:43:19 +00:00
OpenSceneGraph git repository
429aef3b08 Merge pull request #221 from tomhog/topic-gles3-ios
GLES3 support improvements on iOS
2017-03-21 17:56:39 +00:00
Robert Osfield
1778a2a6fb Made VAO the default for GL3 builds.
Improved the handling of DisplaySettings::getVertexBufferHint() values.
2017-03-21 15:38:52 +00:00
Thomas Hogarth
7ba2e728cd GLES3 now working on iOS, tried to maintain support for have bother gles2 and gles3, allowed avfoundation to be added on iOS, improved iOS example cmake generation 2017-03-20 18:39:56 +00:00
Thomas Hogarth
76fe572934 Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in 2017-03-20 18:33:08 +00:00
Robert Osfield
ffbc1167de Added lazy state updating for vertex array object binding/unbinding 2017-03-13 11:44:34 +00:00
OpenSceneGraph git repository
f1f6d23eeb Merge pull request #213 from marchelbling/bug/osg-fixes
Bug/osg fixes
2017-03-11 15:08:57 +00:00
OpenSceneGraph git repository
75e4d85681 Merge pull request #211 from D-A-Heitbrink/master
Added support for unsigned 64 bit ints + some code for bindless textures
2017-03-11 11:58:20 +00:00
Robert Osfield
5b78e334a9 Improved the management of the unbinding of VBO's and EBO's 2017-03-09 18:17:53 +00:00
Robert Osfield
854dac5340 Improved the checks against VBO+VAO usage and cleaned up setup. 2017-03-08 18:12:37 +00:00
Marc Helbling
18826a9ebc Fix implicit ref_ptr conversions 2017-03-06 14:08:27 +01:00
d-a-heitbrink
7b3fc0925c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-03-01 16:12:49 -06:00
OpenSceneGraph git repository
71bf79cf6f Merge pull request #197 from scrawl/geodefix
More fixes for Geode/Drawable handling in visitors
2017-02-03 18:03:13 +00:00
scrawl
e38c3d0303 Fix handling of in-scenegraph Drawables in SmoothingVisitor, TriStripVisitor and GraphicsCostEstimator 2017-02-03 17:55:55 +01:00
Kjell Andersson
f5483b0ad6 Bug fix to not crash when using shared context and adding / removing windowed views dynamically.
The GLExtension object is now reused instead of creating a new when allocating a state on the same ContextID. The static map that stores the GLExtensions is only reset when all references to the extension object are released.
2017-02-02 11:46:16 +01:00
OpenSceneGraph git repository
2a7d72c203 Merge pull request #191 from LaurensVoerman/glExtentions
GLExtensions.cpp: Fixed a few typo's in old function names.
2017-01-27 15:15:39 +00:00
Laurens Voerman
9183f275f5 Fixed a few old function names.
Check extensions trough extermination string - not by function pointer value.
Added a few validContext tests to ensure no functions or isExterntionSupported bool is set for an non valid context.
Remove duplicates / merge some lines.
Removed "GL_APPLE_texture_2D_limited_npot" form isNonPowerOfTwoTextureMipMappedSupported.
2017-01-25 17:05:56 +01:00
Robert Osfield
23da167c27 Fixed linking bug caused by repeated Program::addShader()/removeShader() operations invalidating the internal attach/dettech lists. 2017-01-24 17:36:36 +00:00
Robert Osfield
33f7500a59 Quitened down verbose debug messages 2017-01-20 17:31:09 +00:00
Robert Osfield
e5b493289d Quitened down debug messages 2017-01-20 17:24:49 +00:00
Robert Osfield
ed596c3335 Quietened down some verbose debug messages 2017-01-20 17:07:55 +00:00
Robert Osfield
10b6f7aa47 Fixed indentation of comment 2017-01-19 15:56:57 +00:00
d-a-heitbrink
18369bed2d added code to deal with #extension for shader, added int64 and uint64 support 2017-01-13 09:33:49 -06:00