Commit Graph

1222 Commits

Author SHA1 Message Date
Robert Osfield
7ed0389051 Restructured merge geometry code to make it easier to follow 2018-04-02 14:09:57 +01:00
Robert Osfield
2946ea0759 Fix for MergeGeometryVsiitor bug. Restructured the processing the merge geometry list to avoid missing geometries that aren't binned along with other geometries. 2018-04-02 14:09:49 +01:00
Robert Osfield
b7147ff532 Updated ShaderGen shaders 2018-03-16 11:33:03 +00:00
Robert Osfield
e5b67a6795 Removed the static osg::Program creation as it's not required 2018-03-15 16:50:47 +00:00
Robert Osfield
4447190dd6 Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition. 2018-03-14 08:22:45 +00:00
Robert Osfield
4e6e0f53be Changed glDrawBuffer/glReadBuffer calls to use the new State::glDrawBuffers/glReadBuffers helper functions to enable lazy state updating to avoid unneccessary GL calls 2018-03-07 17:49:40 +00:00
Robert Osfield
2b13166c8d Cleaned up the applying of the glDrawBuffers() 2018-02-23 09:55:00 +00:00
Philippe Renon
4a025cafb4 renderstage: fix spelling in log message 2018-02-18 18:39:47 +01:00
Julien Valentin
61548dc5a8 add recursivity on Camera Callbacks 2018-01-04 03:59:25 +01:00
Robert Osfield
d2bfde30f0 Deprecated dirtyDisplayLists(), use established dirtyGLObjects() instead 2017-12-18 13:54:08 +00:00
Robert Osfield
37dbb04608 Added more flexibility into the State::checkGLErrors() method, allowing calling code to pass in two strings.
Improved the StateSet::compileGLObjects() usage of checkGLErrors() to make the warning reports more meaningful.
2017-12-06 10:11:53 +00:00
Robert Osfield
d313184cd0 Added fine grained checking for GL errors in the GLObjectVisitor so that the OSG's default pre compile stage provides better feesback on any GL errors. 2017-12-06 09:51:57 +00:00
Robert Osfield
9ef79c2f44 Renamed chanels to array to be consistent with the rest of the usage 2017-12-03 11:17:34 +00:00
OpenSceneGraph git repository
92cccff866 Merge pull request #398 from marchelbling/sharedarrayoptimizer-fix
Improve SharedArrayOptimizer
2017-12-03 11:12:20 +00:00
Robert Osfield
200537ed6f Removed redundent !ps 2017-12-03 10:49:39 +00:00
Robert Osfield
5ff16798a3 Removed unused local variable and associated typedef 2017-12-03 09:49:09 +00:00
Robert Osfield
9a96e211f9 Quietened down cppcheck false positive. 2017-12-03 09:45:37 +00:00
Robert Osfield
da68d32482 Improved readaibility of text by removing redundent indirection. 2017-12-02 16:35:16 +00:00
Marc Helbling
75af025c55 Improve SharedArrayOptimizer
When an array is shared within and outside a geometry, it's still worth it and safe
to recreate the reference within each individual geometry.
2017-12-01 12:26:02 +01:00
Robert Osfield
bc4a9d9dd0 Refactored the MergeGeometry::mergeGroup(..) method to avoid O(N^2) issue with using removeChildren() on groups with very large numbers of children. 2017-11-27 15:44:11 +00:00
Andre Normann
e0eb4fbda8 Fixed missing initialization of B_ and N_ in constructor 2017-11-21 13:54:45 +01:00
Robert Osfield
6f924f84ba Fuxed missing initializers 2017-11-02 18:39:11 +00:00
Robert Osfield
248805fedd Fixed pre compilation osg::Program state leaking into the main scene graph rendering 2017-10-25 16:13:26 +01:00
Konstantin S. Matveyev
941ec1e451 LineSegmentIntersector fixed: intersection ratio remaped to the range of LineSegment => correct order in multiset of intersections 2017-09-22 11:46:02 +03:00
OpenSceneGraph git repository
ff6e77c874 Merge pull request #341 from scrawl/cullingactive_fix
LineSegmentIntersector: respect the 'cullingActive' flag for bounding box check
2017-09-04 08:36:49 +01:00
scrawl
6048c1fbdc LineSegmentIntersector: respect the 'cullingActive' flag when testing drawable bounding box 2017-09-03 14:15:36 +00:00
Julien Valentin
107b7be95b Merge remote-tracking branch 'upstream/master' into MDI7 2017-08-24 11:26:23 +02:00
OpenSceneGraph git repository
32f895bc5f Merge pull request #304 from eligovision/master
glClear should not be called with zero-mask in osgUtil::RenderStage::…
2017-08-19 17:20:40 +01:00
Konstantin S. Matveyev
036add8e9e glClear should not be called with zero-mask in osgUtil::RenderStage::drawImplementation 2017-08-18 10:20:26 +03:00
Robert Osfield
bdbff4824b Fixed iterator comparison. 2017-08-18 08:11:57 +01:00
luzpaz
2cd31f65e4 misc. typo fixes
mostly non-user-facing but some doxy.
2017-08-15 12:23:49 -04:00
Julien Valentin
35eb53cc95 add MDI support 2017-08-02 22:10:02 +02:00
blobfish
b52bc2bcd1 osgUtil: LineSegmentIntersector: don't increment primitive index until after adding intersection 2017-06-04 17:29:57 -04:00
blobfish
47efc55621 osgUtil: PolytopeIntersector: don't increment primitive index until after adding intersection 2017-06-04 17:29:57 -04:00
Jordi
8a2f1bc056 Fixes kdtree building 2017-05-31 13:33:37 +02:00
Robert Osfield
a60aed70b5 Replaced DimensionMask naming with more appropriate PrimitiveMask nameing. 2017-05-24 18:36:52 +01:00
Robert Osfield
a201b15648 Added support for PolytopeIntersector::setDimensionsMask. 2017-05-24 18:36:52 +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
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
e7e372bad2 Added support for using new IntersectFunctor for non kdtree as well as kdtree PolytopeIntersector 2017-05-11 15:25:10 +01:00
Robert Osfield
770a52d354 Implemented the setting of all the PolytopeIntersector::Intersection values on hits detected by KdTree/Polytope intersection codes 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
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
6670a6e070 Improved support for stats, fonts and shadergen for GLES2, GLES3 and GL3 2017-03-20 14:07:14 +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
Marc Helbling
a97cdebe11 Remove unused offset attribute in MergeArrayVisitor 2017-03-06 12:25:48 +01:00
Marc Helbling
c765b0b62d Add missing type for attribute merge 2017-03-06 12:25:23 +01:00