Commit Graph

263 Commits

Author SHA1 Message Date
Jan Möbius
505ab99324 Updated License Headers
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@737 fdac6126-5c0c-442c-9429-916003d36597
2012-10-08 07:33:20 +00:00
Jan Möbius
f3312397a5 Updated License Headers
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@736 fdac6126-5c0c-442c-9429-916003d36597
2012-10-08 07:30:49 +00:00
Jan Möbius
0624a524ca Keywords
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@735 fdac6126-5c0c-442c-9429-916003d36597
2012-10-08 07:25:00 +00:00
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
339b4d34d4 Documentation and indents
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@721 fdac6126-5c0c-442c-9429-916003d36597
2012-10-01 07:09:01 +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
61eef1a1d7 DLL is no longer experimental, as it builds and executes fine on Windows
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@701 fdac6126-5c0c-442c-9429-916003d36597
2012-09-24 14:12:15 +00:00
Mike Kremer
5834e277f7 - add dll export macros
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@699 fdac6126-5c0c-442c-9429-916003d36597
2012-09-24 10:10:22 +00:00
Jan Möbius
209965768c - Reorganize DLL Macros
- Added DLL import definition to Apps



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@697 fdac6126-5c0c-442c-9429-916003d36597
2012-09-24 06:06:35 +00:00
Jan Möbius
92e08dfacc Typo
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@694 fdac6126-5c0c-442c-9429-916003d36597
2012-09-23 14:28:38 +00:00
Jan Möbius
92e835b0af First test for DLL Build
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@692 fdac6126-5c0c-442c-9429-916003d36597
2012-09-23 14:21:37 +00:00
Jan Möbius
dc1e08ebb1 First preperations for DLL Build on Windows
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@691 fdac6126-5c0c-442c-9429-916003d36597
2012-09-23 13:53:10 +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
2fd9818384 Increased maximal valence for modified butterfly scheme
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@610 fdac6126-5c0c-442c-9429-916003d36597
2012-06-28 10:50:47 +00:00
Jan Möbius
653b1b8f56 Added catmull clark subdivider. Thanks to Leon Kos for the code.
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@609 fdac6126-5c0c-442c-9429-916003d36597
2012-06-28 09:32:20 +00:00
Jan Möbius
f94143d10b Fixed documentation warnings
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@565 fdac6126-5c0c-442c-9429-916003d36597
2012-03-21 16:07:44 +00:00
Jan Möbius
1afa9669ff Fxed doxygen warnings
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@563 fdac6126-5c0c-442c-9429-916003d36597
2012-03-21 15:56:38 +00:00
Jan Möbius
03fd666b9b Fix to build with correct two phase name lookup (xcode 4.3 compatibility for OpenMesh). The template base class members are not found otherwise.
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@552 fdac6126-5c0c-442c-9429-916003d36597
2012-03-02 16:16:30 +00:00
Jan Möbius
8d0c709eab Drop the template only files
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@544 fdac6126-5c0c-442c-9429-916003d36597
2012-02-29 13:25:12 +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