Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,618 Commits 1 Branch 0 Tags
7a1cad003d076ec27a9ef9b63c854f13b18bc29f
Commit Graph

99 Commits

Author SHA1 Message Date
Jan Möbius
d99a162550 Added more advanced version of the mixxed decimater 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@734 fdac6126-5c0c-442c-9429-916003d36597
 2012-10-08 07:23:50 +00:00
Jan Möbius
fd8ed29ed5 Mixed not ready yet. Keep for next release 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@729 fdac6126-5c0c-442c-9429-916003d36597
 2012-10-02 07:54:57 +00:00
Isaak Lim
19ab724a82 took out workaround in McDecimater, since the RandomNumberGenerator is fixed now 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@728 fdac6126-5c0c-442c-9429-916003d36597
 2012-10-01 09:24:55 +00:00
Jan Möbius
849ee4d293 Docu and indents 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@726 fdac6126-5c0c-442c-9429-916003d36597
 2012-10-01 07:12:25 +00:00
Jan Möbius
ecb76539f3 Check for invalid HE handle 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@718 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 15:05:25 +00:00
Isaak Lim
e5ee41bca2 - added double cast 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@717 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 14:17:37 +00:00
Isaak Lim
020f990aab - took out static_cast in McDecimater 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@716 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 13:27:00 +00:00
Isaak Lim
e0ed6ad954 - added random number generator to Core/Utils that generates a double between 0.0 and 1.0 with garantueed precision 
- use this random number generator for the McDecimater under Windows, since RAND_MAX is not large enough

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@713 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 13:07:33 +00:00
Jan Möbius
9478350b30 Removed debug stuff from mixed decimater 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@712 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 09:40:41 +00:00
Jan Möbius
ccfe862f80 Minor speedup of McDecimater 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@711 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 09:38:21 +00:00
Jan Möbius
26e59ab6d7 Added reset function to base decimater 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@710 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 09:34:14 +00:00
Jan Möbius
398844b1c6 Removed OpenMP stuff 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@709 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-28 09:33:48 +00:00
Jan Möbius
db14a8a186 Removed unused parameter 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@708 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-27 10:24:03 +00:00
Isaak Lim
e4ac38ce96 - removed redundant tests in is_collapse_legal that where already performed in is_collapse_ok 
- on moneta this reduced the running time (release mode) of the incremental decimater from around 30 s to 27.5 s
when decimating 400 000 faces with a distance constraint of 1.0 and a normal dev. constraint of 10
- the McDecimater currently clocks in at around 7 s in average with the same constraints

refs #1005

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@703 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-26 12:26:32 +00:00
Jan Möbius
475115c3cf Indentations 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@690 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-23 12:00:46 +00:00
Isaak Lim
232bf5bb07 fixed warnings 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@686 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-19 16:42:31 +00:00
Isaak Lim
48289493f3 - added the set_error_tolerance_factor function to ModBaseT and implemented it in inherited classes as necessary 
- added the set_error_tolerance_factor function to BaseDecimaterT, which calls set_error_tolerance_factor for all loaded Mods
- implemented a decimate_constraints_only function for the McDecimater (and adjusted the MixedDecimater accordingly)
- implemented stop criterions for the McDecimater
- added some OpenMP loops for the sample generation to the McDecimater

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@685 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-19 16:15:39 +00:00
Isaak Lim
b02909e890 removed OpenMP for loops, which caused problems because priority_collapse was executed in parallel 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@682 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-18 16:39:09 +00:00
Isaak Lim
688a65aba0 fixed Windows OpenMP error 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@681 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-18 13:19:37 +00:00
Isaak Lim
cddb183af5 added some OpenMP for loops for the generation of samples 
refs #1005

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@680 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-18 12:24:42 +00:00
Isaak Lim
60774dbdfa fixed the stop criterion 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@679 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-18 10:54:01 +00:00
Isaak Lim
e3f061f0f0 added a stop criterion for the MC-Decimater, so that an endless loop is prevented from occuring if no vertex or face constraints are given 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@678 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-18 10:28:26 +00:00
Isaak Lim
99c8dca30c took out an OpenMP for loop that caused non-deterministic behaviour 
refs #1005

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@677 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-17 13:37:23 +00:00
Isaak Lim
dea5c91e4a - added some OpenMP loops to ModHausdorffT and defined some variables as const for speedup 
refs #1005

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@673 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-14 14:26:28 +00:00
Matthias Möller
0e15808378 - readd unittests 
- fix McDecimater random crash

refs #1007

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@666 fdac6126-5c0c-442c-9429-916003d36597
 2012-09-10 13:59:42 +00:00
Matthias Möller
6c9fc60520 add: mixedDecimater 
add: unittests (for all Decimaters)
fix: collapses counter in McDecimater

refs #998

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@653 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-22 08:49:55 +00:00
Matthias Möller
d19afb03fb - more this ptr 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@651 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-08 16:10:57 +00:00
Matthias Möller
a093b541c3 - rename module template parameters 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@650 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-08 15:15:17 +00:00
Jan Möbius
54fafe054b Missing this pointers 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@649 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-08 14:48:20 +00:00
Matthias Möller
9894b6fdfe fix: virtual destructor in base class 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@648 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-08 14:37:38 +00:00
Matthias Möller
e50135facc - fix doc warning 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@647 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-08 14:12:39 +00:00
Matthias Möller
1af3dcac53 - decimater modules doesn't need a decimater type as template argument 
- add decimater base class

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@645 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-08 13:43:05 +00:00
Jan Möbius
34e3b8ee86 Aded multiple choice decimater (~4 times faster than the heap one) 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@644 fdac6126-5c0c-442c-9429-916003d36597
 2012-08-06 16:10:52 +00:00
Jan Möbius
365bf0e9b6 Fixed wrong template include defines 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@539 fdac6126-5c0c-442c-9429-916003d36597
 2012-02-27 07:19:49 +00:00
Jan Möbius
b808c1020d Added missing function data_vector to bool specialization. Added corresponding unit tests. closes #451 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@537 fdac6126-5c0c-442c-9429-916003d36597
 2012-02-24 10:11:01 +00:00
Jan Möbius
d4487aaa79 Documentation for decimater modules, updated decimater, more modules 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@460 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-16 09:45:08 +00:00
Isaak Lim
7b5dd574ff Added Decimater Mod AspectRatio. 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@457 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-15 19:23:13 +00:00
Jan Möbius
652dfbf19f Renamed some namespaces and removed extra files 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@455 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-09 11:09:49 +00:00
Jan Möbius
9995294d23 Fixed template definition 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@454 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-09 08:47:25 +00:00
Jan Möbius
e2ea9c00f6 Removed extra character 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@453 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-09 08:46:43 +00:00
Jan Möbius
c2731d1b4d Don't depend on ACG 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@451 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-07 07:18:15 +00:00
Jan Möbius
edce990e21 New Decimater mods: 
EdgeLength
  Hausdorff distance
  Normal Deviation



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@450 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-07 07:03:56 +00:00
Jan Möbius
ce1d3c7b89 Changes to Decimater Base for new mods 
Decimate to faces function in DecimaterT
ModBase with preprocess_collapse



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@448 fdac6126-5c0c-442c-9429-916003d36597
 2011-11-04 12:59:37 +00:00
Jan Möbius
18f98129d8 Fixed bug in decimater where boundary check was using the wrong halfege(Thanks to Michal Nociar for the patch) 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@363 fdac6126-5c0c-442c-9429-916003d36597
 2011-01-26 09:36:24 +00:00
Jan Möbius
4fdd4c2adc Updated license headers 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@362 fdac6126-5c0c-442c-9429-916003d36597
 2011-01-26 09:21:12 +00:00
Jan Möbius
34141f8d9a Changed license Header to 2010 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@325 fdac6126-5c0c-442c-9429-916003d36597
 2010-06-17 10:45:58 +00:00
Jan Möbius
5246b77da6 Updated License to LGPL3 with additional template and macro exceptions 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@137 fdac6126-5c0c-442c-9429-916003d36597
 2009-06-04 08:46:29 +00:00
Jan Möbius
7b1f06d654 - Added all_modules_ to hold pointers to ALL allocated modules. 
- Add a private set_uninitialized() method for resetting the
  initialized_ flag and I also clear the contents of bmodules_ and
  cmodule_. initialize() will repopulate them.
- Fixing a memory leak in remove() - previously, when cmodule_ was
  being removed, it was not deallocated.
- Attempted to simplify the DecimaterT<Mesh>::initialize method.
- Added a "FIXME" comment critical of special treatment of quadric module.
- Replaced -1 with proper ILLEGAL_COLLAPSE enum constant in
  collapse_priority.

Patch submitted by Ilya A. Kriveshko

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@129 fdac6126-5c0c-442c-9429-916003d36597
 2009-05-20 12:20:21 +00:00
Jan Möbius
ea844d6788 Changed OpenMesh directory structure 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@106 fdac6126-5c0c-442c-9429-916003d36597
 2009-04-30 12:41:50 +00:00