Commit Graph

54 Commits

Author SHA1 Message Date
Robert Osfield
4d2221bdb3 Fixed potential memory leak 2016-06-02 15:43:31 +01:00
Robert Osfield
7409820a8f Added Simplifier::requiresDownSampling()/requiresDownSamplingImplementation() to make it possible for the
Simplfifer::ContinueSimplificationCallback to be able to decide whether up or downsampling is required,
removing the previous hardwards reliance on getSampleRatio<1.0.
2016-01-18 11:50:07 +00:00
Robert Osfield
ba9dfb2ff6 From Albert Luaces, typo fixes.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14883 16af8721-9629-0410-8352-f15c8da7e697
2015-06-01 13:40:20 +00:00
Robert Osfield
092dd93be8 Removed deprecated usage of osg::Geometry::get*Binding() 2013-06-27 10:58:26 +00:00
Robert Osfield
7d40c7258f Clean up up osg::Geometry, removing long deprecated support for array indices and BIND_PER_PRIMITIVE binding that forced OpenGL slow paths. osg::Geometry is now smaller and only supports OpenGL fasts paths.
New methods osg::Geometry::containsDeprecatedData() and osg::Geometry::fixDeprecatedData() provide a means for converting geometries that still use the array indices and BIND_PER_PRIMITIVE across to complient
versions.

Cleaned up the rest of the OSG where use of array indices and BIND_PER_PRIMITIVE were accessed or used.
2013-06-18 11:18:28 +00:00
Robert Osfield
14a563dc9f Ran script to remove trailing spaces and tabs 2012-03-21 17:36:20 +00:00
Robert Osfield
24974462f6 Fixed Coverity reported issue.
CID 11830: Uninitialized pointer field (UNINIT_CTOR)
Non-static class member _geometry is not initialized in this constructor nor in any functions that it calls.
2011-05-06 12:25:02 +00:00
Robert Osfield
3b3e0d7cdd Conversion of osg::notify to OSG_INFO etc. 2010-05-28 15:51:00 +00:00
Robert Osfield
370deba546 <iterator>, <stdlib.h> and <ctype.h> includes required for QNX compiler 2009-11-17 14:06:07 +00:00
Robert Osfield
7eafde35e2 Fixed warning 2009-02-03 17:11:54 +00:00
Robert Osfield
734463fcc7 Warning fixes 2009-02-03 15:28:53 +00:00
Robert Osfield
1153ea5feb Warnings fixes for VS. 2009-02-02 20:35:19 +00:00
Robert Osfield
56bc3ae194 Compile fix required when using ref_ptr<> implicit output conversion 2008-10-03 13:38:55 +00:00
Robert Osfield
d71a6f6cab Introduced Geometry::containsSharedArrays() and Geometry::duplicateSharedArrays() to
support a fix to the osgUtil::Simplifier that couldn't handle shared arrays
2008-09-14 10:31:27 +00:00
Robert Osfield
2c0842c7b7 Added an optional use of doubles for computing error metrics to help investigate precision issues seen in VPB when working with small segments of geographic data. 2007-12-20 15:50:07 +00:00
Robert Osfield
f4afa427a7 From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)." 2007-12-10 17:30:18 +00:00
Robert Osfield
1f7b27f851 Changed the simplifier so that it produces deterministic results, no longer
using memory pointers for sorting.
2007-09-19 10:14:52 +00:00
Robert Osfield
f1c2694c17 Updated copyright years. 2006-07-18 15:21:48 +00:00
Robert Osfield
240fc9ebee Replaced ref_ptr<>:take with ref_ptr<>:release, and added handling of removeal
of ref_ptr<> operator >.
2006-06-26 20:45:51 +00:00
Robert Osfield
608a183753 Added s/getDoTriStrip and s/getSmoothing method. 2006-02-06 20:36:09 +00:00
Robert Osfield
6624f3aa62 Improved default settings, re-enambled smoothing and tri stripping of sampled data. 2006-02-06 19:16:04 +00:00
Robert Osfield
3936bcde9e Added support for up sampling by dividing longest edges. 2006-02-06 17:12:35 +00:00
Robert Osfield
0e16b64665 Coverted tabs to space in core libraries. 2005-11-17 13:35:53 +00:00
Robert Osfield
b38f491c12 From Volker Walkiewicz (with tweaks from Robert Osfield):
Fix to the update of the error metrics on the edges in the simplification mesh that are affected by an edge collapse.

Addition of 'n' and 'p' keyboard control in osgsimplifier example to allow users to control the sample ratio manually.
2005-09-28 16:05:35 +00:00
Robert Osfield
d35ea68f3e Renamed Byte2,3,4 and Short2,3,4 and UByte4 to use the Vec*b, Vec*s and Vec4ub form 2005-07-15 14:41:19 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
7d24d9fdd5 Added #include <algorithm> 2005-04-08 12:22:03 +00:00
Robert Osfield
814300f896 Fixed crash in osgUtl::Simplifier which was due to an dereference of an empty array. 2005-01-07 14:31:33 +00:00
Robert Osfield
79bc32ad7c Removed warings 2004-08-02 14:42:20 +00:00
Robert Osfield
dbba29e35c From Boris Bralo, reimplementation of dereference_less functor to use
two input types, to attempt to avoid VC compile problems and redundent
copies of ref_ptr<>.
2004-06-08 09:29:56 +00:00
Robert Osfield
5eafee1b83 From Frank Lindeman, compile fix for VS to get round limitation is VS when
handling templated methods.
2004-05-12 14:22:01 +00:00
Robert Osfield
7742794eec From Bruce Clay, modify template copy method to avoid VS6.0 compile errors. 2004-05-10 20:01:13 +00:00
Robert Osfield
4ab330de96 Removed eroneous return statement. 2004-05-10 13:56:05 +00:00
Robert Osfield
55162d0c7c Changed notify level on several debugging messages from WARN to INFO. 2004-05-04 13:58:07 +00:00
Robert Osfield
be1a124b32 Fix for VS7.0 build from Mike Weiblen 2004-04-29 22:13:23 +00:00
Robert Osfield
0af4365d11 Fixed an iterator invalidation bug. (thanks to Per Månsson for tracking down the
bug)
2004-04-29 21:38:16 +00:00
Robert Osfield
ba5b90d43e Added missing dirtyBound() to billboard section of flatten static transforms 2004-04-29 15:57:03 +00:00
Robert Osfield
91516305d9 Added support for protecting points from being simplified.
Added back in support for generation of skirts in osgTerrain::DataSet.
2004-04-22 13:36:30 +00:00
Robert Osfield
8a923e60a8 Changed the edge collapse to accept edges with more than two connected
triangles.
2004-04-21 10:40:12 +00:00
Robert Osfield
cc1314049c Changed the debugging info to output to osg::notify() rather than cout.
Add a clear of all the internal EdgeCollapse structures to avoid memory
leaks
2004-04-20 09:36:46 +00:00
Robert Osfield
061244056d Added support for using the error metric to guide the simplficiation process 2004-04-19 23:08:30 +00:00
Robert Osfield
45179b8868 Changed the scoping for for variables to fix VS6.0 compile. 2004-04-19 20:44:14 +00:00
Robert Osfield
f72e9befc1 Added support for detecting edge collapses which will overturn the local
triangles.
2004-04-19 20:06:26 +00:00
Robert Osfield
a1caa14a61 Added osgsimplifier example. 2004-04-18 16:15:49 +00:00
Robert Osfield
cf8c4c6a97 Further work on Simplifer support for compute error metric 2004-04-17 22:50:39 +00:00
Robert Osfield
8f819d7756 Changed TriangleSet::iterator to const_iterator to fix build under VS.NET. 2004-04-17 20:27:31 +00:00
Robert Osfield
117fa92462 Further work on simplifier edge collapse code 2004-04-17 16:02:38 +00:00
Robert Osfield
3b4e0a419a Added tests for the consistency of points, edges and triangles. 2004-04-15 09:37:10 +00:00
Robert Osfield
025cc6b819 Added support for removing triangles and associated edge and points from
the EdgeCollapse object.
2004-04-13 15:59:30 +00:00
Robert Osfield
073e49c3d8 Added support for copy all per vertex attributes to and from the edge collapse
object.
2004-04-13 14:39:43 +00:00