diff --git a/DESCRIPTION b/DESCRIPTION index 06f3068b..e019febd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Version: 0.4-00 Date: Author: Stefan Schlager Maintainer: Stefan Schlager -Description: Operations on triangular meshes based on VCGLIB +Description: Operations on triangular meshes based on VCGLIB #. The Visualization and Computer Graphics Library (VCG for short) is an open source portable C++ templated library for manipulation, processing diff --git a/README.md b/README.md index dac9313f..b99069dc 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,38 @@ Rvcg ==== this is an R-package providing methods for manipulations on triangular meshes by using the API of the [VCGLIB]( http://vcg.isti.cnr.it/~cignoni/newvcglib/html/) library. + +##### Installation of the R-package "Rvcg": #### + 0. Make sure to work with the latest version of R and install dependencies (type the following commands into your R terminal): + + install.packages("Rcpp") + + +* Download the version suitable for your OS from [here](https://github.com/zarquon42b/Rvcg/releases/). + Either the compiled package (for Windows and OS X) or the source tarball (Linux). + +* Installation command from within R: + + install.packages("Path_to_downloaded_package_Rvcg[Version_OS]",repos=NULL) + +* check if the package can be loaded: + + load package: library(Rvcg) + +##### Installation of the-R package "Rvcg" (latest development code) using *devtools*:: #### + + +1. install *devtools* from within R (Ubuntu/Debian users will have to install *libcurl4-gnutls-dev* beforehand): + + install.packages("devtools") + +2. Install build environment + * **Windows:** Install latest version of *[Rtools](http://cran.r-project.org/bin/windows/Rtools)* +During installation of *Rtools* make sure to install the *toolchain*, and to select *"Edit the system path"* (and confirming the installers suggestions). + * **OSX:** Install *[XCODE](https://developer.apple.com/xcode/)* + +3. In R run the command: + + require(devtools) + install_url("https://github.com/zarquon42b/Rvcg/archive/master.zip") + \ No newline at end of file diff --git a/inst/include/vcglib/.svn/entries b/inst/include/vcglib/.svn/entries index a0afe948..81f2dfbf 100644 --- a/inst/include/vcglib/.svn/entries +++ b/inst/include/vcglib/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib svn://svn.code.sf.net/p/vcg/code -2013-06-24T10:51:53.920813Z -4909 +2013-07-24T12:00:47.297259Z +4928 cignoni diff --git a/inst/include/vcglib/apps/.svn/entries b/inst/include/vcglib/apps/.svn/entries index fdfaf5ce..e9e15dc6 100644 --- a/inst/include/vcglib/apps/.svn/entries +++ b/inst/include/vcglib/apps/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps svn://svn.code.sf.net/p/vcg/code -2013-04-16T15:20:05.922207Z -4890 +2013-07-23T07:37:29.006637Z +4922 cignoni @@ -26,9 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -plyrefine -dir - pivoting dir @@ -53,3 +50,6 @@ dir quadrangulator dir +plyrefine +dir + diff --git a/inst/include/vcglib/apps/metro/.svn/entries b/inst/include/vcglib/apps/metro/.svn/entries index 8b296dcf..6e27cf8d 100644 --- a/inst/include/vcglib/apps/metro/.svn/entries +++ b/inst/include/vcglib/apps/metro/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/metro svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -history.txt +readme.txt file 2013-06-21T07:05:38.870900Z -49ba9fc018d874d6070fc7bf397c9628 +bf1187cf03700d0b8964aaadaa0de30d 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,18 +58,18 @@ cignoni -1532 +5248 -sampling.h +history.txt file 2013-06-21T07:05:38.870900Z -f69eeb2895b63391231a220239def025 -2013-02-20T21:21:49.121709Z -4820 +49ba9fc018d874d6070fc7bf397c9628 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -92,21 +92,18 @@ cignoni -21639 - -sample -dir +1532 -metro.pro +sampling.h file 2013-06-21T07:05:38.870900Z -d27b36a76f14cf2609d1665a9054c2fb -2012-10-04T16:28:41.586955Z -4534 +f69eeb2895b63391231a220239def025 +2013-02-20T21:21:49.121709Z +4820 cignoni @@ -129,18 +126,21 @@ cignoni -235 +21639 -metro.cpp +sample +dir + +metro.pro file 2013-06-21T07:05:38.870900Z -e441fb7182b5f1eae8be6aa98adb3cac -2013-02-20T21:21:49.121709Z -4820 +d27b36a76f14cf2609d1665a9054c2fb +2012-10-04T16:28:41.586955Z +4534 cignoni @@ -163,18 +163,18 @@ cignoni -17897 +235 -readme.txt +metro.cpp file 2013-06-21T07:05:38.870900Z -bf1187cf03700d0b8964aaadaa0de30d -2011-10-05T15:04:40.740408Z -4180 +e441fb7182b5f1eae8be6aa98adb3cac +2013-02-20T21:21:49.121709Z +4820 cignoni @@ -197,5 +197,5 @@ cignoni -5248 +17897 diff --git a/inst/include/vcglib/apps/metro/sample/.svn/entries b/inst/include/vcglib/apps/metro/sample/.svn/entries index 4991d2af..1a6130c9 100644 --- a/inst/include/vcglib/apps/metro/sample/.svn/entries +++ b/inst/include/vcglib/apps/metro/sample/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/metro/sample svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/pivoting/.svn/entries b/inst/include/vcglib/apps/pivoting/.svn/entries index f98ebd13..4af9b98c 100644 --- a/inst/include/vcglib/apps/pivoting/.svn/entries +++ b/inst/include/vcglib/apps/pivoting/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/pivoting svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -mainwindow.ui +glarea.h file 2013-06-21T07:05:19.734806Z -94ee5c97a0bd48b74e437aac1c18b149 +9143f6bf6489f475621bf70a74327234 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -10927 +1495 -glarea.cpp +cmesh.h file 2013-06-21T07:05:19.734806Z -c635c532a4736a381d9c06c7d0d9463b +93e1bc536bf02decdc0130a34a7aaa97 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -10547 +1236 -pivot.dev +main.cpp file 2013-06-21T07:05:19.734806Z -8d909c6421cead640e3fdc28e313dcf2 +a401ac6309efff5bc9f8129ef8a6dfd4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -3477 +2726 -glarea.h +ring.h file 2013-06-21T07:05:19.734806Z -9143f6bf6489f475621bf70a74327234 +27dbfbd26c2234512f1e716e5b408e16 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -1495 +2687 -cmesh.h +curvature.h file 2013-06-21T07:05:19.734806Z -93e1bc536bf02decdc0130a34a7aaa97 +d41d8cd98f00b204e9800998ecf8427e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -1236 +0 -main.cpp +pivot.h file 2013-06-21T07:05:19.734806Z -a401ac6309efff5bc9f8129ef8a6dfd4 +4689440620650d16d25dd2414eaba261 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -2726 +24872 -ring.h +mainwindow.ui file 2013-06-21T07:05:19.734806Z -27dbfbd26c2234512f1e716e5b408e16 +94ee5c97a0bd48b74e437aac1c18b149 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -2687 +10927 -curvature.h +glarea.cpp file 2013-06-21T07:05:19.734806Z -d41d8cd98f00b204e9800998ecf8427e +c635c532a4736a381d9c06c7d0d9463b 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ cignoni -0 +10547 -pivot.h +pivot.dev file 2013-06-21T07:05:19.734806Z -4689440620650d16d25dd2414eaba261 +8d909c6421cead640e3fdc28e313dcf2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,5 +330,5 @@ cignoni -24872 +3477 diff --git a/inst/include/vcglib/apps/plyrefine/.svn/entries b/inst/include/vcglib/apps/plyrefine/.svn/entries index bb0ef63e..da2bd433 100644 --- a/inst/include/vcglib/apps/plyrefine/.svn/entries +++ b/inst/include/vcglib/apps/plyrefine/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/plyrefine svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/quadrangulator/.svn/entries b/inst/include/vcglib/apps/quadrangulator/.svn/entries index 496f6551..106c0b99 100644 --- a/inst/include/vcglib/apps/quadrangulator/.svn/entries +++ b/inst/include/vcglib/apps/quadrangulator/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/quadrangulator svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -configuration.txt +quadrangulator.pro file 2013-06-21T07:07:56.167581Z -7ae62afd3fec3ad709a9616f489ce673 -2012-10-18T00:42:37.833083Z -4622 -pietroni +ec79d976137b2ab83bca54ca366fad71 +2012-10-18T16:49:26.212527Z +4635 +cignoni has-props @@ -58,16 +58,16 @@ has-props -95 +1853 -quadrangulator.pro +quadrangulator.cpp file 2013-06-21T07:07:56.167581Z -ec79d976137b2ab83bca54ca366fad71 +a173410b72079a72c1adcdc1738a15be 2012-10-18T16:49:26.212527Z 4635 cignoni @@ -92,19 +92,19 @@ has-props -1853 +6374 -quadrangulator.cpp +bunny.ply file -2013-06-21T07:07:56.167581Z -a173410b72079a72c1adcdc1738a15be -2012-10-18T16:49:26.212527Z -4635 -cignoni +2013-06-21T07:07:56.171581Z +697df49e2f53d06103aa61687ce1dd01 +2012-10-18T00:42:37.833083Z +4622 +pietroni has-props @@ -126,16 +126,16 @@ has-props -6374 +1393631 -bunny.ply +bunny.ffield file -2013-06-21T07:07:56.171581Z -697df49e2f53d06103aa61687ce1dd01 +2013-06-21T07:07:56.167581Z +5e031ebf78cd290ad1e6392623741ba3 2012-10-18T00:42:37.833083Z 4622 pietroni @@ -160,16 +160,16 @@ has-props -1393631 +4719438 -bunny.ffield +configuration.txt file 2013-06-21T07:07:56.167581Z -5e031ebf78cd290ad1e6392623741ba3 +7ae62afd3fec3ad709a9616f489ce673 2012-10-18T00:42:37.833083Z 4622 pietroni @@ -194,5 +194,5 @@ has-props -4719438 +95 diff --git a/inst/include/vcglib/apps/sample/.svn/entries b/inst/include/vcglib/apps/sample/.svn/entries index 8d1721f8..f20bc6bd 100644 --- a/inst/include/vcglib/apps/sample/.svn/entries +++ b/inst/include/vcglib/apps/sample/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample svn://svn.code.sf.net/p/vcg/code -2013-04-16T15:20:05.922207Z -4890 +2013-07-23T07:36:40.054633Z +4921 cignoni @@ -26,7 +26,19 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_fitting +trimesh_texture +dir + +trimesh_isosurface +dir + +polygonmesh_base +dir + +trimesh_pointmatching +dir + +space_minimal dir trimesh_intersection @@ -35,16 +47,25 @@ dir trimesh_refine dir +img_filters +dir + +trimesh_voroatlas +dir + trimesh_base dir +trimesh_diskparam +dir + hashing_2D dir -trimesh_kdtree +trimesh_closest dir -trimesh_color +trimesh_kdtree dir trimesh_clustering @@ -53,9 +74,15 @@ dir trimesh_ant_freeglut dir +trimesh_curvature +dir + trimesh_geodesic dir +polygonmesh_zonohedra +dir + trimesh_QT dir @@ -102,64 +129,46 @@ has-props trimesh_ant_qt dir -polygonmesh_quadsimpl +trimesh_ball_pivoting dir -trimesh_ray +trimesh_inertia dir -colorspace +trimesh_join dir -trimesh_join +colorspace dir -trimesh_texture +trimesh_attribute dir trimesh_edge dir -trimesh_pointmatching +trimesh_fitting dir trimesh_pos_demo dir -space_minimal -dir - trimesh_smooth dir -img_filters -dir - -trimesh_sampling -dir - trimesh_copy dir -trimesh_voroatlas -dir - -trimesh_diskparam +trimesh_sampling dir trimesh_topology dir -trimesh_closest -dir - aabb_binary_tree dir -trimesh_curvature -dir - -polygonmesh_zonohedra +trimesh_color dir space_packer @@ -202,24 +211,18 @@ cignoni trimesh_hole dir -trimesh_normal -dir - -trimesh_split_vertex -dir - -trimesh_ball_pivoting +polygonmesh_quadsimpl dir -trimesh_inertia +trimesh_normal dir -trimesh_attribute +trimesh_split_vertex dir -trimesh_isosurface +trimesh_ray dir -polygonmesh_base +trimesh_voronoiclustering dir diff --git a/inst/include/vcglib/apps/sample/aabb_binary_tree/.svn/entries b/inst/include/vcglib/apps/sample/aabb_binary_tree/.svn/entries index ef4fcd0f..53566b84 100644 --- a/inst/include/vcglib/apps/sample/aabb_binary_tree/.svn/entries +++ b/inst/include/vcglib/apps/sample/aabb_binary_tree/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/aabb_binary_tree svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/colorspace/.svn/entries b/inst/include/vcglib/apps/sample/colorspace/.svn/entries index c23a51ec..9f7d8e68 100644 --- a/inst/include/vcglib/apps/sample/colorspace/.svn/entries +++ b/inst/include/vcglib/apps/sample/colorspace/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/colorspace svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/hashing_2D/.svn/entries b/inst/include/vcglib/apps/sample/hashing_2D/.svn/entries index aa63f8bb..217925bf 100644 --- a/inst/include/vcglib/apps/sample/hashing_2D/.svn/entries +++ b/inst/include/vcglib/apps/sample/hashing_2D/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/hashing_2D svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ pietroni e8973e21-934d-0410-ac44-de4585f5606d -test_hash2D.cpp +test_hash2D.pro file 2013-06-21T07:05:21.534814Z -e749ec46307ca9fa426d64c85056bdc1 -2012-08-27T12:46:31.661081Z -4497 +07addbb4a5f5780179a55d595f44b2a5 +2012-08-27T12:45:30.191246Z +4496 pietroni +has-props @@ -57,21 +58,19 @@ pietroni - -11748 +407 -test_hash2D.pro +test_hash2D.cpp file 2013-06-21T07:05:21.534814Z -07addbb4a5f5780179a55d595f44b2a5 -2012-08-27T12:45:30.191246Z -4496 +e749ec46307ca9fa426d64c85056bdc1 +2012-08-27T12:46:31.661081Z +4497 pietroni -has-props @@ -92,5 +91,6 @@ has-props -407 + +11748 diff --git a/inst/include/vcglib/apps/sample/img_filters/.svn/entries b/inst/include/vcglib/apps/sample/img_filters/.svn/entries index bea3ea53..8d3ab40c 100644 --- a/inst/include/vcglib/apps/sample/img_filters/.svn/entries +++ b/inst/include/vcglib/apps/sample/img_filters/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/img_filters svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/polygonmesh_base/.svn/entries b/inst/include/vcglib/apps/sample/polygonmesh_base/.svn/entries index eb65524b..037d260c 100644 --- a/inst/include/vcglib/apps/sample/polygonmesh_base/.svn/entries +++ b/inst/include/vcglib/apps/sample/polygonmesh_base/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/polygonmesh_base svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -polygonmesh.cpp +polygonmesh_base.pro file 2013-06-21T07:05:21.178813Z -5c693b95ec6e5ae854da2c3d89439fb9 +f14b34dbb8f70017d1069225eebf7801 2012-10-09T08:43:35.607016Z 4566 cignoni @@ -58,16 +58,16 @@ cignoni -8537 +108 -polygonmesh_base.pro +polygonmesh.cpp file 2013-06-21T07:05:21.178813Z -f14b34dbb8f70017d1069225eebf7801 +5c693b95ec6e5ae854da2c3d89439fb9 2012-10-09T08:43:35.607016Z 4566 cignoni @@ -92,5 +92,5 @@ cignoni -108 +8537 diff --git a/inst/include/vcglib/apps/sample/polygonmesh_quadsimpl/.svn/entries b/inst/include/vcglib/apps/sample/polygonmesh_quadsimpl/.svn/entries index 5519d077..2ff6a500 100644 --- a/inst/include/vcglib/apps/sample/polygonmesh_quadsimpl/.svn/entries +++ b/inst/include/vcglib/apps/sample/polygonmesh_quadsimpl/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/polygonmesh_quadsimpl svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -polygonmesh_quadsimpl.pro +quadsimpl.cpp file -2013-06-21T07:05:22.766821Z -717887970c01c6f8c19e5466aa4759e2 +2013-06-21T07:05:22.762820Z +fa6c75fa5046977ac2c74534af8051ba 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -58,19 +57,21 @@ has-props -184 + +13689 -quadsimpl.cpp +polygonmesh_quadsimpl.pro file -2013-06-21T07:05:22.762820Z -fa6c75fa5046977ac2c74534af8051ba +2013-06-21T07:05:22.766821Z +717887970c01c6f8c19e5466aa4759e2 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -91,6 +92,5 @@ cignoni - -13689 +184 diff --git a/inst/include/vcglib/apps/sample/polygonmesh_zonohedra/.svn/entries b/inst/include/vcglib/apps/sample/polygonmesh_zonohedra/.svn/entries index d3225863..50b76e70 100644 --- a/inst/include/vcglib/apps/sample/polygonmesh_zonohedra/.svn/entries +++ b/inst/include/vcglib/apps/sample/polygonmesh_zonohedra/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/polygonmesh_zonohedra svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/space_minimal/.svn/entries b/inst/include/vcglib/apps/sample/space_minimal/.svn/entries index 9cbb4ee8..d4a95322 100644 --- a/inst/include/vcglib/apps/sample/space_minimal/.svn/entries +++ b/inst/include/vcglib/apps/sample/space_minimal/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/space_minimal svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/space_packer/.svn/entries b/inst/include/vcglib/apps/sample/space_packer/.svn/entries index a108882b..f7bdb738 100644 --- a/inst/include/vcglib/apps/sample/space_packer/.svn/entries +++ b/inst/include/vcglib/apps/sample/space_packer/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/space_packer svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_QT/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_QT/.svn/entries index 538d422d..b440a09f 100644 --- a/inst/include/vcglib/apps/sample/trimesh_QT/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_QT/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_QT svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ ganovelli e8973e21-934d-0410-ac44-de4585f5606d -glarea.h +mainwindow.ui file 2013-06-21T07:05:22.238818Z -0efe2e0edb40a1d2ff7b1b2c3219e07b -2013-03-08T09:07:25.075811Z -4828 -ganovelli +8fb344db4504dac840badc0e5f141d1f +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -58,19 +58,19 @@ ganovelli -4203 +5097 -mainwindow.h +glarea.cpp file 2013-06-21T07:05:22.238818Z -fc2c1bd30ca01eedc78a860f625517fb -2011-10-05T15:04:40.740408Z -4180 -cignoni +4873563a013575a47a3b0cf52c2abec0 +2013-03-08T09:07:25.075811Z +4828 +ganovelli @@ -92,16 +92,16 @@ cignoni -2244 +6242 -main.cpp +mainwindow.cpp file 2013-06-21T07:05:22.238818Z -9362ac91df932c9d3dc8d46bc3e46b76 +6b16da6bbbe152764ebd0273a28f3042 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -2368 +3114 -mainwindow.ui +trimesh_qt.pro file 2013-06-21T07:05:22.238818Z -8fb344db4504dac840badc0e5f141d1f +dab68b8ec2a130e672a7338876427e5d 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -5097 +744 -glarea.cpp +glarea.h file 2013-06-21T07:05:22.238818Z -4873563a013575a47a3b0cf52c2abec0 +0efe2e0edb40a1d2ff7b1b2c3219e07b 2013-03-08T09:07:25.075811Z 4828 ganovelli @@ -194,16 +194,16 @@ ganovelli -6242 +4203 -mainwindow.cpp +mainwindow.h file 2013-06-21T07:05:22.238818Z -6b16da6bbbe152764ebd0273a28f3042 +fc2c1bd30ca01eedc78a860f625517fb 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -3114 +2244 -trimesh_qt.pro +main.cpp file 2013-06-21T07:05:22.238818Z -dab68b8ec2a130e672a7338876427e5d +9362ac91df932c9d3dc8d46bc3e46b76 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,5 +262,5 @@ cignoni -744 +2368 diff --git a/inst/include/vcglib/apps/sample/trimesh_allocate/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_allocate/.svn/entries index 535b72ad..b22305e0 100644 --- a/inst/include/vcglib/apps/sample/trimesh_allocate/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_allocate/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_allocate svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_ant_freeglut/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_ant_freeglut/.svn/entries index d722a3ce..5bbd0ceb 100644 --- a/inst/include/vcglib/apps/sample/trimesh_ant_freeglut/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_ant_freeglut/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_ant_freeglut svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_ant_qt/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_ant_qt/.svn/entries index 51cd1b79..06a5c281 100644 --- a/inst/include/vcglib/apps/sample/trimesh_ant_qt/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_ant_qt/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_ant_qt svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_attribute/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_attribute/.svn/entries index 57360e53..ba214238 100644 --- a/inst/include/vcglib/apps/sample/trimesh_attribute/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_attribute/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_attribute svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_ball_pivoting/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_ball_pivoting/.svn/entries index b413e524..cf97a4e7 100644 --- a/inst/include/vcglib/apps/sample/trimesh_ball_pivoting/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_ball_pivoting/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_ball_pivoting svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_base/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_base/.svn/entries index 50fe7ff5..fb1c1d28 100644 --- a/inst/include/vcglib/apps/sample/trimesh_base/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_base/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_base svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_closest/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_closest/.svn/entries index 15860497..c906cea8 100644 --- a/inst/include/vcglib/apps/sample/trimesh_closest/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_closest/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_closest svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_clustering/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_clustering/.svn/entries index 3545c2d7..8edf1ce2 100644 --- a/inst/include/vcglib/apps/sample/trimesh_clustering/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_clustering/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_clustering svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_clustering.cpp +trimesh_clustering.pro file 2013-06-21T07:05:21.886816Z -0107524139ac063e76bb5b51e353479b -2012-10-16T09:08:19.337521Z -4601 +dc93dea12b86a30727b8933698f81de5 +2012-10-09T08:43:35.607016Z +4566 cignoni @@ -58,18 +58,18 @@ cignoni -4698 +114 -trimesh_clustering.pro +trimesh_clustering.cpp file 2013-06-21T07:05:21.886816Z -dc93dea12b86a30727b8933698f81de5 -2012-10-09T08:43:35.607016Z -4566 +0107524139ac063e76bb5b51e353479b +2012-10-16T09:08:19.337521Z +4601 cignoni @@ -92,5 +92,5 @@ cignoni -114 +4698 diff --git a/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries index 5ba094e8..44525242 100644 --- a/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_color svn://svn.code.sf.net/p/vcg/code -2012-10-19T12:32:05.842918Z -4639 +2013-07-23T07:33:48.618537Z +4920 cignoni @@ -66,10 +66,10 @@ file -2013-06-21T07:05:21.710815Z -d1c755f67b59d254cd571d4d45139068 -2012-10-19T12:32:05.842918Z -4639 +2013-07-25T06:52:24.618398Z +58337c4816719f0621302fbd3574e9fa +2013-07-23T07:33:48.618537Z +4920 cignoni has-props @@ -92,5 +92,5 @@ has-props -3297 +3276 diff --git a/inst/include/vcglib/apps/sample/trimesh_color/.svn/text-base/trimesh_color.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_color/.svn/text-base/trimesh_color.cpp.svn-base index 4f741bfc..344ff46e 100644 --- a/inst/include/vcglib/apps/sample/trimesh_color/.svn/text-base/trimesh_color.cpp.svn-base +++ b/inst/include/vcglib/apps/sample/trimesh_color/.svn/text-base/trimesh_color.cpp.svn-base @@ -48,7 +48,7 @@ class MyFace : public vcg::Face < MyUsedTypes, vcg::face::VertexRef, vcg::fac class MyMesh : public vcg::tri::TriMesh< std::vector, std::vector > {}; -int main(int argc, char **argv) +int main() { MyMesh m; diff --git a/inst/include/vcglib/apps/sample/trimesh_color/trimesh_color.cpp b/inst/include/vcglib/apps/sample/trimesh_color/trimesh_color.cpp index 4f741bfc..344ff46e 100644 --- a/inst/include/vcglib/apps/sample/trimesh_color/trimesh_color.cpp +++ b/inst/include/vcglib/apps/sample/trimesh_color/trimesh_color.cpp @@ -48,7 +48,7 @@ class MyFace : public vcg::Face < MyUsedTypes, vcg::face::VertexRef, vcg::fac class MyMesh : public vcg::tri::TriMesh< std::vector, std::vector > {}; -int main(int argc, char **argv) +int main() { MyMesh m; diff --git a/inst/include/vcglib/apps/sample/trimesh_copy/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_copy/.svn/entries index 0fe32545..161ef5a5 100644 --- a/inst/include/vcglib/apps/sample/trimesh_copy/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_copy/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_copy svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_curvature/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_curvature/.svn/entries index 6d10279a..11adec0e 100644 --- a/inst/include/vcglib/apps/sample/trimesh_curvature/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_curvature/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_curvature svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ ganovelli e8973e21-934d-0410-ac44-de4585f5606d -trimesh_curvature.cpp +trimesh_curvature.pro file 2013-06-21T07:05:24.354828Z -1461fd386be7cc68f7c83bee9b8b1aa3 -2013-01-30T17:18:55.488904Z -4811 -ganovelli +fbe2f99538733fffbcf68426a4935b53 +2012-10-09T10:25:00.890420Z +4568 +cignoni has-props @@ -58,19 +58,19 @@ has-props -3537 +83 -trimesh_curvature.pro +trimesh_curvature.cpp file 2013-06-21T07:05:24.354828Z -fbe2f99538733fffbcf68426a4935b53 -2012-10-09T10:25:00.890420Z -4568 -cignoni +1461fd386be7cc68f7c83bee9b8b1aa3 +2013-01-30T17:18:55.488904Z +4811 +ganovelli has-props @@ -92,5 +92,5 @@ has-props -83 +3537 diff --git a/inst/include/vcglib/apps/sample/trimesh_diskparam/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_diskparam/.svn/entries index 10345e5d..724d1567 100644 --- a/inst/include/vcglib/apps/sample/trimesh_diskparam/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_diskparam/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_diskparam svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_edge/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_edge/.svn/entries index 1002ce90..2b0288c4 100644 --- a/inst/include/vcglib/apps/sample/trimesh_edge/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_edge/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_edge svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/entries index d3367444..7cb245f0 100644 --- a/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_fitting svn://svn.code.sf.net/p/vcg/code -2012-11-10T16:57:26.357169Z -4716 +2013-07-23T07:33:48.618537Z +4920 cignoni @@ -66,10 +66,10 @@ file -2013-06-21T07:05:21.182813Z -e82b0ef7d452fb1e25524727ef543b9a -2012-11-10T16:57:26.357169Z -4716 +2013-07-25T06:52:24.590398Z +6db8de0180d7d6a7b64902709c618fba +2013-07-23T07:33:48.618537Z +4920 cignoni has-props @@ -92,5 +92,5 @@ has-props -5101 +5054 diff --git a/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/text-base/trimesh_fitting.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/text-base/trimesh_fitting.cpp.svn-base index c0d4255c..52f1f524 100644 --- a/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/text-base/trimesh_fitting.cpp.svn-base +++ b/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/text-base/trimesh_fitting.cpp.svn-base @@ -52,7 +52,7 @@ class MyFace : public vcg::Face< MyUsedTypes, vcg::face::FFAdj, vcg::face::V class MyEdge : public vcg::Edge{}; class MyMesh : public vcg::tri::TriMesh< std::vector, std::vector , std::vector > {}; -float EvalPlane(vcg::Plane3f &pl, vcg::Point3f &dir, std::vector posVec) +float EvalPlane(vcg::Plane3f &pl, std::vector posVec) { float off=0; for(size_t i=0;i p } -int main( int argc, char **argv ) +int main( ) { MyMesh m; vcg::tri::Icosahedron(m); @@ -76,6 +76,7 @@ int main( int argc, char **argv ) int cnt=0; float scaleFac = m.bbox.Diag()/10.0f; printf("ScaleFac %f\n\n",scaleFac); + vcg::math::MarsenneTwisterRNG rnd; for(int i=0;i ExactVec; @@ -87,7 +88,7 @@ int main( int argc, char **argv ) { vcg::Point3f p = vcg::tri::SurfaceSampling::RandomPointInTriangle(m.face[i]); ExactVec.push_back(p); - vcg::Point3f off=vcg::tri::SurfaceSampling::RandomPoint3fBall01(); + vcg::Point3f off = vcg::math::GeneratePointInUnitBallUniform(rnd); p+=off*scaleFac; float w = std::max(0.0, 1.0f-fabs(vcg::SignedDistancePlanePoint(pl,p))/scaleFac); PerturbVec.push_back(p); @@ -95,13 +96,13 @@ int main( int argc, char **argv ) } vcg::FitPlaneToPointSet(ExactVec,ple); - float err=EvalPlane(ple,m.face[i].N(),ExactVec); + float err=EvalPlane(ple,ExactVec); vcg::FitPlaneToPointSet(PerturbVec,plf); - float err0=EvalPlane(plf,m.face[i].N(),ExactVec); + float err0=EvalPlane(plf,ExactVec); vcg::WeightedFitPlaneToPointSet(PerturbVec,WeightVec,plw); - float err1=EvalPlane(plw,m.face[i].N(),ExactVec); + float err1=EvalPlane(plw,ExactVec); printf("Exact %5.3f Fit to Perturbed %5.3f Weighted fit to perturbed %5.3f\n",err,err0,err1); if(err0>err1) cnt++; } diff --git a/inst/include/vcglib/apps/sample/trimesh_fitting/trimesh_fitting.cpp b/inst/include/vcglib/apps/sample/trimesh_fitting/trimesh_fitting.cpp index c0d4255c..52f1f524 100644 --- a/inst/include/vcglib/apps/sample/trimesh_fitting/trimesh_fitting.cpp +++ b/inst/include/vcglib/apps/sample/trimesh_fitting/trimesh_fitting.cpp @@ -52,7 +52,7 @@ class MyFace : public vcg::Face< MyUsedTypes, vcg::face::FFAdj, vcg::face::V class MyEdge : public vcg::Edge{}; class MyMesh : public vcg::tri::TriMesh< std::vector, std::vector , std::vector > {}; -float EvalPlane(vcg::Plane3f &pl, vcg::Point3f &dir, std::vector posVec) +float EvalPlane(vcg::Plane3f &pl, std::vector posVec) { float off=0; for(size_t i=0;i p } -int main( int argc, char **argv ) +int main( ) { MyMesh m; vcg::tri::Icosahedron(m); @@ -76,6 +76,7 @@ int main( int argc, char **argv ) int cnt=0; float scaleFac = m.bbox.Diag()/10.0f; printf("ScaleFac %f\n\n",scaleFac); + vcg::math::MarsenneTwisterRNG rnd; for(int i=0;i ExactVec; @@ -87,7 +88,7 @@ int main( int argc, char **argv ) { vcg::Point3f p = vcg::tri::SurfaceSampling::RandomPointInTriangle(m.face[i]); ExactVec.push_back(p); - vcg::Point3f off=vcg::tri::SurfaceSampling::RandomPoint3fBall01(); + vcg::Point3f off = vcg::math::GeneratePointInUnitBallUniform(rnd); p+=off*scaleFac; float w = std::max(0.0, 1.0f-fabs(vcg::SignedDistancePlanePoint(pl,p))/scaleFac); PerturbVec.push_back(p); @@ -95,13 +96,13 @@ int main( int argc, char **argv ) } vcg::FitPlaneToPointSet(ExactVec,ple); - float err=EvalPlane(ple,m.face[i].N(),ExactVec); + float err=EvalPlane(ple,ExactVec); vcg::FitPlaneToPointSet(PerturbVec,plf); - float err0=EvalPlane(plf,m.face[i].N(),ExactVec); + float err0=EvalPlane(plf,ExactVec); vcg::WeightedFitPlaneToPointSet(PerturbVec,WeightVec,plw); - float err1=EvalPlane(plw,m.face[i].N(),ExactVec); + float err1=EvalPlane(plw,ExactVec); printf("Exact %5.3f Fit to Perturbed %5.3f Weighted fit to perturbed %5.3f\n",err,err0,err1); if(err0>err1) cnt++; } diff --git a/inst/include/vcglib/apps/sample/trimesh_geodesic/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_geodesic/.svn/entries index a3d54c46..05460ede 100644 --- a/inst/include/vcglib/apps/sample/trimesh_geodesic/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_geodesic/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_geodesic svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_geodesic.cpp +trimesh_geodesic.pro file 2013-06-21T07:05:22.058817Z -774035904da81d217fd4cc151f5a21e5 +52985faeaad24ac2d365f497ddb1d80b 2012-11-07T01:16:21.651740Z 4686 cignoni @@ -58,16 +58,16 @@ has-props -2858 +81 -trimesh_geodesic.pro +trimesh_geodesic.cpp file 2013-06-21T07:05:22.058817Z -52985faeaad24ac2d365f497ddb1d80b +774035904da81d217fd4cc151f5a21e5 2012-11-07T01:16:21.651740Z 4686 cignoni @@ -92,5 +92,5 @@ has-props -81 +2858 diff --git a/inst/include/vcglib/apps/sample/trimesh_hole/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_hole/.svn/entries index 00f6e2cb..a458dc8d 100644 --- a/inst/include/vcglib/apps/sample/trimesh_hole/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_hole/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_hole svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_inertia/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_inertia/.svn/entries index 66a84d8d..437bdc65 100644 --- a/inst/include/vcglib/apps/sample/trimesh_inertia/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_inertia/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_inertia svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_intersection/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_intersection/.svn/entries index 2936d9d7..33eefc7d 100644 --- a/inst/include/vcglib/apps/sample/trimesh_intersection/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_intersection/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_intersection svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_isosurface/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_isosurface/.svn/entries index f459e888..57fe743f 100644 --- a/inst/include/vcglib/apps/sample/trimesh_isosurface/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_isosurface/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_isosurface svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -simple_volume.h +trimesh_isosurface.cpp file 2013-06-21T07:05:20.998812Z -e2ebc68d5a9b7db6c1ec673f200f3e27 -2011-10-05T15:04:40.740408Z -4180 +6a2251aadbfe5755d968f86288309e29 +2013-03-22T17:06:41.310674Z +4857 cignoni @@ -58,18 +58,18 @@ cignoni -2692 +3422 -trimesh_isosurface.pro +simple_volume.h file 2013-06-21T07:05:20.998812Z -49dbf666044aef528e9f0c9d5297a31a -2012-10-09T08:43:35.607016Z -4566 +e2ebc68d5a9b7db6c1ec673f200f3e27 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -92,18 +92,18 @@ cignoni -114 +2692 -trimesh_isosurface.cpp +trimesh_isosurface.pro file 2013-06-21T07:05:20.998812Z -6a2251aadbfe5755d968f86288309e29 -2013-03-22T17:06:41.310674Z -4857 +49dbf666044aef528e9f0c9d5297a31a +2012-10-09T08:43:35.607016Z +4566 cignoni @@ -126,5 +126,5 @@ cignoni -3422 +114 diff --git a/inst/include/vcglib/apps/sample/trimesh_join/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_join/.svn/entries index cbdcc4a8..5ca2c7ba 100644 --- a/inst/include/vcglib/apps/sample/trimesh_join/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_join/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_join svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_kdtree/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_kdtree/.svn/entries index 0aa8d0e8..ad60104f 100644 --- a/inst/include/vcglib/apps/sample/trimesh_kdtree/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_kdtree/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_kdtree svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_normal/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_normal/.svn/entries index d091c4f3..16c96f3c 100644 --- a/inst/include/vcglib/apps/sample/trimesh_normal/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_normal/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_normal svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_optional/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_optional/.svn/entries index 5e18ba1c..86789a68 100644 --- a/inst/include/vcglib/apps/sample/trimesh_optional/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_optional/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_optional svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_optional_ocf.cpp +trimesh_optional.pro file 2013-06-21T07:05:22.414819Z -caae91ad670fa14370e595bac5719de5 -2011-10-05T15:04:40.740408Z -4180 +e5a4ff4b530e314da1bf3586cf2911fb +2012-10-09T08:43:35.607016Z +4566 cignoni @@ -58,18 +58,18 @@ cignoni -1113 +110 -trimesh_optional.pro +trimesh_optional.cpp file 2013-06-21T07:05:22.414819Z -e5a4ff4b530e314da1bf3586cf2911fb -2012-10-09T08:43:35.607016Z -4566 +13f1efe6f2a48d6e988c2b0a228f0cd4 +2012-10-19T11:48:33.877458Z +4637 cignoni @@ -92,18 +92,18 @@ cignoni -110 +6238 -trimesh_optional.cpp +trimesh_optional_occ.cpp file 2013-06-21T07:05:22.414819Z -13f1efe6f2a48d6e988c2b0a228f0cd4 -2012-10-19T11:48:33.877458Z -4637 +2df4bded7c6f875abf5168e753810d14 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -126,16 +126,16 @@ cignoni -6238 +1034 -trimesh_optional_occ.cpp +trimesh_simpdata_simp.cpp file 2013-06-21T07:05:22.414819Z -2df4bded7c6f875abf5168e753810d14 +b231a37e5d2687ced3193dc6aa22fcb2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -1034 +1232 -trimesh_simpdata_simp.cpp +trimesh_optional_ocf.cpp file 2013-06-21T07:05:22.414819Z -b231a37e5d2687ced3193dc6aa22fcb2 +caae91ad670fa14370e595bac5719de5 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,5 +194,5 @@ cignoni -1232 +1113 diff --git a/inst/include/vcglib/apps/sample/trimesh_pointmatching/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_pointmatching/.svn/entries index c5da6d1b..ab7eff05 100644 --- a/inst/include/vcglib/apps/sample/trimesh_pointmatching/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_pointmatching/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_pointmatching svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_pos_demo/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_pos_demo/.svn/entries index 4664952e..3b880557 100644 --- a/inst/include/vcglib/apps/sample/trimesh_pos_demo/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_pos_demo/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_pos_demo svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -mesh_type.h +trimesh_pos_demo.cpp file 2013-06-21T07:05:23.646825Z -9b4780a7db6801cd5ff4121926dd9125 +4f675c91a5ef2448c132a1927e178bd5 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -3421 +1423 -main.cpp +mesh_type.h file 2013-06-21T07:05:23.646825Z -e238ece8d9e7dbbfdbafafbdcbd78f15 +9b4780a7db6801cd5ff4121926dd9125 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -172 +3421 -glwidget.cpp +main.cpp file 2013-06-21T07:05:23.646825Z -a06f324d96506e8aa61ecb7d61f6cb15 +e238ece8d9e7dbbfdbafafbdcbd78f15 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -7931 +172 -window.cpp +glwidget.cpp file 2013-06-21T07:05:23.646825Z -45559167cfe8402eb67407c511bd5ed9 +a06f324d96506e8aa61ecb7d61f6cb15 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -3190 +7931 -glwidget.h +window.cpp file -2013-06-21T07:05:23.650825Z -f2344b5abc5f60dff29ca97a7ac56867 +2013-06-21T07:05:23.646825Z +45559167cfe8402eb67407c511bd5ed9 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -3795 +3190 -window.h +glwidget.h file 2013-06-21T07:05:23.650825Z -fc69f2effa4e99f24aef70e5acec9af2 +f2344b5abc5f60dff29ca97a7ac56867 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -2368 +3795 -trimesh_pos_demo.pro +window.h file -2013-06-21T07:05:23.646825Z -7d9de2ae210674db7a5cd8727bc64d52 +2013-06-21T07:05:23.650825Z +fc69f2effa4e99f24aef70e5acec9af2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -563 +2368 -trimesh_vfiter_demo.cpp +trimesh_pos_demo.pro file 2013-06-21T07:05:23.646825Z -4f0b76310bbb55d494c0ceef09fac12c +7d9de2ae210674db7a5cd8727bc64d52 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ cignoni -1084 +563 -trimesh_pos_demo.cpp +trimesh_vfiter_demo.cpp file 2013-06-21T07:05:23.646825Z -4f675c91a5ef2448c132a1927e178bd5 +4f0b76310bbb55d494c0ceef09fac12c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,5 +330,5 @@ cignoni -1423 +1084 diff --git a/inst/include/vcglib/apps/sample/trimesh_ray/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_ray/.svn/entries index 2e52b00c..5e8ae0ca 100644 --- a/inst/include/vcglib/apps/sample/trimesh_ray/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_ray/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_ray svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_refine/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_refine/.svn/entries index d505b55a..a58f428a 100644 --- a/inst/include/vcglib/apps/sample/trimesh_refine/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_refine/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_refine svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/entries index 103658e4..bc5457c6 100644 --- a/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_sampling svn://svn.code.sf.net/p/vcg/code -2012-10-12T06:07:06.906058Z -4582 +2013-07-01T14:09:40.405635Z +4912 cignoni @@ -66,10 +66,10 @@ file -2013-06-21T07:05:23.882826Z -6dfb3bf67e811562ccd7ae302892c75c -2012-10-12T06:07:06.906058Z -4582 +2013-07-25T06:52:24.646398Z +bcbd1efaf7bc59835ec59b83ddf30251 +2013-07-01T14:09:40.405635Z +4912 cignoni has-props @@ -92,5 +92,5 @@ has-props -2864 +5647 diff --git a/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/text-base/trimesh_sampling.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/text-base/trimesh_sampling.cpp.svn-base index 8df5c2fb..679762b2 100644 --- a/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/text-base/trimesh_sampling.cpp.svn-base +++ b/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/text-base/trimesh_sampling.cpp.svn-base @@ -23,8 +23,10 @@ #include #include +#include #include +#include using namespace vcg; using namespace std; @@ -37,7 +39,7 @@ struct MyUsedTypes : public UsedTypes< Use ::AsVertexType, Use ::AsFaceType>{}; class MyVertex : public Vertex{}; -class MyFace : public Face< MyUsedTypes, face::FFAdj, face::VertexRef, face::BitFlags > {}; +class MyFace : public Face< MyUsedTypes, face::FFAdj, face::Normal3f, face::VertexRef, face::BitFlags > {}; class MyEdge : public Edge{}; class MyMesh : public tri::TriMesh< vector, vector , vector > {}; @@ -45,7 +47,7 @@ int main( int argc, char **argv ) { if(argc<2) { - printf("Usage trimesh_base \n"); + printf("Usage trimesh_base radius\n"); return -1; } @@ -56,9 +58,66 @@ int main( int argc, char **argv ) printf("Error reading file %s\n",argv[1]); exit(0); } + tri::SurfaceSampling >::SamplingRandomGenerator().initialize(time(0)); + + //---------------------------------------------------------------------- + // Basic Sample, + // Build a point cloud with points with a plain poisson disk distribution + int t0=clock(); vector pointVec; - float radius; - tri::PoissonSampling(m,pointVec,1000,radius); + float rad; + if(argc>2) rad=atof(argv[2]); + int sampleNum=rad?0:1000; + tri::PoissonSampling(m,pointVec,sampleNum,rad); + int t1=clock(); + MyMesh BasicPoissonMesh; + tri::Build(BasicPoissonMesh,pointVec); + + tri::io::ExporterOFF::Save(BasicPoissonMesh,"BasicPoissonMesh.off"); + printf("Computed a basic poisson disk distribution of %i vertices radius is %6.3f in %5.2f sec\n",BasicPoissonMesh.VN(),rad,float(t1-t0)/CLOCKS_PER_SEC); + + //---------------------------------------------------------------------- + // Advanced Sample + // Make a feature dependent Poisson Disk sampling + MyMesh MontecarloSurfaceMesh; + MyMesh MontecarloEdgeMesh; + MyMesh PoissonEdgeMesh; + MyMesh PoissonMesh; + + std::vector sampleVec; + tri::TrivialSampler mps(sampleVec); + tri::UpdateTopology::FaceFace(m); + tri::UpdateNormal::PerFace(m); + tri::UpdateFlags::FaceFauxCrease(m,math::ToRad(40.0f)); + tri::SurfaceSampling >::EdgeMontecarlo(m,mps,10000,false); + tri::Build(MontecarloEdgeMesh,sampleVec); + tri::io::ExporterOFF::Save(MontecarloEdgeMesh,"MontecarloEdgeMesh.off"); + + sampleVec.clear(); + tri::SurfaceSampling >::VertexCrease(m, mps); + tri::Build(PoissonEdgeMesh,sampleVec); + tri::io::ExporterOFF::Save(PoissonEdgeMesh,"CreaseMesh.off"); + + tri::SurfaceSampling >::PoissonDiskParam pp; + pp.preGenMesh = &PoissonEdgeMesh; + pp.preGenFlag=true; + sampleVec.clear(); + tri::SurfaceSampling >::PoissonDiskPruning(mps, MontecarloEdgeMesh, rad, pp); + tri::Build(PoissonEdgeMesh,sampleVec); + tri::io::ExporterOFF::Save(PoissonEdgeMesh,"PoissonEdgeMesh.off"); + + sampleVec.clear(); + tri::SurfaceSampling >::Montecarlo(m,mps,50000); + tri::Build(MontecarloSurfaceMesh,sampleVec); + tri::io::ExporterOFF::Save(MontecarloSurfaceMesh,"MontecarloSurfaceMesh.off"); + + pp.preGenMesh = &PoissonEdgeMesh; + pp.preGenFlag=true; + sampleVec.clear(); + tri::SurfaceSampling >::PoissonDiskPruning(mps, MontecarloSurfaceMesh, rad, pp); + tri::Build(PoissonMesh,sampleVec); + tri::io::ExporterOFF::Save(PoissonMesh,"PoissonMesh.off"); + printf("Computed a feature aware poisson disk distribution of %i vertices radius is %6.3f\n",PoissonMesh.VN(),rad); return 0; } diff --git a/inst/include/vcglib/apps/sample/trimesh_sampling/trimesh_sampling.cpp b/inst/include/vcglib/apps/sample/trimesh_sampling/trimesh_sampling.cpp index 8df5c2fb..679762b2 100644 --- a/inst/include/vcglib/apps/sample/trimesh_sampling/trimesh_sampling.cpp +++ b/inst/include/vcglib/apps/sample/trimesh_sampling/trimesh_sampling.cpp @@ -23,8 +23,10 @@ #include #include +#include #include +#include using namespace vcg; using namespace std; @@ -37,7 +39,7 @@ struct MyUsedTypes : public UsedTypes< Use ::AsVertexType, Use ::AsFaceType>{}; class MyVertex : public Vertex{}; -class MyFace : public Face< MyUsedTypes, face::FFAdj, face::VertexRef, face::BitFlags > {}; +class MyFace : public Face< MyUsedTypes, face::FFAdj, face::Normal3f, face::VertexRef, face::BitFlags > {}; class MyEdge : public Edge{}; class MyMesh : public tri::TriMesh< vector, vector , vector > {}; @@ -45,7 +47,7 @@ int main( int argc, char **argv ) { if(argc<2) { - printf("Usage trimesh_base \n"); + printf("Usage trimesh_base radius\n"); return -1; } @@ -56,9 +58,66 @@ int main( int argc, char **argv ) printf("Error reading file %s\n",argv[1]); exit(0); } + tri::SurfaceSampling >::SamplingRandomGenerator().initialize(time(0)); + + //---------------------------------------------------------------------- + // Basic Sample, + // Build a point cloud with points with a plain poisson disk distribution + int t0=clock(); vector pointVec; - float radius; - tri::PoissonSampling(m,pointVec,1000,radius); + float rad; + if(argc>2) rad=atof(argv[2]); + int sampleNum=rad?0:1000; + tri::PoissonSampling(m,pointVec,sampleNum,rad); + int t1=clock(); + MyMesh BasicPoissonMesh; + tri::Build(BasicPoissonMesh,pointVec); + + tri::io::ExporterOFF::Save(BasicPoissonMesh,"BasicPoissonMesh.off"); + printf("Computed a basic poisson disk distribution of %i vertices radius is %6.3f in %5.2f sec\n",BasicPoissonMesh.VN(),rad,float(t1-t0)/CLOCKS_PER_SEC); + + //---------------------------------------------------------------------- + // Advanced Sample + // Make a feature dependent Poisson Disk sampling + MyMesh MontecarloSurfaceMesh; + MyMesh MontecarloEdgeMesh; + MyMesh PoissonEdgeMesh; + MyMesh PoissonMesh; + + std::vector sampleVec; + tri::TrivialSampler mps(sampleVec); + tri::UpdateTopology::FaceFace(m); + tri::UpdateNormal::PerFace(m); + tri::UpdateFlags::FaceFauxCrease(m,math::ToRad(40.0f)); + tri::SurfaceSampling >::EdgeMontecarlo(m,mps,10000,false); + tri::Build(MontecarloEdgeMesh,sampleVec); + tri::io::ExporterOFF::Save(MontecarloEdgeMesh,"MontecarloEdgeMesh.off"); + + sampleVec.clear(); + tri::SurfaceSampling >::VertexCrease(m, mps); + tri::Build(PoissonEdgeMesh,sampleVec); + tri::io::ExporterOFF::Save(PoissonEdgeMesh,"CreaseMesh.off"); + + tri::SurfaceSampling >::PoissonDiskParam pp; + pp.preGenMesh = &PoissonEdgeMesh; + pp.preGenFlag=true; + sampleVec.clear(); + tri::SurfaceSampling >::PoissonDiskPruning(mps, MontecarloEdgeMesh, rad, pp); + tri::Build(PoissonEdgeMesh,sampleVec); + tri::io::ExporterOFF::Save(PoissonEdgeMesh,"PoissonEdgeMesh.off"); + + sampleVec.clear(); + tri::SurfaceSampling >::Montecarlo(m,mps,50000); + tri::Build(MontecarloSurfaceMesh,sampleVec); + tri::io::ExporterOFF::Save(MontecarloSurfaceMesh,"MontecarloSurfaceMesh.off"); + + pp.preGenMesh = &PoissonEdgeMesh; + pp.preGenFlag=true; + sampleVec.clear(); + tri::SurfaceSampling >::PoissonDiskPruning(mps, MontecarloSurfaceMesh, rad, pp); + tri::Build(PoissonMesh,sampleVec); + tri::io::ExporterOFF::Save(PoissonMesh,"PoissonMesh.off"); + printf("Computed a feature aware poisson disk distribution of %i vertices radius is %6.3f\n",PoissonMesh.VN(),rad); return 0; } diff --git a/inst/include/vcglib/apps/sample/trimesh_smooth/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_smooth/.svn/entries index 0d62ba17..90a85d2d 100644 --- a/inst/include/vcglib/apps/sample/trimesh_smooth/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_smooth/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_smooth svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_split_vertex/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_split_vertex/.svn/entries index 4411486e..5eda1974 100644 --- a/inst/include/vcglib/apps/sample/trimesh_split_vertex/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_split_vertex/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_split_vertex svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_split_vertex.cpp +trimesh_split_vertex.pro file 2013-06-21T07:05:20.638810Z -6608e343819aca39519d95c8c2eebc1d -2013-04-16T15:15:33.264748Z -4889 +b5513fa63060bcb8f132c584385c5589 +2012-11-05T10:10:33.340500Z +4682 cignoni @@ -58,18 +58,18 @@ cignoni -5279 +118 -trimesh_split_vertex.pro +trimesh_split_vertex.cpp file 2013-06-21T07:05:20.638810Z -b5513fa63060bcb8f132c584385c5589 -2012-11-05T10:10:33.340500Z -4682 +6608e343819aca39519d95c8c2eebc1d +2013-04-16T15:15:33.264748Z +4889 cignoni @@ -92,5 +92,5 @@ cignoni -118 +5279 diff --git a/inst/include/vcglib/apps/sample/trimesh_texture/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_texture/.svn/entries index 2ac8390c..50058ce8 100644 --- a/inst/include/vcglib/apps/sample/trimesh_texture/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_texture/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_texture svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_topology/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_topology/.svn/entries index 173fb42c..8cf7327e 100644 --- a/inst/include/vcglib/apps/sample/trimesh_topology/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_topology/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_topology svn://svn.code.sf.net/p/vcg/code -2012-10-09T08:43:35.607016Z -4566 +2013-07-23T07:36:40.054633Z +4921 cignoni @@ -66,10 +66,10 @@ file -2013-06-21T07:05:24.178828Z -4c0778dded9eeca075915ca380761cc5 -2012-10-09T07:12:31.411361Z -4560 +2013-07-25T06:52:24.654398Z +3c9b77894e1d384e241bae62d8bd0433 +2013-07-23T07:36:40.054633Z +4921 cignoni @@ -92,5 +92,5 @@ cignoni -3848 +3866 diff --git a/inst/include/vcglib/apps/sample/trimesh_topology/.svn/text-base/trimesh_topology.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_topology/.svn/text-base/trimesh_topology.cpp.svn-base index d72116aa..7f76bdef 100644 --- a/inst/include/vcglib/apps/sample/trimesh_topology/.svn/text-base/trimesh_topology.cpp.svn-base +++ b/inst/include/vcglib/apps/sample/trimesh_topology/.svn/text-base/trimesh_topology.cpp.svn-base @@ -50,8 +50,8 @@ int main(int ,char ** ) //update the face-face topology vcg::tri::UpdateTopology::FaceFace(m); - // Now for each face the F() members are meaningful - + // Now for each face the FFp() FFi() members are correctly initialized + if(face::IsBorder(m.face[0],0)) printf("Edge 0 of face 0 is a border\n"); else printf("Edge 0 of face 0 is NOT a border\n"); // always this path! @@ -76,7 +76,7 @@ int main(int ,char ** ) { for(int j=0;j<3;j++) { - if ( face::IsBorder(*fi,j) && tri::IsMarked(m,&*fi)) + if ( face::IsBorder(*fi,j) && !tri::IsMarked(m,&*fi)) { tri::Mark(m,&*fi); hei.Set(&*fi,j,fi->V(j)); @@ -84,7 +84,7 @@ int main(int ,char ** ) do { BorderEdgeNum++; - he.NextB(); // next edge along a border + he.NextB(); // next pos along a border tri::Mark(m,he.f); } while (he.f!=hei.f); diff --git a/inst/include/vcglib/apps/sample/trimesh_topology/trimesh_topology.cpp b/inst/include/vcglib/apps/sample/trimesh_topology/trimesh_topology.cpp index d72116aa..7f76bdef 100644 --- a/inst/include/vcglib/apps/sample/trimesh_topology/trimesh_topology.cpp +++ b/inst/include/vcglib/apps/sample/trimesh_topology/trimesh_topology.cpp @@ -50,8 +50,8 @@ int main(int ,char ** ) //update the face-face topology vcg::tri::UpdateTopology::FaceFace(m); - // Now for each face the F() members are meaningful - + // Now for each face the FFp() FFi() members are correctly initialized + if(face::IsBorder(m.face[0],0)) printf("Edge 0 of face 0 is a border\n"); else printf("Edge 0 of face 0 is NOT a border\n"); // always this path! @@ -76,7 +76,7 @@ int main(int ,char ** ) { for(int j=0;j<3;j++) { - if ( face::IsBorder(*fi,j) && tri::IsMarked(m,&*fi)) + if ( face::IsBorder(*fi,j) && !tri::IsMarked(m,&*fi)) { tri::Mark(m,&*fi); hei.Set(&*fi,j,fi->V(j)); @@ -84,7 +84,7 @@ int main(int ,char ** ) do { BorderEdgeNum++; - he.NextB(); // next edge along a border + he.NextB(); // next pos along a border tri::Mark(m,he.f); } while (he.f!=hei.f); diff --git a/inst/include/vcglib/apps/sample/trimesh_voroatlas/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_voroatlas/.svn/entries index 57690c98..54704696 100644 --- a/inst/include/vcglib/apps/sample/trimesh_voroatlas/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_voroatlas/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_voroatlas svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/test/.svn/entries b/inst/include/vcglib/apps/test/.svn/entries index d2125445..7d7649d0 100644 --- a/inst/include/vcglib/apps/test/.svn/entries +++ b/inst/include/vcglib/apps/test/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test svn://svn.code.sf.net/p/vcg/code @@ -26,15 +26,15 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -tetramesh +quaternion dir -trackball +camerashot dir -quaternion +tetramesh dir -camerashot +trackball dir diff --git a/inst/include/vcglib/apps/test/camerashot/.svn/entries b/inst/include/vcglib/apps/test/camerashot/.svn/entries index 890c8ac9..6d0ad9e1 100644 --- a/inst/include/vcglib/apps/test/camerashot/.svn/entries +++ b/inst/include/vcglib/apps/test/camerashot/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test/camerashot svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/test/quaternion/.svn/entries b/inst/include/vcglib/apps/test/quaternion/.svn/entries index 7ee60b45..24db0fef 100644 --- a/inst/include/vcglib/apps/test/quaternion/.svn/entries +++ b/inst/include/vcglib/apps/test/quaternion/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test/quaternion svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/test/tetramesh/.svn/entries b/inst/include/vcglib/apps/test/tetramesh/.svn/entries index 11e5977c..ee7679bd 100644 --- a/inst/include/vcglib/apps/test/tetramesh/.svn/entries +++ b/inst/include/vcglib/apps/test/tetramesh/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test/tetramesh svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/test/tetramesh/test/.svn/entries b/inst/include/vcglib/apps/test/tetramesh/test/.svn/entries index 578cba2a..acd6e006 100644 --- a/inst/include/vcglib/apps/test/tetramesh/test/.svn/entries +++ b/inst/include/vcglib/apps/test/tetramesh/test/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test/tetramesh/test svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -test.suo +test.sln file 2013-06-21T07:05:20.282808Z -453db44ae0202027f78cde1fc9f32988 +a221ee26ad60a4003fc3614f7b993cb2 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -58,16 +57,17 @@ has-props -10752 + +887 -test.sln +test.cpp file 2013-06-21T07:05:20.282808Z -a221ee26ad60a4003fc3614f7b993cb2 +1b6c21deddb0b46c8a8d528dcef8e261 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,19 +92,20 @@ cignoni -887 +1098 -test.cpp +test.ncb file 2013-06-21T07:05:20.282808Z -1b6c21deddb0b46c8a8d528dcef8e261 +dd0ea790f470027fee59a4eea83acdc8 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -125,21 +126,19 @@ cignoni - -1098 +44032 -test.ncb +test.vcproj file 2013-06-21T07:05:20.282808Z -dd0ea790f470027fee59a4eea83acdc8 +2d4ef6649f32eaa0fa32e6c5e12afd9c 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -160,19 +159,21 @@ has-props -44032 + +3474 -test.vcproj +test.suo file 2013-06-21T07:05:20.282808Z -2d4ef6649f32eaa0fa32e6c5e12afd9c +453db44ae0202027f78cde1fc9f32988 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -193,6 +194,5 @@ cignoni - -3474 +10752 diff --git a/inst/include/vcglib/apps/test/trackball/.svn/entries b/inst/include/vcglib/apps/test/trackball/.svn/entries index 005ea820..abeaa153 100644 --- a/inst/include/vcglib/apps/test/trackball/.svn/entries +++ b/inst/include/vcglib/apps/test/trackball/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test/trackball svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trackball.vcproj +main.cpp file 2013-06-21T07:05:19.758806Z -2e02a9a9c9a5ca68ab3fcf7a6738e406 +40c2a744b92b4f4c66db7486c727970e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -3808 +3751 -main.cpp +trackball.sln file 2013-06-21T07:05:19.758806Z -40c2a744b92b4f4c66db7486c727970e +aacf1c2381e68117d09b57a38f66c840 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -3751 +897 -trackball.sln +trackball.vcproj file 2013-06-21T07:05:19.758806Z -aacf1c2381e68117d09b57a38f66c840 +2e02a9a9c9a5ca68ab3fcf7a6738e406 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,5 +126,5 @@ cignoni -897 +3808 diff --git a/inst/include/vcglib/apps/tridecimator/.svn/entries b/inst/include/vcglib/apps/tridecimator/.svn/entries index 0a35f414..d31db231 100644 --- a/inst/include/vcglib/apps/tridecimator/.svn/entries +++ b/inst/include/vcglib/apps/tridecimator/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/tridecimator svn://svn.code.sf.net/p/vcg/code -2011-10-24T11:23:49.777468Z -4198 +2013-07-23T07:37:29.006637Z +4922 cignoni @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -tridecimator.pro +Tetraascii.ply file -2013-06-21T07:05:39.222902Z -5fa76e530f94a9a23dc90962fe103d54 -2011-10-24T11:23:49.777468Z -4198 +2013-06-21T07:05:39.226902Z +100eb0b32068b6ef3a92dd33673c4c98 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -58,16 +58,16 @@ cignoni -278 +249 -tridecimator.cpp +readme.txt file 2013-06-21T07:05:39.226902Z -9fc895027ccd918a5261e7aed34501ef +361fc05609729993b227b02f9f7296e2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -7978 +3672 -Tetraascii.ply +quad.ply file 2013-06-21T07:05:39.226902Z -100eb0b32068b6ef3a92dd33673c4c98 +4be5a093d04f456acd25b125d9796f15 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -249 +233 -readme.txt +history.txt file -2013-06-21T07:05:39.226902Z -361fc05609729993b227b02f9f7296e2 +2013-06-21T07:05:39.222902Z +eb6dd981d51f855b29f42e388cb5f742 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -3672 +1119 -quad.ply +quad4.ply file -2013-06-21T07:05:39.226902Z -4be5a093d04f456acd25b125d9796f15 +2013-06-21T07:05:39.222902Z +ccdf9315040f2b02d6fbaa569ce69d32 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -233 +255 -history.txt +quad5.ply file 2013-06-21T07:05:39.222902Z -eb6dd981d51f855b29f42e388cb5f742 +d01c6f662c761f92641659a7ae726df8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,18 +228,18 @@ cignoni -1119 +286 -quad4.ply +tridecimator.pro file 2013-06-21T07:05:39.222902Z -ccdf9315040f2b02d6fbaa569ce69d32 -2011-10-05T15:04:40.740408Z -4180 +5fa76e530f94a9a23dc90962fe103d54 +2011-10-24T11:23:49.777468Z +4198 cignoni @@ -262,18 +262,18 @@ cignoni -255 +278 -quad5.ply +tridecimator.cpp file -2013-06-21T07:05:39.222902Z -d01c6f662c761f92641659a7ae726df8 -2011-10-05T15:04:40.740408Z -4180 +2013-07-25T06:52:24.690398Z +0226dc43a2102cf7304b640635fc3a64 +2013-07-23T07:37:29.006637Z +4922 cignoni @@ -296,5 +296,5 @@ cignoni -286 +7770 diff --git a/inst/include/vcglib/apps/tridecimator/.svn/text-base/tridecimator.cpp.svn-base b/inst/include/vcglib/apps/tridecimator/.svn/text-base/tridecimator.cpp.svn-base index 02137a38..347723c2 100644 --- a/inst/include/vcglib/apps/tridecimator/.svn/text-base/tridecimator.cpp.svn-base +++ b/inst/include/vcglib/apps/tridecimator/.svn/text-base/tridecimator.cpp.svn-base @@ -1,26 +1,10 @@ -#include -#include - -#include -#include - - // stuff to define the mesh -#include -#include -#include #include -#include -#include - // io #include #include -// update -#include - // local optimization #include #include @@ -37,9 +21,9 @@ For edge collpases we need verteses with: - per vertex Normal -Moreover for using a quadric based collapse the vertex class +Moreover for using a quadric based collapse the vertex class must have also a Quadric member Q(); -Otherwise the user have to provide an helper function object +Otherwise the user have to provide an helper function object to recover the quadric. ******************************************************/ @@ -84,32 +68,32 @@ class MyTriEdgeCollapse: public vcg::tri::TriEdgeCollapseQuadric< MyMesh, Vertex void Usage() { - printf( + printf( "---------------------------------\n" " TriSimp V.1.0 \n" " http://vcg.isti.cnr.it\n" " http://vcg.sourceforge.net\n" " release date: "__DATE__"\n" "---------------------------------\n\n" - "TriDecimator 1.0 \n"__DATE__"\n" + "TriDecimator 1.0 \n"__DATE__"\n" "Copyright 2003-2012 Visual Computing Lab I.S.T.I. C.N.R.\n" "\nUsage: "\ "tridecimator fileIn fileOut face_num [opt]\n"\ "Where opt can be:\n"\ " -e# QuadricError threshold (range [0,inf) default inf)\n" - " -b# Boundary Weight (default .5)\n" - " -q# Quality threshold (range [0.0, 0.866], default .3 )\n" - " -n# Normal threshold (degree range [0,180] default 90)\n" - " -E# Minimal admitted quadric value (default 1e-15, must be >0)\n" - " -Q[y|n] Use or not Quality Threshold (default yes)\n" - " -N[y|n] Use or not Normal Threshold (default no)\n" - " -A[y|n] Use or not Area Weighted Quadrics (default yes)\n" - " -O[y|n] Use or not vertex optimal placement (default yes)\n" - " -S[y|n] Use or not Scale Independent quadric measure(default yes) \n" - " -B[y|n] Preserve or not mesh boundary (default no)\n" - " -T[y|n] Preserve or not Topology (default no)\n" - " -H[y|n] Use or not Safe Heap Update (default no)\n" - " -P Before simplification, remove duplicate & unreferenced vertices\n" + " -b# Boundary Weight (default .5)\n" + " -q# Quality threshold (range [0.0, 0.866], default .3 )\n" + " -n# Normal threshold (degree range [0,180] default 90)\n" + " -E# Minimal admitted quadric value (default 1e-15, must be >0)\n" + " -Q[y|n] Use or not Quality Threshold (default yes)\n" + " -N[y|n] Use or not Normal Threshold (default no)\n" + " -A[y|n] Use or not Area Weighted Quadrics (default yes)\n" + " -O[y|n] Use or not vertex optimal placement (default yes)\n" + " -S[y|n] Use or not Scale Independent quadric measure(default yes) \n" + " -B[y|n] Preserve or not mesh boundary (default no)\n" + " -T[y|n] Preserve or not Topology (default no)\n" + " -H[y|n] Use or not Safe Heap Update (default no)\n" + " -P Before simplification, remove duplicate & unreferenced vertices\n" ); exit(-1); } @@ -129,7 +113,7 @@ if(argc<4) Usage(); exit(-1); } printf("mesh loaded %d %d \n",mesh.vn,mesh.fn); - + TriEdgeCollapseQuadricParameter qparams; qparams.QualityThr =.3; float TargetError=std::numeric_limits::max(); @@ -175,12 +159,12 @@ if(argc<4) Usage(); printf("reducing it to %i\n",FinalSize); - + vcg::tri::UpdateBounding::Box(mesh); - + // decimator initialization vcg::LocalOptimization DeciSession(mesh,&qparams); - + int t1=clock(); DeciSession.Init(); int t2=clock(); @@ -196,8 +180,8 @@ if(argc<4) Usage(); int t3=clock(); printf("mesh %d %d Error %g \n",mesh.vn,mesh.fn,DeciSession.currMetric); printf("\nCompleted in (%i+%i) msec\n",t2-t1,t3-t2); - + vcg::tri::io::ExporterPLY::Save(mesh,argv[2]); - return 0; + return 0; } diff --git a/inst/include/vcglib/apps/tridecimator/tridecimator.cpp b/inst/include/vcglib/apps/tridecimator/tridecimator.cpp index 02137a38..347723c2 100644 --- a/inst/include/vcglib/apps/tridecimator/tridecimator.cpp +++ b/inst/include/vcglib/apps/tridecimator/tridecimator.cpp @@ -1,26 +1,10 @@ -#include -#include - -#include -#include - - // stuff to define the mesh -#include -#include -#include #include -#include -#include - // io #include #include -// update -#include - // local optimization #include #include @@ -37,9 +21,9 @@ For edge collpases we need verteses with: - per vertex Normal -Moreover for using a quadric based collapse the vertex class +Moreover for using a quadric based collapse the vertex class must have also a Quadric member Q(); -Otherwise the user have to provide an helper function object +Otherwise the user have to provide an helper function object to recover the quadric. ******************************************************/ @@ -84,32 +68,32 @@ class MyTriEdgeCollapse: public vcg::tri::TriEdgeCollapseQuadric< MyMesh, Vertex void Usage() { - printf( + printf( "---------------------------------\n" " TriSimp V.1.0 \n" " http://vcg.isti.cnr.it\n" " http://vcg.sourceforge.net\n" " release date: "__DATE__"\n" "---------------------------------\n\n" - "TriDecimator 1.0 \n"__DATE__"\n" + "TriDecimator 1.0 \n"__DATE__"\n" "Copyright 2003-2012 Visual Computing Lab I.S.T.I. C.N.R.\n" "\nUsage: "\ "tridecimator fileIn fileOut face_num [opt]\n"\ "Where opt can be:\n"\ " -e# QuadricError threshold (range [0,inf) default inf)\n" - " -b# Boundary Weight (default .5)\n" - " -q# Quality threshold (range [0.0, 0.866], default .3 )\n" - " -n# Normal threshold (degree range [0,180] default 90)\n" - " -E# Minimal admitted quadric value (default 1e-15, must be >0)\n" - " -Q[y|n] Use or not Quality Threshold (default yes)\n" - " -N[y|n] Use or not Normal Threshold (default no)\n" - " -A[y|n] Use or not Area Weighted Quadrics (default yes)\n" - " -O[y|n] Use or not vertex optimal placement (default yes)\n" - " -S[y|n] Use or not Scale Independent quadric measure(default yes) \n" - " -B[y|n] Preserve or not mesh boundary (default no)\n" - " -T[y|n] Preserve or not Topology (default no)\n" - " -H[y|n] Use or not Safe Heap Update (default no)\n" - " -P Before simplification, remove duplicate & unreferenced vertices\n" + " -b# Boundary Weight (default .5)\n" + " -q# Quality threshold (range [0.0, 0.866], default .3 )\n" + " -n# Normal threshold (degree range [0,180] default 90)\n" + " -E# Minimal admitted quadric value (default 1e-15, must be >0)\n" + " -Q[y|n] Use or not Quality Threshold (default yes)\n" + " -N[y|n] Use or not Normal Threshold (default no)\n" + " -A[y|n] Use or not Area Weighted Quadrics (default yes)\n" + " -O[y|n] Use or not vertex optimal placement (default yes)\n" + " -S[y|n] Use or not Scale Independent quadric measure(default yes) \n" + " -B[y|n] Preserve or not mesh boundary (default no)\n" + " -T[y|n] Preserve or not Topology (default no)\n" + " -H[y|n] Use or not Safe Heap Update (default no)\n" + " -P Before simplification, remove duplicate & unreferenced vertices\n" ); exit(-1); } @@ -129,7 +113,7 @@ if(argc<4) Usage(); exit(-1); } printf("mesh loaded %d %d \n",mesh.vn,mesh.fn); - + TriEdgeCollapseQuadricParameter qparams; qparams.QualityThr =.3; float TargetError=std::numeric_limits::max(); @@ -175,12 +159,12 @@ if(argc<4) Usage(); printf("reducing it to %i\n",FinalSize); - + vcg::tri::UpdateBounding::Box(mesh); - + // decimator initialization vcg::LocalOptimization DeciSession(mesh,&qparams); - + int t1=clock(); DeciSession.Init(); int t2=clock(); @@ -196,8 +180,8 @@ if(argc<4) Usage(); int t3=clock(); printf("mesh %d %d Error %g \n",mesh.vn,mesh.fn,DeciSession.currMetric); printf("\nCompleted in (%i+%i) msec\n",t2-t1,t3-t2); - + vcg::tri::io::ExporterPLY::Save(mesh,argv[2]); - return 0; + return 0; } diff --git a/inst/include/vcglib/apps/trimeshinfo/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/.svn/entries index 798a23ca..ff2f02a5 100644 --- a/inst/include/vcglib/apps/trimeshinfo/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo svn://svn.code.sf.net/p/vcg/code @@ -26,40 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -InstancesNode.h -file - - - - -2013-06-21T07:06:52.687266Z -063adf58feb2a3e6fde5a6512ffed176 -2011-10-05T15:04:40.740408Z -4180 -cignoni - - - - - - - - - - - - - - - - - - - - - -1413 - trimeshinfo1.00 dir @@ -375,3 +341,37 @@ cignoni 3087 +InstancesNode.h +file + + + + +2013-06-21T07:06:52.687266Z +063adf58feb2a3e6fde5a6512ffed176 +2011-10-05T15:04:40.740408Z +4180 +cignoni + + + + + + + + + + + + + + + + + + + + + +1413 + diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.00/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.00/.svn/entries index d19b3822..a1b46caa 100644 --- a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.00/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.00/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.00 svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/.svn/entries index 2f25efbd..c784d7dc 100644 --- a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.01 svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/.svn/entries index 97537af2..33eaeb4d 100644 --- a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101 svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -resource.h +main.cpp file 2013-06-21T07:05:41.426913Z -ae60eaab9009168284919bf3c5f33686 +e2d58cd95563ff050893e31d60043eae 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -482 +15429 -main.cpp +defs.h file 2013-06-21T07:05:41.426913Z -e2d58cd95563ff050893e31d60043eae +9c5143baa3ad0f1cf7e8695d092bfd22 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -15429 +2162 -defs.h +readme.txt file 2013-06-21T07:05:41.426913Z -9c5143baa3ad0f1cf7e8695d092bfd22 +6aac9018e4543948d39078efe5e2968f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -2162 +3054 -readme.txt +resource.h file 2013-06-21T07:05:41.426913Z -6aac9018e4543948d39078efe5e2968f +ae60eaab9009168284919bf3c5f33686 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,5 +160,5 @@ cignoni -3054 +482 diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfosample/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfosample/.svn/entries index 27cd14db..b1333cc9 100644 --- a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfosample/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfosample/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfosample svn://svn.code.sf.net/p/vcg/code @@ -26,40 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -kleine.ply -file - - - - -2013-06-21T07:05:48.430948Z -c077677d86622fd459bbcb3dff836fcf -2011-10-05T15:04:40.740408Z -4180 -cignoni -has-props - - - - - - - - - - - - - - - - - - - - -14257 - readme.txt file @@ -366,3 +332,37 @@ has-props 14877 +kleine.ply +file + + + + +2013-06-21T07:05:48.430948Z +c077677d86622fd459bbcb3dff836fcf +2011-10-05T15:04:40.740408Z +4180 +cignoni +has-props + + + + + + + + + + + + + + + + + + + + +14257 + diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/.svn/entries index 5671af86..58f0da73 100644 --- a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.02 svn://svn.code.sf.net/p/vcg/code @@ -26,12 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimeshinfo1.02 -dir - -trimeshinfosample -dir - trimeshinfosample.zip file @@ -100,3 +94,9 @@ has-props 106042 +trimeshinfo1.02 +dir + +trimeshinfosample +dir + diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfo1.02/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfo1.02/.svn/entries index 621aca25..031772db 100644 --- a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfo1.02/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfo1.02/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfo1.02 svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfosample/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfosample/.svn/entries index 727af2a2..3514b931 100644 --- a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfosample/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfosample/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfosample svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -knot_subsampled.ply +test1.ply file -2013-06-21T07:06:43.847223Z -d18f0f86446c47d706df75049603a897 +2013-06-21T07:06:43.851223Z +f15853fa843819beef1a0493aa6dc7f2 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -58,20 +57,20 @@ has-props -40237 + +830367 -knot_orig.ply +kite_degenerate2.ply file -2013-06-21T07:06:43.847223Z -e4f7264e614cae0ea21553d0326efce4 +2013-06-21T07:06:43.851223Z +a94506c94b26603e70cc8a77d0214bfc 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -92,16 +91,17 @@ has-props -640240 + +414 -kite.ply +test2.ply file -2013-06-21T07:06:43.847223Z -353c4204c868ddb9bff64d75756ed8f0 +2013-06-21T07:06:43.851223Z +3b169ce102732dab40da9b62651eb35e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -462 +1568040 -test1.ply +test3.ply file -2013-06-21T07:06:43.851223Z -f15853fa843819beef1a0493aa6dc7f2 +2013-06-21T07:06:43.859223Z +25eb82fd1baf318be84d08bdb2a79e53 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,19 +160,20 @@ cignoni -830367 +3660031 -test2.ply +moebius.ply file -2013-06-21T07:06:43.851223Z -3b169ce102732dab40da9b62651eb35e +2013-06-21T07:06:43.859223Z +072c2bf9d305462f5d4bc43cfb2dce25 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -193,17 +194,16 @@ cignoni - -1568040 +3275 -kite_degenerate2.ply +kite_hole.ply file -2013-06-21T07:06:43.851223Z -a94506c94b26603e70cc8a77d0214bfc +2013-06-21T07:06:43.859223Z +99baf4783a2898481065cb980f8d99d1 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -414 +445 -test3.ply +degenerate.ply file 2013-06-21T07:06:43.859223Z -25eb82fd1baf318be84d08bdb2a79e53 +df7c679d70946c70b9608ae29789a46a 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -3660031 +245 -degenerate.ply +nonmanifold.ply file 2013-06-21T07:06:43.859223Z -df7c679d70946c70b9608ae29789a46a +fa340ed50b480fef045f15fc9564f129 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,19 +296,20 @@ cignoni -245 +307 -kite_hole.ply +kleine.ply file 2013-06-21T07:06:43.859223Z -99baf4783a2898481065cb980f8d99d1 +c077677d86622fd459bbcb3dff836fcf 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -329,21 +330,19 @@ cignoni - -445 +14257 -moebius.ply +three.ply file 2013-06-21T07:06:43.859223Z -072c2bf9d305462f5d4bc43cfb2dce25 +3795db7fea5dc9cdd3258c316c3017ac 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -364,16 +363,17 @@ has-props -3275 + +275 -nonmanifold.ply +readme.txt file 2013-06-21T07:06:43.859223Z -fa340ed50b480fef045f15fc9564f129 +c4f1b81ca822a834bdb8f5a851df28f5 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -398,16 +398,16 @@ cignoni -307 +716 -three.ply +two.ply file 2013-06-21T07:06:43.859223Z -3795db7fea5dc9cdd3258c316c3017ac +3f23218137ab5ad0f1418d32a9f435b8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -432,20 +432,19 @@ cignoni -275 +249 -kleine.ply +eight3D.ply2.html file -2013-06-21T07:06:43.859223Z -c077677d86622fd459bbcb3dff836fcf +2013-06-21T07:06:43.843223Z +d41d8cd98f00b204e9800998ecf8427e 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -466,16 +465,17 @@ has-props -14257 + +0 -readme.txt +kite_degenerate.ply file -2013-06-21T07:06:43.859223Z -c4f1b81ca822a834bdb8f5a851df28f5 +2013-06-21T07:06:43.847223Z +eacba21b0aee8d6899bccae9a1e8835f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -500,19 +500,20 @@ cignoni -716 +412 -two.ply +knot_vcg_simplified.ply file -2013-06-21T07:06:43.859223Z -3f23218137ab5ad0f1418d32a9f435b8 +2013-06-21T07:06:43.847223Z +ff0ea0d89e68f4b9a53d9d079427c456 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -533,17 +534,16 @@ cignoni - -249 +40237 -eight3D.ply2.html +one.ply file -2013-06-21T07:06:43.843223Z -d41d8cd98f00b204e9800998ecf8427e +2013-06-21T07:06:43.847223Z +0f01cdd79bb8226e93056ee96c88cefc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -568,19 +568,20 @@ cignoni -0 +205 -kite_degenerate.ply +moebius_big.ply file 2013-06-21T07:06:43.847223Z -eacba21b0aee8d6899bccae9a1e8835f +5e2cfae711e2ec5bf89dae46c8315e06 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -601,21 +602,19 @@ cignoni - -412 +14877 -knot_vcg_simplified.ply +degenerate2.ply file 2013-06-21T07:06:43.847223Z -ff0ea0d89e68f4b9a53d9d079427c456 +deb9cd52af4aa957d42e5e6d6aa504ed 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -636,16 +635,17 @@ has-props -40237 + +247 -one.ply +eight2D.ply file 2013-06-21T07:06:43.847223Z -0f01cdd79bb8226e93056ee96c88cefc +e0f25b6407ec20883a9c587628742405 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -670,20 +670,19 @@ cignoni -205 +491 -moebius_big.ply +degenerate3.ply file 2013-06-21T07:06:43.847223Z -5e2cfae711e2ec5bf89dae46c8315e06 +65d2b37e1cd15aef1f317e27802183ab 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -704,16 +703,17 @@ has-props -14877 + +248 -degenerate2.ply +four_twoconnected.ply file 2013-06-21T07:06:43.847223Z -deb9cd52af4aa957d42e5e6d6aa504ed +384e8836b1132412a08ffb8197eeb692 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -738,16 +738,16 @@ cignoni -247 +290 -eight2D.ply +eight3D.ply file 2013-06-21T07:06:43.847223Z -e0f25b6407ec20883a9c587628742405 +a58b50d6a6eb8fa967c2cd179c9594f4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -772,19 +772,20 @@ cignoni -491 +45420 -degenerate3.ply +knot_subsampled.ply file 2013-06-21T07:06:43.847223Z -65d2b37e1cd15aef1f317e27802183ab +d18f0f86446c47d706df75049603a897 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -805,20 +806,20 @@ cignoni - -248 +40237 -four_twoconnected.ply +knot_orig.ply file 2013-06-21T07:06:43.847223Z -384e8836b1132412a08ffb8197eeb692 +e4f7264e614cae0ea21553d0326efce4 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -839,17 +840,16 @@ cignoni - -290 +640240 -eight3D.ply +kite.ply file 2013-06-21T07:06:43.847223Z -a58b50d6a6eb8fa967c2cd179c9594f4 +353c4204c868ddb9bff64d75756ed8f0 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -874,5 +874,5 @@ cignoni -45420 +462 diff --git a/inst/include/vcglib/apps/unsupported/.svn/entries b/inst/include/vcglib/apps/unsupported/.svn/entries index 0dd72ee9..ac0415ab 100644 --- a/inst/include/vcglib/apps/unsupported/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported svn://svn.code.sf.net/p/vcg/code @@ -26,12 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -texdeci -dir - -shadevis -dir - trimesh_SDL dir @@ -44,3 +38,9 @@ dir ptx2ply dir +texdeci +dir + +shadevis +dir + diff --git a/inst/include/vcglib/apps/unsupported/extractors/.svn/entries b/inst/include/vcglib/apps/unsupported/extractors/.svn/entries index 0301405d..efc1412e 100644 --- a/inst/include/vcglib/apps/unsupported/extractors/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/extractors/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/extractors svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -extractors.sln +extractors.ncb file 2013-06-21T07:06:56.059283Z -8d4efa75b2c43778e05477adf4131303 +bd6038877b6fe9292b2691a44769c903 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -57,20 +58,16 @@ cignoni - -896 - -extractor -dir +322560 -extractors.ncb +extractors.suo file 2013-06-21T07:06:56.059283Z -bd6038877b6fe9292b2691a44769c903 +520b5e7387db298e8a77d2e1b341bdff 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -95,20 +92,19 @@ has-props -322560 +11776 -extractors.suo +extractors.sln file 2013-06-21T07:06:56.059283Z -520b5e7387db298e8a77d2e1b341bdff +8d4efa75b2c43778e05477adf4131303 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -129,5 +125,9 @@ has-props -11776 + +896 + +extractor +dir diff --git a/inst/include/vcglib/apps/unsupported/extractors/extractor/.svn/entries b/inst/include/vcglib/apps/unsupported/extractors/extractor/.svn/entries index d14321c0..50e7283d 100644 --- a/inst/include/vcglib/apps/unsupported/extractors/extractor/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/extractors/extractor/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/extractors/extractor svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -ImplicitSphere.h +extractor.pro file 2013-06-21T07:06:56.059283Z -7930ebfaeb5da95f69330c6b5d77b0f8 -2011-10-05T15:04:40.740408Z -4180 +fb0c0e36cdfc636537d2f6a33360214c +2013-04-15T20:17:43.978734Z +4885 cignoni +has-props @@ -57,17 +58,16 @@ cignoni - -2019 +318 -SphereDifference.h +Walker.h file 2013-06-21T07:06:56.059283Z -8d78b7ec569d7a7b8b8e94d21d5eb6bf +3c7fc62cd76007351a865d780d53b8bc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,20 +92,19 @@ cignoni -1221 +7503 -extractor.pro +Volume.h file 2013-06-21T07:06:56.059283Z -fb0c0e36cdfc636537d2f6a33360214c -2013-04-15T20:17:43.978734Z -4885 +1844b0251f7c6d69e4216a93e22dbba2 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -126,16 +125,17 @@ has-props -318 + +2058 -Walker.h +extractor.vcproj file 2013-06-21T07:06:56.059283Z -3c7fc62cd76007351a865d780d53b8bc +f45e2db6b351cbf1ec8cf32e1fdc1e0f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -7503 +3761 -Volume.h +Implicit.h file 2013-06-21T07:06:56.059283Z -1844b0251f7c6d69e4216a93e22dbba2 +7e7c04cb1f442ef3fe233a0e7af069f8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -2058 +292 -extractor.vcproj +Definitions.h file 2013-06-21T07:06:56.059283Z -f45e2db6b351cbf1ec8cf32e1fdc1e0f +31c324b44e8b0d9198990833af265e45 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -3761 +656 -Implicit.h +SphereUnion.h file 2013-06-21T07:06:56.059283Z -7e7c04cb1f442ef3fe233a0e7af069f8 +e7666f6d3b1805bec7af283be990bc80 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -292 +1514 -Definitions.h +main.cpp file 2013-06-21T07:06:56.059283Z -31c324b44e8b0d9198990833af265e45 +10facd982d2cbb6aab3fcdfb353d6915 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ cignoni -656 +1185 -SphereUnion.h +ImplicitSphere.h file 2013-06-21T07:06:56.059283Z -e7666f6d3b1805bec7af283be990bc80 +7930ebfaeb5da95f69330c6b5d77b0f8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,16 +330,16 @@ cignoni -1514 +2019 -main.cpp +SphereDifference.h file 2013-06-21T07:06:56.059283Z -10facd982d2cbb6aab3fcdfb353d6915 +8d78b7ec569d7a7b8b8e94d21d5eb6bf 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,5 +364,5 @@ cignoni -1185 +1221 diff --git a/inst/include/vcglib/apps/unsupported/ptx2ply/.svn/entries b/inst/include/vcglib/apps/unsupported/ptx2ply/.svn/entries index 26439dd3..a2e30cd8 100644 --- a/inst/include/vcglib/apps/unsupported/ptx2ply/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/ptx2ply/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/ptx2ply svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -ptx2ply.vcproj +ptx2ply.pro file 2013-06-21T07:06:52.879267Z -0f78c84da5d4f55c990f37feceb83b4c +fdf38d31ba6f205450ec90ea9d089ff3 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -57,17 +58,16 @@ cignoni - -3418 +286 -ptx2ply.sln +ptx2ply.cpp file 2013-06-21T07:06:52.879267Z -ea9fbc432b9d630167de3f8ceba44bc4 +c1e92f30d6db82b11e18713583f27aa6 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,20 +92,19 @@ cignoni -882 +19883 -ptx2ply.pro +ptx2ply.vcproj file 2013-06-21T07:06:52.879267Z -fdf38d31ba6f205450ec90ea9d089ff3 +0f78c84da5d4f55c990f37feceb83b4c 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -126,16 +125,17 @@ has-props -286 + +3418 -ptx2ply.cpp +ptx2ply.sln file 2013-06-21T07:06:52.879267Z -c1e92f30d6db82b11e18713583f27aa6 +ea9fbc432b9d630167de3f8ceba44bc4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,5 +160,5 @@ cignoni -19883 +882 diff --git a/inst/include/vcglib/apps/unsupported/shadevis/.svn/entries b/inst/include/vcglib/apps/unsupported/shadevis/.svn/entries index 57efde71..f663e140 100644 --- a/inst/include/vcglib/apps/unsupported/shadevis/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/shadevis/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/shadevis svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -visshader.h +shadevis.txt file 2013-06-21T07:06:53.395270Z -99ac0468fc368b79b336ff0874aa175f -2012-03-04T17:48:04.145977Z -4340 +70e88db8774477f7eed7a2c1e2ad50f1 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -58,18 +58,18 @@ cignoni -16663 +6236 -history.txt +shadevis.cpp file 2013-06-21T07:06:53.395270Z -46f1ccc07b839120e5e9d0e7928116dc -2011-10-05T15:04:40.740408Z -4180 +3c6395093f71959b1090991141027458 +2013-01-28T15:15:14.079360Z +4807 cignoni @@ -92,16 +92,16 @@ cignoni -700 +18537 -shadevis.txt +simplepic.h file 2013-06-21T07:06:53.395270Z -70e88db8774477f7eed7a2c1e2ad50f1 +9281d1636b684fd7231d0f072491d9d1 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,18 +126,18 @@ cignoni -6236 +3061 -shadevis.cpp +visshader.h file 2013-06-21T07:06:53.395270Z -3c6395093f71959b1090991141027458 -2013-01-28T15:15:14.079360Z -4807 +99ac0468fc368b79b336ff0874aa175f +2012-03-04T17:48:04.145977Z +4340 cignoni @@ -160,16 +160,16 @@ cignoni -18537 +16663 -simplepic.h +history.txt file 2013-06-21T07:06:53.395270Z -9281d1636b684fd7231d0f072491d9d1 +46f1ccc07b839120e5e9d0e7928116dc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,5 +194,5 @@ cignoni -3061 +700 diff --git a/inst/include/vcglib/apps/unsupported/texdeci/.svn/entries b/inst/include/vcglib/apps/unsupported/texdeci/.svn/entries index 30f88146..825cacdd 100644 --- a/inst/include/vcglib/apps/unsupported/texdeci/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/texdeci/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/texdeci svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/unsupported/trackball_SDL/.svn/entries b/inst/include/vcglib/apps/unsupported/trackball_SDL/.svn/entries index 744179ee..e88fa2ed 100644 --- a/inst/include/vcglib/apps/unsupported/trackball_SDL/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/trackball_SDL/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/trackball_SDL svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/unsupported/trimesh_SDL/.svn/entries b/inst/include/vcglib/apps/unsupported/trimesh_SDL/.svn/entries index 996b045b..4ac310a4 100644 --- a/inst/include/vcglib/apps/unsupported/trimesh_SDL/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/trimesh_SDL/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/trimesh_SDL svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_sdl.cpp +trimesh_sdl.pro file 2013-06-21T07:06:53.571271Z -73248b5102c62aa5c056ae7d1e0e2ab1 -2013-01-28T15:15:14.079360Z -4807 +3e623c3258cb1500490715cf14aa6e88 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -58,18 +58,18 @@ cignoni -8958 +702 -trimesh_sdl.pro +trimesh_sdl.cpp file 2013-06-21T07:06:53.571271Z -3e623c3258cb1500490715cf14aa6e88 -2011-10-05T15:04:40.740408Z -4180 +73248b5102c62aa5c056ae7d1e0e2ab1 +2013-01-28T15:15:14.079360Z +4807 cignoni @@ -92,5 +92,5 @@ cignoni -702 +8958 diff --git a/inst/include/vcglib/docs/.svn/entries b/inst/include/vcglib/docs/.svn/entries index 6eda0ac9..662a674b 100644 --- a/inst/include/vcglib/docs/.svn/entries +++ b/inst/include/vcglib/docs/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/docs svn://svn.code.sf.net/p/vcg/code -2013-06-19T05:36:49.475981Z -4898 +2013-06-25T10:23:25.607913Z +4910 cignoni diff --git a/inst/include/vcglib/docs/Doxygen/.svn/entries b/inst/include/vcglib/docs/Doxygen/.svn/entries index be39158f..0c704d68 100644 --- a/inst/include/vcglib/docs/Doxygen/.svn/entries +++ b/inst/include/vcglib/docs/Doxygen/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/docs/Doxygen svn://svn.code.sf.net/p/vcg/code -2013-06-19T05:36:49.475981Z -4898 +2013-06-25T10:23:25.607913Z +4910 cignoni @@ -26,17 +26,21 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -adjacency.dxy +img +dir + +shot.dxy file -2013-06-21T07:08:07.227636Z -915b0dc615dc87dca74d1c42a29bb4c0 -2013-06-19T05:36:49.475981Z -4898 +2013-06-21T07:08:07.223636Z +7c4a303f245a64ece7f529d4118ddc6d +2012-10-26T06:16:15.203769Z +4672 cignoni +has-props @@ -57,19 +61,18 @@ cignoni - -11328 +6227 -allocation.dxy +examples.dxy file -2013-06-21T07:08:07.227636Z -8e496c4a8a8d2d0a5f40e5d1d1ce187a -2012-10-30T18:49:32.008158Z -4678 +2013-06-21T07:08:07.223636Z +f4de58063389d8fc270d794abcac2197 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -92,20 +95,19 @@ has-props -4040 +194 -attributes.dxy +namespaces.dxy file -2013-06-21T07:08:07.227636Z -a2a63e0e1199b1b1d8574ca9a009daff -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.223636Z +d5357ce38a222f6062f9d637f191b349 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -126,20 +128,20 @@ has-props -2819 + +1016 -metro.dxy +groups.dxy file -2013-06-21T07:08:07.227636Z -6341575fb2b96c2d33b60fb029492030 -2012-10-04T15:30:56.073172Z -4527 +2013-06-21T07:08:07.223636Z +ed0a39d6089374c3c96c5324774a0273 +2012-11-07T01:24:45.064120Z +4687 cignoni -has-props @@ -160,20 +162,20 @@ has-props -2488 + +1165 -fileformat.dxy +doxyfile file -2013-06-21T07:08:07.227636Z -500d9acd01cd81cd3bc9b05449f7592b -2012-10-03T17:58:12.891124Z -4523 +2013-06-21T07:08:07.223636Z +a5a0efc4e951887da3a0bba35ef6f15c +2012-12-10T12:40:21.652204Z +4776 cignoni -has-props @@ -194,20 +196,20 @@ has-props -4131 + +79882 -flags.dxy +adjacency.dxy file 2013-06-21T07:08:07.227636Z -aee2630e5b4440e58a04730027dad455 -2012-10-15T07:59:28.051873Z -4591 +915b0dc615dc87dca74d1c42a29bb4c0 +2013-06-19T05:36:49.475981Z +4898 cignoni -has-props @@ -228,19 +230,21 @@ has-props -2318 + +11328 -footer.html +allocation.dxy file 2013-06-21T07:08:07.227636Z -d7a6f43a1f50c2c3db4eb80b8333b0c0 -2011-10-05T15:04:40.740408Z -4180 +8e496c4a8a8d2d0a5f40e5d1d1ce187a +2012-10-30T18:49:32.008158Z +4678 cignoni +has-props @@ -261,20 +265,20 @@ cignoni - -241 +4040 -main_concept.dxy +metro.dxy file 2013-06-21T07:08:07.227636Z -6e0228d7fde530bcf1f207654fcc5512 -2012-11-07T01:24:45.064120Z -4687 +6341575fb2b96c2d33b60fb029492030 +2012-10-04T15:30:56.073172Z +4527 cignoni +has-props @@ -295,20 +299,20 @@ cignoni - -7584 +2488 -style.dxy +attributes.dxy file 2013-06-21T07:08:07.227636Z -ee891eda5280ce4df71236002e81ae5a -2013-06-19T05:36:49.475981Z -4898 +a2a63e0e1199b1b1d8574ca9a009daff +2012-10-11T10:36:05.183822Z +4571 cignoni +has-props @@ -329,20 +333,20 @@ cignoni - -3124 +2819 -vcg.css +fileformat.dxy file 2013-06-21T07:08:07.227636Z -c9433629e608b2b61a4ec501bf5ef5a1 -2012-10-15T07:59:28.051873Z -4591 +500d9acd01cd81cd3bc9b05449f7592b +2012-10-03T17:58:12.891124Z +4523 cignoni +has-props @@ -363,19 +367,18 @@ cignoni - -145 +4131 -install.dxy +flags.dxy file 2013-06-21T07:08:07.227636Z -73a1090f4ad19a2a68cde083187b0303 -2013-04-28T21:25:47.428129Z -4893 +aee2630e5b4440e58a04730027dad455 +2012-10-15T07:59:28.051873Z +4591 cignoni has-props @@ -398,18 +401,18 @@ has-props -1972 +2318 -index.dxy +footer.html file 2013-06-21T07:08:07.227636Z -f2c2b4995df5739fc744bdb3bafc75a8 -2012-10-30T18:49:32.008158Z -4678 +d7a6f43a1f50c2c3db4eb80b8333b0c0 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -432,23 +435,19 @@ cignoni -2707 - -img -dir +241 -shot.dxy +main_concept.dxy file -2013-06-21T07:08:07.223636Z -7c4a303f245a64ece7f529d4118ddc6d -2012-10-26T06:16:15.203769Z -4672 +2013-06-21T07:08:07.227636Z +6e0228d7fde530bcf1f207654fcc5512 +2012-11-07T01:24:45.064120Z +4687 cignoni -has-props @@ -469,20 +468,20 @@ has-props -6227 + +7584 -examples.dxy +style.dxy file -2013-06-21T07:08:07.223636Z -f4de58063389d8fc270d794abcac2197 -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.227636Z +ee891eda5280ce4df71236002e81ae5a +2013-06-19T05:36:49.475981Z +4898 cignoni -has-props @@ -503,18 +502,19 @@ has-props -194 + +3124 -namespaces.dxy +vcg.css file -2013-06-21T07:08:07.223636Z -d5357ce38a222f6062f9d637f191b349 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:07.227636Z +c9433629e608b2b61a4ec501bf5ef5a1 +2012-10-15T07:59:28.051873Z +4591 cignoni @@ -537,19 +537,20 @@ cignoni -1016 +145 -groups.dxy +install.dxy file -2013-06-21T07:08:07.223636Z -ed0a39d6089374c3c96c5324774a0273 -2012-11-07T01:24:45.064120Z -4687 +2013-07-25T06:52:24.722399Z +58303b504d74221c5c9ff12d748630cc +2013-06-25T10:23:25.607913Z +4910 cignoni +has-props @@ -570,19 +571,18 @@ cignoni - -1165 +2375 -doxyfile +index.dxy file -2013-06-21T07:08:07.223636Z -a5a0efc4e951887da3a0bba35ef6f15c -2012-12-10T12:40:21.652204Z -4776 +2013-06-21T07:08:07.227636Z +f2c2b4995df5739fc744bdb3bafc75a8 +2012-10-30T18:49:32.008158Z +4678 cignoni @@ -605,5 +605,5 @@ cignoni -79882 +2707 diff --git a/inst/include/vcglib/docs/Doxygen/.svn/text-base/install.dxy.svn-base b/inst/include/vcglib/docs/Doxygen/.svn/text-base/install.dxy.svn-base index dec91bcc..a1831cfb 100644 --- a/inst/include/vcglib/docs/Doxygen/.svn/text-base/install.dxy.svn-base +++ b/inst/include/vcglib/docs/Doxygen/.svn/text-base/install.dxy.svn-base @@ -3,7 +3,10 @@ Installation and folder structure ================ -VCG Lib uses a SVN repository. To get the right subset of the svn trunk in the devel folder you should issue the following svn command: +VCG Lib uses a SVN repository hosted by sourceforge. +The main project page of the library is http://sourceforge.net/projects/vcg/ + +To get the right subset of the svn trunk in the devel folder you should issue the following svn command: svn checkout svn://svn.code.sf.net/p/vcg/code/trunk/vcglib vcglib @@ -11,7 +14,7 @@ Windows users with tortoisesvn (http://www.tortoisesvn.net) installed should 1. create a folder named vcglib. 2. right-click in the newly created vcglib folder and choose SVN Checkout -3. put in the first parameter: https://svn.code.sf.net/p/vcg/code/trunk/vcglib +3. put in the first parameter: svn://svn.code.sf.net/p/vcg/code/trunk/vcglib 4. press ok and wait, it should start to check out the last revision of the whole tree. Folder Structure @@ -20,11 +23,13 @@ VCG Lib is mostly made of header files (and its core part it's only header files Just download the tarball from here and uncompress it in a folder, e.g. named vcg, inside you compiler "include" directory. Afterwards, you have to just include the file you need. -Inside vcg folder you will find 4 sub-folders: +Inside vcg folder you will find 5 sub-folders: - `vcg`: this is the core of the library, where all the algorithms and data structures are defined. This part is pure, quite heavily templated, C++ code with STL support for common data structures and algorithms. You will not find a single include from here to anything else than standard libraries. Note that core part is made of header files (.h files) only. - `wrap`: here you will find the wrapping of VCG concepts towards specific needs/contexts/libraries. For example you will find all the code to import/export meshes from the hard disk in many formats, or the routines for rendering triangle meshes with OpenGL, supports for common GUI tools like a trackball, and so on.. - `apps`: this folder contains the command line applications developed with the VCG Lib. Many (much more) examples can be found in MeshLab. The apps/simple directory contains a sub-collection of very basic apps. A good starting point for beginners! - `docs`: documentation lives here (including this tutorial) +- `eigenlib` a copy of the latest stable version of the eigen library for linear algebra ( http://http://eigen.tuxfamily.org/ ). VCGlib relies on eigen for all the advanced matrix processing. +You can browse the svn tree on the sourceforge page http://sourceforge.net/p/vcg/code/HEAD/tree/trunk/vcglib/ */ diff --git a/inst/include/vcglib/docs/Doxygen/img/.svn/entries b/inst/include/vcglib/docs/Doxygen/img/.svn/entries index dada67a4..6bd8abeb 100644 --- a/inst/include/vcglib/docs/Doxygen/img/.svn/entries +++ b/inst/include/vcglib/docs/Doxygen/img/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/docs/Doxygen/img svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -ff.png +VertexStar.png file 2013-06-21T07:08:07.223636Z -f1e586645e9f349f530b53195ade55b2 -2011-10-05T15:04:40.740408Z -4180 +1f53e7e2b4134eda82496b6680636089 +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -58,18 +58,18 @@ has-props -12637 +35531 -shot-Focal.jpg +FF_Adj.png file 2013-06-21T07:08:07.223636Z -68ed835909d9ff8c14416a5dd02a4058 -2012-10-11T10:36:05.183822Z -4571 +3c6840568393f712c212fa7ecc19ccdf +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -92,16 +92,16 @@ has-props -3239 +6717 -vcglogo.png +vcglogo.svg file -2013-06-21T07:08:07.219636Z -e63e6a66836b1245fe345d3eae494cf4 +2013-06-21T07:08:07.223636Z +2b73f5cf1b97f891bd4107345fcd6903 2012-10-03T11:56:27.764346Z 4520 cignoni @@ -126,18 +126,18 @@ has-props -30286 +21446 -triord.png +pos_example.png file -2013-06-21T07:08:07.223636Z -f5125245bb1a1e01f1912ed462c244de -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:07.219636Z +060dab58524c2f47aabbf4be67b48c00 +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -160,16 +160,16 @@ has-props -2392 +14073 -VertexStar.png +FF_nonmanifold.png file -2013-06-21T07:08:07.223636Z -1f53e7e2b4134eda82496b6680636089 +2013-06-21T07:08:07.219636Z +19642dd0692ffb1131ebe5be08fe7fd6 2012-10-03T11:56:27.764346Z 4520 cignoni @@ -194,18 +194,18 @@ has-props -35531 +11255 -FF_Adj.png +shot-Distort1.jpg file -2013-06-21T07:08:07.223636Z -3c6840568393f712c212fa7ecc19ccdf -2012-10-03T11:56:27.764346Z -4520 +2013-06-21T07:08:07.219636Z +25a4ffb7a56c834fb14fedc318a99d75 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -228,18 +228,18 @@ has-props -6717 +4133 -vcglogo.svg +shot-Distort2.jpg file -2013-06-21T07:08:07.223636Z -2b73f5cf1b97f891bd4107345fcd6903 -2012-10-03T11:56:27.764346Z -4520 +2013-06-21T07:08:07.219636Z +939a69cebd231b584fd95e393b3ed17c +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -262,18 +262,18 @@ has-props -21446 +7230 -pos_example.png +shot-Distort3.jpg file 2013-06-21T07:08:07.219636Z -060dab58524c2f47aabbf4be67b48c00 -2012-10-03T11:56:27.764346Z -4520 +53f4dc45d2b53642753d1a1cdbbcc0c6 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -296,18 +296,18 @@ has-props -14073 +3061 -FF_nonmanifold.png +shot-Camera_model.png file 2013-06-21T07:08:07.219636Z -19642dd0692ffb1131ebe5be08fe7fd6 -2012-10-03T11:56:27.764346Z -4520 +b311d22b240d3fec290134068da756c6 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -330,16 +330,16 @@ has-props -11255 +37995 -shot-Distort1.jpg +shot-Projection.png file -2013-06-21T07:08:07.219636Z -25a4ffb7a56c834fb14fedc318a99d75 +2013-06-21T07:08:07.223636Z +974711af310c5c9287fb0038c89cd253 2012-10-11T10:36:05.183822Z 4571 cignoni @@ -364,18 +364,18 @@ has-props -4133 +2964 -shot-Distort2.jpg +figure.xar file -2013-06-21T07:08:07.219636Z -939a69cebd231b584fd95e393b3ed17c -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.223636Z +9b749651b9ae58f90e27427d744c562e +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -398,16 +398,16 @@ has-props -7230 +4351 -shot-Distort3.jpg +shot-Focal.jpg file -2013-06-21T07:08:07.219636Z -53f4dc45d2b53642753d1a1cdbbcc0c6 +2013-06-21T07:08:07.223636Z +68ed835909d9ff8c14416a5dd02a4058 2012-10-11T10:36:05.183822Z 4571 cignoni @@ -432,18 +432,18 @@ has-props -3061 +3239 -shot-Camera_model.png +ff.png file -2013-06-21T07:08:07.219636Z -b311d22b240d3fec290134068da756c6 -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.223636Z +f1e586645e9f349f530b53195ade55b2 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -466,18 +466,18 @@ has-props -37995 +12637 -figure.xar +vcglogo.png file -2013-06-21T07:08:07.223636Z -9b749651b9ae58f90e27427d744c562e -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:07.219636Z +e63e6a66836b1245fe345d3eae494cf4 +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -500,18 +500,18 @@ has-props -4351 +30286 -shot-Projection.png +triord.png file 2013-06-21T07:08:07.223636Z -974711af310c5c9287fb0038c89cd253 -2012-10-11T10:36:05.183822Z -4571 +f5125245bb1a1e01f1912ed462c244de +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -534,5 +534,5 @@ has-props -2964 +2392 diff --git a/inst/include/vcglib/docs/Doxygen/install.dxy b/inst/include/vcglib/docs/Doxygen/install.dxy index dec91bcc..a1831cfb 100644 --- a/inst/include/vcglib/docs/Doxygen/install.dxy +++ b/inst/include/vcglib/docs/Doxygen/install.dxy @@ -3,7 +3,10 @@ Installation and folder structure ================ -VCG Lib uses a SVN repository. To get the right subset of the svn trunk in the devel folder you should issue the following svn command: +VCG Lib uses a SVN repository hosted by sourceforge. +The main project page of the library is http://sourceforge.net/projects/vcg/ + +To get the right subset of the svn trunk in the devel folder you should issue the following svn command: svn checkout svn://svn.code.sf.net/p/vcg/code/trunk/vcglib vcglib @@ -11,7 +14,7 @@ Windows users with tortoisesvn (http://www.tortoisesvn.net) installed should 1. create a folder named vcglib. 2. right-click in the newly created vcglib folder and choose SVN Checkout -3. put in the first parameter: https://svn.code.sf.net/p/vcg/code/trunk/vcglib +3. put in the first parameter: svn://svn.code.sf.net/p/vcg/code/trunk/vcglib 4. press ok and wait, it should start to check out the last revision of the whole tree. Folder Structure @@ -20,11 +23,13 @@ VCG Lib is mostly made of header files (and its core part it's only header files Just download the tarball from here and uncompress it in a folder, e.g. named vcg, inside you compiler "include" directory. Afterwards, you have to just include the file you need. -Inside vcg folder you will find 4 sub-folders: +Inside vcg folder you will find 5 sub-folders: - `vcg`: this is the core of the library, where all the algorithms and data structures are defined. This part is pure, quite heavily templated, C++ code with STL support for common data structures and algorithms. You will not find a single include from here to anything else than standard libraries. Note that core part is made of header files (.h files) only. - `wrap`: here you will find the wrapping of VCG concepts towards specific needs/contexts/libraries. For example you will find all the code to import/export meshes from the hard disk in many formats, or the routines for rendering triangle meshes with OpenGL, supports for common GUI tools like a trackball, and so on.. - `apps`: this folder contains the command line applications developed with the VCG Lib. Many (much more) examples can be found in MeshLab. The apps/simple directory contains a sub-collection of very basic apps. A good starting point for beginners! - `docs`: documentation lives here (including this tutorial) +- `eigenlib` a copy of the latest stable version of the eigen library for linear algebra ( http://http://eigen.tuxfamily.org/ ). VCGlib relies on eigen for all the advanced matrix processing. +You can browse the svn tree on the sourceforge page http://sourceforge.net/p/vcg/code/HEAD/tree/trunk/vcglib/ */ diff --git a/inst/include/vcglib/eigenlib/.svn/entries b/inst/include/vcglib/eigenlib/.svn/entries index 3b9e9397..d1c00fd6 100644 --- a/inst/include/vcglib/eigenlib/.svn/entries +++ b/inst/include/vcglib/eigenlib/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/.svn/entries index d168062e..74ea48ba 100644 --- a/inst/include/vcglib/eigenlib/Eigen/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -LeastSquares +Core file -2013-06-21T07:08:41.535806Z -987b95885498ec70eff400222266a5cd +2013-06-21T07:08:41.531806Z +441c9278fb9256a43e60f7e51d7f187e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -712 +12199 -StdVector +Geometry file -2013-06-21T07:08:41.535806Z -7b21216e9765b2377f896e03125cb770 +2013-06-21T07:08:41.531806Z +487e560825b2f7ea00b15f39a2249717 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -755 +1605 -CMakeLists.txt +SVD file -2013-06-21T07:08:41.535806Z -8356f203720db32a51ace30ea0c5222a -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.531806Z +e7d000f56e20c39db2371e8f541548a9 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -126,16 +126,16 @@ has-props -607 +858 -StdDeque +SuperLUSupport file -2013-06-21T07:08:41.535806Z -a7fc70b0b4bdaae815e1cc3ab2ed397f +2013-06-21T07:08:41.531806Z +a3290fa13f66c58f9c4306172efb9c9b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,18 +160,18 @@ has-props -749 +1904 -Array +Sparse file -2013-06-21T07:08:41.535806Z -fa5316eb01fca98c95b06f387528371c -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.531806Z +e1567d379ec542a0cdb1b2bfa0d2c310 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -194,16 +194,16 @@ has-props -304 +449 -LU +OrderingMethods file -2013-06-21T07:08:41.527806Z -a5cc6bd7d4224de467d608d8089cf654 +2013-06-21T07:08:41.531806Z +bdabf44d15eb731f0f632b543a5fd585 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,18 +228,18 @@ has-props -983 +500 -Cholesky +Dense file -2013-06-21T07:08:41.527806Z -cab478a04db5276e45971c6a605db842 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.531806Z +d83e7f96733d79a7a1a38630c4287e85 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -262,16 +262,16 @@ has-props -775 +122 -Householder +PardisoSupport file -2013-06-21T07:08:41.527806Z -0e1a42f1f2babc77852672cd6624f270 +2013-06-21T07:08:41.531806Z +9a31cf511f6c6943b078ee70e0b47a68 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +296,16 @@ has-props -580 +864 -QR +SparseCholesky file -2013-06-21T07:08:41.527806Z -cea968edf0dd761028216cdd23b0f5e8 +2013-06-21T07:08:41.531806Z +8801a8f66e72643e191b9d41a56af224 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,18 +330,18 @@ has-props -926 +872 -CholmodSupport +QtAlignedMalloc file -2013-06-21T07:08:41.527806Z -4e24337b58c851f124e313d3383c8c72 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.531806Z +2a9d42bb6b8417d78354a261b9fba46d +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -364,16 +364,16 @@ has-props -1696 +637 -UmfPackSupport +PaStiXSupport file -2013-06-21T07:08:41.527806Z -699921c9285ce7a774f570ae78939c19 +2013-06-21T07:08:41.531806Z +3d816111cd741761cd0327e110dfc228 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +398,16 @@ has-props -1177 +1467 -StdList +IterativeLinearSolvers file -2013-06-21T07:08:41.527806Z -14b24bb8d1a65ab65f32ac09ddb5c32f +2013-06-21T07:08:41.531806Z +ceb2f24ad7ade75204f671fab2dd2809 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,16 +432,16 @@ has-props -682 +1617 -Jacobi +SparseCore file 2013-06-21T07:08:41.531806Z -924f127376e826e39c3dec5a30edbbf9 +2884d0272700d7e0cd8c6238904222e1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -466,18 +466,18 @@ has-props -645 +1940 -Eigen +Eigen2Support file -2013-06-21T07:08:41.527806Z -434431e5a962b9e2e7f785b36fbcbd27 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.531806Z +d4c4328a53193013b8abbe8e32b38e43 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -500,19 +500,16 @@ has-props -37 - -src -dir +2686 -Core +Eigenvalues file 2013-06-21T07:08:41.531806Z -441c9278fb9256a43e60f7e51d7f187e +bdfff180c7b7ad5240099e39b17ce7d0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -537,16 +534,16 @@ has-props -12199 +1306 -Geometry +LeastSquares file -2013-06-21T07:08:41.531806Z -487e560825b2f7ea00b15f39a2249717 +2013-06-21T07:08:41.535806Z +987b95885498ec70eff400222266a5cd 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -571,18 +568,18 @@ has-props -1605 +712 -SVD +CMakeLists.txt file -2013-06-21T07:08:41.531806Z -e7d000f56e20c39db2371e8f541548a9 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.535806Z +8356f203720db32a51ace30ea0c5222a +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -605,16 +602,16 @@ has-props -858 +607 -SuperLUSupport +StdVector file -2013-06-21T07:08:41.531806Z -a3290fa13f66c58f9c4306172efb9c9b +2013-06-21T07:08:41.535806Z +7b21216e9765b2377f896e03125cb770 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -639,18 +636,18 @@ has-props -1904 +755 -Sparse +Array file -2013-06-21T07:08:41.531806Z -e1567d379ec542a0cdb1b2bfa0d2c310 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.535806Z +fa5316eb01fca98c95b06f387528371c +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -673,16 +670,16 @@ has-props -449 +304 -OrderingMethods +StdDeque file -2013-06-21T07:08:41.531806Z -bdabf44d15eb731f0f632b543a5fd585 +2013-06-21T07:08:41.535806Z +a7fc70b0b4bdaae815e1cc3ab2ed397f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -707,18 +704,18 @@ has-props -500 +749 -Dense +LU file -2013-06-21T07:08:41.531806Z -d83e7f96733d79a7a1a38630c4287e85 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.527806Z +a5cc6bd7d4224de467d608d8089cf654 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -741,16 +738,16 @@ has-props -122 +983 -PardisoSupport +Householder file -2013-06-21T07:08:41.531806Z -9a31cf511f6c6943b078ee70e0b47a68 +2013-06-21T07:08:41.527806Z +0e1a42f1f2babc77852672cd6624f270 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -775,16 +772,16 @@ has-props -864 +580 -SparseCholesky +Cholesky file -2013-06-21T07:08:41.531806Z -8801a8f66e72643e191b9d41a56af224 +2013-06-21T07:08:41.527806Z +cab478a04db5276e45971c6a605db842 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -809,18 +806,18 @@ has-props -872 +775 -QtAlignedMalloc +CholmodSupport file -2013-06-21T07:08:41.531806Z -2a9d42bb6b8417d78354a261b9fba46d -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.527806Z +4e24337b58c851f124e313d3383c8c72 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -843,16 +840,16 @@ has-props -637 +1696 -PaStiXSupport +QR file -2013-06-21T07:08:41.531806Z -3d816111cd741761cd0327e110dfc228 +2013-06-21T07:08:41.527806Z +cea968edf0dd761028216cdd23b0f5e8 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -877,16 +874,16 @@ has-props -1467 +926 -IterativeLinearSolvers +UmfPackSupport file -2013-06-21T07:08:41.531806Z -ceb2f24ad7ade75204f671fab2dd2809 +2013-06-21T07:08:41.527806Z +699921c9285ce7a774f570ae78939c19 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -911,16 +908,16 @@ has-props -1617 +1177 -SparseCore +StdList file -2013-06-21T07:08:41.531806Z -2884d0272700d7e0cd8c6238904222e1 +2013-06-21T07:08:41.527806Z +14b24bb8d1a65ab65f32ac09ddb5c32f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -945,18 +942,21 @@ has-props -1940 +682 -Eigen2Support +src +dir + +Eigen file -2013-06-21T07:08:41.531806Z -d4c4328a53193013b8abbe8e32b38e43 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.527806Z +434431e5a962b9e2e7f785b36fbcbd27 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -979,16 +979,16 @@ has-props -2686 +37 -Eigenvalues +Jacobi file 2013-06-21T07:08:41.531806Z -bdfff180c7b7ad5240099e39b17ce7d0 +924f127376e826e39c3dec5a30edbbf9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1013,5 +1013,5 @@ has-props -1306 +645 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/.svn/entries index 72ada82a..9c82700e 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src svn://svn.code.sf.net/p/vcg/code @@ -26,45 +26,51 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -misc +Jacobi +dir + +Core dir Geometry dir -SuperLUSupport +misc dir SVD dir -OrderingMethods +SuperLUSupport dir Sparse dir -PardisoSupport +OrderingMethods dir -SparseCholesky +PardisoSupport dir StlSupport dir -PaStiXSupport +SparseCholesky dir IterativeLinearSolvers dir -Eigen2Support +PaStiXSupport dir SparseCore dir +Eigen2Support +dir + Eigenvalues dir @@ -123,9 +129,3 @@ dir UmfPackSupport dir -Jacobi -dir - -Core -dir - diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Cholesky/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Cholesky/.svn/entries index 40312139..176c8c9c 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Cholesky/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Cholesky/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Cholesky svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/CholmodSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/CholmodSupport/.svn/entries index 0742e2a9..7def16ea 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/CholmodSupport/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/CholmodSupport/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/CholmodSupport svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/.svn/entries index 46fb2bd0..fd64c31b 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -VectorwiseOp.h +PermutationMatrix.h file -2013-06-21T07:08:32.639762Z -a11cab920bb89acbb7fead4611870295 +2013-06-21T07:08:32.627762Z +87c3f8d6d8de2b710f2963e901d82b31 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -24824 +23841 -DenseBase.h +DiagonalMatrix.h file -2013-06-21T07:08:32.639762Z -d607f4f9afb512a42c4a3e16be3a3821 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.627762Z +a89ef32b9c37c332169c3c5de12e7621 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -92,18 +92,18 @@ has-props -23660 +11366 -Stride.h +StableNorm.h file -2013-06-21T07:08:32.639762Z -ce6a2b32531f88448dff0cb2d47c0e7d -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.627762Z +8d3248372c871fee3e3c78842e9a0850 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -126,16 +126,16 @@ has-props -3620 +6238 -SelfAdjointView.h +IO.h file -2013-06-21T07:08:32.639762Z -d98fa4497657aae306d56eb5203d9cf7 +2013-06-21T07:08:32.627762Z +5aa0cbdeeb9abbd4e8cd8d5831f50193 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,18 +160,18 @@ has-props -11510 +7523 -MatrixBase.h +Map.h file -2013-06-21T07:08:32.639762Z -275760eeba960ed03649fb4374f37e1a -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.631762Z +87ade0ef792240f927852ad7cadbc89b +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -194,16 +194,16 @@ has-props -22569 +8091 -Transpositions.h +Product.h file -2013-06-21T07:08:32.643762Z -975dfb0b55a71265c50b5775dd4c241c +2013-06-21T07:08:32.631762Z +1ad45c0afe96c427e10c7ca84ba2a4af 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +228,16 @@ has-props -15331 +3758 -NestByValue.h +CwiseNullaryOp.h file -2013-06-21T07:08:32.643762Z -fd4b5acc96fba4a2fe9db88caad9a3f7 +2013-06-21T07:08:32.631762Z +9bac5e85dcb7bfd3015756f9cd86bf6c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,18 +262,18 @@ has-props -3211 +29228 -Functors.h +MathFunctions.h file -2013-06-21T07:08:32.643762Z -9c04fe18787d99d0771762b3169cd489 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.635762Z +78f6aea2d3e1a2874c63411830dc01ea +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -296,16 +296,16 @@ has-props -36372 +24671 -ReturnByValue.h +DenseStorage.h file -2013-06-21T07:08:32.643762Z -14eaea14b369a4fe9abd6da8fb273dff +2013-06-21T07:08:32.635762Z +b6129541a313a5a1de459969de903ee1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -3158 +13407 -MapBase.h +Redux.h file -2013-06-21T07:08:32.643762Z -e9b634f15d4fc7fa92e3f60b40fba29c +2013-06-21T07:08:32.635762Z +cbc7bdb2d9a119071ff938453748c91c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,16 +364,16 @@ has-props -8156 +13968 -Replicate.h +Assign_MKL.h file -2013-06-21T07:08:32.643762Z -7ab66e44a14765478f2667f5ff03959b +2013-06-21T07:08:32.639762Z +d967574a5cfced88f97c5c9db5019898 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +398,16 @@ has-props -6967 +11282 -ProductBase.h +CwiseUnaryOp.h file -2013-06-21T07:08:32.643762Z -26e89fd7434018579d5f2b94f5a1cef5 +2013-06-21T07:08:32.639762Z +0519135fb76561894bd6ac135a91dd4d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,16 +432,16 @@ has-props -10489 +4705 -VectorBlock.h +DenseBase.h file -2013-06-21T07:08:32.643762Z -233c51e4e7deca76a23c9b746b35dfaf +2013-06-21T07:08:32.639762Z +d607f4f9afb512a42c4a3e16be3a3821 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -466,19 +466,16 @@ has-props -9638 - -products -dir +23660 -Array.h +SelfAdjointView.h file -2013-06-21T07:08:32.647762Z -90ad1c46199ee95a81e8645fcfb35992 +2013-06-21T07:08:32.639762Z +d98fa4497657aae306d56eb5203d9cf7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -503,16 +500,16 @@ has-props -11613 +11510 -GenericPacketMath.h +NestByValue.h file -2013-06-21T07:08:32.647762Z -90d46fb05b82d3a0252dea1bc7b572ed +2013-06-21T07:08:32.643762Z +fd4b5acc96fba4a2fe9db88caad9a3f7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -537,16 +534,16 @@ has-props -11300 +3211 -DiagonalProduct.h +ReturnByValue.h file -2013-06-21T07:08:32.647762Z -28cec217ada5069565486d4522a237db +2013-06-21T07:08:32.643762Z +14eaea14b369a4fe9abd6da8fb273dff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -571,16 +568,16 @@ has-props -5387 +3158 -DenseCoeffsBase.h +Replicate.h file -2013-06-21T07:08:32.647762Z -38621510e6bcb803660672e663b79fc2 +2013-06-21T07:08:32.643762Z +7ab66e44a14765478f2667f5ff03959b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -605,16 +602,16 @@ has-props -27623 +6967 -SolveTriangular.h +MapBase.h file -2013-06-21T07:08:32.647762Z -86772a7a09b6e5737c62f2ec036fe145 +2013-06-21T07:08:32.643762Z +e9b634f15d4fc7fa92e3f60b40fba29c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -639,16 +636,16 @@ has-props -10229 +8156 -NumTraits.h +Swap.h file -2013-06-21T07:08:32.651762Z -de50a3c8247c282bea2618dfd5ba9863 +2013-06-21T07:08:32.643762Z +0ffd749278fa6a1010caaeb9a27ba86a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -673,16 +670,16 @@ has-props -6177 +4326 -NoAlias.h +ProductBase.h file -2013-06-21T07:08:32.651762Z -d1b0cf6f0af1ad2519c05de472e00cfd +2013-06-21T07:08:32.643762Z +26e89fd7434018579d5f2b94f5a1cef5 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -707,16 +704,16 @@ has-props -5128 +10489 -Flagged.h +VectorBlock.h file -2013-06-21T07:08:32.623762Z -51c5bb653576b4a179710b4dc6d53423 +2013-06-21T07:08:32.643762Z +233c51e4e7deca76a23c9b746b35dfaf 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -741,16 +738,16 @@ has-props -4199 +9638 -BandMatrix.h +GeneralProduct.h file -2013-06-21T07:08:32.627762Z -ba6d139a70d94d92f8686ea213608cfb +2013-06-21T07:08:32.647762Z +12b7110a96a06e476c86196e716ec487 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -775,18 +772,18 @@ has-props -13049 +27005 -DiagonalMatrix.h +Array.h file -2013-06-21T07:08:32.627762Z -a89ef32b9c37c332169c3c5de12e7621 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.647762Z +90ad1c46199ee95a81e8645fcfb35992 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -809,18 +806,18 @@ has-props -11366 +11613 -StableNorm.h +GenericPacketMath.h file -2013-06-21T07:08:32.627762Z -8d3248372c871fee3e3c78842e9a0850 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.647762Z +90d46fb05b82d3a0252dea1bc7b572ed +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -843,16 +840,16 @@ has-props -6238 +11300 -IO.h +Select.h file -2013-06-21T07:08:32.627762Z -5aa0cbdeeb9abbd4e8cd8d5831f50193 +2013-06-21T07:08:32.647762Z +2793c6b7a5ed2700a0afe8ddf08226a6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -877,16 +874,16 @@ has-props -7523 +6073 -ArrayBase.h +DiagonalProduct.h file -2013-06-21T07:08:32.631762Z -c75ec7425327feb064640f5acc1e8163 +2013-06-21T07:08:32.647762Z +28cec217ada5069565486d4522a237db 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -911,16 +908,16 @@ has-props -8497 +5387 -Reverse.h +DenseCoeffsBase.h file -2013-06-21T07:08:32.631762Z -395a13564d5f6e9179a8d5815f9f69ff +2013-06-21T07:08:32.647762Z +38621510e6bcb803660672e663b79fc2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -945,16 +942,16 @@ has-props -7795 +27623 -CwiseBinaryOp.h +SolveTriangular.h file -2013-06-21T07:08:32.631762Z -a0c5304488d2631eafb6b2a113259a53 +2013-06-21T07:08:32.647762Z +86772a7a09b6e5737c62f2ec036fe145 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -979,17 +976,17 @@ has-props -9831 +10229 -CwiseNullaryOp.h +CwiseUnaryView.h file -2013-06-21T07:08:32.631762Z -9bac5e85dcb7bfd3015756f9cd86bf6c -2012-10-05T07:27:34.803522Z +2013-06-21T07:08:32.647762Z +8111736861bb1a88e1510771ab1c1867 +2012-10-05T07:27:34.803522Z 4539 cignoni has-props @@ -1013,16 +1010,16 @@ has-props -29228 +5102 -EigenBase.h +NumTraits.h file -2013-06-21T07:08:32.635762Z -35761152c8c49a74dfe53389e4ff34d7 +2013-06-21T07:08:32.651762Z +de50a3c8247c282bea2618dfd5ba9863 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1047,16 +1044,16 @@ has-props -5659 +6177 -DenseStorage.h +NoAlias.h file -2013-06-21T07:08:32.635762Z -b6129541a313a5a1de459969de903ee1 +2013-06-21T07:08:32.651762Z +d1b0cf6f0af1ad2519c05de472e00cfd 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1081,16 +1078,19 @@ has-props -13407 +5128 -PlainObjectBase.h +util +dir + +Flagged.h file -2013-06-21T07:08:32.635762Z -f302498950da9575afe4e7b4ff825eae +2013-06-21T07:08:32.623762Z +51c5bb653576b4a179710b4dc6d53423 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1115,18 +1115,18 @@ has-props -33745 +4199 -Dot.h +TriangularMatrix.h file -2013-06-21T07:08:32.635762Z -e1be0965f84db120861eb1e20a92774a -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.627762Z +12dd2e6f2ac801aeb021c40ee0516e12 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -1149,18 +1149,18 @@ has-props -9390 +29906 -Fuzzy.h +CommaInitializer.h file -2013-06-21T07:08:32.639762Z -2d21a8e62ac10c8530bbc431d8ae470f -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.627762Z +aab3dbaf965cd7413cb9c7c3e01f55c2 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -1183,16 +1183,16 @@ has-props -5509 +4779 -Assign_MKL.h +Matrix.h file -2013-06-21T07:08:32.639762Z -d967574a5cfced88f97c5c9db5019898 +2013-06-21T07:08:32.627762Z +b26fa0e9ee2a4d9fc1a7c99ec825f9d4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1217,16 +1217,16 @@ has-props -11282 +17030 -CwiseUnaryOp.h +ForceAlignedAccess.h file -2013-06-21T07:08:32.639762Z -0519135fb76561894bd6ac135a91dd4d +2013-06-21T07:08:32.627762Z +111ea74b2d24c6052f9312029747d569 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1251,16 +1251,16 @@ has-props -4705 +4460 -Block.h +ArrayBase.h file -2013-06-21T07:08:32.639762Z -ba1e11d992b3d69f7113303a4914e950 +2013-06-21T07:08:32.631762Z +c75ec7425327feb064640f5acc1e8163 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1285,16 +1285,16 @@ has-props -14169 +8497 -Visitor.h +Reverse.h file -2013-06-21T07:08:32.643762Z -8baaf9f57bd8211cd18f6b74d3a42671 +2013-06-21T07:08:32.631762Z +395a13564d5f6e9179a8d5815f9f69ff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1319,16 +1319,16 @@ has-props -6834 +7795 -Swap.h +Diagonal.h file -2013-06-21T07:08:32.643762Z -0ffd749278fa6a1010caaeb9a27ba86a +2013-06-21T07:08:32.631762Z +537f7ea841770cb9818c110d2d9cef47 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1353,16 +1353,16 @@ has-props -4326 +8995 -Transpose.h +CwiseBinaryOp.h file -2013-06-21T07:08:32.647762Z -05af8c5427afacaa47265b7be14b867c +2013-06-21T07:08:32.631762Z +a0c5304488d2631eafb6b2a113259a53 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1387,18 +1387,18 @@ has-props -14430 +9831 -GeneralProduct.h +ArrayWrapper.h file -2013-06-21T07:08:32.647762Z -12b7110a96a06e476c86196e716ec487 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.631762Z +1ac230d4cb5ee8e36ae2ccc23c56f757 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -1421,16 +1421,16 @@ has-props -27005 +7905 -Select.h +Random.h file -2013-06-21T07:08:32.647762Z -2793c6b7a5ed2700a0afe8ddf08226a6 +2013-06-21T07:08:32.631762Z +0f1b31343cc0b429204869647ac4905a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1455,16 +1455,16 @@ has-props -6073 +5396 -CwiseUnaryView.h +EigenBase.h file -2013-06-21T07:08:32.647762Z -8111736861bb1a88e1510771ab1c1867 +2013-06-21T07:08:32.635762Z +35761152c8c49a74dfe53389e4ff34d7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1489,19 +1489,16 @@ has-props -5102 - -util -dir +5659 -SelfCwiseBinaryOp.h +Assign.h file -2013-06-21T07:08:32.651762Z -5b24aac48c52749578a9fed263139b02 +2013-06-21T07:08:32.635762Z +482fe85673d7f948e8a43955f2341016 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1526,16 +1523,16 @@ has-props -7147 +22859 -GlobalFunctions.h +PlainObjectBase.h file -2013-06-21T07:08:32.623762Z -1679ebe7251cafe4c75fcacfe7e9e18f +2013-06-21T07:08:32.635762Z +f302498950da9575afe4e7b4ff825eae 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1560,16 +1557,16 @@ has-props -4204 +33745 -PermutationMatrix.h +Dot.h file -2013-06-21T07:08:32.627762Z -87c3f8d6d8de2b710f2963e901d82b31 +2013-06-21T07:08:32.635762Z +e1be0965f84db120861eb1e20a92774a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1594,18 +1591,21 @@ has-props -23841 +9390 -TriangularMatrix.h +arch +dir + +BooleanRedux.h file -2013-06-21T07:08:32.627762Z -12dd2e6f2ac801aeb021c40ee0516e12 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.635762Z +b404bc5f1787969ef5d5b8b1b63fe0d0 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1628,18 +1628,18 @@ has-props -29906 +3519 -CommaInitializer.h +CMakeLists.txt file -2013-06-21T07:08:32.627762Z -aab3dbaf965cd7413cb9c7c3e01f55c2 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.635762Z +099895d1839148dc196c4caea197a70e +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -1662,16 +1662,16 @@ has-props -4779 +215 -ForceAlignedAccess.h +Fuzzy.h file -2013-06-21T07:08:32.627762Z -111ea74b2d24c6052f9312029747d569 +2013-06-21T07:08:32.639762Z +2d21a8e62ac10c8530bbc431d8ae470f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1696,16 +1696,16 @@ has-props -4460 +5509 -Matrix.h +VectorwiseOp.h file -2013-06-21T07:08:32.627762Z -b26fa0e9ee2a4d9fc1a7c99ec825f9d4 +2013-06-21T07:08:32.639762Z +a11cab920bb89acbb7fead4611870295 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1730,16 +1730,16 @@ has-props -17030 +24824 -Map.h +Block.h file -2013-06-21T07:08:32.631762Z -87ade0ef792240f927852ad7cadbc89b +2013-06-21T07:08:32.639762Z +ba1e11d992b3d69f7113303a4914e950 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1764,16 +1764,16 @@ has-props -8091 +14169 -Diagonal.h +Stride.h file -2013-06-21T07:08:32.631762Z -537f7ea841770cb9818c110d2d9cef47 +2013-06-21T07:08:32.639762Z +ce6a2b32531f88448dff0cb2d47c0e7d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1798,18 +1798,18 @@ has-props -8995 +3620 -ArrayWrapper.h +Visitor.h file -2013-06-21T07:08:32.631762Z -1ac230d4cb5ee8e36ae2ccc23c56f757 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.643762Z +8baaf9f57bd8211cd18f6b74d3a42671 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1832,16 +1832,16 @@ has-props -7905 +6834 -Random.h +Transpositions.h file -2013-06-21T07:08:32.631762Z -0f1b31343cc0b429204869647ac4905a +2013-06-21T07:08:32.643762Z +975dfb0b55a71265c50b5775dd4c241c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1866,18 +1866,18 @@ has-props -5396 +15331 -Product.h +MatrixBase.h file -2013-06-21T07:08:32.631762Z -1ad45c0afe96c427e10c7ca84ba2a4af -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.639762Z +275760eeba960ed03649fb4374f37e1a +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -1900,18 +1900,18 @@ has-props -3758 +22569 -MathFunctions.h +Functors.h file -2013-06-21T07:08:32.635762Z -78f6aea2d3e1a2874c63411830dc01ea -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.643762Z +9c04fe18787d99d0771762b3169cd489 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -1934,16 +1934,19 @@ has-props -24671 +36372 -Assign.h +products +dir + +Transpose.h file -2013-06-21T07:08:32.635762Z -482fe85673d7f948e8a43955f2341016 +2013-06-21T07:08:32.647762Z +05af8c5427afacaa47265b7be14b867c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1968,18 +1971,18 @@ has-props -22859 +14430 -CMakeLists.txt +SelfCwiseBinaryOp.h file -2013-06-21T07:08:32.635762Z -099895d1839148dc196c4caea197a70e -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:32.651762Z +5b24aac48c52749578a9fed263139b02 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -2002,16 +2005,16 @@ has-props -215 +7147 -BooleanRedux.h +GlobalFunctions.h file -2013-06-21T07:08:32.635762Z -b404bc5f1787969ef5d5b8b1b63fe0d0 +2013-06-21T07:08:32.623762Z +1679ebe7251cafe4c75fcacfe7e9e18f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -2036,19 +2039,16 @@ has-props -3519 - -arch -dir +4204 -Redux.h +BandMatrix.h file -2013-06-21T07:08:32.635762Z -cbc7bdb2d9a119071ff938453748c91c +2013-06-21T07:08:32.627762Z +ba6d139a70d94d92f8686ea213608cfb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -2073,5 +2073,5 @@ has-props -13968 +13049 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/.svn/entries index b2f3be64..8de34037 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/arch svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,12 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +AltiVec +dir + +SSE +dir + CMakeLists.txt file @@ -66,9 +72,3 @@ dir Default dir -AltiVec -dir - -SSE -dir - diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/AltiVec/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/AltiVec/.svn/entries index 2fa17a44..2b4b6c70 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/AltiVec/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/AltiVec/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/arch/AltiVec svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/Default/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/Default/.svn/entries index ccb201fd..f1371dd1 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/Default/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/Default/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/arch/Default svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/NEON/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/NEON/.svn/entries index a49dc1ca..35562848 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/NEON/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/NEON/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/arch/NEON svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/SSE/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/SSE/.svn/entries index 49b22ab5..7ae0e022 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/SSE/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/arch/SSE/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/arch/SSE svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/products/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/products/.svn/entries index 548568c1..f680f053 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/products/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/products/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/products svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -TriangularMatrixVector.h +GeneralBlockPanelKernel.h file -2013-06-21T07:08:30.859753Z -0ab4ef300a2c636bc3023553573e0ed3 +2013-06-21T07:08:30.855753Z +15954fbeae387f2dbb26b28035da8309 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -14083 +45030 -GeneralMatrixMatrixTriangular.h +SelfadjointMatrixVector.h file 2013-06-21T07:08:30.859753Z -a455b6c4e2a3bb19e64dbbe780263d48 +4bd1d2900a19275f31e9d7785a89cc30 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -10367 +10426 -TriangularMatrixMatrix.h +SelfadjointMatrixMatrix.h file 2013-06-21T07:08:30.859753Z -53dbf059d962fa83f7af5a6c75a64896 +82b33fabe2e29d187eaf82304c1ec9ee 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -17048 +14668 -CoeffBasedProduct.h +SelfadjointMatrixVector_MKL.h file 2013-06-21T07:08:30.859753Z -095c6f13c0889be5d160bc4e8d3af9ad +892fc0da96ecbe146325e2d705f5104c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,18 +160,18 @@ has-props -18474 +5062 -TriangularMatrixVector_MKL.h +SelfadjointMatrixMatrix_MKL.h file 2013-06-21T07:08:30.859753Z -8b0d93528c7bc2ec4afea6433f1161ea -2013-02-27T21:07:14.867394Z -4823 +2bdcb1ad1fa18218748bc05009f8a79d +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -194,16 +194,16 @@ has-props -9887 +10419 -GeneralMatrixMatrixTriangular_MKL.h +GeneralMatrixMatrixTriangular.h file -2013-06-21T07:08:30.863753Z -41f9a143ca46f157ee71c2035817ad36 +2013-06-21T07:08:30.859753Z +a455b6c4e2a3bb19e64dbbe780263d48 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,18 +228,18 @@ has-props -6537 +10367 -TriangularMatrixMatrix_MKL.h +TriangularMatrixVector.h file -2013-06-21T07:08:30.863753Z -11b00717714c8c071927f8de83db6c27 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:30.859753Z +0ab4ef300a2c636bc3023553573e0ed3 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -262,18 +262,18 @@ has-props -13025 +14083 -GeneralMatrixVector.h +CoeffBasedProduct.h file -2013-06-21T07:08:30.863753Z -8e3c189a625544ba73f9dcc2a0d78ee6 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:30.859753Z +095c6f13c0889be5d160bc4e8d3af9ad +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -296,16 +296,16 @@ has-props -22147 +18474 -Parallelizer.h +TriangularMatrixMatrix.h file -2013-06-21T07:08:30.863753Z -232c1391681fdead8643f048beb0f3a7 +2013-06-21T07:08:30.859753Z +53dbf059d962fa83f7af5a6c75a64896 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -4137 +17048 -TriangularSolverVector.h +GeneralMatrixMatrixTriangular_MKL.h file 2013-06-21T07:08:30.863753Z -cff686d97576a6c53728b2a28e92ab55 +41f9a143ca46f157ee71c2035817ad36 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,18 +364,18 @@ has-props -5380 +6537 -GeneralMatrixMatrix.h +TriangularMatrixVector_MKL.h file -2013-06-21T07:08:30.863753Z -7b8e76dadb260d340a1ce3492e7b9687 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:30.859753Z +8b0d93528c7bc2ec4afea6433f1161ea +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -398,18 +398,18 @@ has-props -16084 +9887 -CMakeLists.txt +GeneralMatrixVector.h file 2013-06-21T07:08:30.863753Z -e91ebbb6023c74df6d3042f9eb133978 -2011-10-05T15:04:40.740408Z -4180 +8e3c189a625544ba73f9dcc2a0d78ee6 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -432,18 +432,18 @@ has-props -166 +22147 -GeneralMatrixVector_MKL.h +TriangularMatrixMatrix_MKL.h file 2013-06-21T07:08:30.863753Z -f820242e95fdfa01bd52ebd4aa7e32e9 -2012-10-05T07:27:34.803522Z -4539 +11b00717714c8c071927f8de83db6c27 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -466,16 +466,16 @@ has-props -5701 +13025 -TriangularSolverMatrix.h +TriangularSolverVector.h file 2013-06-21T07:08:30.863753Z -346c8c57ddb5b3b7108d250786bb49bc +cff686d97576a6c53728b2a28e92ab55 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -500,16 +500,16 @@ has-props -13191 +5380 -GeneralMatrixMatrix_MKL.h +Parallelizer.h file -2013-06-21T07:08:30.855753Z -615326b097524ba7056428ca0d5dcbd5 +2013-06-21T07:08:30.863753Z +232c1391681fdead8643f048beb0f3a7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -534,18 +534,18 @@ has-props -4652 +4137 -TriangularSolverMatrix_MKL.h +CMakeLists.txt file -2013-06-21T07:08:30.855753Z -844610dc286c1c9546fe4413c7d04291 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:30.863753Z +e91ebbb6023c74df6d3042f9eb133978 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -568,16 +568,16 @@ has-props -5877 +166 -SelfadjointProduct.h +GeneralMatrixMatrix.h file -2013-06-21T07:08:30.855753Z -41d52b3cd6e8cbb035b98021178a1ff0 +2013-06-21T07:08:30.863753Z +7b8e76dadb260d340a1ce3492e7b9687 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -602,16 +602,16 @@ has-props -5863 +16084 -SelfadjointRank2Update.h +TriangularSolverMatrix.h file -2013-06-21T07:08:30.855753Z -73c174248ab4f9aba6262d5e604c75b4 +2013-06-21T07:08:30.863753Z +346c8c57ddb5b3b7108d250786bb49bc 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -636,16 +636,16 @@ has-props -3950 +13191 -GeneralBlockPanelKernel.h +GeneralMatrixVector_MKL.h file -2013-06-21T07:08:30.855753Z -15954fbeae387f2dbb26b28035da8309 +2013-06-21T07:08:30.863753Z +f820242e95fdfa01bd52ebd4aa7e32e9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -670,16 +670,16 @@ has-props -45030 +5701 -SelfadjointMatrixVector.h +GeneralMatrixMatrix_MKL.h file -2013-06-21T07:08:30.859753Z -4bd1d2900a19275f31e9d7785a89cc30 +2013-06-21T07:08:30.855753Z +615326b097524ba7056428ca0d5dcbd5 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -704,16 +704,16 @@ has-props -10426 +4652 -SelfadjointMatrixMatrix.h +TriangularSolverMatrix_MKL.h file -2013-06-21T07:08:30.859753Z -82b33fabe2e29d187eaf82304c1ec9ee +2013-06-21T07:08:30.855753Z +844610dc286c1c9546fe4413c7d04291 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -738,16 +738,16 @@ has-props -14668 +5877 -SelfadjointMatrixVector_MKL.h +SelfadjointProduct.h file -2013-06-21T07:08:30.859753Z -892fc0da96ecbe146325e2d705f5104c +2013-06-21T07:08:30.855753Z +41d52b3cd6e8cbb035b98021178a1ff0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -772,16 +772,16 @@ has-props -5062 +5863 -SelfadjointMatrixMatrix_MKL.h +SelfadjointRank2Update.h file -2013-06-21T07:08:30.859753Z -2bdcb1ad1fa18218748bc05009f8a79d +2013-06-21T07:08:30.855753Z +73c174248ab4f9aba6262d5e604c75b4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -806,5 +806,5 @@ has-props -10419 +3950 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/util/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/util/.svn/entries index 9dba781b..dd46ec24 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Core/util/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Core/util/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/util svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Macros.h +BlasUtil.h file 2013-06-21T07:08:32.619762Z -ced0ddb886a820afc0ba7884e6b6a90c -2013-02-27T21:07:14.867394Z -4823 +67643926f9a4ff6b1897f62deb6a5b92 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -58,16 +58,16 @@ has-props -16969 +10157 -DisableStupidWarnings.h +MKL_support.h file -2013-06-21T07:08:32.623762Z -6e693a3812ad0e47d1c38666ecc8094b +2013-06-21T07:08:32.619762Z +7e11f8d538ce6cd16a6a7a6c745fc2eb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -2089 +3733 -NonMPL2.h +ReenableStupidWarnings.h file -2013-06-21T07:08:32.623762Z -c4ca2e16c302c71df98732240109e7e0 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.619762Z +e0abd50c752bd47acdcebe62b325fcab +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -126,18 +126,18 @@ has-props -85 +325 -Meta.h +Macros.h file -2013-06-21T07:08:32.623762Z -83daf5b96c24b8162581accd796d2166 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.619762Z +ced0ddb886a820afc0ba7884e6b6a90c +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -160,18 +160,18 @@ has-props -9718 +16969 -CMakeLists.txt +DisableStupidWarnings.h file 2013-06-21T07:08:32.623762Z -9cc3f7fa207b677c45f30be2628adb4a -2011-10-05T15:04:40.740408Z -4180 +6e693a3812ad0e47d1c38666ecc8094b +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -194,18 +194,18 @@ has-props -157 +2089 -Memory.h +NonMPL2.h file 2013-06-21T07:08:32.623762Z -ed6341d5e65761a6dfacd9ecc24b19a1 -2013-02-27T21:07:14.867394Z -4823 +c4ca2e16c302c71df98732240109e7e0 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -228,16 +228,16 @@ has-props -36469 +85 -StaticAssert.h +Meta.h file -2013-06-21T07:08:32.619762Z -437be1565a772d4585e17cdab102dca9 +2013-06-21T07:08:32.623762Z +83daf5b96c24b8162581accd796d2166 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,18 +262,18 @@ has-props -9190 +9718 -XprHelper.h +CMakeLists.txt file -2013-06-21T07:08:32.619762Z -f9291d1f0ae551bbe27bb79bfaccd8ef -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.623762Z +9cc3f7fa207b677c45f30be2628adb4a +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -296,18 +296,18 @@ has-props -16554 +157 -Constants.h +Memory.h file -2013-06-21T07:08:32.619762Z -2f4366a1704d786dfec33e4eeadc9df2 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.623762Z +ed6341d5e65761a6dfacd9ecc24b19a1 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -330,16 +330,16 @@ has-props -16782 +36469 -ForwardDeclarations.h +StaticAssert.h file 2013-06-21T07:08:32.619762Z -7b34de7f1fcf13200c2a991dd2d834ff +437be1565a772d4585e17cdab102dca9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,18 +364,18 @@ has-props -13636 +9190 -BlasUtil.h +XprHelper.h file 2013-06-21T07:08:32.619762Z -67643926f9a4ff6b1897f62deb6a5b92 -2012-10-05T07:27:34.803522Z -4539 +f9291d1f0ae551bbe27bb79bfaccd8ef +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -398,16 +398,16 @@ has-props -10157 +16554 -MKL_support.h +Constants.h file 2013-06-21T07:08:32.619762Z -7e11f8d538ce6cd16a6a7a6c745fc2eb +2f4366a1704d786dfec33e4eeadc9df2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,18 +432,18 @@ has-props -3733 +16782 -ReenableStupidWarnings.h +ForwardDeclarations.h file 2013-06-21T07:08:32.619762Z -e0abd50c752bd47acdcebe62b325fcab -2011-10-05T15:04:40.740408Z -4180 +7b34de7f1fcf13200c2a991dd2d834ff +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -466,5 +466,5 @@ has-props -325 +13636 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/.svn/entries index ac1c6172..9c45b4e6 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Eigen2Support svn://svn.code.sf.net/p/vcg/code @@ -26,43 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -TriangularSolver.h -file - - - - -2013-06-21T07:08:38.091789Z -018d77ccbe68578d1385a3c9d4747b84 -2012-10-05T07:27:34.803522Z -4539 -cignoni -has-props - - - - - - - - - - - - - - - - - - - - -1525 - -Geometry -dir - Memory.h file @@ -301,14 +264,14 @@ has-props 4466 -MathFunctions.h +QR.h file 2013-06-21T07:08:38.095789Z -4df3219aec2bcbd94caae9e1d9f3c3ea +0e9cd9501ae65f8630ce4a87961afe70 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -333,16 +296,16 @@ has-props -2761 +1781 -QR.h +MathFunctions.h file 2013-06-21T07:08:38.095789Z -0e9cd9501ae65f8630ce4a87961afe70 +4df3219aec2bcbd94caae9e1d9f3c3ea 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -367,16 +330,16 @@ has-props -1781 +2761 -Minor.h +Macros.h file 2013-06-21T07:08:38.095789Z -bfbef3f4ebb36efe4cac736cc751d4d3 +fc41d545289111054b2e8a9cc041b063 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -401,16 +364,16 @@ has-props -3624 +613 -Macros.h +Minor.h file 2013-06-21T07:08:38.095789Z -fc41d545289111054b2e8a9cc041b063 +bfbef3f4ebb36efe4cac736cc751d4d3 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -435,7 +398,7 @@ has-props -613 +3624 Meta.h file @@ -573,3 +536,40 @@ has-props 18545 +TriangularSolver.h +file + + + + +2013-06-21T07:08:38.091789Z +018d77ccbe68578d1385a3c9d4747b84 +2012-10-05T07:27:34.803522Z +4539 +cignoni +has-props + + + + + + + + + + + + + + + + + + + + +1525 + +Geometry +dir + diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/Geometry/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/Geometry/.svn/entries index 4f2794ca..5cac7877 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/Geometry/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/Geometry/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Eigen2Support/Geometry svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -All.h +Quaternion.h file -2013-06-21T07:08:37.567787Z -caac77c027fa1ec7a5d228ed2a9e8fbb +2013-06-21T07:08:37.563787Z +8b3c5602504a37040ff7cc32d0e57fd2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -2636 +16988 -RotationBase.h +Rotation2D.h file 2013-06-21T07:08:37.563787Z -37009fc3ae7355ce60050e6b43171e61 +2ceca70b4b935ceb63863cffdda9a132 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -4606 +4973 -AngleAxis.h +CMakeLists.txt file 2013-06-21T07:08:37.563787Z -4df2cc1032ba859bbc772bb9d6c8166e -2012-10-05T07:27:34.803522Z -4539 +171089de5918ebcd6303a4cba9d98096 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -126,16 +126,16 @@ has-props -7032 +179 -Transform.h +Hyperplane.h file -2013-06-21T07:08:37.563787Z -baec7da3c0a34abf61096b636cb8f9d2 +2013-06-21T07:08:37.567787Z +b2a8f86efe3249d9dcc3de8e4200d9ee 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -28270 +10615 -AlignedBox.h +All.h file -2013-06-21T07:08:37.563787Z -32b8aad8b076fac443d5e60b2c7ae87e +2013-06-21T07:08:37.567787Z +caac77c027fa1ec7a5d228ed2a9e8fbb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -6241 +2636 -Translation.h +RotationBase.h file 2013-06-21T07:08:37.563787Z -614eda5c17dd8cb2236a7eca717db49c +37009fc3ae7355ce60050e6b43171e61 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +228,16 @@ has-props -6108 +4606 -ParametrizedLine.h +AngleAxis.h file 2013-06-21T07:08:37.563787Z -725ed9d358cdceb186633839d826924c +4df2cc1032ba859bbc772bb9d6c8166e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,16 +262,16 @@ has-props -5725 +7032 -Scaling.h +Transform.h file 2013-06-21T07:08:37.563787Z -7e50332a40e2c019dd7a95a531efa1cf +baec7da3c0a34abf61096b636cb8f9d2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +296,16 @@ has-props -5700 +28270 -Quaternion.h +AlignedBox.h file 2013-06-21T07:08:37.563787Z -8b3c5602504a37040ff7cc32d0e57fd2 +32b8aad8b076fac443d5e60b2c7ae87e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -16988 +6241 -Rotation2D.h +Translation.h file 2013-06-21T07:08:37.563787Z -2ceca70b4b935ceb63863cffdda9a132 +614eda5c17dd8cb2236a7eca717db49c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,18 +364,18 @@ has-props -4973 +6108 -CMakeLists.txt +ParametrizedLine.h file 2013-06-21T07:08:37.563787Z -171089de5918ebcd6303a4cba9d98096 -2011-10-05T15:04:40.740408Z -4180 +725ed9d358cdceb186633839d826924c +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -398,16 +398,16 @@ has-props -179 +5725 -Hyperplane.h +Scaling.h file -2013-06-21T07:08:37.567787Z -b2a8f86efe3249d9dcc3de8e4200d9ee +2013-06-21T07:08:37.563787Z +7e50332a40e2c019dd7a95a531efa1cf 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,5 +432,5 @@ has-props -10615 +5700 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Eigenvalues/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Eigenvalues/.svn/entries index 1b2087fb..e84d429c 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Eigenvalues/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Eigenvalues/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Eigenvalues svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -ComplexEigenSolver.h +EigenSolver.h file 2013-06-21T07:08:40.963803Z -54752aecee93c9d8edad3c1119ac70c7 +ef428ca242d4503f62f8fd46b115df25 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -11787 +21370 -RealSchur_MKL.h +HessenbergDecomposition.h file 2013-06-21T07:08:40.963803Z -3514117d974b165cadb78bb70cbf77e4 +abe3f16cc6730229c0b8bd06ae23de81 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -3645 +14213 -Tridiagonalization.h +SelfAdjointEigenSolver.h file 2013-06-21T07:08:40.963803Z -4980b7835e463a3191ee25a19e214c2b -2012-10-05T07:27:34.803522Z -4539 +bc1d0d59d15ab44c5142d96f34f1d421 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -126,18 +126,18 @@ has-props -22383 +29539 -ComplexSchur.h +CMakeLists.txt file -2013-06-21T07:08:40.963803Z -775c549597f6db19ef6da80ca18df92c -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:40.967803Z +3d3aea060e420e2bc4d53920c2c6a159 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -160,18 +160,18 @@ has-props -14686 +162 -ComplexSchur_MKL.h +MatrixBaseEigenvalues.h file -2013-06-21T07:08:40.963803Z -f49cfc44998d5f9899db09ccccf9226f -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:40.967803Z +130e579dd1fc043c2a60e9de7ca4be07 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -194,18 +194,18 @@ has-props -4009 +5670 -GeneralizedSelfAdjointEigenSolver.h +RealSchur.h file -2013-06-21T07:08:40.963803Z -afb0465080f0bd8f5bf9d270585f9bd5 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:40.967803Z +e832762668491ef937ba8776eaa4967d +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -228,18 +228,18 @@ has-props -9746 +17458 -EigenSolver.h +SelfAdjointEigenSolver_MKL.h file -2013-06-21T07:08:40.963803Z -ef428ca242d4503f62f8fd46b115df25 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:40.967803Z +e24ad847b6204287343fa30cc8a369c0 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -262,16 +262,16 @@ has-props -21370 +4198 -HessenbergDecomposition.h +ComplexEigenSolver.h file 2013-06-21T07:08:40.963803Z -abe3f16cc6730229c0b8bd06ae23de81 +54752aecee93c9d8edad3c1119ac70c7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,18 +296,18 @@ has-props -14213 +11787 -SelfAdjointEigenSolver.h +RealSchur_MKL.h file 2013-06-21T07:08:40.963803Z -bc1d0d59d15ab44c5142d96f34f1d421 -2013-02-27T21:07:14.867394Z -4823 +3514117d974b165cadb78bb70cbf77e4 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -330,18 +330,18 @@ has-props -29539 +3645 -CMakeLists.txt +Tridiagonalization.h file -2013-06-21T07:08:40.967803Z -3d3aea060e420e2bc4d53920c2c6a159 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:40.963803Z +4980b7835e463a3191ee25a19e214c2b +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -364,18 +364,18 @@ has-props -162 +22383 -MatrixBaseEigenvalues.h +ComplexSchur.h file -2013-06-21T07:08:40.967803Z -130e579dd1fc043c2a60e9de7ca4be07 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:40.963803Z +775c549597f6db19ef6da80ca18df92c +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -398,16 +398,16 @@ has-props -5670 +14686 -RealSchur.h +ComplexSchur_MKL.h file -2013-06-21T07:08:40.967803Z -e832762668491ef937ba8776eaa4967d +2013-06-21T07:08:40.963803Z +f49cfc44998d5f9899db09ccccf9226f 2013-02-27T21:07:14.867394Z 4823 cignoni @@ -432,18 +432,18 @@ has-props -17458 +4009 -SelfAdjointEigenSolver_MKL.h +GeneralizedSelfAdjointEigenSolver.h file -2013-06-21T07:08:40.967803Z -e24ad847b6204287343fa30cc8a369c0 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:40.963803Z +afb0465080f0bd8f5bf9d270585f9bd5 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -466,5 +466,5 @@ has-props -4198 +9746 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Geometry/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Geometry/.svn/entries index 49ccf6fe..b408f5b3 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Geometry/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Geometry/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Geometry svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Hyperplane.h +OrthoMethods.h file -2013-06-21T07:08:34.215770Z -09d385dd0db821c00a4133c2e384920e +2013-06-21T07:08:34.219770Z +9ffe0d95389c4f0f0d51758a7243baf9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -11053 +8278 -AngleAxis.h +Scaling.h file -2013-06-21T07:08:34.215770Z -2df2928a2efffdb647e756458faa2240 +2013-06-21T07:08:34.219770Z +129abb6c5c244875378e67ff25edc187 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -7542 +6248 -Transform.h +Rotation2D.h file 2013-06-21T07:08:34.219770Z -6a51d80694868cbc90681257fa29411e +dfc053d090bef9d2069ceee7a0554c7f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -55634 +5075 -AlignedBox.h +Quaternion.h file 2013-06-21T07:08:34.219770Z -6a7cc62cd70c86b54ba6881f14cd22e6 -2013-02-27T21:07:14.867394Z -4823 +062b05edab48be3facd026c5c71ba448 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,18 +160,18 @@ has-props -12802 +28929 -OrthoMethods.h +CMakeLists.txt file 2013-06-21T07:08:34.219770Z -9ffe0d95389c4f0f0d51758a7243baf9 -2012-10-05T07:27:34.803522Z -4539 +bc30b159413527da749fb4bc005b63c8 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -194,16 +194,19 @@ has-props -8278 +177 -Scaling.h +arch +dir + +Homogeneous.h file 2013-06-21T07:08:34.219770Z -129abb6c5c244875378e67ff25edc187 +d42483d2e40df345d33b8991017fe594 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +231,16 @@ has-props -6248 +11621 -Quaternion.h +RotationBase.h file -2013-06-21T07:08:34.219770Z -062b05edab48be3facd026c5c71ba448 +2013-06-21T07:08:34.215770Z +ac1283a265cf68e93f943b6654a72f53 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,16 +265,16 @@ has-props -28929 +7699 -Rotation2D.h +Umeyama.h file -2013-06-21T07:08:34.219770Z -dfc053d090bef9d2069ceee7a0554c7f +2013-06-21T07:08:34.215770Z +a44f265790dc6fd0beb78b4809b08ce6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,21 +299,18 @@ has-props -5075 - -arch -dir +6652 -CMakeLists.txt +Translation.h file -2013-06-21T07:08:34.219770Z -bc30b159413527da749fb4bc005b63c8 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:34.215770Z +dec6dc21c3491f84d18cda35e92c8061 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -333,16 +333,16 @@ has-props -177 +7201 -Homogeneous.h +ParametrizedLine.h file -2013-06-21T07:08:34.219770Z -d42483d2e40df345d33b8991017fe594 +2013-06-21T07:08:34.215770Z +d81954ff78c032de4f68a7cfe1c942bc 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -367,16 +367,16 @@ has-props -11621 +7760 -RotationBase.h +EulerAngles.h file 2013-06-21T07:08:34.215770Z -ac1283a265cf68e93f943b6654a72f53 +3677ffbf9d2dd2a75dcfb08d8bc61511 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -401,16 +401,16 @@ has-props -7699 +2620 -Translation.h +Hyperplane.h file 2013-06-21T07:08:34.215770Z -dec6dc21c3491f84d18cda35e92c8061 +09d385dd0db821c00a4133c2e384920e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -435,16 +435,16 @@ has-props -7201 +11053 -Umeyama.h +Transform.h file -2013-06-21T07:08:34.215770Z -a44f265790dc6fd0beb78b4809b08ce6 +2013-06-21T07:08:34.219770Z +6a51d80694868cbc90681257fa29411e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -469,16 +469,16 @@ has-props -6652 +55634 -ParametrizedLine.h +AngleAxis.h file 2013-06-21T07:08:34.215770Z -d81954ff78c032de4f68a7cfe1c942bc +2df2928a2efffdb647e756458faa2240 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -503,18 +503,18 @@ has-props -7760 +7542 -EulerAngles.h +AlignedBox.h file -2013-06-21T07:08:34.215770Z -3677ffbf9d2dd2a75dcfb08d8bc61511 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:34.219770Z +6a7cc62cd70c86b54ba6881f14cd22e6 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -537,5 +537,5 @@ has-props -2620 +12802 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Geometry/arch/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Geometry/arch/.svn/entries index 5783befd..38fd0871 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Geometry/arch/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Geometry/arch/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Geometry/arch svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Householder/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Householder/.svn/entries index fa256342..771bf2cc 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Householder/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Householder/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Householder svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -BlockHouseholder.h +Householder.h file 2013-06-21T07:08:23.807718Z -37b411c3159a50887e8dcb8252665062 +fe8bd420756fa1edbf083f89f34cd268 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -2737 +5230 -Householder.h +CMakeLists.txt file 2013-06-21T07:08:23.807718Z -fe8bd420756fa1edbf083f89f34cd268 -2012-10-05T07:27:34.803522Z -4539 +c7996e833fd490d7510eb85dc3f884b5 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -92,18 +92,18 @@ has-props -5230 +162 -CMakeLists.txt +HouseholderSequence.h file 2013-06-21T07:08:23.807718Z -c7996e833fd490d7510eb85dc3f884b5 -2011-10-05T15:04:40.740408Z -4180 +5059e9bf12074d8fd502508e525f0820 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -126,16 +126,16 @@ has-props -162 +19007 -HouseholderSequence.h +BlockHouseholder.h file 2013-06-21T07:08:23.807718Z -5059e9bf12074d8fd502508e525f0820 +37b411c3159a50887e8dcb8252665062 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,5 +160,5 @@ has-props -19007 +2737 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/IterativeLinearSolvers/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/IterativeLinearSolvers/.svn/entries index b33f007c..3ab1a238 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/IterativeLinearSolvers/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/IterativeLinearSolvers/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/IterativeLinearSolvers svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -CMakeLists.txt +IncompleteLUT.h file 2013-06-21T07:08:36.507781Z -bfd10f4c9c652cae30f71cb47ee57a89 +34ce9f3229ce3bf1bc1a5a813d2b5246 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -195 +14759 -BasicPreconditioners.h +CMakeLists.txt file 2013-06-21T07:08:36.507781Z -6838798fd76bd49ca3ddf238ccebddf2 +bfd10f4c9c652cae30f71cb47ee57a89 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -4423 +195 -ConjugateGradient.h +BasicPreconditioners.h file 2013-06-21T07:08:36.507781Z -15a125e42712cc03c1d19fd3146d2f0a +6838798fd76bd49ca3ddf238ccebddf2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -8684 +4423 -BiCGSTAB.h +ConjugateGradient.h file 2013-06-21T07:08:36.507781Z -6cf9848dbc0bd64c6a1a0c167fd4628d +15a125e42712cc03c1d19fd3146d2f0a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -8037 +8684 -IterativeSolverBase.h +BiCGSTAB.h file 2013-06-21T07:08:36.507781Z -75906a1399197f77cddb34579220c4f1 +6cf9848dbc0bd64c6a1a0c167fd4628d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -8253 +8037 -IncompleteLUT.h +IterativeSolverBase.h file 2013-06-21T07:08:36.507781Z -34ce9f3229ce3bf1bc1a5a813d2b5246 +75906a1399197f77cddb34579220c4f1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,5 +228,5 @@ has-props -14759 +8253 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Jacobi/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Jacobi/.svn/entries index 20e92790..06b9d0aa 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Jacobi/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Jacobi/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Jacobi svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/LU/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/LU/.svn/entries index a9b8c458..dd8fc80b 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/LU/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/LU/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/LU svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/LU/arch/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/LU/arch/.svn/entries index b0176468..3a2c5942 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/LU/arch/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/LU/arch/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/LU/arch svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/OrderingMethods/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/OrderingMethods/.svn/entries index be979a99..a2479cca 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/OrderingMethods/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/OrderingMethods/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/OrderingMethods svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Amd.h +CMakeLists.txt file 2013-06-21T07:08:35.099774Z -20c650e84ce64ea7ec59dc4648d88b3e +1731dd9e5ce9c93fea612295b0b63826 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -16044 +174 -CMakeLists.txt +Amd.h file 2013-06-21T07:08:35.099774Z -1731dd9e5ce9c93fea612295b0b63826 +20c650e84ce64ea7ec59dc4648d88b3e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,5 +92,5 @@ has-props -174 +16044 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/PaStiXSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/PaStiXSupport/.svn/entries index 235d8ae7..ab984f47 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/PaStiXSupport/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/PaStiXSupport/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/PaStiXSupport svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/PardisoSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/PardisoSupport/.svn/entries index 4c8dde95..1786872e 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/PardisoSupport/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/PardisoSupport/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/PardisoSupport svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -CMakeLists.txt +PardisoSupport.h file 2013-06-21T07:08:35.099774Z -494da80308b416d1d1514c827b2f7c73 -2012-10-05T07:27:34.803522Z -4539 +38134e14f6fbd3208c3c51a92c7eee13 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -58,18 +58,18 @@ has-props -172 +21561 -PardisoSupport.h +CMakeLists.txt file 2013-06-21T07:08:35.099774Z -38134e14f6fbd3208c3c51a92c7eee13 -2013-02-27T21:07:14.867394Z -4823 +494da80308b416d1d1514c827b2f7c73 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -92,5 +92,5 @@ has-props -21561 +172 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/QR/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/QR/.svn/entries index 1e91cebd..05b0198b 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/QR/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/QR/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/QR svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -ColPivHouseholderQR.h +ColPivHouseholderQR_MKL.h file 2013-06-21T07:08:24.511722Z -7e1d4cb995fe330dc84dac4e7a1237de -2012-10-05T07:27:34.803522Z -4539 +5b56a84272f4e3ac10a2424aecf84c82 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -58,18 +58,18 @@ has-props -20149 +4478 -ColPivHouseholderQR_MKL.h +HouseholderQR.h file 2013-06-21T07:08:24.511722Z -5b56a84272f4e3ac10a2424aecf84c82 -2013-02-27T21:07:14.867394Z -4823 +8c706205c70ac501032003cbed5dc35d +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -92,16 +92,16 @@ has-props -4478 +11678 -HouseholderQR.h +FullPivHouseholderQR.h file 2013-06-21T07:08:24.511722Z -8c706205c70ac501032003cbed5dc35d +6fc6da2e09bbfef7e5a6eb0dbcc544af 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -11678 +22664 -FullPivHouseholderQR.h +CMakeLists.txt file 2013-06-21T07:08:24.511722Z -6fc6da2e09bbfef7e5a6eb0dbcc544af -2012-10-05T07:27:34.803522Z -4539 +728eaf2cda49b033d11fded23649187c +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -160,18 +160,18 @@ has-props -22664 +135 -CMakeLists.txt +HouseholderQR_MKL.h file 2013-06-21T07:08:24.511722Z -728eaf2cda49b033d11fded23649187c -2011-10-05T15:04:40.740408Z -4180 +f7742a734cb1beee55423d87879742c7 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -194,16 +194,16 @@ has-props -135 +2944 -HouseholderQR_MKL.h +ColPivHouseholderQR.h file 2013-06-21T07:08:24.511722Z -f7742a734cb1beee55423d87879742c7 +7e1d4cb995fe330dc84dac4e7a1237de 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,5 +228,5 @@ has-props -2944 +20149 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/SVD/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/SVD/.svn/entries index 1179383e..1cfae7e5 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/SVD/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/SVD/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/SVD svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -UpperBidiagonalization.h +CMakeLists.txt file 2013-06-21T07:08:34.743772Z -7657bb08e37f86b6ffd9e52420292562 -2012-10-05T07:27:34.803522Z -4539 +9cf714d769ab9c4bda4f66f8bb745535 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,18 +58,18 @@ has-props -5703 +138 -JacobiSVD.h +JacobiSVD_MKL.h file 2013-06-21T07:08:34.743772Z -416c32b67cffe5d8e1a7fc597bf2aa30 -2012-10-05T07:27:34.803522Z -4539 +63e6b406f59f5ed93277f68ec4642c87 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -92,18 +92,18 @@ has-props -35836 +4654 -CMakeLists.txt +UpperBidiagonalization.h file 2013-06-21T07:08:34.743772Z -9cf714d769ab9c4bda4f66f8bb745535 -2011-10-05T15:04:40.740408Z -4180 +7657bb08e37f86b6ffd9e52420292562 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -126,18 +126,18 @@ has-props -138 +5703 -JacobiSVD_MKL.h +JacobiSVD.h file 2013-06-21T07:08:34.743772Z -63e6b406f59f5ed93277f68ec4642c87 -2013-02-27T21:07:14.867394Z -4823 +416c32b67cffe5d8e1a7fc597bf2aa30 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,5 +160,5 @@ has-props -4654 +35836 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Sparse/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Sparse/.svn/entries index a04be179..90ca1376 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/Sparse/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/Sparse/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Sparse svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/SparseCholesky/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/SparseCholesky/.svn/entries index 7b4bc264..716261c7 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/SparseCholesky/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/SparseCholesky/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/SparseCholesky svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/SparseCore/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/SparseCore/.svn/entries index 22e56c94..fe51c4ad 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/SparseCore/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/SparseCore/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/SparseCore svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -SparseSparseProductWithPruning.h +CMakeLists.txt file -2013-06-21T07:08:39.735797Z -b48270546540d754a4a4b16b3a7721eb +2013-06-21T07:08:39.739797Z +f3611b2cfcd36603f08751241a1532a9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -6153 +160 -SparseSelfAdjointView.h +SparseView.h file -2013-06-21T07:08:39.735797Z -d9ee10f7812f01f8a74ecb05eb541351 +2013-06-21T07:08:39.739797Z +b0dc8d0529c1b72f4dfc0438e41ec486 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -16820 +2725 -SparseDenseProduct.h +CompressedStorage.h file -2013-06-21T07:08:39.735797Z -bf3f0bcf3a37be95cae836ec7de6f082 +2013-06-21T07:08:39.731797Z +e1c3404ba1e0dd5797a20e628cc86b46 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -10583 +6631 -SparseMatrixBase.h +SparseUtil.h file -2013-06-21T07:08:39.735797Z -0d802a7609086d2c83a9cfd991f6e8a1 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:39.731797Z +4ab051d7b0dd186c97b1204a6f28a53d +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -160,16 +160,16 @@ has-props -18639 +6472 -SparseVector.h +AmbiVector.h file -2013-06-21T07:08:39.735797Z -b3e44f0d9d446ddde6c0be66365404d3 +2013-06-21T07:08:39.731797Z +5dfa4d56f822a6420fb7e2785b3a72a4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -11495 +10005 -SparseTriangularView.h +SparseCwiseBinaryOp.h file -2013-06-21T07:08:39.735797Z -ed8654be411da47896945fa22ba2e26c +2013-06-21T07:08:39.731797Z +68e041c40b2ec20e7deee0cf5a8274da 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,18 +228,18 @@ has-props -5261 +11957 -SparseMatrix.h +SparseTranspose.h file -2013-06-21T07:08:39.739797Z -0c894182032312bdea24a580f76570b7 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:39.731797Z +ceb1adefd2154fba0b1b2b1b94334458 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -262,18 +262,18 @@ has-props -39999 +2413 -CoreIterators.h +SparseDiagonalProduct.h file -2013-06-21T07:08:39.739797Z -ddccc519c5632052b038522c4bcb058f -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:39.731797Z +e2866a91ee0c3bcdc810bb90cc61aec0 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -296,16 +296,16 @@ has-props -1941 +7405 -SparsePermutation.h +SparseProduct.h file -2013-06-21T07:08:39.739797Z -8d1b3ec8be754aa514572f71bd2eb9ff +2013-06-21T07:08:39.731797Z +ea6242f35aadbb10b489dcb959be94e0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -6293 +6785 -CMakeLists.txt +SparseAssign.h file -2013-06-21T07:08:39.739797Z -f3611b2cfcd36603f08751241a1532a9 +2013-06-21T07:08:39.731797Z +d41d8cd98f00b204e9800998ecf8427e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,16 +364,16 @@ has-props -160 +0 -SparseView.h +TriangularSolver.h file -2013-06-21T07:08:39.739797Z -b0dc8d0529c1b72f4dfc0438e41ec486 +2013-06-21T07:08:39.731797Z +2876fbf9d9a295bd676d07b20387a99d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +398,16 @@ has-props -2725 +10092 -CompressedStorage.h +SparseDot.h file 2013-06-21T07:08:39.731797Z -e1c3404ba1e0dd5797a20e628cc86b46 +31092a444c3e1acdd4337e669430fd00 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,16 +432,16 @@ has-props -6631 +2981 -AmbiVector.h +SparseRedux.h file 2013-06-21T07:08:39.731797Z -5dfa4d56f822a6420fb7e2785b3a72a4 +5ffed040d24b36bc28ec3a0a77c94629 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -466,18 +466,18 @@ has-props -10005 +1560 -SparseUtil.h +ConservativeSparseSparseProduct.h file 2013-06-21T07:08:39.731797Z -4ab051d7b0dd186c97b1204a6f28a53d -2013-02-27T21:07:14.867394Z -4823 +5ca6f2ec4f3bef3ed2697061eac1feca +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -500,16 +500,16 @@ has-props -6472 +8383 -SparseCwiseBinaryOp.h +SparseFuzzy.h file 2013-06-21T07:08:39.731797Z -68e041c40b2ec20e7deee0cf5a8274da +d654b4b494899499fd9f24556ee7dd97 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -534,16 +534,16 @@ has-props -11957 +984 -SparseTranspose.h +SparseCwiseUnaryOp.h file 2013-06-21T07:08:39.731797Z -ceb1adefd2154fba0b1b2b1b94334458 +5255ffa2b32777f6afae9ad5c3c70ebb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -568,18 +568,18 @@ has-props -2413 +5961 -SparseDiagonalProduct.h +SparseBlock.h file -2013-06-21T07:08:39.731797Z -e2866a91ee0c3bcdc810bb90cc61aec0 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:39.735797Z +2fbb9db4db65818833ee01dccc7299b0 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -602,16 +602,16 @@ has-props -7405 +15288 -SparseProduct.h +MappedSparseMatrix.h file -2013-06-21T07:08:39.731797Z -ea6242f35aadbb10b489dcb959be94e0 +2013-06-21T07:08:39.735797Z +3224bb5abe1661580028f316dd975353 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -636,16 +636,16 @@ has-props -6785 +6198 -SparseAssign.h +SparseSelfAdjointView.h file -2013-06-21T07:08:39.731797Z -d41d8cd98f00b204e9800998ecf8427e +2013-06-21T07:08:39.735797Z +d9ee10f7812f01f8a74ecb05eb541351 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -670,16 +670,16 @@ has-props -0 +16820 -TriangularSolver.h +SparseSparseProductWithPruning.h file -2013-06-21T07:08:39.731797Z -2876fbf9d9a295bd676d07b20387a99d +2013-06-21T07:08:39.735797Z +b48270546540d754a4a4b16b3a7721eb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -704,16 +704,16 @@ has-props -10092 +6153 -SparseDot.h +SparseMatrixBase.h file -2013-06-21T07:08:39.731797Z -31092a444c3e1acdd4337e669430fd00 +2013-06-21T07:08:39.735797Z +0d802a7609086d2c83a9cfd991f6e8a1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -738,16 +738,16 @@ has-props -2981 +18639 -SparseRedux.h +SparseDenseProduct.h file -2013-06-21T07:08:39.731797Z -5ffed040d24b36bc28ec3a0a77c94629 +2013-06-21T07:08:39.735797Z +bf3f0bcf3a37be95cae836ec7de6f082 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -772,16 +772,16 @@ has-props -1560 +10583 -ConservativeSparseSparseProduct.h +SparseVector.h file -2013-06-21T07:08:39.731797Z -5ca6f2ec4f3bef3ed2697061eac1feca +2013-06-21T07:08:39.735797Z +b3e44f0d9d446ddde6c0be66365404d3 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -806,16 +806,16 @@ has-props -8383 +11495 -SparseFuzzy.h +SparseTriangularView.h file -2013-06-21T07:08:39.731797Z -d654b4b494899499fd9f24556ee7dd97 +2013-06-21T07:08:39.735797Z +ed8654be411da47896945fa22ba2e26c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -840,18 +840,18 @@ has-props -984 +5261 -SparseCwiseUnaryOp.h +SparseMatrix.h file -2013-06-21T07:08:39.731797Z -5255ffa2b32777f6afae9ad5c3c70ebb -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:39.739797Z +0c894182032312bdea24a580f76570b7 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -874,16 +874,16 @@ has-props -5961 +39999 -SparseBlock.h +SparsePermutation.h file -2013-06-21T07:08:39.735797Z -2fbb9db4db65818833ee01dccc7299b0 +2013-06-21T07:08:39.739797Z +8d1b3ec8be754aa514572f71bd2eb9ff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -908,16 +908,16 @@ has-props -15288 +6293 -MappedSparseMatrix.h +CoreIterators.h file -2013-06-21T07:08:39.735797Z -3224bb5abe1661580028f316dd975353 +2013-06-21T07:08:39.739797Z +ddccc519c5632052b038522c4bcb058f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -942,5 +942,5 @@ has-props -6198 +1941 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/StlSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/StlSupport/.svn/entries index 30348f03..8fcd59ec 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/StlSupport/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/StlSupport/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/StlSupport svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -details.h +StdVector.h file 2013-06-21T07:08:35.803778Z -a5821f10b69792c35620d717877f6dea +665774a6e7160a0106bf457cacdfb7b6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -2763 +5210 -StdList.h +StdDeque.h file 2013-06-21T07:08:35.803778Z -9b8c12ce887b49449c57200b7acbae5b +299f709ed67a7ddd11814eb4be2ee095 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -4525 +5495 -CMakeLists.txt +details.h file 2013-06-21T07:08:35.803778Z -375f155764c6a99fe51c01209981d1e3 -2011-10-05T15:04:40.740408Z -4180 +a5821f10b69792c35620d717877f6dea +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -126,16 +126,16 @@ has-props -159 +2763 -StdVector.h +StdList.h file 2013-06-21T07:08:35.803778Z -665774a6e7160a0106bf457cacdfb7b6 +9b8c12ce887b49449c57200b7acbae5b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,18 +160,18 @@ has-props -5210 +4525 -StdDeque.h +CMakeLists.txt file 2013-06-21T07:08:35.803778Z -299f709ed67a7ddd11814eb4be2ee095 -2012-10-05T07:27:34.803522Z -4539 +375f155764c6a99fe51c01209981d1e3 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -194,5 +194,5 @@ has-props -5495 +159 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/SuperLUSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/SuperLUSupport/.svn/entries index 0f9da3fd..c7c3d919 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/SuperLUSupport/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/SuperLUSupport/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/SuperLUSupport svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/UmfPackSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/UmfPackSupport/.svn/entries index b6e0b30d..2b142671 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/UmfPackSupport/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/UmfPackSupport/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/UmfPackSupport svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/misc/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/misc/.svn/entries index bd6b3043..679c372f 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/misc/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/misc/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/misc svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/plugins/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/plugins/.svn/entries index 5e9ea639..3ae0b86b 100644 --- a/inst/include/vcglib/eigenlib/Eigen/src/plugins/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/src/plugins/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/plugins svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -ArrayCwiseUnaryOps.h +BlockMethods.h file -2013-06-21T07:08:23.271716Z -41b797a706b028ff9133494e7f52677b -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:23.275716Z +f84e85f8fb623df2f89c653c4bb781ce +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -58,18 +58,18 @@ has-props -5052 +19218 -CommonCwiseBinaryOps.h +ArrayCwiseBinaryOps.h file -2013-06-21T07:08:23.271716Z -cbd65be692bfa660e5c49b7f72cb923a -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:23.275716Z +2191ddda84e1faf10578db326c56c888 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -92,16 +92,16 @@ has-props -1938 +7518 -BlockMethods.h +MatrixCwiseUnaryOps.h file 2013-06-21T07:08:23.275716Z -f84e85f8fb623df2f89c653c4bb781ce +17b3c347113258e434b8ac42b2f3d49d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -19218 +2617 -ArrayCwiseBinaryOps.h +CommonCwiseUnaryOps.h file 2013-06-21T07:08:23.275716Z -2191ddda84e1faf10578db326c56c888 -2013-02-27T21:07:14.867394Z -4823 +700240826de57d08f778e0e5daa7a22e +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,16 +160,16 @@ has-props -7518 +6603 -MatrixCwiseUnaryOps.h +MatrixCwiseBinaryOps.h file 2013-06-21T07:08:23.275716Z -17b3c347113258e434b8ac42b2f3d49d +312894849505619846dbe58ab5ac260a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -2617 +5320 -CommonCwiseUnaryOps.h +CMakeLists.txt file 2013-06-21T07:08:23.275716Z -700240826de57d08f778e0e5daa7a22e -2012-10-05T07:27:34.803522Z -4539 +300b33e24241d19a9d457e755b2747b8 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -228,18 +228,18 @@ has-props -6603 +150 -MatrixCwiseBinaryOps.h +ArrayCwiseUnaryOps.h file -2013-06-21T07:08:23.275716Z -312894849505619846dbe58ab5ac260a -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:23.271716Z +41b797a706b028ff9133494e7f52677b +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -262,18 +262,18 @@ has-props -5320 +5052 -CMakeLists.txt +CommonCwiseBinaryOps.h file -2013-06-21T07:08:23.275716Z -300b33e24241d19a9d457e755b2747b8 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:23.271716Z +cbd65be692bfa660e5c49b7f72cb923a +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -296,5 +296,5 @@ has-props -150 +1938 diff --git a/inst/include/vcglib/eigenlib/unsupported/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/.svn/entries index 628d262f..281dbada 100644 --- a/inst/include/vcglib/eigenlib/unsupported/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported svn://svn.code.sf.net/p/vcg/code @@ -26,20 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -doc -dir - -Eigen -dir - -README.txt +CMakeLists.txt file -2013-06-21T07:08:51.419855Z -d38bd4f90c3154ad9cce5dd9aa110939 +2013-06-21T07:08:51.423855Z +e41163a9e2be15cfd2c9a00231a85830 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -64,16 +58,25 @@ has-props -1875 +227 -CMakeLists.txt +test +dir + +doc +dir + +Eigen +dir + +README.txt file -2013-06-21T07:08:51.423855Z -e41163a9e2be15cfd2c9a00231a85830 +2013-06-21T07:08:51.419855Z +d38bd4f90c3154ad9cce5dd9aa110939 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -98,8 +101,5 @@ has-props -227 - -test -dir +1875 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/.svn/entries index 9f6dfd70..c5fe88b4 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Splines +MoreVectorization file 2013-06-21T07:08:51.419855Z -36e3071c1350bb2e8b4fa9f8ee015e9e +7475a69194352f145ab4a516d296e2ae 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -900 +318 -CMakeLists.txt +KroneckerProduct file 2013-06-21T07:08:51.419855Z -1ccc84aecda9fa1a49033a7a57c3ea5c +bdde6f91e05d06a178b646ab5c5bb04b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,19 @@ has-props -425 +624 -MPRealSupport +src +dir + +NonLinearOptimization file 2013-06-21T07:08:51.419855Z -2d8c00320d91bda5cf0f2ff1d03547cd +ef8b75b85ca2fdcb98f3c72b88349ddb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +129,16 @@ has-props -4538 +5807 -Skyline +MatrixFunctions file 2013-06-21T07:08:51.419855Z -c510b8875613fe21944b5730bbb4c204 +04a51f27b0f72d06516dc2be5921e3cf 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +163,16 @@ has-props -644 +13532 -FFT +AutoDiff file 2013-06-21T07:08:51.419855Z -6b9d7b187d9a7262c921ad627f7bc4ff +068021dc4d23601124e5dfe53087b39e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +197,16 @@ has-props -13945 +1083 -BVH +SparseExtra file 2013-06-21T07:08:51.419855Z -38ff422557baef97ce47f9916baf352c +e4ab405d155f1ea64aeb041ce7750235 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +231,16 @@ has-props -5534 +1083 -OpenGLSupport +Polynomials file 2013-06-21T07:08:51.419855Z -0d6c94b93bd7b947bdde0a95a3176221 +406461028c22b8cbc2e4ef529a8ee7a7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,16 +265,16 @@ has-props -19012 +4514 -MoreVectorization +AdolcForward file 2013-06-21T07:08:51.419855Z -7475a69194352f145ab4a516d296e2ae +83b14b0d2f120cc1676ef30e4a795915 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +299,16 @@ has-props -318 +4273 -KroneckerProduct +NumericalDiff file 2013-06-21T07:08:51.419855Z -bdde6f91e05d06a178b646ab5c5bb04b +60acfeec432d596f8009a4096c5880d6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,19 +333,16 @@ has-props -624 - -src -dir +1802 -NonLinearOptimization +AlignedVector3 file 2013-06-21T07:08:51.419855Z -ef8b75b85ca2fdcb98f3c72b88349ddb +f9889c573d59529ddf26d30eb91ff4a8 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -367,16 +367,16 @@ has-props -5807 +5195 -MatrixFunctions +IterativeSolvers file 2013-06-21T07:08:51.419855Z -04a51f27b0f72d06516dc2be5921e3cf +83772b4b82305dd245e149af30929b58 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -401,16 +401,16 @@ has-props -13532 +1297 -SparseExtra +MPRealSupport file 2013-06-21T07:08:51.419855Z -e4ab405d155f1ea64aeb041ce7750235 +2d8c00320d91bda5cf0f2ff1d03547cd 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -435,16 +435,16 @@ has-props -1083 +4538 -AutoDiff +CMakeLists.txt file 2013-06-21T07:08:51.419855Z -068021dc4d23601124e5dfe53087b39e +1ccc84aecda9fa1a49033a7a57c3ea5c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -469,16 +469,16 @@ has-props -1083 +425 -Polynomials +Splines file 2013-06-21T07:08:51.419855Z -406461028c22b8cbc2e4ef529a8ee7a7 +36e3071c1350bb2e8b4fa9f8ee015e9e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -503,16 +503,16 @@ has-props -4514 +900 -AdolcForward +Skyline file 2013-06-21T07:08:51.419855Z -83b14b0d2f120cc1676ef30e4a795915 +c510b8875613fe21944b5730bbb4c204 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -537,16 +537,16 @@ has-props -4273 +644 -NumericalDiff +BVH file 2013-06-21T07:08:51.419855Z -60acfeec432d596f8009a4096c5880d6 +38ff422557baef97ce47f9916baf352c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -571,16 +571,16 @@ has-props -1802 +5534 -AlignedVector3 +FFT file 2013-06-21T07:08:51.419855Z -f9889c573d59529ddf26d30eb91ff4a8 +6b9d7b187d9a7262c921ad627f7bc4ff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -605,16 +605,16 @@ has-props -5195 +13945 -IterativeSolvers +OpenGLSupport file 2013-06-21T07:08:51.419855Z -83772b4b82305dd245e149af30929b58 +0d6c94b93bd7b947bdde0a95a3176221 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -639,5 +639,5 @@ has-props -1297 +19012 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/.svn/entries index 1956f046..940daff1 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,9 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +KroneckerProduct +dir + Polynomials dir @@ -96,6 +99,3 @@ dir MoreVectorization dir -KroneckerProduct -dir - diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/AutoDiff/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/AutoDiff/.svn/entries index 4ee23711..a0e9742d 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/AutoDiff/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/AutoDiff/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/AutoDiff svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/BVH/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/BVH/.svn/entries index 09964bd7..0e0cd5c5 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/BVH/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/BVH/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/BVH svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/FFT/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/FFT/.svn/entries index e4d2aaf1..be711e40 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/FFT/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/FFT/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/FFT svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/IterativeSolvers/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/IterativeSolvers/.svn/entries index fcaaae48..470bd933 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/IterativeSolvers/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/IterativeSolvers/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/IterativeSolvers svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -GMRES.h +ConstrainedConjGrad.h file 2013-06-21T07:08:47.315835Z -4e00fb7184de3a5481c0bd81e71e917a +1da228336288de955dfb8b050699f80a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -12671 +5508 -IncompleteLU.h +IterationController.h file -2013-06-21T07:08:47.315835Z -0ec734504c7a3f2136befe900a82e0ef +2013-06-21T07:08:47.319835Z +49b3dd451042009c38eb3e099bddf29e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -3234 +5546 -Scaling.h +CMakeLists.txt file -2013-06-21T07:08:47.315835Z -9c6b46792e8edb4b14dd3b487cfab276 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:47.319835Z +b33ede05ad58b564af1e905b55eef56f +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -126,16 +126,16 @@ has-props -5701 +189 -ConstrainedConjGrad.h +GMRES.h file 2013-06-21T07:08:47.315835Z -1da228336288de955dfb8b050699f80a +4e00fb7184de3a5481c0bd81e71e917a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -5508 +12671 -IterationController.h +IncompleteLU.h file -2013-06-21T07:08:47.319835Z -49b3dd451042009c38eb3e099bddf29e +2013-06-21T07:08:47.315835Z +0ec734504c7a3f2136befe900a82e0ef 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -5546 +3234 -CMakeLists.txt +Scaling.h file -2013-06-21T07:08:47.319835Z -b33ede05ad58b564af1e905b55eef56f -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:47.315835Z +9c6b46792e8edb4b14dd3b487cfab276 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -228,5 +228,5 @@ has-props -189 +5701 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/KroneckerProduct/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/KroneckerProduct/.svn/entries index ebbe97ec..6daa7e81 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/KroneckerProduct/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/KroneckerProduct/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/KroneckerProduct svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MatrixFunctions/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MatrixFunctions/.svn/entries index d59eecf8..a2716573 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MatrixFunctions/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MatrixFunctions/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/MatrixFunctions svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -MatrixSquareRoot.h +MatrixExponential.h file 2013-06-21T07:08:49.295845Z -f8e13ddbc674dfc2161442543c28464f +b2c5d89238f15ea23c10114a227ade1e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -17334 +15110 -MatrixFunction.h +MatrixLogarithm.h file 2013-06-21T07:08:49.295845Z -7da7156a13cfe635305b839178fe985f -2012-10-05T07:27:34.803522Z -4539 +fc751bff35417a16c89b1ac86f38eead +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -92,16 +92,16 @@ has-props -22312 +23413 -MatrixExponential.h +StemFunction.h file 2013-06-21T07:08:49.295845Z -b2c5d89238f15ea23c10114a227ade1e +4ebd6bbb8528727c398f3c6f1c863569 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -15110 +2053 -MatrixLogarithm.h +CMakeLists.txt file 2013-06-21T07:08:49.295845Z -fc751bff35417a16c89b1ac86f38eead -2013-02-27T21:07:14.867394Z -4823 +a0f4c75a7bd54bf8b7b8ae476e90ac32 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -160,16 +160,16 @@ has-props -23413 +186 -StemFunction.h +MatrixFunctionAtomic.h file 2013-06-21T07:08:49.295845Z -4ebd6bbb8528727c398f3c6f1c863569 +67654bc1f82effb3bb2f794fe689c983 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -2053 +4378 -CMakeLists.txt +MatrixSquareRoot.h file 2013-06-21T07:08:49.295845Z -a0f4c75a7bd54bf8b7b8ae476e90ac32 -2011-10-05T15:04:40.740408Z -4180 +f8e13ddbc674dfc2161442543c28464f +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -228,16 +228,16 @@ has-props -186 +17334 -MatrixFunctionAtomic.h +MatrixFunction.h file 2013-06-21T07:08:49.295845Z -67654bc1f82effb3bb2f794fe689c983 +7da7156a13cfe635305b839178fe985f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,5 +262,5 @@ has-props -4378 +22312 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MoreVectorization/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MoreVectorization/.svn/entries index 0647e389..2899a333 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MoreVectorization/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/MoreVectorization/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/MoreVectorization svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -MathFunctions.h +CMakeLists.txt file 2013-06-21T07:08:46.431831Z -e3e564572a4abd4270811bfd55eefc0b -2012-10-05T07:27:34.803522Z -4539 +ec4b59ea9aab17f39b2a06a8b0ace434 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,18 +58,18 @@ has-props -3035 +192 -CMakeLists.txt +MathFunctions.h file 2013-06-21T07:08:46.431831Z -ec4b59ea9aab17f39b2a06a8b0ace434 -2011-10-05T15:04:40.740408Z -4180 +e3e564572a4abd4270811bfd55eefc0b +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -92,5 +92,5 @@ has-props -192 +3035 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NonLinearOptimization/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NonLinearOptimization/.svn/entries index 0db78432..e09bf0ea 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NonLinearOptimization/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NonLinearOptimization/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/NonLinearOptimization svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -r1updt.h +qrsolv.h file 2013-06-21T07:08:48.375840Z -a2efc5516d5643ccdeb47741ab4b3981 +0d49b2d974445a92028da7a50f4fc940 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -3058 +3263 -chkder.h +CMakeLists.txt file 2013-06-21T07:08:48.375840Z -9ef23f88b622d464fedda85398c47520 -2012-10-05T07:27:34.803522Z -4539 +7dac94e4373b0fa23415c08c31278564 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -92,16 +92,16 @@ has-props -1798 +204 -dogleg.h +fdjac1.h file 2013-06-21T07:08:48.375840Z -f70da358b566aecc9260af5745d20b76 +a5749af0b5f11ca2ae1b147bfd2af096 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -3193 +2173 -HybridNonLinearSolver.h +r1mpyq.h file 2013-06-21T07:08:48.375840Z -03c23d5c68cb824328408ea88e9e7139 +383cf032d01af4567d1f02d11897fb7d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -19782 +1081 -rwupdt.h +LevenbergMarquardt.h file 2013-06-21T07:08:48.375840Z -ad3c34be2984b0c7a5f6db4ea4041533 +5aec351a3ff2c19182915113d5da9d09 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -1356 +22154 -qrsolv.h +covar.h file 2013-06-21T07:08:48.375840Z -0d49b2d974445a92028da7a50f4fc940 +988035a7a73603e450a4875f4292a989 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,18 +228,18 @@ has-props -3263 +1884 -CMakeLists.txt +lmpar.h file 2013-06-21T07:08:48.375840Z -7dac94e4373b0fa23415c08c31278564 -2011-10-05T15:04:40.740408Z -4180 +fbf88fe20a14472bc9d9c7b73d991512 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -262,16 +262,16 @@ has-props -204 +8995 -fdjac1.h +r1updt.h file 2013-06-21T07:08:48.375840Z -a5749af0b5f11ca2ae1b147bfd2af096 +a2efc5516d5643ccdeb47741ab4b3981 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +296,16 @@ has-props -2173 +3058 -r1mpyq.h +chkder.h file 2013-06-21T07:08:48.375840Z -383cf032d01af4567d1f02d11897fb7d +9ef23f88b622d464fedda85398c47520 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -1081 +1798 -LevenbergMarquardt.h +dogleg.h file 2013-06-21T07:08:48.375840Z -5aec351a3ff2c19182915113d5da9d09 +f70da358b566aecc9260af5745d20b76 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,16 +364,16 @@ has-props -22154 +3193 -covar.h +HybridNonLinearSolver.h file 2013-06-21T07:08:48.375840Z -988035a7a73603e450a4875f4292a989 +03c23d5c68cb824328408ea88e9e7139 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +398,16 @@ has-props -1884 +19782 -lmpar.h +rwupdt.h file 2013-06-21T07:08:48.375840Z -fbf88fe20a14472bc9d9c7b73d991512 +ad3c34be2984b0c7a5f6db4ea4041533 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,5 +432,5 @@ has-props -8995 +1356 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NumericalDiff/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NumericalDiff/.svn/entries index abb92e1c..386703e8 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NumericalDiff/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/NumericalDiff/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/NumericalDiff svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Polynomials/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Polynomials/.svn/entries index 05ba1aed..7a27778a 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Polynomials/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Polynomials/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/Polynomials svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -PolynomialSolver.h +Companion.h file 2013-06-21T07:08:46.611831Z -16bdef71edd85047dda8347f8bccbb67 +0d407d66e9509bd7efd6a631b5638c25 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -13981 +7727 -Companion.h +PolynomialUtils.h file 2013-06-21T07:08:46.611831Z -0d407d66e9509bd7efd6a631b5638c25 +83d4d71ab371cc9f1f8b880f5436a48f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -7727 +4839 -PolynomialUtils.h +CMakeLists.txt file 2013-06-21T07:08:46.611831Z -83d4d71ab371cc9f1f8b880f5436a48f -2012-10-05T07:27:34.803522Z -4539 +cf878432fdd5b066387dafc7522357d3 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -126,18 +126,18 @@ has-props -4839 +174 -CMakeLists.txt +PolynomialSolver.h file 2013-06-21T07:08:46.611831Z -cf878432fdd5b066387dafc7522357d3 -2011-10-05T15:04:40.740408Z -4180 +16bdef71edd85047dda8347f8bccbb67 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,5 +160,5 @@ has-props -174 +13981 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Skyline/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Skyline/.svn/entries index a2b4baf6..4066a78a 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Skyline/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Skyline/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/Skyline svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -SkylineInplaceLU.h +SkylineUtil.h file 2013-06-21T07:08:50.315850Z -408e7c33174077874e802f3a14e5ebee +3fde3a91d55eb2fafb974de05722a571 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -11358 +3153 -SkylineUtil.h +SkylineMatrixBase.h file 2013-06-21T07:08:50.315850Z -3fde3a91d55eb2fafb974de05722a571 +ea8f6ba4c64ab6a4448899e13f772aff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -3153 +7745 -SkylineMatrixBase.h +SkylineProduct.h file 2013-06-21T07:08:50.315850Z -ea8f6ba4c64ab6a4448899e13f772aff +66081be474e4d0fc0eaac9fa8407aaa7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -7745 +10842 -SkylineProduct.h +SkylineMatrix.h file 2013-06-21T07:08:50.315850Z -66081be474e4d0fc0eaac9fa8407aaa7 +2efac347bce0237002d9eafe921ad2de 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -10842 +31065 -SkylineMatrix.h +SkylineStorage.h file 2013-06-21T07:08:50.315850Z -2efac347bce0237002d9eafe921ad2de +15568a241e9d760618cbb32f23fae05d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -31065 +7969 -SkylineStorage.h +CMakeLists.txt file 2013-06-21T07:08:50.315850Z -15568a241e9d760618cbb32f23fae05d -2012-10-05T07:27:34.803522Z -4539 +f4676f144d14d6192d125ad006d118c6 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -228,18 +228,18 @@ has-props -7969 +162 -CMakeLists.txt +SkylineInplaceLU.h file 2013-06-21T07:08:50.315850Z -f4676f144d14d6192d125ad006d118c6 -2011-10-05T15:04:40.740408Z -4180 +408e7c33174077874e802f3a14e5ebee +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -262,5 +262,5 @@ has-props -162 +11358 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/SparseExtra/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/SparseExtra/.svn/entries index 508aa6dc..a9bab51b 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/SparseExtra/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/SparseExtra/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/SparseExtra svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Splines/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Splines/.svn/entries index cc9e0368..86212482 100644 --- a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Splines/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/Splines/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/Splines svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -CMakeLists.txt +SplineFwd.h file 2013-06-21T07:08:49.479846Z -844d689dc6933b8ddafc990d7b4de0cf +d45df26162f67bb3fa2b8f6e5c8fc9b6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -162 +3894 -Spline.h +SplineFitting.h file 2013-06-21T07:08:49.479846Z -ee9c437cfa6a8bb75eaaa4761b642b22 +68f5ff1cd9851c34424aedadb7c93656 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -16407 +5656 -SplineFwd.h +CMakeLists.txt file 2013-06-21T07:08:49.479846Z -d45df26162f67bb3fa2b8f6e5c8fc9b6 +844d689dc6933b8ddafc990d7b4de0cf 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -3894 +162 -SplineFitting.h +Spline.h file 2013-06-21T07:08:49.479846Z -68f5ff1cd9851c34424aedadb7c93656 +ee9c437cfa6a8bb75eaaa4761b642b22 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,5 +160,5 @@ has-props -5656 +16407 diff --git a/inst/include/vcglib/eigenlib/unsupported/doc/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/doc/.svn/entries index 72763a44..a0448f29 100644 --- a/inst/include/vcglib/eigenlib/unsupported/doc/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/doc/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/doc svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Doxyfile.in +CMakeLists.txt file 2013-06-21T07:08:45.203824Z -eb7ce2f8118537ae6a4692b369a772ed -2012-10-05T07:27:34.803522Z -4539 +fb6aae85e8fb807af1aaab8c05347584 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,18 +58,21 @@ has-props -62221 +114 -CMakeLists.txt +examples +dir + +Overview.dox file 2013-06-21T07:08:45.203824Z -fb6aae85e8fb807af1aaab8c05347584 -2011-10-05T15:04:40.740408Z -4180 +8283d3b775fd6b3665b29701a7aae48c +2012-06-14T13:31:05.191445Z +4432 cignoni has-props @@ -92,21 +95,21 @@ has-props -114 +644 -examples +snippets dir -Overview.dox +Doxyfile.in file 2013-06-21T07:08:45.203824Z -8283d3b775fd6b3665b29701a7aae48c -2012-06-14T13:31:05.191445Z -4432 +eb7ce2f8118537ae6a4692b369a772ed +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -129,8 +132,5 @@ has-props -644 - -snippets -dir +62221 diff --git a/inst/include/vcglib/eigenlib/unsupported/doc/examples/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/doc/examples/.svn/entries index 53cb5aad..0ad5f03e 100644 --- a/inst/include/vcglib/eigenlib/unsupported/doc/examples/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/doc/examples/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/doc/examples svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -MatrixSquareRoot.cpp +MatrixSine.cpp file 2013-06-21T07:08:45.199824Z -d7565e2f4aa4702dc0bade968592e5f6 -2012-10-05T07:27:34.803522Z -4539 +95c1c68f4d711dfa50992c08d8948e57 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,16 +58,16 @@ has-props -434 +508 -BVH_Example.cpp +PolynomialUtils1.cpp file 2013-06-21T07:08:45.199824Z -830058a44b40def9b8a087186729010e +24f327e9f22610344307b823155c5568 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ has-props -2145 +635 -MatrixFunction.cpp +MatrixSinh.cpp file -2013-06-21T07:08:45.203824Z -4af0c291ea4d21fdb64765e21675bde9 +2013-06-21T07:08:45.199824Z +3910877f5a974b9db02d81355c95a8a4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,18 +126,18 @@ has-props -469 +524 -MatrixExponential.cpp +MatrixSquareRoot.cpp file -2013-06-21T07:08:45.203824Z -c2df0cd6e514f0a9b8784e80a03cc413 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:45.199824Z +d7565e2f4aa4702dc0bade968592e5f6 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,18 +160,18 @@ has-props -356 +434 -MatrixLogarithm.cpp +BVH_Example.cpp file -2013-06-21T07:08:45.203824Z -50dda8bf28d29ad8d4992ae13b969910 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:45.199824Z +830058a44b40def9b8a087186729010e +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -194,16 +194,16 @@ has-props -375 +2145 -CMakeLists.txt +MatrixFunction.cpp file 2013-06-21T07:08:45.203824Z -8297573e7714b426263e53f657571084 +4af0c291ea4d21fdb64765e21675bde9 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ has-props -762 +469 -FFT.cpp +MatrixExponential.cpp file -2013-06-21T07:08:45.199824Z -d73c663e1330070a4a18ce39fe5259bc +2013-06-21T07:08:45.203824Z +c2df0cd6e514f0a9b8784e80a03cc413 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,18 +262,18 @@ has-props -2518 +356 -PolynomialSolver1.cpp +MatrixLogarithm.cpp file -2013-06-21T07:08:45.199824Z -ea7ac9dc78266daf86eddfa5c3b297f6 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:45.203824Z +50dda8bf28d29ad8d4992ae13b969910 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -296,16 +296,16 @@ has-props -2397 +375 -MatrixSine.cpp +CMakeLists.txt file -2013-06-21T07:08:45.199824Z -95c1c68f4d711dfa50992c08d8948e57 +2013-06-21T07:08:45.203824Z +8297573e7714b426263e53f657571084 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,16 +330,16 @@ has-props -508 +762 -PolynomialUtils1.cpp +FFT.cpp file 2013-06-21T07:08:45.199824Z -24f327e9f22610344307b823155c5568 +d73c663e1330070a4a18ce39fe5259bc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,16 +364,16 @@ has-props -635 +2518 -MatrixSinh.cpp +PolynomialSolver1.cpp file 2013-06-21T07:08:45.199824Z -3910877f5a974b9db02d81355c95a8a4 +ea7ac9dc78266daf86eddfa5c3b297f6 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -398,5 +398,5 @@ has-props -524 +2397 diff --git a/inst/include/vcglib/eigenlib/unsupported/doc/snippets/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/doc/snippets/.svn/entries index 417571f6..1744c524 100644 --- a/inst/include/vcglib/eigenlib/unsupported/doc/snippets/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/doc/snippets/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/doc/snippets svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/test/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/test/.svn/entries index e72741a8..0d3758a8 100644 --- a/inst/include/vcglib/eigenlib/unsupported/test/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/test/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/test svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -polynomialutils.cpp +kronecker_product.cpp file -2013-06-21T07:08:44.491821Z -c037213a0cca4db859d26407f9e4479e +2013-06-21T07:08:44.495821Z +94525d168bf87069c660e0fa7d9de395 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -3574 +6622 -FFTW.cpp +matrix_square_root.cpp file -2013-06-21T07:08:44.491821Z -21735718ebf3a35d0b7be3d485a662db +2013-06-21T07:08:44.495821Z +9cd68bee9d3bd8505a8b96c2e56e4129 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -9160 +2100 -forward_adolc.cpp +CMakeLists.txt file -2013-06-21T07:08:44.491821Z -e605a33f050be498e8f310f8bea0d459 +2013-06-21T07:08:44.499821Z +3f1186b7ea7d9e3e29d77d41e1077dd8 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -3839 +2591 -NumericalDiff.cpp +NonLinearOptimization.cpp file -2013-06-21T07:08:44.491821Z -4b52d11fe8ca947f494636ed7ebb5455 +2013-06-21T07:08:44.499821Z +10dbbbd9e12de7b30ed546f2541fbdfc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,19 @@ has-props -2850 +65196 -alignedvector3.cpp +mpreal +dir + +sparse_extra.cpp file 2013-06-21T07:08:44.491821Z -50a08f595e261b7fb368c7102ab46504 +e722f8681e23a37660ff721e74568bc3 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +197,16 @@ has-props -1816 +5453 -matrix_function.cpp +autodiff.cpp file 2013-06-21T07:08:44.491821Z -8df6d6152fbc025cef84c443fb2abc38 +ca741eb91fe6fedbc5af7db3e3a41532 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +231,16 @@ has-props -6730 +4649 -matrix_exponential.cpp +polynomialutils.cpp file -2013-06-21T07:08:44.495821Z -f5d3899c7ef0d2d78b691854fe1c9214 +2013-06-21T07:08:44.491821Z +c037213a0cca4db859d26407f9e4479e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,16 +265,16 @@ has-props -4708 +3574 -mpreal_support.cpp +forward_adolc.cpp file -2013-06-21T07:08:44.495821Z -a5a55c6addeed39a806f62dfed3594c4 +2013-06-21T07:08:44.491821Z +e605a33f050be498e8f310f8bea0d459 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +299,16 @@ has-props -2022 +3839 -gmres.cpp +FFTW.cpp file -2013-06-21T07:08:44.495821Z -c639beb78d0be0546da62d56fa90b508 +2013-06-21T07:08:44.491821Z +21735718ebf3a35d0b7be3d485a662db 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,18 +333,18 @@ has-props -1283 +9160 -splines.cpp +NumericalDiff.cpp file -2013-06-21T07:08:44.495821Z -8d558a06cab9a76b6c8cf3c4d67cf6f1 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:44.491821Z +4b52d11fe8ca947f494636ed7ebb5455 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -364,16 +367,16 @@ has-props -7235 +2850 -polynomialsolver.cpp +matrix_function.cpp file -2013-06-21T07:08:44.495821Z -940ad2fa01d86dbfa567ed9fb859d59a +2013-06-21T07:08:44.491821Z +8df6d6152fbc025cef84c443fb2abc38 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +401,16 @@ has-props -6836 +6730 -BVH.cpp +alignedvector3.cpp file -2013-06-21T07:08:44.495821Z -f02f2f6a547f905e20a514825dd48d00 +2013-06-21T07:08:44.491821Z +50a08f595e261b7fb368c7102ab46504 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,18 +435,18 @@ has-props -7182 +1816 -FFT.cpp +matrix_exponential.cpp file 2013-06-21T07:08:44.495821Z -b2bd45c4040e455343e513173792993f -2011-10-05T15:04:40.740408Z -4180 +f5d3899c7ef0d2d78b691854fe1c9214 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -466,16 +469,16 @@ has-props -47 +4708 -openglsupport.cpp +mpreal_support.cpp file 2013-06-21T07:08:44.495821Z -43c8c2e24ac6a59c4151da38e60a108c +a5a55c6addeed39a806f62dfed3594c4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -500,16 +503,16 @@ has-props -10694 +2022 -kronecker_product.cpp +splines.cpp file 2013-06-21T07:08:44.495821Z -94525d168bf87069c660e0fa7d9de395 +8d558a06cab9a76b6c8cf3c4d67cf6f1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -534,16 +537,16 @@ has-props -6622 +7235 -matrix_square_root.cpp +gmres.cpp file 2013-06-21T07:08:44.495821Z -9cd68bee9d3bd8505a8b96c2e56e4129 +c639beb78d0be0546da62d56fa90b508 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -568,16 +571,16 @@ has-props -2100 +1283 -CMakeLists.txt +polynomialsolver.cpp file -2013-06-21T07:08:44.499821Z -3f1186b7ea7d9e3e29d77d41e1077dd8 +2013-06-21T07:08:44.495821Z +940ad2fa01d86dbfa567ed9fb859d59a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -602,16 +605,16 @@ has-props -2591 +6836 -NonLinearOptimization.cpp +FFT.cpp file -2013-06-21T07:08:44.499821Z -10dbbbd9e12de7b30ed546f2541fbdfc +2013-06-21T07:08:44.495821Z +b2bd45c4040e455343e513173792993f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -636,19 +639,16 @@ has-props -65196 - -mpreal -dir +47 -sparse_extra.cpp +BVH.cpp file -2013-06-21T07:08:44.491821Z -e722f8681e23a37660ff721e74568bc3 +2013-06-21T07:08:44.495821Z +f02f2f6a547f905e20a514825dd48d00 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -673,16 +673,16 @@ has-props -5453 +7182 -autodiff.cpp +openglsupport.cpp file -2013-06-21T07:08:44.491821Z -ca741eb91fe6fedbc5af7db3e3a41532 +2013-06-21T07:08:44.495821Z +43c8c2e24ac6a59c4151da38e60a108c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -707,5 +707,5 @@ has-props -4649 +10694 diff --git a/inst/include/vcglib/eigenlib/unsupported/test/mpreal/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/test/mpreal/.svn/entries index 3263d60a..c94508ee 100644 --- a/inst/include/vcglib/eigenlib/unsupported/test/mpreal/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/test/mpreal/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/test/mpreal svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -mpreal.cpp +dlmalloc.h file -2013-06-21T07:08:43.151814Z -161d4f86145b4495cda273cb33034b13 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:43.159814Z +d26e21fc0f3502a09102a55f6fefed3f +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,16 +58,16 @@ has-props -12952 +20343 -mpreal.h +mpreal.cpp file -2013-06-21T07:08:43.155814Z -668c2aa285106aa5303e9382dd44b4e8 +2013-06-21T07:08:43.151814Z +161d4f86145b4495cda273cb33034b13 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -80048 +12952 -dlmalloc.c +mpreal.h file -2013-06-21T07:08:43.159814Z -5d833e43255e71e49babe1603d1e8c18 +2013-06-21T07:08:43.155814Z +668c2aa285106aa5303e9382dd44b4e8 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -199892 +80048 -dlmalloc.h +dlmalloc.c file 2013-06-21T07:08:43.159814Z -d26e21fc0f3502a09102a55f6fefed3f -2011-10-05T15:04:40.740408Z -4180 +5d833e43255e71e49babe1603d1e8c18 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,5 +160,5 @@ has-props -20343 +199892 diff --git a/inst/include/vcglib/img/.svn/entries b/inst/include/vcglib/img/.svn/entries index 1eea4eb9..d9c5b7e9 100644 --- a/inst/include/vcglib/img/.svn/entries +++ b/inst/include/vcglib/img/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/img svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -img_io.h +img_cs_base.h file 2013-06-21T07:08:22.215710Z -b10c3b01612e19e788177a3bb8e15c13 +a4facfddd994c040bac9318dd9942cad 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -58,16 +57,17 @@ has-props -2647 + +13273 -img_base.h +img.h file 2013-06-21T07:08:22.215710Z -e5563e454c9ab6f19f30597e117c6464 +08dc3ae286092984eca4eba81c168925 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ has-props -1912 +381 -img_info.h +img_convert.h file 2013-06-21T07:08:22.215710Z -a8505acdd1405960d53f859647c1a34a +f76d93751f21949ba5fb039bcda22ee7 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,19 +126,20 @@ has-props -1102 +8179 -img_cs_base.h +img_image.h file 2013-06-21T07:08:22.215710Z -a4facfddd994c040bac9318dd9942cad +a4bd121acc6e99766f5f43d65d6b54e7 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -159,17 +160,16 @@ cignoni - -13273 +17749 -img.h +img_filter.h file 2013-06-21T07:08:22.215710Z -08dc3ae286092984eca4eba81c168925 +c41bbf61b2892bb1e9b18d64c260e1c8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ has-props -381 +14420 -img_convert.h +img_scalar.h file 2013-06-21T07:08:22.215710Z -f76d93751f21949ba5fb039bcda22ee7 +3592408bb16b01278e7e12db0817b413 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,20 +228,19 @@ has-props -8179 +3032 -img_image.h +img_attributes.h file 2013-06-21T07:08:22.215710Z -a4bd121acc6e99766f5f43d65d6b54e7 +3ec852b7e386051298fc2314510567a8 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -262,16 +261,17 @@ has-props -17749 + +7781 -img_filter.h +img_io.h file 2013-06-21T07:08:22.215710Z -c41bbf61b2892bb1e9b18d64c260e1c8 +b10c3b01612e19e788177a3bb8e15c13 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ has-props -14420 +2647 -img_scalar.h +img_base.h file 2013-06-21T07:08:22.215710Z -3592408bb16b01278e7e12db0817b413 +e5563e454c9ab6f19f30597e117c6464 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,19 +330,20 @@ has-props -3032 +1912 -img_attributes.h +img_info.h file 2013-06-21T07:08:22.215710Z -3ec852b7e386051298fc2314510567a8 +a8505acdd1405960d53f859647c1a34a 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -363,6 +364,5 @@ cignoni - -7781 +1102 diff --git a/inst/include/vcglib/vcg/.svn/entries b/inst/include/vcglib/vcg/.svn/entries index 090043d5..b06e2097 100644 --- a/inst/include/vcglib/vcg/.svn/entries +++ b/inst/include/vcglib/vcg/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg svn://svn.code.sf.net/p/vcg/code -2013-06-24T10:51:53.920813Z -4909 +2013-07-24T12:00:47.297259Z +4928 cignoni @@ -26,21 +26,21 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -space +container dir -connectors +complex dir -simplex +math dir -container +space dir -complex +connectors dir -math +simplex dir diff --git a/inst/include/vcglib/vcg/complex/.svn/entries b/inst/include/vcglib/vcg/complex/.svn/entries index 1d9dacac..cace91df 100644 --- a/inst/include/vcglib/vcg/complex/.svn/entries +++ b/inst/include/vcglib/vcg/complex/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex svn://svn.code.sf.net/p/vcg/code -2013-06-24T10:51:53.920813Z -4909 +2013-07-24T12:00:47.297259Z +4928 cignoni @@ -26,20 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -algorithms -dir - -allocate.h +append.h file 2013-06-21T07:05:06.454740Z -95ce6e94f5d76e71c8f3022bbde4e0c2 -2013-03-20T08:28:30.558674Z -4850 -cignoni +7924fcb30c27c6aab659fbcb8d3b38f6 +2013-03-11T11:53:26.500988Z +4829 +ganovelli @@ -61,20 +58,19 @@ cignoni -56094 +15976 -used_types.h +complex.h file 2013-06-21T07:05:06.454740Z -4be901fe98a851d5d1f3f986d6bef320 -2012-10-15T09:17:48.998055Z -4593 +816a500b5b5b705fc260617ed11e09a1 +2012-12-06T10:59:18.361375Z +4767 cignoni -has-props @@ -95,20 +91,21 @@ has-props -3243 + +2077 -append.h +base.h file 2013-06-21T07:05:06.454740Z -7924fcb30c27c6aab659fbcb8d3b38f6 -2013-03-11T11:53:26.500988Z -4829 -ganovelli - +b318c4d1aefddb4459f851357a24ba34 +2013-04-12T09:16:49.539437Z +4881 +cignoni +has-props @@ -129,19 +126,20 @@ ganovelli -15976 +35386 -complex.h +all_types.h file 2013-06-21T07:05:06.454740Z -816a500b5b5b705fc260617ed11e09a1 -2012-12-06T10:59:18.361375Z -4767 +49afa293f65150231283a59de336445c +2012-10-04T20:41:28.156725Z +4538 cignoni +has-props @@ -162,21 +160,19 @@ cignoni - -2077 +208 -base.h +exception.h file 2013-06-21T07:05:06.454740Z -b318c4d1aefddb4459f851357a24ba34 -2013-04-12T09:16:49.539437Z -4881 +626d9f80a8e2627010d878b946129292 +2012-12-10T09:10:19.054723Z +4773 cignoni -has-props @@ -197,20 +193,23 @@ has-props -35386 + +2198 -all_types.h +algorithms +dir + +allocate.h file 2013-06-21T07:05:06.454740Z -49afa293f65150231283a59de336445c -2012-10-04T20:41:28.156725Z -4538 +95ce6e94f5d76e71c8f3022bbde4e0c2 +2013-03-20T08:28:30.558674Z +4850 cignoni -has-props @@ -231,19 +230,21 @@ has-props -208 + +56094 -exception.h +used_types.h file 2013-06-21T07:05:06.454740Z -626d9f80a8e2627010d878b946129292 -2012-12-10T09:10:19.054723Z -4773 +4be901fe98a851d5d1f3f986d6bef320 +2012-10-15T09:17:48.998055Z +4593 cignoni +has-props @@ -264,6 +265,5 @@ cignoni - -2198 +3243 diff --git a/inst/include/vcglib/vcg/complex/algorithms/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/.svn/entries index 1507a993..b05d70bc 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/.svn/entries +++ b/inst/include/vcglib/vcg/complex/algorithms/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms svn://svn.code.sf.net/p/vcg/code -2013-06-24T10:51:53.920813Z -4909 +2013-07-24T12:00:47.297259Z +4928 cignoni @@ -100,10 +100,10 @@ file -2013-06-21T07:05:06.106738Z -6f61515348b203f379a83e002c883dc7 -2012-11-08T18:33:55.311806Z -4702 +2013-07-25T06:52:24.542398Z +cd437d7820d39a5138f6efae7572cfe4 +2013-07-03T21:12:08.526708Z +4913 cignoni @@ -126,7 +126,7 @@ cignoni -40432 +41882 autoalign_4pcs.h file @@ -378,10 +378,10 @@ file -2013-06-21T07:05:06.102738Z -9944513b851d2b611a6c64ebb7cdb380 -2012-11-15T19:11:28.863456Z -4733 +2013-07-25T06:52:24.542398Z +3a00cd388c546e3f29f0d89dbbf8e657 +2013-07-03T21:44:39.487228Z +4914 cignoni @@ -404,7 +404,7 @@ cignoni -11893 +11991 bitquad_optimization.h file @@ -579,17 +579,18 @@ cignoni local_optimization dir -inside.h +outline_support.h file -2013-06-21T07:05:06.102738Z -8be5cc4d635dcf1fc16f1f87a49db28c -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:06.106738Z +f3e8680823f27e2b22a7e86747342501 +2013-04-03T10:02:19.303093Z +4878 cignoni +has-props @@ -610,20 +611,20 @@ cignoni - -4609 +8336 -stat.h +halfedge_quad_clean.h file -2013-06-21T07:05:06.102738Z -3d8f78a0ba8d604dccdeed229faa4551 -2012-07-06T09:06:43.979355Z -4471 +2013-06-21T07:05:06.106738Z +0af1fd2081c41004538268d4cb5b8569 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -644,21 +645,19 @@ cignoni - -10534 +24521 -halfedge_quad_clean.h +stat.h file -2013-06-21T07:05:06.106738Z -0af1fd2081c41004538268d4cb5b8569 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:06.102738Z +3d8f78a0ba8d604dccdeed229faa4551 +2012-07-06T09:06:43.979355Z +4471 cignoni -has-props @@ -679,20 +678,20 @@ has-props -24521 + +10534 -outline_support.h +inside.h file -2013-06-21T07:05:06.106738Z -f3e8680823f27e2b22a7e86747342501 -2013-04-03T10:02:19.303093Z -4878 +2013-06-21T07:05:06.102738Z +8be5cc4d635dcf1fc16f1f87a49db28c +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -713,18 +712,19 @@ has-props -8336 + +4609 -nring.h +crease_cut.h file -2013-06-21T07:05:06.106738Z -a14ebb4e1f3743f9e37f6fc18eb94587 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:06.102738Z +2a55a177a21ee4870465ade929b6a407 +2013-03-13T14:59:34.350989Z +4837 cignoni @@ -747,18 +747,18 @@ cignoni -4536 +6087 -crease_cut.h +nring.h file -2013-06-21T07:05:06.102738Z -2a55a177a21ee4870465ade929b6a407 -2013-03-13T14:59:34.350989Z -4837 +2013-06-21T07:05:06.106738Z +a14ebb4e1f3743f9e37f6fc18eb94587 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -781,7 +781,7 @@ cignoni -6087 +4536 clustering.h file @@ -851,17 +851,17 @@ cignoni 13483 -clean.h +geodesic.h file -2013-06-24T13:55:27.906354Z -f5017bcad6b6ca7b1b57165c707f0cec -2013-06-24T10:50:14.179533Z -4908 -cignoni +2013-06-21T07:05:06.102738Z +fa066dd7421d3032b6fde8e5e92d5311 +2013-01-30T17:14:47.671353Z +4810 +ganovelli @@ -883,19 +883,19 @@ cignoni -60801 +19706 -geodesic.h +clean.h file -2013-06-21T07:05:06.102738Z -fa066dd7421d3032b6fde8e5e92d5311 -2013-01-30T17:14:47.671353Z -4810 -ganovelli +2013-06-24T13:55:27.906354Z +f5017bcad6b6ca7b1b57165c707f0cec +2013-06-24T10:50:14.179533Z +4908 +cignoni @@ -917,19 +917,20 @@ ganovelli -19706 +60801 -polygon_support.h +point_sampling.h file -2013-06-21T07:05:06.106738Z -4865806d61b65854d870e5de59f463e9 -2012-10-23T23:41:41.113838Z -4652 +2013-07-25T06:52:24.542398Z +528a9fe997b030933f56f6915ca676c8 +2013-07-23T07:32:12.864713Z +4919 cignoni +has-props @@ -950,21 +951,19 @@ cignoni - -8144 +61860 -point_sampling.h +polygon_support.h file -2013-06-24T13:55:27.906354Z -e61d93de02568451f1c751ac77c1e0dd -2013-06-24T10:51:53.920813Z -4909 +2013-06-21T07:05:06.106738Z +4865806d61b65854d870e5de59f463e9 +2012-10-23T23:41:41.113838Z +4652 cignoni -has-props @@ -985,7 +984,8 @@ has-props -60115 + +8144 pointcloud_normal.h file @@ -1027,11 +1027,11 @@ file -2013-06-21T07:05:06.102738Z -23219eedb4c3d4011c8a4bb95e64d53c -2013-03-24T16:33:50.474742Z -4859 -granzuglia +2013-07-25T06:52:24.542398Z +bb9f1a3f83d1c9f3591739aadee914b2 +2013-07-05T14:46:48.577791Z +4916 +cignoni has-props @@ -1053,7 +1053,7 @@ has-props -15848 +15808 update dir diff --git a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/inertia.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/inertia.h.svn-base index 2e8cfcaf..185db90d 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/inertia.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/inertia.h.svn-base @@ -167,19 +167,19 @@ void CompFaceIntegrals(FaceType &f) Faa = k1 * Paa; Fbb = k1 * Pbb; Fcc = k3 * (SQR(n[A])*Paa + 2*n[A]*n[B]*Pab + SQR(n[B])*Pbb - + w*(2*(n[A]*Pa + n[B]*Pb) + w*P1)); + + w*(2*(n[A]*Pa + n[B]*Pb) + w*P1)); Faaa = k1 * Paaa; Fbbb = k1 * Pbbb; Fccc = -k4 * (CUBE(n[A])*Paaa + 3*SQR(n[A])*n[B]*Paab - + 3*n[A]*SQR(n[B])*Pabb + CUBE(n[B])*Pbbb - + 3*w*(SQR(n[A])*Paa + 2*n[A]*n[B]*Pab + SQR(n[B])*Pbb) - + w*w*(3*(n[A]*Pa + n[B]*Pb) + w*P1)); + + 3*n[A]*SQR(n[B])*Pabb + CUBE(n[B])*Pbbb + + 3*w*(SQR(n[A])*Paa + 2*n[A]*n[B]*Pab + SQR(n[B])*Pbb) + + w*w*(3*(n[A]*Pa + n[B]*Pb) + w*P1)); Faab = k1 * Paab; Fbbc = -k2 * (n[A]*Pabb + n[B]*Pbbb + w*Pbb); Fcca = k3 * (SQR(n[A])*Paaa + 2*n[A]*n[B]*Paab + SQR(n[B])*Pabb - + w*(2*(n[A]*Paa + n[B]*Pab) + w*Pa)); + + w*(2*(n[A]*Paa + n[B]*Pab) + w*Pa)); } @@ -196,9 +196,9 @@ void Compute(MeshType &m) T0 = T1[X] = T1[Y] = T1[Z] = T2[X] = T2[Y] = T2[Z] = TP[X] = TP[Y] = TP[Z] = 0; - FaceIterator fi; - for (fi=m.face.begin(); fi!=m.face.end();++fi) if(!(*fi).IsD()) { - FaceType &f=(*fi); + FaceIterator fi; + for (fi=m.face.begin(); fi!=m.face.end();++fi) if(!(*fi).IsD() && vcg::DoubleArea(*fi)>std::numeric_limits::min()) { + FaceType &f=(*fi); nx = fabs(f.N()[0]); ny = fabs(f.N()[1]); @@ -234,7 +234,7 @@ Meaningful only if the mesh is watertight. */ ScalarType Mass() { - return static_cast(T0); + return static_cast(T0); } /*! \brief Return the Center of Mass (or barycenter) of the mesh. @@ -243,14 +243,14 @@ Meaningful only if the mesh is watertight. */ Point3 CenterOfMass() { - Point3 r; + Point3 r; r[X] = T1[X] / T0; r[Y] = T1[Y] / T0; r[Z] = T1[Z] / T0; - return r; + return r; } void InertiaTensor(Matrix33 &J ){ - Point3 r; + Point3 r; r[X] = T1[X] / T0; r[Y] = T1[Y] / T0; r[Z] = T1[Z] / T0; @@ -313,7 +313,7 @@ void InertiaTensorEigen(Matrix33 &EV, Point3 &ev ) } /** Compute covariance matrix of a mesh, i.e. the integral - int_{M} { (x-b)(x-b)^T }dx where b is the barycenter and x spans over the mesh M + int_{M} { (x-b)(x-b)^T }dx where b is the barycenter and x spans over the mesh M */ static void Covariance(const MeshType & m, vcg::Point3 & bary, vcg::Matrix33 &C) { @@ -341,7 +341,7 @@ static void Covariance(const MeshType & m, vcg::Point3 & bary, vcg:: // integral of (x,y,0) in the same triangle CoordType X(1/6.0,1/6.0,0); vcg::Matrix33 A, // matrix that bring the vertices to (v1-v0,v2-v0,n) - DC; + DC; for(fi = m.face.begin(); fi != m.face.end(); ++fi) if(!(*fi).IsD()) { @@ -370,7 +370,7 @@ static void Covariance(const MeshType & m, vcg::Point3 & bary, vcg:: tmp.OuterProduct(delta,delta); DC+=tmp*0.5; // DC*=fabs(A.Determinant()); // the determinant of A is the jacobian of the change of variables A*x+delta - DC*=da; // the determinant of A is also the double area of *fi + DC*=da; // the determinant of A is also the double area of *fi C+=DC; } diff --git a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/point_sampling.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/point_sampling.h.svn-base index 0daf2e00..a3811672 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/point_sampling.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/point_sampling.h.svn-base @@ -40,6 +40,7 @@ sampling strategies (montecarlo, stratified etc). #include #include #include +#include #include #include #include @@ -56,7 +57,6 @@ namespace tri /** \brief An basic sampler class that show the required interface used by the SurfaceSampling class. - Most of the methods of sampling classes call the AddFace method of this class with the face containing the sample and its barycentric coord. Beside being an example of how to write a sampler it provides a simple way to use the various sampling classes. For example if you just want to get a vector with positions over the surface You have just to write @@ -116,6 +116,39 @@ public: }; // end class TrivialSampler + + + +template +class MeshSampler +{ +public: + typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::FaceType FaceType; + typedef typename MeshType::CoordType CoordType; + + MeshSampler(MeshType &_m):m(_m){} + MeshType &m; + + void AddVert(const VertexType &p) + { + tri::Allocator::AddVertices(m,1); + m.vert.back().ImportData(p); + } + + void AddFace(const FaceType &f, CoordType p) + { + tri::Allocator::AddVertices(m,1); + m.vert.back().P() = f.cP(0)*p[0] + f.cP(1)*p[1] +f.cP(2)*p[2]; + m.vert.back().N() = f.cV(0)->N()*p[0] + f.cV(1)->N()*p[1] + f.cV(2)->N()*p[2]; + m.vert.back().Q() = f.cV(0)->Q()*p[0] + f.cV(1)->Q()*p[1] + f.cV(2)->Q()*p[2]; + } +}; // end class BaseSampler + + + + + /** \brief Main Class of the Sampling framework. @@ -1232,6 +1265,9 @@ static int ComputePoissonSampleNum(MetroMesh &origMesh, ScalarType diskRadius) return sampleNum; } +// Note that this function actually CHANGE the quality of the montecarlo samples so that it represents the expected radius of each sample +// the expected radius of the sample is computed so that it linearly maps the quality between diskradius / variance and diskradius*variance + static void ComputePoissonSampleRadii(MetroMesh &sampleMesh, ScalarType diskRadius, ScalarType radiusVariance, bool invert) { VertexIterator vi; @@ -1270,6 +1306,7 @@ static void PoissonDiskPruning(VertexSampler &ps, MetroMesh &montecarloMesh, if(pp.pds) pp.pds->gridSize = gridsize; // if we are doing variable density sampling we have to prepare the random samples quality with the correct expected radii. + // At this point we just assume that there is the quality values as sampled from the base mesh if(pp.adaptiveRadiusFlag) ComputePoissonSampleRadii(montecarloMesh, diskRadius, pp.radiusVariance, pp.invertQuality); @@ -1542,6 +1579,16 @@ static void SubdivideAndSample(MetroMesh & m, std::vector &pvec, const }; // end class +template +void MontecarloSampling(MeshType &m, // the mesh that has to be sampled + MeshType &mm, // the mesh that will contain the samples + int sampleNum) // the desired number sample, if zero you must set the radius to the wanted value +{ + typedef tri::MeshSampler BaseSampler; + MeshSampler mcSampler(&mm); + tri::SurfaceSampling::Montecarlo(m, mcSampler, sampleNum); +} + template void MontecarloSampling(MeshType &m, // the mesh that has to be sampled @@ -1559,9 +1606,13 @@ template void PoissonSampling(MeshType &m, // the mesh that has to be sampled std::vector &poissonSamples, // the vector that will contain the set of points int sampleNum, // the desired number sample, if zero you must set the radius to the wanted value - float &radius) // the Poisson Disk Radius (used if sampleNum==0, setted if sampleNum!=0) + float &radius, // the Poisson Disk Radius (used if sampleNum==0, setted if sampleNum!=0) + float radiusVariance=1) + { typedef tri::TrivialSampler BaseSampler; + typedef tri::MeshSampler MontecarloSampler; + typename tri::SurfaceSampling::PoissonDiskParam pp; typename tri::SurfaceSampling::PoissonDiskParam::Stat stat; pp.pds = &stat; @@ -1572,22 +1623,24 @@ void PoissonSampling(MeshType &m, // the mesh that has to be sampled pp.pds->sampleNum = sampleNum; poissonSamples.clear(); - std::vector MontecarloSamples; +// std::vector MontecarloSamples; MeshType MontecarloMesh; // First step build the sampling - BaseSampler mcSampler(MontecarloSamples); + MontecarloSampler mcSampler(MontecarloMesh); BaseSampler pdSampler(poissonSamples); - tri::SurfaceSampling::Montecarlo(m, mcSampler, std::max(10000,sampleNum*40)); - - tri::Allocator::AddVertices(MontecarloMesh,MontecarloSamples.size()); - for(size_t i=0;i::Montecarlo(m, mcSampler, std::max(10000,sampleNum*40)); tri::UpdateBounding::Box(MontecarloMesh); +// tri::Build(MontecarloMesh, MontecarloSamples); int t1=clock(); pp.pds->montecarloTime = t1-t0; + if(radiusVariance !=1) + { + pp.adaptiveRadiusFlag=true; + pp.radiusVariance=radiusVariance; + } tri::SurfaceSampling::PoissonDiskPruning(pdSampler, MontecarloMesh, radius,pp); int t2=clock(); pp.pds->totalTime = t2-t0; diff --git a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/smooth.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/smooth.h.svn-base index 7409e6f7..96123182 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/smooth.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/smooth.h.svn-base @@ -60,8 +60,8 @@ public: typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FaceIterator FaceIterator; typedef typename MeshType::FaceContainer FaceContainer; - typedef typename vcg::Box3 Box3Type; - typedef typename vcg::face::VFIterator VFLocalIterator; + typedef typename vcg::Box3 Box3Type; + typedef typename vcg::face::VFIterator VFLocalIterator; class ScaleLaplacianInfo { @@ -178,10 +178,10 @@ static void VertexCoordScaleDependentLaplacian_Fujiwara(MeshType &m, int step, S TD[(*fi).V1(j)].LenSum+=len; } // The fundamental part: - // We move the new point of a quantity - // - // L(M) = 1/Sum(edgelen) * Sum(Normalized edges) - // + // We move the new point of a quantity + // + // L(M) = 1/Sum(edgelen) * Sum(Normalized edges) + // for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD() && TD[*vi].LenSum>0 ) @@ -213,17 +213,17 @@ public: static void AccumulateLaplacianInfo(MeshType &m, SimpleTempData &TD, bool cotangentFlag=false) { float weight =1.0f; - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) - { - if(!(*fi).IsD()) - for(int j=0;j<3;++j) - if(!(*fi).IsB(j)) - { - if(cotangentFlag) { - float angle = Angle(fi->P1(j)-fi->P2(j),fi->P0(j)-fi->P2(j)); - weight = tan(M_PI_2 - angle); - } + FaceIterator fi; + for(fi=m.face.begin();fi!=m.face.end();++fi) + { + if(!(*fi).IsD()) + for(int j=0;j<3;++j) + if(!(*fi).IsB(j)) + { + if(cotangentFlag) { + float angle = Angle(fi->P1(j)-fi->P2(j),fi->P0(j)-fi->P2(j)); + weight = tan((M_PI*0.5) - angle); + } TD[(*fi).V0(j)].sum+=(*fi).P1(j)*weight; TD[(*fi).V1(j)].sum+=(*fi).P0(j)*weight; @@ -263,40 +263,40 @@ static void AccumulateLaplacianInfo(MeshType &m, SimpleTempData TD(m.vert,lpz); - for(int i=0;i0 ) - { - if(!SmoothSelected || (*vi).IsS()) - (*vi).P() = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); - } - } + LaplacianInfo lpz(CoordType(0,0,0),0); + SimpleTempData TD(m.vert,lpz); + for(int i=0;i0 ) + { + if(!SmoothSelected || (*vi).IsS()) + (*vi).P() = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); + } + } } // Same of above but moves only the vertices that do not change FaceOrientation more that the given threshold static void VertexCoordPlanarLaplacian(MeshType &m, int step, float AngleThrRad = math::ToRad(1.0), bool SmoothSelected=false, vcg::CallBackPos * cb=0) { VertexIterator vi; - FaceIterator fi; - LaplacianInfo lpz(CoordType(0,0,0),0); - SimpleTempData TD(m.vert,lpz); - for(int i=0;i0 ) - { - if(!SmoothSelected || (*vi).IsS()) - TD[*vi].sum = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); - } + FaceIterator fi; + LaplacianInfo lpz(CoordType(0,0,0),0); + SimpleTempData TD(m.vert,lpz); + for(int i=0;i0 ) + { + if(!SmoothSelected || (*vi).IsS()) + TD[*vi].sum = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); + } for(fi=m.face.begin();fi!=m.face.end();++fi){ if(!(*fi).IsD()){ @@ -409,19 +409,19 @@ static void VertexCoordTaubin(MeshType &m, int step, float lambda, float mu, boo static void VertexCoordLaplacianQuality(MeshType &m, int step, bool SmoothSelected=false) { LaplacianInfo lpz; - lpz.sum=CoordType(0,0,0); - lpz.cnt=1; - SimpleTempData TD(m.vert,lpz); - for(int i=0;i0 ) - if(!SmoothSelected || (*vi).IsS()) - { - float q=(*vi).Q(); - (*vi).P()=(*vi).P()*q + (TD[*vi].sum/TD[*vi].cnt)*(1.0-q); - } - } // end for + lpz.sum=CoordType(0,0,0); + lpz.cnt=1; + SimpleTempData TD(m.vert,lpz); + for(int i=0;i0 ) + if(!SmoothSelected || (*vi).IsS()) + { + float q=(*vi).Q(); + (*vi).P()=(*vi).P()*q + (TD[*vi].sum/TD[*vi].cnt)*(1.0-q); + } + } // end for }; /* @@ -440,37 +440,37 @@ public: static void VertexCoordLaplacianHC(MeshType &m, int step, bool SmoothSelected=false ) { - ScalarType beta=0.5; + ScalarType beta=0.5; HCSmoothInfo lpz; - lpz.sum=CoordType(0,0,0); - lpz.dif=CoordType(0,0,0); - lpz.cnt=0; - for(int i=0;i TD(m.vert,lpz); - // First Loop compute the laplacian - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi)if(!(*fi).IsD()) - { - for(int j=0;j<3;++j) - { - TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); - TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); - ++TD[(*fi).V(j)].cnt; - ++TD[(*fi).V1(j)].cnt; - // se l'edge j e' di bordo si deve sommare due volte - if((*fi).IsB(j)) - { - TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); - TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); - ++TD[(*fi).V(j)].cnt; - ++TD[(*fi).V1(j)].cnt; - } - } - } - VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - TD[*vi].sum/=(float)TD[*vi].cnt; + lpz.sum=CoordType(0,0,0); + lpz.dif=CoordType(0,0,0); + lpz.cnt=0; + for(int i=0;i TD(m.vert,lpz); + // First Loop compute the laplacian + FaceIterator fi; + for(fi=m.face.begin();fi!=m.face.end();++fi)if(!(*fi).IsD()) + { + for(int j=0;j<3;++j) + { + TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); + TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); + ++TD[(*fi).V(j)].cnt; + ++TD[(*fi).V1(j)].cnt; + // se l'edge j e' di bordo si deve sommare due volte + if((*fi).IsB(j)) + { + TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); + TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); + ++TD[(*fi).V(j)].cnt; + ++TD[(*fi).V1(j)].cnt; + } + } + } + VertexIterator vi; + for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + TD[*vi].sum/=(float)TD[*vi].cnt; // Second Loop compute average difference for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) @@ -636,15 +636,15 @@ public: static void VertexQualityLaplacian(MeshType &m, int step=1, bool SmoothSelected=false) { QualitySmoothInfo lpz; - lpz.sum=0; - lpz.cnt=0; - SimpleTempData TD(m.vert,lpz); - //TD.Start(lpz); - for(int i=0;i TD(m.vert,lpz); + //TD.Start(lpz); + for(int i=0;i TD(m.vert,lpz); for(int i=0;icP(); - TD[(*fi).V1(j)].sum+=(*fi).V(j)->cP(); - ++TD[(*fi).V(j)].cnt; - ++TD[(*fi).V1(j)].cnt; - } + for(fi=m.face.begin();fi!=m.face.end();++fi) + if(!(*fi).IsD()) + for(int j=0;j<3;++j) + if((*fi).IsB(j)) + { + TD[(*fi).V(j)].sum+=(*fi).V1(j)->cP(); + TD[(*fi).V1(j)].sum+=(*fi).V(j)->cP(); + ++TD[(*fi).V(j)].cnt; + ++TD[(*fi).V1(j)].cnt; + } for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD() && TD[*vi].cnt>0 ) @@ -858,10 +858,10 @@ void FaceNormalFuzzyVectorSB(MeshType &m, for(fi=m.face.begin();fi!=m.face.end();++fi) { CoordType bc=(*fi).Barycenter(); - // 1) Clear all the visited flag of faces that are vertex-adjacent to fi + // 1) Clear all the visited flag of faces that are vertex-adjacent to fi for(i=0;i<3;++i) { - vcg::face::VFIterator ep(&*fi,i); + vcg::face::VFIterator ep(&*fi,i); while (!ep.End()) { ep.f->ClearV(); @@ -871,29 +871,29 @@ void FaceNormalFuzzyVectorSB(MeshType &m, // 1) Effectively average the normals weighting them with (*fi).SetV(); - CoordType mm=CoordType(0,0,0); - for(i=0;i<3;++i) - { - vcg::face::VFIterator ep(&*fi,i); - while (!ep.End()) - { - if(! (*ep.f).IsV() ) - { - if(sigma>0) - { - ScalarType dd=SquaredDistance(ep.f->Barycenter(),bc); - ScalarType ang=AngleN(ep.f->N(),(*fi).N()); - mm+=ep.f->N()*exp((-sigma)*ang*ang/dd); - } - else mm+=ep.f->N(); - (*ep.f).SetV(); - } - ++ep; - } - } - mm.Normalize(); - TD[*fi].m=mm; - } + CoordType mm=CoordType(0,0,0); + for(i=0;i<3;++i) + { + vcg::face::VFIterator ep(&*fi,i); + while (!ep.End()) + { + if(! (*ep.f).IsV() ) + { + if(sigma>0) + { + ScalarType dd=SquaredDistance(ep.f->Barycenter(),bc); + ScalarType ang=AngleN(ep.f->N(),(*fi).N()); + mm+=ep.f->N()*exp((-sigma)*ang*ang/dd); + } + else mm+=ep.f->N(); + (*ep.f).SetV(); + } + ++ep; + } + } + mm.Normalize(); + TD[*fi].m=mm; + } } // Replace the normal of the face with the average of normals of the vertex adijacent faces. @@ -915,7 +915,7 @@ static void FaceNormalLaplacianVF(MeshType &m) FaceIterator fi; - tri::UpdateNormal::AreaNormalizeFace(m); + tri::UpdateNormal::AreaNormalizeFace(m); for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) { @@ -1016,37 +1016,37 @@ static void FaceNormalAngleThreshold(MeshType &m, for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) { CoordType bc=Barycenter(*fi); - // 1) Clear all the visited flag of faces that are vertex-adjacent to fi + // 1) Clear all the visited flag of faces that are vertex-adjacent to fi for(i=0;i<3;++i) { - VFLocalIterator ep(&*fi,i); + VFLocalIterator ep(&*fi,i); for (;!ep.End();++ep) ep.f->ClearV(); } - // 1) Effectively average the normals weighting them with the squared difference of the angle similarity + // 1) Effectively average the normals weighting them with the squared difference of the angle similarity // sigma is the cosine of a threshold angle. sigma \in 0..1 // sigma == 0 All the normals are averaged // sigma == 1 Nothing is averaged. // The averaging is weighted with the difference between normals. more similar the normal more important they are. - CoordType normalSum=CoordType(0,0,0); + CoordType normalSum=CoordType(0,0,0); for(i=0;i<3;++i) { - VFLocalIterator ep(&*fi,i); + VFLocalIterator ep(&*fi,i); for (;!ep.End();++ep) { if(! (*ep.f).IsV() ) { - ScalarType cosang=ep.f->N().dot((*fi).N()); + ScalarType cosang=ep.f->N().dot((*fi).N()); // Note that if two faces form an angle larger than 90 deg, their contribution should be very very small. // Without this clamping cosang = math::Clamp(cosang,0.0001f,1.f); - if(cosang >= sigma) - { - ScalarType w = cosang-sigma; + if(cosang >= sigma) + { + ScalarType w = cosang-sigma; normalSum += ep.f->N()*(w*w); // similar normals have a cosang very close to 1 so cosang - sigma is maximized - } + } (*ep.f).SetV(); } } @@ -1149,9 +1149,9 @@ static void FitMesh(MeshType &m, static void FastFitMesh(MeshType &m, - SimpleTempData &TDV, + SimpleTempData &TDV, //SimpleTempData &TDF, - bool OnlySelected=false) + bool OnlySelected=false) { //vcg::face::Pos ep; vcg::face::VFIterator ep; @@ -1162,14 +1162,14 @@ static void FastFitMesh(MeshType &m, CoordType Sum(0,0,0); ScalarType cnt=0; VFLocalIterator ep(&*vi); - for (;!ep.End();++ep) - { + for (;!ep.End();++ep) + { CoordType bc=Barycenter(*ep.F()); Sum += ep.F()->N()*(ep.F()->N().dot(bc - (*vi).P())); ++cnt; - } - TDV[*vi].np=(*vi).P()+ Sum*(1.0/cnt); - } + } + TDV[*vi].np=(*vi).P()+ Sum*(1.0/cnt); + } if(OnlySelected) { @@ -1226,7 +1226,7 @@ static void VertexCoordPasoDobleFast(MeshType &m, int NormalSmoothStep, typename SimpleTempData< typename MeshType::FaceContainer, PDFaceInfo> TDF(m.face,lpzf); for(int j=0;j #include #include namespace vcg @@ -35,41 +33,38 @@ namespace tri template class ClusteringSampler - { - public: - typedef typename MeshType::VertexType VertexType; - - ClusteringSampler() - { - sampleVec=0; - } - ClusteringSampler(std::vector *_vec) - { - sampleVec = _vec; - } - std::vector *sampleVec; - - void AddVert(const VertexType &p) - { - sampleVec->push_back((VertexType *)(&p)); - } - }; // end class ClusteringSampler +{ +public: + typedef typename MeshType::VertexType VertexType; + + ClusteringSampler(std::vector &_vec): sampleVec(_vec) + { + sampleVec = _vec; + } + + std::vector &sampleVec; + + void AddVert(const VertexType &p) + { + sampleVec.push_back((VertexType *)(&p)); + } +}; // end class ClusteringSampler template class VoronoiProcessing { - typedef typename MeshType::CoordType CoordType; + typedef typename MeshType::CoordType CoordType; typedef typename MeshType::ScalarType ScalarType; - typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::VertexType VertexType; typedef typename MeshType::VertexPointer VertexPointer; typedef typename MeshType::VertexIterator VertexIterator; typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FaceIterator FaceIterator; typedef typename MeshType::FaceType FaceType; typedef typename MeshType::FaceContainer FaceContainer; - public: + public: // Given a vector of point3f it finds the closest vertices on the mesh. @@ -118,18 +113,18 @@ static void VoronoiColoring(MeshType &m, std::vector &seedVec, boo tri::Geodesic g; VertexPointer farthest; - if(frontierFlag) - { - //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. - //The error should have been removed from MSVS2012 - std::pair zz(0.0f,static_cast(NULL)); - std::vector< std::pair > regionArea(m.vert.size(),zz); - std::vector borderVec; - GetAreaAndFrontier(m, sources, regionArea, borderVec); - tri::Geodesic::Compute(m,borderVec); - } + if(frontierFlag) + { + //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. + //The error should have been removed from MSVS2012 + std::pair zz(0.0f,static_cast(NULL)); + std::vector< std::pair > regionArea(m.vert.size(),zz); + std::vector borderVec; + GetAreaAndFrontier(m, sources, regionArea, borderVec); + tri::Geodesic::Compute(m,borderVec); + } - tri::UpdateColor::PerVertexQualityRamp(m); + tri::UpdateColor::PerVertexQualityRamp(m); } // It associates the faces with a given vertex according to the vertex associations @@ -242,153 +237,157 @@ static void GetAreaAndFrontier(MeshType &m, PerVertexPointerHandle &sources, std::vector< std::pair > ®ionArea, std::vector &borderVec) { - tri::UpdateFlags::VertexClearV(m); - for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) - { - if( sources[(*fi).V(0)] != sources[(*fi).V(1)] || - sources[(*fi).V(0)] != sources[(*fi).V(2)] ) - { - for(int i=0;i<3;++i) - { - (*fi).V(i)->SetV(); - (*fi).V(i)->C() = Color4b::Black; - } - } - else // the face belongs to a single region; accumulate area; - { - if(sources[(*fi).V(0)] != 0) - { - int seedIndex = sources[(*fi).V(0)] - &*m.vert.begin(); - regionArea[seedIndex].first+=DoubleArea(*fi); - regionArea[seedIndex].second=sources[(*fi).V(0)]; - } - } - } - - // Collect the frontier vertexes - borderVec.clear(); - for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) - if((*vi).IsV()) borderVec.push_back(&*vi); + tri::UpdateFlags::VertexClearV(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + { + if( sources[(*fi).V(0)] != sources[(*fi).V(1)] || + sources[(*fi).V(0)] != sources[(*fi).V(2)] ) + { + for(int i=0;i<3;++i) + { + (*fi).V(i)->SetV(); + (*fi).V(i)->C() = Color4b::Black; + } + } + else // the face belongs to a single region; accumulate area; + { + if(sources[(*fi).V(0)] != 0) + { + int seedIndex = sources[(*fi).V(0)] - &*m.vert.begin(); + regionArea[seedIndex].first+=DoubleArea(*fi); + regionArea[seedIndex].second=sources[(*fi).V(0)]; + } + } + } + + // Collect the frontier vertexes + borderVec.clear(); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + if((*vi).IsV()) borderVec.push_back(&*vi); } static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int relaxIter, int /*percentileClamping*/, vcg::CallBackPos *cb=0) -{ - for(int iter=0;iter sources; - sources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); - - tri::Geodesic::Compute(m,seedVec,std::numeric_limits::max(),0,&sources); - - // Delete all the (hopefully) small regions that have not been reached by the seeds; - tri::UpdateFlags::VertexClearV(m); - for(int i=0;iV(0)->IsV() || fi->V(1)->IsV() || fi->V(2)->IsV() ) - { - face::VFDetach(*fi); - tri::Allocator::DeleteFace(m,*fi); - } - qDebug("Deleted faces not reached: %i -> %i",int(m.face.size()),m.fn); - tri::Clean::RemoveUnreferencedVertex(m); - tri::Allocator::CompactFaceVector(m); - tri::Allocator::CompactVertexVector(m); - - //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. - //The error should have been removed from MSVS2012 - std::pair zz(0.0f,static_cast(NULL)); - std::vector< std::pair > regionArea(m.vert.size(),zz); - std::vector borderVec; - - GetAreaAndFrontier(m, sources, regionArea, borderVec); - - // Smaller area region are discarded - Distribution H; +{ + tri::RequireVFAdjacency(m); + + typename MeshType::template PerVertexAttributeHandle sources; + sources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); + + for(int iter=0;iter::Compute(m,seedVec,std::numeric_limits::max(),0,&sources); + + // Delete all the (hopefully) small regions that have not been reached by the seeds; + tri::UpdateFlags::VertexClearV(m); + for(int i=0;iV(0)->IsV() || fi->V(1)->IsV() || fi->V(2)->IsV() ) + { + face::VFDetach(*fi); + tri::Allocator::DeleteFace(m,*fi); + } + // qDebug("Deleted faces not reached: %i -> %i",int(m.face.size()),m.fn); + tri::Clean::RemoveUnreferencedVertex(m); + tri::Allocator::CompactFaceVector(m); + tri::Allocator::CompactVertexVector(m); + + //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. + //The error should have been removed from MSVS2012 + std::pair zz(0.0f,static_cast(NULL)); + std::vector< std::pair > regionArea(m.vert.size(),zz); + std::vector borderVec; + + GetAreaAndFrontier(m, sources, regionArea, borderVec); + + // Smaller area region are discarded + Distribution H; for(size_t i=0;i::Compute(m,borderVec); - tri::UpdateColor::PerVertexQualityRamp(m); - - // Search the local maxima for each region and use them as new seeds - std::vector< std::pair > seedMaxima(m.vert.size(),zz); - for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) - { - int seedIndex = tri::Index(m,sources[vi]); - if(seedMaxima[seedIndex].first < (*vi).Q()) - { - seedMaxima[seedIndex].first=(*vi).Q(); - seedMaxima[seedIndex].second=&*vi; - } - } - std::vector newSeeds; + if(regionArea[i].second) H.Add(regionArea[i].first); + + float areaThreshold; + if(iter==0) areaThreshold = H.Percentile(.1f); + else areaThreshold = H.Percentile(.001f); + //qDebug("We have found %i regions range (%f %f), avg area is %f, Variance is %f 10perc is %f",(int)seedVec.size(),H.Min(),H.Max(),H.Avg(),H.StandardDeviation(),areaThreshold); + + if(cb) cb(iter*100/relaxIter,"Voronoi Lloyd Relaxation: Searching New Seeds"); + + tri::Geodesic::Compute(m,borderVec); + tri::UpdateColor::PerVertexQualityRamp(m); + + // Search the local maxima for each region and use them as new seeds + std::vector< std::pair > seedMaxima(m.vert.size(),zz); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + { + int seedIndex = tri::Index(m,sources[vi]); + if(seedMaxima[seedIndex].first < (*vi).Q()) + { + seedMaxima[seedIndex].first=(*vi).Q(); + seedMaxima[seedIndex].second=&*vi; + } + } + std::vector newSeeds; for(size_t i=0;iC() = Color4b::Gray; - if(regionArea[i].first >= areaThreshold) - newSeeds.push_back(seedMaxima[i].second); - } - - tri::UpdateColor::PerVertexQualityRamp(m); + if(seedMaxima[i].second) + { + seedMaxima[i].second->C() = Color4b::Gray; + if(regionArea[i].first >= areaThreshold) + newSeeds.push_back(seedMaxima[i].second); + } + + tri::UpdateColor::PerVertexQualityRamp(m); for(size_t i=0;iC() = Color4b::Black; - + seedVec[i]->C() = Color4b::Black; + for(size_t i=0;iC() = Color4b::Gray; - - swap(newSeeds,seedVec); - + borderVec[i]->C() = Color4b::Gray; + + swap(newSeeds,seedVec); + for(size_t i=0;iC() = Color4b::White; + seedVec[i]->C() = Color4b::White; + } + tri::Allocator::DeletePerVertexAttribute (m,"sources"); - tri::Allocator::DeletePerVertexAttribute (m,"sources"); - - } } + + // Base vertex voronoi coloring algorithm. -// it assumes VF adjacency. No attempt of computing real geodesic distnace is done. Just a BFS visit starting from the seeds. +// it assumes VF adjacency. No attempt of computing real geodesic distnace is done. Just a BFS visit starting from the seeds. static void TopologicalVertexColoring(MeshType &m, std::vector &seedVec) -{ - std::queue VQ; - - tri::UpdateQuality::VertexConstant(m,0); - - for(size_t i=0;iQ()=i+1; - } - - while(!VQ.empty()) - { - VertexPointer vp = VQ.front(); - VQ.pop(); - - std::vector vertStar; - vcg::face::VVStarVF(vp,vertStar); - for(typename std::vector::iterator vv = vertStar.begin();vv!=vertStar.end();++vv) - { - if((*vv)->Q()==0) - { - (*vv)->Q()=vp->Q(); - VQ.push(*vv); - } - } - } // end while(!VQ.empty()) +{ + std::queue VQ; - } + tri::UpdateQuality::VertexConstant(m,0); + + for(size_t i=0;iQ()=i+1; + } + + while(!VQ.empty()) + { + VertexPointer vp = VQ.front(); + VQ.pop(); + + std::vector vertStar; + vcg::face::VVStarVF(vp,vertStar); + for(typename std::vector::iterator vv = vertStar.begin();vv!=vertStar.end();++vv) + { + if((*vv)->Q()==0) + { + (*vv)->Q()=vp->Q(); + VQ.push(*vv); + } + } + } // end while(!VQ.empty()) + +} // Drastic Simplification algorithm. // Similar in philosopy to the classic grid clustering but using a voronoi partition instead of the regular grid. @@ -397,22 +396,22 @@ static void TopologicalVertexColoring(MeshType &m, std::vector &se // mNew is created by collasping onto a single vertex all the vertices that lies in the same cluster. // Non degenerate triangles are preserved. -static void VoronoiClustering(MeshType &mOld, MeshType &mNew, std::vector &seedVec) +static void VoronoiClustering(MeshType &mOld, MeshType &mNew, std::vector &seedVec) { std::set clusteredFace; FaceIterator fi; for(fi=mOld.face.begin();fi!=mOld.face.end();++fi) { - if( (fi->V(0)->Q() != fi->V(1)->Q() ) && + if( (fi->V(0)->Q() != fi->V(1)->Q() ) && (fi->V(0)->Q() != fi->V(2)->Q() ) && (fi->V(1)->Q() != fi->V(2)->Q() ) ) - clusteredFace.insert( Point3i(int(fi->V(0)->Q()), int(fi->V(1)->Q()), int(fi->V(2)->Q()))); - } + clusteredFace.insert( Point3i(int(fi->V(0)->Q()), int(fi->V(1)->Q()), int(fi->V(2)->Q()))); + } tri::Allocator::AddVertices(mNew,seedVec.size()); for(size_t i=0;i< seedVec.size();++i) - mNew.vert[i].ImportLocal(*(seedVec[i])); + mNew.vert[i].ImportData(*(seedVec[i])); tri::Allocator::AddFaces(mNew,clusteredFace.size()); std::set::iterator fsi; ; diff --git a/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries index 34cd927e..1a6c8942 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries +++ b/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms/create svn://svn.code.sf.net/p/vcg/code -2013-06-24T09:36:46.352528Z -4907 +2013-07-16T15:44:52.091083Z +4918 cignoni @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -extrude.h +mc_trivial_walker.h file 2013-06-21T07:05:05.218734Z -b66b0fa6b72ca8358c1229d0bab657b6 -2013-01-23T08:35:23.484447Z -4805 +a865a54aca7a0771c851124bd356430d +2013-03-22T17:06:41.310674Z +4857 cignoni -has-props @@ -58,18 +57,19 @@ has-props -2627 + +11248 -advancing_front.h +mc_lookup_table.h file 2013-06-21T07:05:05.218734Z -66f3bb1a2b5a0b043839c8d551676e42 -2012-11-14T12:48:35.656236Z -4730 +61d3d5584b57fb73bd048a636e51e632 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -92,19 +92,20 @@ cignoni -16120 +173333 -emc_lookup_table.h +extrude.h file 2013-06-21T07:05:05.218734Z -cb99e47ac508530409c23910f23b41e3 -2013-03-22T17:06:41.310674Z -4857 +b66b0fa6b72ca8358c1229d0bab657b6 +2013-01-23T08:35:23.484447Z +4805 cignoni +has-props @@ -125,19 +126,18 @@ cignoni - -40594 +2627 -readme.txt +advancing_front.h file 2013-06-21T07:05:05.218734Z -75e96946e85dde41ce0b3a09d8a9e1a3 -2011-10-05T15:04:40.740408Z -4180 +66f3bb1a2b5a0b043839c8d551676e42 +2012-11-14T12:48:35.656236Z +4730 cignoni @@ -160,19 +160,19 @@ cignoni -6725 +16120 -zonohedron.h +emc_lookup_table.h file 2013-06-21T07:05:05.218734Z -1547e5b37534a4fe5fe13e13c672356a -2012-07-24T01:48:21.496304Z -4488 -tarini +cb99e47ac508530409c23910f23b41e3 +2013-03-22T17:06:41.310674Z +4857 +cignoni @@ -194,18 +194,18 @@ tarini -9221 +40594 -ball_pivoting.h +readme.txt file 2013-06-21T07:05:05.218734Z -af198f7ef0fa85ce571168010a2ff736 -2012-11-14T12:48:35.656236Z -4730 +75e96946e85dde41ce0b3a09d8a9e1a3 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -228,19 +228,19 @@ cignoni -12657 +6725 -extended_marching_cubes.h +zonohedron.h file 2013-06-21T07:05:05.218734Z -c2a9457efb0d23244d82dbb5bf3026fb -2013-03-22T17:06:41.310674Z -4857 -cignoni +1547e5b37534a4fe5fe13e13c672356a +2012-07-24T01:48:21.496304Z +4488 +tarini @@ -262,18 +262,18 @@ cignoni -18829 +9221 -marching_cubes.h +ball_pivoting.h file 2013-06-21T07:05:05.218734Z -67c16819e693f9001c4c66a5ceb36458 -2011-10-05T15:04:40.740408Z -4180 +af198f7ef0fa85ce571168010a2ff736 +2012-11-14T12:48:35.656236Z +4730 cignoni @@ -296,18 +296,18 @@ cignoni -30538 +12657 -platonic.h +extended_marching_cubes.h file -2013-06-24T13:55:27.726353Z -abc9741172e7c3d5287d79771c868ac7 -2013-06-24T09:36:46.352528Z -4907 +2013-06-21T07:05:05.218734Z +c2a9457efb0d23244d82dbb5bf3026fb +2013-03-22T17:06:41.310674Z +4857 cignoni @@ -330,18 +330,18 @@ cignoni -32745 +18829 -resampler.h +marching_cubes.h file 2013-06-21T07:05:05.218734Z -c4c1686a8147ee9c9755958061feb309 -2012-10-11T11:11:33.961622Z -4578 +67c16819e693f9001c4c66a5ceb36458 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -364,18 +364,18 @@ cignoni -19715 +30538 -mc_trivial_walker.h +platonic.h file -2013-06-21T07:05:05.218734Z -a865a54aca7a0771c851124bd356430d -2013-03-22T17:06:41.310674Z -4857 +2013-06-24T13:55:27.726353Z +abc9741172e7c3d5287d79771c868ac7 +2013-06-24T09:36:46.352528Z +4907 cignoni @@ -398,18 +398,18 @@ cignoni -11248 +32745 -mc_lookup_table.h +resampler.h file -2013-06-21T07:05:05.218734Z -61d3d5584b57fb73bd048a636e51e632 -2011-10-05T15:04:40.740408Z -4180 +2013-07-25T06:52:24.538398Z +49d95eca07658db0e421b8b12b924492 +2013-07-16T15:44:52.091083Z +4918 cignoni @@ -432,5 +432,5 @@ cignoni -173333 +19624 diff --git a/inst/include/vcglib/vcg/complex/algorithms/create/.svn/text-base/resampler.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/create/.svn/text-base/resampler.h.svn-base index 685b0692..5d517f5f 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/create/.svn/text-base/resampler.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/create/.svn/text-base/resampler.h.svn-base @@ -40,7 +40,7 @@ namespace tri { /*@{*/ /*@{*/ /** Class Resampler. - This is class reasmpling a mesh using marching cubes methods + This is class reasmpling a mesh using marching cubes methods @param OLD_MESH_TYPE (Template Parameter) Specifies the type of mesh to be resampled @param NEW_MESH_TYPE (Template Parameter) Specifies the type of output mesh. */ @@ -139,18 +139,18 @@ template 0) // we Not are in the middle of the face so the face normal is NOT reliable. - { + { closestNormV = (f->V(0)->cN())*pip[0] + (f->V(1)->cN())*pip[1] + (f->V(2)->cN())*pip[2] ; signBest = dir.dot(closestNormV) ; } @@ -205,7 +205,7 @@ template 0) positiveCnt ++; } - if(positiveCnt<=MultiSample/2) distSum = -distSum; + if(positiveCnt<=MultiSample/2) distSum = -distSum; return field_value(true, distSum/MultiSample); } @@ -294,7 +294,7 @@ template 0); -#ifndef NO_QT +#ifdef QT_VERSION if(flippedTot>0) qDebug("Flipped %i values in %i times",flippedTot,flippedTimes); #endif @@ -338,11 +338,11 @@ template siz.Y(); j++) + for (int j=0; j<=this->siz.Y(); j++) { - if (cb) cb((100*j)/this->siz.Y(),"Marching "); + if (cb) cb((100*j)/this->siz.Y(),"Marching "); ProcessSlice(extractor);//find cells where there is the isosurface and examine it - NextSlice(); + NextSlice(); } extractor.Finalize(); typename New_Mesh::VertexIterator vi; @@ -493,14 +493,14 @@ template siz.X(); - VertexIndex pos=-1; + VertexIndex pos=-1; if (p1.Y()==CurrentSlice) { if ((pos=_x_cs[index])==-1) @@ -525,21 +525,21 @@ template =0); + assert(pos>=0); v = &_newM->vert[pos]; } ///if there is a vertex in y axis of a cell return the vertex or create it void GetYIntercept(const vcg::Point3i &p1, const vcg::Point3i &p2, VertexPointer &v) { - assert(p1.X() == p2.X()); + assert(p1.X() == p2.X()); assert(p1.Y()+1 == p2.Y()); assert(p1.Z() == p2.Z()); int i = p1.X(); // (p1.X() - _bbox.min.X())/_cell_size.X(); int z = p1.Z(); // (p1.Z() - _bbox.min.Z())/_cell_size.Z(); VertexIndex index = i+z*this->siz.X(); - VertexIndex pos=-1; + VertexIndex pos=-1; if ((pos=_y_cs[index])==-1) { _y_cs[index] = (VertexIndex) _newM->vert.size(); @@ -548,14 +548,14 @@ template vert[ pos ]; v->P()=Interpolate(p1,p2,1); } - assert(pos>=0); - v = &_newM->vert[pos]; + assert(pos>=0); + v = &_newM->vert[pos]; } ///if there is a vertex in z axis of a cell return the vertex or create it void GetZIntercept(const vcg::Point3i &p1, const vcg::Point3i &p2, VertexPointer &v) { - assert(p1.X() == p2.X()); + assert(p1.X() == p2.X()); assert(p1.Y() == p2.Y()); assert(p1.Z()+1 == p2.Z()); @@ -563,7 +563,7 @@ template siz.X(); - VertexIndex pos=-1; + VertexIndex pos=-1; if (p1.Y()==CurrentSlice) { if ((pos=_z_cs[index])==-1) @@ -588,7 +588,7 @@ template =0); + assert(pos>=0); v = &_newM->vert[pos]; } diff --git a/inst/include/vcglib/vcg/complex/algorithms/create/resampler.h b/inst/include/vcglib/vcg/complex/algorithms/create/resampler.h index 685b0692..5d517f5f 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/create/resampler.h +++ b/inst/include/vcglib/vcg/complex/algorithms/create/resampler.h @@ -40,7 +40,7 @@ namespace tri { /*@{*/ /*@{*/ /** Class Resampler. - This is class reasmpling a mesh using marching cubes methods + This is class reasmpling a mesh using marching cubes methods @param OLD_MESH_TYPE (Template Parameter) Specifies the type of mesh to be resampled @param NEW_MESH_TYPE (Template Parameter) Specifies the type of output mesh. */ @@ -139,18 +139,18 @@ template 0) // we Not are in the middle of the face so the face normal is NOT reliable. - { + { closestNormV = (f->V(0)->cN())*pip[0] + (f->V(1)->cN())*pip[1] + (f->V(2)->cN())*pip[2] ; signBest = dir.dot(closestNormV) ; } @@ -205,7 +205,7 @@ template 0) positiveCnt ++; } - if(positiveCnt<=MultiSample/2) distSum = -distSum; + if(positiveCnt<=MultiSample/2) distSum = -distSum; return field_value(true, distSum/MultiSample); } @@ -294,7 +294,7 @@ template 0); -#ifndef NO_QT +#ifdef QT_VERSION if(flippedTot>0) qDebug("Flipped %i values in %i times",flippedTot,flippedTimes); #endif @@ -338,11 +338,11 @@ template siz.Y(); j++) + for (int j=0; j<=this->siz.Y(); j++) { - if (cb) cb((100*j)/this->siz.Y(),"Marching "); + if (cb) cb((100*j)/this->siz.Y(),"Marching "); ProcessSlice(extractor);//find cells where there is the isosurface and examine it - NextSlice(); + NextSlice(); } extractor.Finalize(); typename New_Mesh::VertexIterator vi; @@ -493,14 +493,14 @@ template siz.X(); - VertexIndex pos=-1; + VertexIndex pos=-1; if (p1.Y()==CurrentSlice) { if ((pos=_x_cs[index])==-1) @@ -525,21 +525,21 @@ template =0); + assert(pos>=0); v = &_newM->vert[pos]; } ///if there is a vertex in y axis of a cell return the vertex or create it void GetYIntercept(const vcg::Point3i &p1, const vcg::Point3i &p2, VertexPointer &v) { - assert(p1.X() == p2.X()); + assert(p1.X() == p2.X()); assert(p1.Y()+1 == p2.Y()); assert(p1.Z() == p2.Z()); int i = p1.X(); // (p1.X() - _bbox.min.X())/_cell_size.X(); int z = p1.Z(); // (p1.Z() - _bbox.min.Z())/_cell_size.Z(); VertexIndex index = i+z*this->siz.X(); - VertexIndex pos=-1; + VertexIndex pos=-1; if ((pos=_y_cs[index])==-1) { _y_cs[index] = (VertexIndex) _newM->vert.size(); @@ -548,14 +548,14 @@ template vert[ pos ]; v->P()=Interpolate(p1,p2,1); } - assert(pos>=0); - v = &_newM->vert[pos]; + assert(pos>=0); + v = &_newM->vert[pos]; } ///if there is a vertex in z axis of a cell return the vertex or create it void GetZIntercept(const vcg::Point3i &p1, const vcg::Point3i &p2, VertexPointer &v) { - assert(p1.X() == p2.X()); + assert(p1.X() == p2.X()); assert(p1.Y() == p2.Y()); assert(p1.Z()+1 == p2.Z()); @@ -563,7 +563,7 @@ template siz.X(); - VertexIndex pos=-1; + VertexIndex pos=-1; if (p1.Y()==CurrentSlice) { if ((pos=_z_cs[index])==-1) @@ -588,7 +588,7 @@ template =0); + assert(pos>=0); v = &_newM->vert[pos]; } diff --git a/inst/include/vcglib/vcg/complex/algorithms/inertia.h b/inst/include/vcglib/vcg/complex/algorithms/inertia.h index 2e8cfcaf..185db90d 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/inertia.h +++ b/inst/include/vcglib/vcg/complex/algorithms/inertia.h @@ -167,19 +167,19 @@ void CompFaceIntegrals(FaceType &f) Faa = k1 * Paa; Fbb = k1 * Pbb; Fcc = k3 * (SQR(n[A])*Paa + 2*n[A]*n[B]*Pab + SQR(n[B])*Pbb - + w*(2*(n[A]*Pa + n[B]*Pb) + w*P1)); + + w*(2*(n[A]*Pa + n[B]*Pb) + w*P1)); Faaa = k1 * Paaa; Fbbb = k1 * Pbbb; Fccc = -k4 * (CUBE(n[A])*Paaa + 3*SQR(n[A])*n[B]*Paab - + 3*n[A]*SQR(n[B])*Pabb + CUBE(n[B])*Pbbb - + 3*w*(SQR(n[A])*Paa + 2*n[A]*n[B]*Pab + SQR(n[B])*Pbb) - + w*w*(3*(n[A]*Pa + n[B]*Pb) + w*P1)); + + 3*n[A]*SQR(n[B])*Pabb + CUBE(n[B])*Pbbb + + 3*w*(SQR(n[A])*Paa + 2*n[A]*n[B]*Pab + SQR(n[B])*Pbb) + + w*w*(3*(n[A]*Pa + n[B]*Pb) + w*P1)); Faab = k1 * Paab; Fbbc = -k2 * (n[A]*Pabb + n[B]*Pbbb + w*Pbb); Fcca = k3 * (SQR(n[A])*Paaa + 2*n[A]*n[B]*Paab + SQR(n[B])*Pabb - + w*(2*(n[A]*Paa + n[B]*Pab) + w*Pa)); + + w*(2*(n[A]*Paa + n[B]*Pab) + w*Pa)); } @@ -196,9 +196,9 @@ void Compute(MeshType &m) T0 = T1[X] = T1[Y] = T1[Z] = T2[X] = T2[Y] = T2[Z] = TP[X] = TP[Y] = TP[Z] = 0; - FaceIterator fi; - for (fi=m.face.begin(); fi!=m.face.end();++fi) if(!(*fi).IsD()) { - FaceType &f=(*fi); + FaceIterator fi; + for (fi=m.face.begin(); fi!=m.face.end();++fi) if(!(*fi).IsD() && vcg::DoubleArea(*fi)>std::numeric_limits::min()) { + FaceType &f=(*fi); nx = fabs(f.N()[0]); ny = fabs(f.N()[1]); @@ -234,7 +234,7 @@ Meaningful only if the mesh is watertight. */ ScalarType Mass() { - return static_cast(T0); + return static_cast(T0); } /*! \brief Return the Center of Mass (or barycenter) of the mesh. @@ -243,14 +243,14 @@ Meaningful only if the mesh is watertight. */ Point3 CenterOfMass() { - Point3 r; + Point3 r; r[X] = T1[X] / T0; r[Y] = T1[Y] / T0; r[Z] = T1[Z] / T0; - return r; + return r; } void InertiaTensor(Matrix33 &J ){ - Point3 r; + Point3 r; r[X] = T1[X] / T0; r[Y] = T1[Y] / T0; r[Z] = T1[Z] / T0; @@ -313,7 +313,7 @@ void InertiaTensorEigen(Matrix33 &EV, Point3 &ev ) } /** Compute covariance matrix of a mesh, i.e. the integral - int_{M} { (x-b)(x-b)^T }dx where b is the barycenter and x spans over the mesh M + int_{M} { (x-b)(x-b)^T }dx where b is the barycenter and x spans over the mesh M */ static void Covariance(const MeshType & m, vcg::Point3 & bary, vcg::Matrix33 &C) { @@ -341,7 +341,7 @@ static void Covariance(const MeshType & m, vcg::Point3 & bary, vcg:: // integral of (x,y,0) in the same triangle CoordType X(1/6.0,1/6.0,0); vcg::Matrix33 A, // matrix that bring the vertices to (v1-v0,v2-v0,n) - DC; + DC; for(fi = m.face.begin(); fi != m.face.end(); ++fi) if(!(*fi).IsD()) { @@ -370,7 +370,7 @@ static void Covariance(const MeshType & m, vcg::Point3 & bary, vcg:: tmp.OuterProduct(delta,delta); DC+=tmp*0.5; // DC*=fabs(A.Determinant()); // the determinant of A is the jacobian of the change of variables A*x+delta - DC*=da; // the determinant of A is also the double area of *fi + DC*=da; // the determinant of A is also the double area of *fi C+=DC; } diff --git a/inst/include/vcglib/vcg/complex/algorithms/local_optimization/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/local_optimization/.svn/entries index b0b35ecb..3a12e8bc 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/local_optimization/.svn/entries +++ b/inst/include/vcglib/vcg/complex/algorithms/local_optimization/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms/local_optimization svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -tri_edge_collapse_quadric.h +quad_diag_collapse.h file 2013-06-21T07:04:56.754692Z -15c6c03387ead69e743d708191632457 -2013-01-28T15:42:24.503745Z -4808 +02a29ca74154df8707131c146f81489d +2012-10-08T09:03:25.280307Z +4549 cignoni +has-props @@ -57,21 +58,19 @@ cignoni - -22643 +21434 -tri_edge_collapse_quadric_tex.h +tri_edge_collapse.h file 2013-06-21T07:04:56.754692Z -8df10b44d3de89c1b30f8dfa01b39311 -2011-10-05T15:04:40.740408Z -4180 +a365c8e34acd74ff51c5e5f645099eeb +2013-01-28T15:42:24.503745Z +4808 cignoni -has-props @@ -92,18 +91,19 @@ has-props -26787 + +8566 -tri_edge_flip.h +tetra_edge_collapse.h file 2013-06-21T07:04:56.754692Z -91525e9b60424e996db464f183a70895 -2012-10-09T07:05:45.613022Z -4559 +10f1aa4bf01a6c1f732ce551792765be +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -126,20 +126,19 @@ cignoni -16112 +8763 -quad_diag_collapse.h +tri_edge_collapse_quadric.h file 2013-06-21T07:04:56.754692Z -02a29ca74154df8707131c146f81489d -2012-10-08T09:03:25.280307Z -4549 +15c6c03387ead69e743d708191632457 +2013-01-28T15:42:24.503745Z +4808 cignoni -has-props @@ -160,19 +159,21 @@ has-props -21434 + +22643 -tri_edge_collapse.h +tri_edge_collapse_quadric_tex.h file 2013-06-21T07:04:56.754692Z -a365c8e34acd74ff51c5e5f645099eeb -2013-01-28T15:42:24.503745Z -4808 +8df10b44d3de89c1b30f8dfa01b39311 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -193,19 +194,18 @@ cignoni - -8566 +26787 -tetra_edge_collapse.h +tri_edge_flip.h file 2013-06-21T07:04:56.754692Z -10f1aa4bf01a6c1f732ce551792765be -2011-10-05T15:04:40.740408Z -4180 +91525e9b60424e996db464f183a70895 +2012-10-09T07:05:45.613022Z +4559 cignoni @@ -228,5 +228,5 @@ cignoni -8763 +16112 diff --git a/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries index 11a770f8..c96a5048 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries +++ b/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries @@ -1,15 +1,15 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms/parametrization svn://svn.code.sf.net/p/vcg/code -2013-04-03T10:07:29.655724Z -4879 -cignoni +2013-07-23T11:22:06.031850Z +4924 +pietroni @@ -26,17 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -distortion.h +uv_utils.h file 2013-06-21T07:04:58.518700Z -cca1d04130da7edaa71babe6135e3708 -2012-11-15T19:11:28.863456Z -4733 -cignoni +5e82b4679676215d8704922248c01006 +2013-02-19T13:54:14.305513Z +4817 +pietroni @@ -58,20 +58,19 @@ cignoni -9671 +5526 -voronoi_atlas.h +distortion.h file 2013-06-21T07:04:58.518700Z -b3050025ec71936e1ee0e647c824021c -2013-04-03T10:07:29.655724Z -4879 +cca1d04130da7edaa71babe6135e3708 +2012-11-15T19:11:28.863456Z +4733 cignoni -has-props @@ -92,20 +91,21 @@ has-props -8181 + +9671 -tangent_field_operators.h +voronoi_atlas.h file 2013-06-21T07:04:58.518700Z -534f628c16fdf03f8d12412e909ee4c6 -2013-01-22T09:58:20.090287Z -4799 -pietroni - +b3050025ec71936e1ee0e647c824021c +2013-04-03T10:07:29.655724Z +4879 +cignoni +has-props @@ -126,18 +126,18 @@ pietroni -24853 +8181 -poisson_solver.h +tangent_field_operators.h file 2013-06-21T07:04:58.518700Z -eea3850233bb7f64f9b3e90634b9d075 -2013-03-30T15:30:18.886575Z -4876 +534f628c16fdf03f8d12412e909ee4c6 +2013-01-22T09:58:20.090287Z +4799 pietroni @@ -160,18 +160,18 @@ pietroni -24809 +24853 -uv_utils.h +poisson_solver.h file -2013-06-21T07:04:58.518700Z -5e82b4679676215d8704922248c01006 -2013-02-19T13:54:14.305513Z -4817 +2013-07-25T06:52:24.418397Z +5e61c1715fc4703225a5bfeb48171584 +2013-07-23T11:22:06.031850Z +4924 pietroni @@ -194,5 +194,5 @@ pietroni -5526 +24815 diff --git a/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/text-base/poisson_solver.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/text-base/poisson_solver.h.svn-base index fd8cfb40..0920b4ca 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/text-base/poisson_solver.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/text-base/poisson_solver.h.svn-base @@ -130,13 +130,13 @@ class PoissonSolver if (vt1->IsD())continue; if (!vt0->IsB())continue; if (!vt1->IsB())continue; -// ScalarType d_test=(vt0->P()-vt1->P()).Norm(); - ScalarType Dx=fabs(vt0->P().X()-vt1->P().X()); - ScalarType Dy=fabs(vt0->P().Y()-vt1->P().Y()); - ScalarType Dz=fabs(vt0->P().Z()-vt1->P().Z()); + ScalarType d_test=(vt0->P()-vt1->P()).Norm(); +// ScalarType Dx=fabs(vt0->P().X()-vt1->P().X()); +// ScalarType Dy=fabs(vt0->P().Y()-vt1->P().Y()); +// ScalarType Dz=fabs(vt0->P().Z()-vt1->P().Z()); -// ScalarType d_test=std::max(Dx,std::max(Dy,Dz)); - ScalarType d_test=std::max(fabs(Dx-Dy),std::max(fabs(Dx-Dz),fabs(Dy-Dz))); + //ScalarType d_test=std::max(Dx,std::max(Dy,Dz)); + //ScalarType d_test=std::max(fabs(Dx-Dy),std::max(fabs(Dx-Dz),fabs(Dy-Dz))); if (d_test>dmax) { dmax=d_test; diff --git a/inst/include/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h b/inst/include/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h index fd8cfb40..0920b4ca 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h +++ b/inst/include/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h @@ -130,13 +130,13 @@ class PoissonSolver if (vt1->IsD())continue; if (!vt0->IsB())continue; if (!vt1->IsB())continue; -// ScalarType d_test=(vt0->P()-vt1->P()).Norm(); - ScalarType Dx=fabs(vt0->P().X()-vt1->P().X()); - ScalarType Dy=fabs(vt0->P().Y()-vt1->P().Y()); - ScalarType Dz=fabs(vt0->P().Z()-vt1->P().Z()); + ScalarType d_test=(vt0->P()-vt1->P()).Norm(); +// ScalarType Dx=fabs(vt0->P().X()-vt1->P().X()); +// ScalarType Dy=fabs(vt0->P().Y()-vt1->P().Y()); +// ScalarType Dz=fabs(vt0->P().Z()-vt1->P().Z()); -// ScalarType d_test=std::max(Dx,std::max(Dy,Dz)); - ScalarType d_test=std::max(fabs(Dx-Dy),std::max(fabs(Dx-Dz),fabs(Dy-Dz))); + //ScalarType d_test=std::max(Dx,std::max(Dy,Dz)); + //ScalarType d_test=std::max(fabs(Dx-Dy),std::max(fabs(Dx-Dz),fabs(Dy-Dz))); if (d_test>dmax) { dmax=d_test; diff --git a/inst/include/vcglib/vcg/complex/algorithms/point_sampling.h b/inst/include/vcglib/vcg/complex/algorithms/point_sampling.h index 0daf2e00..a3811672 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/point_sampling.h +++ b/inst/include/vcglib/vcg/complex/algorithms/point_sampling.h @@ -40,6 +40,7 @@ sampling strategies (montecarlo, stratified etc). #include #include #include +#include #include #include #include @@ -56,7 +57,6 @@ namespace tri /** \brief An basic sampler class that show the required interface used by the SurfaceSampling class. - Most of the methods of sampling classes call the AddFace method of this class with the face containing the sample and its barycentric coord. Beside being an example of how to write a sampler it provides a simple way to use the various sampling classes. For example if you just want to get a vector with positions over the surface You have just to write @@ -116,6 +116,39 @@ class TrivialSampler }; // end class TrivialSampler + + + +template +class MeshSampler +{ +public: + typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::FaceType FaceType; + typedef typename MeshType::CoordType CoordType; + + MeshSampler(MeshType &_m):m(_m){} + MeshType &m; + + void AddVert(const VertexType &p) + { + tri::Allocator::AddVertices(m,1); + m.vert.back().ImportData(p); + } + + void AddFace(const FaceType &f, CoordType p) + { + tri::Allocator::AddVertices(m,1); + m.vert.back().P() = f.cP(0)*p[0] + f.cP(1)*p[1] +f.cP(2)*p[2]; + m.vert.back().N() = f.cV(0)->N()*p[0] + f.cV(1)->N()*p[1] + f.cV(2)->N()*p[2]; + m.vert.back().Q() = f.cV(0)->Q()*p[0] + f.cV(1)->Q()*p[1] + f.cV(2)->Q()*p[2]; + } +}; // end class BaseSampler + + + + + /** \brief Main Class of the Sampling framework. @@ -1232,6 +1265,9 @@ static int ComputePoissonSampleNum(MetroMesh &origMesh, ScalarType diskRadius) return sampleNum; } +// Note that this function actually CHANGE the quality of the montecarlo samples so that it represents the expected radius of each sample +// the expected radius of the sample is computed so that it linearly maps the quality between diskradius / variance and diskradius*variance + static void ComputePoissonSampleRadii(MetroMesh &sampleMesh, ScalarType diskRadius, ScalarType radiusVariance, bool invert) { VertexIterator vi; @@ -1270,6 +1306,7 @@ static void PoissonDiskPruning(VertexSampler &ps, MetroMesh &montecarloMesh, if(pp.pds) pp.pds->gridSize = gridsize; // if we are doing variable density sampling we have to prepare the random samples quality with the correct expected radii. + // At this point we just assume that there is the quality values as sampled from the base mesh if(pp.adaptiveRadiusFlag) ComputePoissonSampleRadii(montecarloMesh, diskRadius, pp.radiusVariance, pp.invertQuality); @@ -1542,6 +1579,16 @@ static void SubdivideAndSample(MetroMesh & m, std::vector &pvec, const }; // end class +template +void MontecarloSampling(MeshType &m, // the mesh that has to be sampled + MeshType &mm, // the mesh that will contain the samples + int sampleNum) // the desired number sample, if zero you must set the radius to the wanted value +{ + typedef tri::MeshSampler BaseSampler; + MeshSampler mcSampler(&mm); + tri::SurfaceSampling::Montecarlo(m, mcSampler, sampleNum); +} + template void MontecarloSampling(MeshType &m, // the mesh that has to be sampled @@ -1559,9 +1606,13 @@ template void PoissonSampling(MeshType &m, // the mesh that has to be sampled std::vector &poissonSamples, // the vector that will contain the set of points int sampleNum, // the desired number sample, if zero you must set the radius to the wanted value - float &radius) // the Poisson Disk Radius (used if sampleNum==0, setted if sampleNum!=0) + float &radius, // the Poisson Disk Radius (used if sampleNum==0, setted if sampleNum!=0) + float radiusVariance=1) + { typedef tri::TrivialSampler BaseSampler; + typedef tri::MeshSampler MontecarloSampler; + typename tri::SurfaceSampling::PoissonDiskParam pp; typename tri::SurfaceSampling::PoissonDiskParam::Stat stat; pp.pds = &stat; @@ -1572,22 +1623,24 @@ void PoissonSampling(MeshType &m, // the mesh that has to be sampled pp.pds->sampleNum = sampleNum; poissonSamples.clear(); - std::vector MontecarloSamples; +// std::vector MontecarloSamples; MeshType MontecarloMesh; // First step build the sampling - BaseSampler mcSampler(MontecarloSamples); + MontecarloSampler mcSampler(MontecarloMesh); BaseSampler pdSampler(poissonSamples); - tri::SurfaceSampling::Montecarlo(m, mcSampler, std::max(10000,sampleNum*40)); - - tri::Allocator::AddVertices(MontecarloMesh,MontecarloSamples.size()); - for(size_t i=0;i::Montecarlo(m, mcSampler, std::max(10000,sampleNum*40)); tri::UpdateBounding::Box(MontecarloMesh); +// tri::Build(MontecarloMesh, MontecarloSamples); int t1=clock(); pp.pds->montecarloTime = t1-t0; + if(radiusVariance !=1) + { + pp.adaptiveRadiusFlag=true; + pp.radiusVariance=radiusVariance; + } tri::SurfaceSampling::PoissonDiskPruning(pdSampler, MontecarloMesh, radius,pp); int t2=clock(); pp.pds->totalTime = t2-t0; diff --git a/inst/include/vcglib/vcg/complex/algorithms/smooth.h b/inst/include/vcglib/vcg/complex/algorithms/smooth.h index 7409e6f7..96123182 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/smooth.h +++ b/inst/include/vcglib/vcg/complex/algorithms/smooth.h @@ -60,8 +60,8 @@ class Smooth typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FaceIterator FaceIterator; typedef typename MeshType::FaceContainer FaceContainer; - typedef typename vcg::Box3 Box3Type; - typedef typename vcg::face::VFIterator VFLocalIterator; + typedef typename vcg::Box3 Box3Type; + typedef typename vcg::face::VFIterator VFLocalIterator; class ScaleLaplacianInfo { @@ -178,10 +178,10 @@ static void VertexCoordScaleDependentLaplacian_Fujiwara(MeshType &m, int step, S TD[(*fi).V1(j)].LenSum+=len; } // The fundamental part: - // We move the new point of a quantity - // - // L(M) = 1/Sum(edgelen) * Sum(Normalized edges) - // + // We move the new point of a quantity + // + // L(M) = 1/Sum(edgelen) * Sum(Normalized edges) + // for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD() && TD[*vi].LenSum>0 ) @@ -213,17 +213,17 @@ class LaplacianInfo static void AccumulateLaplacianInfo(MeshType &m, SimpleTempData &TD, bool cotangentFlag=false) { float weight =1.0f; - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) - { - if(!(*fi).IsD()) - for(int j=0;j<3;++j) - if(!(*fi).IsB(j)) - { - if(cotangentFlag) { - float angle = Angle(fi->P1(j)-fi->P2(j),fi->P0(j)-fi->P2(j)); - weight = tan(M_PI_2 - angle); - } + FaceIterator fi; + for(fi=m.face.begin();fi!=m.face.end();++fi) + { + if(!(*fi).IsD()) + for(int j=0;j<3;++j) + if(!(*fi).IsB(j)) + { + if(cotangentFlag) { + float angle = Angle(fi->P1(j)-fi->P2(j),fi->P0(j)-fi->P2(j)); + weight = tan((M_PI*0.5) - angle); + } TD[(*fi).V0(j)].sum+=(*fi).P1(j)*weight; TD[(*fi).V1(j)].sum+=(*fi).P0(j)*weight; @@ -263,40 +263,40 @@ static void AccumulateLaplacianInfo(MeshType &m, SimpleTempData TD(m.vert,lpz); - for(int i=0;i0 ) - { - if(!SmoothSelected || (*vi).IsS()) - (*vi).P() = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); - } - } + LaplacianInfo lpz(CoordType(0,0,0),0); + SimpleTempData TD(m.vert,lpz); + for(int i=0;i0 ) + { + if(!SmoothSelected || (*vi).IsS()) + (*vi).P() = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); + } + } } // Same of above but moves only the vertices that do not change FaceOrientation more that the given threshold static void VertexCoordPlanarLaplacian(MeshType &m, int step, float AngleThrRad = math::ToRad(1.0), bool SmoothSelected=false, vcg::CallBackPos * cb=0) { VertexIterator vi; - FaceIterator fi; - LaplacianInfo lpz(CoordType(0,0,0),0); - SimpleTempData TD(m.vert,lpz); - for(int i=0;i0 ) - { - if(!SmoothSelected || (*vi).IsS()) - TD[*vi].sum = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); - } + FaceIterator fi; + LaplacianInfo lpz(CoordType(0,0,0),0); + SimpleTempData TD(m.vert,lpz); + for(int i=0;i0 ) + { + if(!SmoothSelected || (*vi).IsS()) + TD[*vi].sum = ( (*vi).P() + TD[*vi].sum)/(TD[*vi].cnt+1); + } for(fi=m.face.begin();fi!=m.face.end();++fi){ if(!(*fi).IsD()){ @@ -409,19 +409,19 @@ static void VertexCoordTaubin(MeshType &m, int step, float lambda, float mu, boo static void VertexCoordLaplacianQuality(MeshType &m, int step, bool SmoothSelected=false) { LaplacianInfo lpz; - lpz.sum=CoordType(0,0,0); - lpz.cnt=1; - SimpleTempData TD(m.vert,lpz); - for(int i=0;i0 ) - if(!SmoothSelected || (*vi).IsS()) - { - float q=(*vi).Q(); - (*vi).P()=(*vi).P()*q + (TD[*vi].sum/TD[*vi].cnt)*(1.0-q); - } - } // end for + lpz.sum=CoordType(0,0,0); + lpz.cnt=1; + SimpleTempData TD(m.vert,lpz); + for(int i=0;i0 ) + if(!SmoothSelected || (*vi).IsS()) + { + float q=(*vi).Q(); + (*vi).P()=(*vi).P()*q + (TD[*vi].sum/TD[*vi].cnt)*(1.0-q); + } + } // end for }; /* @@ -440,37 +440,37 @@ class HCSmoothInfo static void VertexCoordLaplacianHC(MeshType &m, int step, bool SmoothSelected=false ) { - ScalarType beta=0.5; + ScalarType beta=0.5; HCSmoothInfo lpz; - lpz.sum=CoordType(0,0,0); - lpz.dif=CoordType(0,0,0); - lpz.cnt=0; - for(int i=0;i TD(m.vert,lpz); - // First Loop compute the laplacian - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi)if(!(*fi).IsD()) - { - for(int j=0;j<3;++j) - { - TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); - TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); - ++TD[(*fi).V(j)].cnt; - ++TD[(*fi).V1(j)].cnt; - // se l'edge j e' di bordo si deve sommare due volte - if((*fi).IsB(j)) - { - TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); - TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); - ++TD[(*fi).V(j)].cnt; - ++TD[(*fi).V1(j)].cnt; - } - } - } - VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - TD[*vi].sum/=(float)TD[*vi].cnt; + lpz.sum=CoordType(0,0,0); + lpz.dif=CoordType(0,0,0); + lpz.cnt=0; + for(int i=0;i TD(m.vert,lpz); + // First Loop compute the laplacian + FaceIterator fi; + for(fi=m.face.begin();fi!=m.face.end();++fi)if(!(*fi).IsD()) + { + for(int j=0;j<3;++j) + { + TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); + TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); + ++TD[(*fi).V(j)].cnt; + ++TD[(*fi).V1(j)].cnt; + // se l'edge j e' di bordo si deve sommare due volte + if((*fi).IsB(j)) + { + TD[(*fi).V(j)].sum+=(*fi).V1(j)->P(); + TD[(*fi).V1(j)].sum+=(*fi).V(j)->P(); + ++TD[(*fi).V(j)].cnt; + ++TD[(*fi).V1(j)].cnt; + } + } + } + VertexIterator vi; + for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + TD[*vi].sum/=(float)TD[*vi].cnt; // Second Loop compute average difference for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) @@ -636,15 +636,15 @@ class QualitySmoothInfo static void VertexQualityLaplacian(MeshType &m, int step=1, bool SmoothSelected=false) { QualitySmoothInfo lpz; - lpz.sum=0; - lpz.cnt=0; - SimpleTempData TD(m.vert,lpz); - //TD.Start(lpz); - for(int i=0;i TD(m.vert,lpz); + //TD.Start(lpz); + for(int i=0;i TD(m.vert,lpz); for(int i=0;icP(); - TD[(*fi).V1(j)].sum+=(*fi).V(j)->cP(); - ++TD[(*fi).V(j)].cnt; - ++TD[(*fi).V1(j)].cnt; - } + for(fi=m.face.begin();fi!=m.face.end();++fi) + if(!(*fi).IsD()) + for(int j=0;j<3;++j) + if((*fi).IsB(j)) + { + TD[(*fi).V(j)].sum+=(*fi).V1(j)->cP(); + TD[(*fi).V1(j)].sum+=(*fi).V(j)->cP(); + ++TD[(*fi).V(j)].cnt; + ++TD[(*fi).V1(j)].cnt; + } for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD() && TD[*vi].cnt>0 ) @@ -858,10 +858,10 @@ void FaceNormalFuzzyVectorSB(MeshType &m, for(fi=m.face.begin();fi!=m.face.end();++fi) { CoordType bc=(*fi).Barycenter(); - // 1) Clear all the visited flag of faces that are vertex-adjacent to fi + // 1) Clear all the visited flag of faces that are vertex-adjacent to fi for(i=0;i<3;++i) { - vcg::face::VFIterator ep(&*fi,i); + vcg::face::VFIterator ep(&*fi,i); while (!ep.End()) { ep.f->ClearV(); @@ -871,29 +871,29 @@ void FaceNormalFuzzyVectorSB(MeshType &m, // 1) Effectively average the normals weighting them with (*fi).SetV(); - CoordType mm=CoordType(0,0,0); - for(i=0;i<3;++i) - { - vcg::face::VFIterator ep(&*fi,i); - while (!ep.End()) - { - if(! (*ep.f).IsV() ) - { - if(sigma>0) - { - ScalarType dd=SquaredDistance(ep.f->Barycenter(),bc); - ScalarType ang=AngleN(ep.f->N(),(*fi).N()); - mm+=ep.f->N()*exp((-sigma)*ang*ang/dd); - } - else mm+=ep.f->N(); - (*ep.f).SetV(); - } - ++ep; - } - } - mm.Normalize(); - TD[*fi].m=mm; - } + CoordType mm=CoordType(0,0,0); + for(i=0;i<3;++i) + { + vcg::face::VFIterator ep(&*fi,i); + while (!ep.End()) + { + if(! (*ep.f).IsV() ) + { + if(sigma>0) + { + ScalarType dd=SquaredDistance(ep.f->Barycenter(),bc); + ScalarType ang=AngleN(ep.f->N(),(*fi).N()); + mm+=ep.f->N()*exp((-sigma)*ang*ang/dd); + } + else mm+=ep.f->N(); + (*ep.f).SetV(); + } + ++ep; + } + } + mm.Normalize(); + TD[*fi].m=mm; + } } // Replace the normal of the face with the average of normals of the vertex adijacent faces. @@ -915,7 +915,7 @@ static void FaceNormalLaplacianVF(MeshType &m) FaceIterator fi; - tri::UpdateNormal::AreaNormalizeFace(m); + tri::UpdateNormal::AreaNormalizeFace(m); for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) { @@ -1016,37 +1016,37 @@ static void FaceNormalAngleThreshold(MeshType &m, for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) { CoordType bc=Barycenter(*fi); - // 1) Clear all the visited flag of faces that are vertex-adjacent to fi + // 1) Clear all the visited flag of faces that are vertex-adjacent to fi for(i=0;i<3;++i) { - VFLocalIterator ep(&*fi,i); + VFLocalIterator ep(&*fi,i); for (;!ep.End();++ep) ep.f->ClearV(); } - // 1) Effectively average the normals weighting them with the squared difference of the angle similarity + // 1) Effectively average the normals weighting them with the squared difference of the angle similarity // sigma is the cosine of a threshold angle. sigma \in 0..1 // sigma == 0 All the normals are averaged // sigma == 1 Nothing is averaged. // The averaging is weighted with the difference between normals. more similar the normal more important they are. - CoordType normalSum=CoordType(0,0,0); + CoordType normalSum=CoordType(0,0,0); for(i=0;i<3;++i) { - VFLocalIterator ep(&*fi,i); + VFLocalIterator ep(&*fi,i); for (;!ep.End();++ep) { if(! (*ep.f).IsV() ) { - ScalarType cosang=ep.f->N().dot((*fi).N()); + ScalarType cosang=ep.f->N().dot((*fi).N()); // Note that if two faces form an angle larger than 90 deg, their contribution should be very very small. // Without this clamping cosang = math::Clamp(cosang,0.0001f,1.f); - if(cosang >= sigma) - { - ScalarType w = cosang-sigma; + if(cosang >= sigma) + { + ScalarType w = cosang-sigma; normalSum += ep.f->N()*(w*w); // similar normals have a cosang very close to 1 so cosang - sigma is maximized - } + } (*ep.f).SetV(); } } @@ -1149,9 +1149,9 @@ static void FitMesh(MeshType &m, static void FastFitMesh(MeshType &m, - SimpleTempData &TDV, + SimpleTempData &TDV, //SimpleTempData &TDF, - bool OnlySelected=false) + bool OnlySelected=false) { //vcg::face::Pos ep; vcg::face::VFIterator ep; @@ -1162,14 +1162,14 @@ static void FastFitMesh(MeshType &m, CoordType Sum(0,0,0); ScalarType cnt=0; VFLocalIterator ep(&*vi); - for (;!ep.End();++ep) - { + for (;!ep.End();++ep) + { CoordType bc=Barycenter(*ep.F()); Sum += ep.F()->N()*(ep.F()->N().dot(bc - (*vi).P())); ++cnt; - } - TDV[*vi].np=(*vi).P()+ Sum*(1.0/cnt); - } + } + TDV[*vi].np=(*vi).P()+ Sum*(1.0/cnt); + } if(OnlySelected) { @@ -1226,7 +1226,7 @@ static void VertexCoordPasoDobleFast(MeshType &m, int NormalSmoothStep, typename SimpleTempData< typename MeshType::FaceContainer, PDFaceInfo> TDF(m.face,lpzf); for(int j=0;jf->SetB(ps->z); - } else + } /*else if(pe-ps!=2) { // Caso complex!! for(;ps!=pe;++ps) ps->f->SetB(ps->z); // Si settano border anche i complex. - } + }*/ ps = pe; } if(pe==e.end()) break; diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/quality.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/quality.h.svn-base index a53aa6a8..f1c9f25d 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/quality.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/quality.h.svn-base @@ -8,7 +8,7 @@ * \ * * All rights reserved. * * * -* This program is free software; you can redistribute it and/or modify * +* This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * @@ -33,11 +33,11 @@ namespace vcg { namespace tri { -/// \ingroup trimesh +/// \ingroup trimesh /// \headerfile quality.h vcg/complex/algorithms/update/quality.h -/// \brief Generation of per-vertex and per-face qualities. +/// \brief Generation of per-vertex and per-face qualities. /** It works according to various strategy, like geodesic distance from the border (UpdateQuality::VertexGeodesicFromBorder) or curvature ecc. This class is templated over the mesh and (like all other Update* classes) has only static members; Typical usage: @@ -51,7 +51,7 @@ template class UpdateQuality { public: - typedef UpdateMeshType MeshType; + typedef UpdateMeshType MeshType; typedef typename MeshType::ScalarType ScalarType; typedef typename MeshType::VertexType VertexType; typedef typename MeshType::VertexPointer VertexPointer; @@ -60,133 +60,22 @@ public: typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FaceIterator FaceIterator; -class VQualityHeap -{ -public: - float q; - VertexPointer p; - inline VQualityHeap( VertexPointer np ) - { - q = np->Q(); - p = np; - } - // Attenzione il minore e' maggiore - inline bool operator < ( const VQualityHeap & vq ) const { return q > vq.q; } - inline bool operator == ( const VQualityHeap & vq ) const { return q == vq.q; } - inline bool operator > ( const VQualityHeap & vq ) const { return q < vq.q; } - inline bool operator != ( const VQualityHeap & vq ) const { return q != vq.q; } - inline bool operator <= ( const VQualityHeap & vq ) const { return q >= vq.q; } - inline bool operator >= ( const VQualityHeap & vq ) const { return q <= vq.q; } - inline bool is_valid() const { return q==p->Q(); } -}; - - - -// *** IMPORTANT REQUIREMENTS -// VF topology -// Border FLags -// tri::UpdateTopology::VertexFace(sm); -// tri::UpdateFlags::FaceBorderFromVF(sm); -// -// Calcola la qualita' come distanza geodesica dal bordo della mesh. -// Robusta funziona anche per mesh non manifold. -// La qualita' memorizzata indica la distanza assoluta dal bordo della mesh. -// Nota prima del 13/11/03 in alcuni casi rari SPT andava in loop perche' poteva capitare -// che per approx numeriche ben strane pw->Q() > pv->Q()+d ma durante la memorizzazione -// della nuova distanza essa rimanesse uguale a prima. Patchato rimettendo i vertici nello -// heap solo se migliorano la distanza di un epsilon == 1/100000 della mesh diag. - -/// \brief Compute, for each vertex of the mesh the geodesic distance from the border of the mesh itself. - -/** -It uses the classical Dijkstra Shortest Path Tree algorithm. -The geodesic distance is approximated by allowing to walk only along edges of the mesh. - -\warning VF topology, Per Vertex Quality and border flags already computed (see UpdateFlags::FaceBorderFromVF and UpdateTopology::VertexFace); - -*/ -static void VertexGeodesicFromBorder(MeshType &m) // R1 -{ - //Requirements - assert(HasPerVertexVFAdjacency(m) && HasPerFaceVFAdjacency(m)); - assert(HasPerVertexQuality(m)); - - std::vector< VQualityHeap > heap; - VertexIterator v; - FaceIterator f; - int j; - - for(v=m.vert.begin();v!=m.vert.end();++v) - (*v).Q() = -1; - for(f=m.face.begin();f!=m.face.end();++f) // Inserisco nell'heap i v di bordo - if(!(*f).IsD()) - for(j=0;j<3;++j) - if( (*f).IsB(j) ) - { - for(int k=0;k<2;++k) - { - VertexPointer pv = (*f).V((j+k)%3); - if( pv->Q()==-1 ) - { - pv->Q() = 0; - heap.push_back(VQualityHeap(pv)); - } - } - } - - const ScalarType loc_eps=m.bbox.Diag()/ScalarType(100000); - while( heap.size()!=0 ) // Shortest path tree - { - VertexPointer pv; - std::pop_heap(heap.begin(),heap.end()); - if( ! heap.back().is_valid() ) - { - heap.pop_back(); - continue; - } - pv = heap.back().p; - heap.pop_back(); - - for(face::VFIterator vfi(pv) ; !vfi.End(); ++vfi ) - { - for(int k=0;k<2;++k) - { - VertexPointer pw; - float d; - if(k==0) pw = vfi.f->V1(vfi.z); - else pw = vfi.f->V2(vfi.z); - d = Distance(pv->P(),pw->P()); - if( pw->Q()==-1 || pw->Q() > pv->Q()+d + loc_eps) - { - pw->Q() = pv->Q()+d; - heap.push_back(VQualityHeap(pw)); - std::push_heap(heap.begin(),heap.end()); - } - } - } - } - - for(v=m.vert.begin();v!=m.vert.end();++v) - if(v->Q()==-1) - v->Q() = 0; -} - /** Assign to each vertex of the mesh a constant quality value. Useful for initialization. */ static void VertexConstant(MeshType &m, float q) { - VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q()=q; + tri::RequirePerVertexQuality(m); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + (*vi).Q()=q; } /** Clamp each vertex of the mesh with a range of values. */ static void VertexClamp(MeshType &m, float qmin, float qmax) { - VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + tri::RequirePerVertexQuality(m); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) (*vi).Q()=std::min(qmax, std::max(qmin,(*vi).Q())); } @@ -194,6 +83,7 @@ static void VertexClamp(MeshType &m, float qmin, float qmax) */ static void VertexNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) { + tri::RequirePerVertexQuality(m); ScalarType deltaRange = qmax-qmin; std::pair minmax = tri::Stat::ComputePerVertexQualityMinMax(m); VertexIterator vi; @@ -205,10 +95,10 @@ static void VertexNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) */ static void FaceNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) { + tri::RequirePerFaceQuality(m); ScalarType deltaRange = qmax-qmin; std::pair minmax = tri::Stat::ComputePerFaceQualityMinMax(m); - FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) + for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) (*fi).Q() = qmin+deltaRange*((*fi).Q() - minmax.first)/(minmax.second - minmax.first); } @@ -216,27 +106,54 @@ static void FaceNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) */ static void FaceConstant(MeshType &m, float q) { - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) - (*fi).Q()=q; + tri::RequirePerFaceQuality(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + (*fi).Q()=q; } -/** Assign to each face of the mesh its double area. +/** Assign to each face of the mesh its area. */ static void FaceArea(MeshType &m) { - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) - (*fi).Q()=vcg::DoubleArea(*fi)/2; + tri::RequirePerFaceQuality(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + (*fi).Q()=vcg::DoubleArea(*fi)/ScalarType(2.0); +} + +static void VertexFromFace( MeshType &m, bool areaWeighted=true) +{ + tri::RequirePerFaceQuality(m); + tri::RequirePerVertexQuality(m); + SimpleTempData TQ(m.vert,0); + SimpleTempData TCnt(m.vert,0); + + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + if(!(*fi).IsD()) + { + ScalarType weight=1.0; + if(areaWeighted) weight = vcg::DoubleArea(*fi); + for(int j=0;j<3;++j) + { + TQ[(*fi).V(j)]+=(*fi).Q(); + TCnt[(*fi).V(j)]+=weight; + } + } + + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + if(!(*vi).IsD() && TCnt[*vi]>0 ) + { + (*vi).Q() = TQ[*vi] / TCnt[*vi]; + } } static void FaceFromVertex( MeshType &m) { - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) - { - (*fi).Q() = ((*fi).V(0)->Q()+(*fi).V(1)->Q()+(*fi).V(2)->Q())/3.0f; - } + tri::RequirePerFaceQuality(m); + tri::RequirePerVertexQuality(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) + { + (*fi).Q() = ((*fi).V(0)->Q()+(*fi).V(1)->Q()+(*fi).V(2)->Q())/3.0f; + } } static void VertexFromPlane(MeshType &m, const Plane3 &pl) @@ -246,19 +163,19 @@ static void VertexFromPlane(MeshType &m, const Plane3 &pl) } static void VertexFromGaussianCurvatureHG(MeshType &m) -{ +{ tri::RequirePerVertexQuality(m); tri::RequirePerVertexCurvature(m); for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q() = (*vi).Kg(); + (*vi).Q() = (*vi).Kg(); } static void VertexFromMeanCurvatureHG(MeshType &m) -{ +{ tri::RequirePerVertexQuality(m); tri::RequirePerVertexCurvature(m); for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q() = (*vi).Kh(); + (*vi).Q() = (*vi).Kh(); } static void VertexFromGaussianCurvatureDir(MeshType &m) @@ -278,45 +195,45 @@ static void VertexFromMeanCurvatureDir(MeshType &m) } /* - * Absolute Curvature + * Absolute Curvature * * 2|H| if K >= 0 * |k1| + |k2| = < * 2 * sqrt(|H|^2-K) otherwise * - * defs and formulas taken from - * + * defs and formulas taken from + * * Improved curvature estimation for watershed segmentation of 3-dimensional meshes * S Pulla, A Razdan, G Farin - Arizona State University, Tech. Rep, 2001 * and from - * Optimizing 3D triangulations using discrete curvature analysis - * N Dyn, K Hormann, SJ Kim, D Levin - Mathematical Methods for Curves and Surfaces: Oslo, 2000 + * Optimizing 3D triangulations using discrete curvature analysis + * N Dyn, K Hormann, SJ Kim, D Levin - Mathematical Methods for Curves and Surfaces: Oslo, 2000 */ static void VertexFromAbsoluteCurvature(MeshType &m) -{ +{ VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) { - if((*vi).Kg() >= 0) + if((*vi).Kg() >= 0) (*vi).Q() = math::Abs( 2*(*vi).Kh() ); else - (*vi).Q() = 2*math::Sqrt(math::Abs( (*vi).Kh()*(*vi).Kh() - (*vi).Kg())); + (*vi).Q() = 2*math::Sqrt(math::Abs( (*vi).Kh()*(*vi).Kh() - (*vi).Kg())); } } /* * RMS Curvature = sqrt(4H^2-2K) - * def and formula taken from - * + * def and formula taken from + * * Improved curvature estimation for watershed segmentation of 3-dimensional meshes * S Pulla, A Razdan, G Farin - Arizona State University, Tech. Rep, 2001 - */ + */ static void VertexFromRMSCurvature(MeshType &m) -{ +{ VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q() = math::Sqrt(math::Abs( 4*(*vi).Kh()*(*vi).Kh() - 2*(*vi).Kg())); + for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + (*vi).Q() = math::Sqrt(math::Abs( 4*(*vi).Kh()*(*vi).Kh() - 2*(*vi).Kg())); } diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/flag.h b/inst/include/vcglib/vcg/complex/algorithms/update/flag.h index 0238e286..7f7d5f61 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/flag.h +++ b/inst/include/vcglib/vcg/complex/algorithms/update/flag.h @@ -326,11 +326,11 @@ class UpdateFlags { if(pe-ps==1) { ps->f->SetB(ps->z); - } else + } /*else if(pe-ps!=2) { // Caso complex!! for(;ps!=pe;++ps) ps->f->SetB(ps->z); // Si settano border anche i complex. - } + }*/ ps = pe; } if(pe==e.end()) break; diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/quality.h b/inst/include/vcglib/vcg/complex/algorithms/update/quality.h index a53aa6a8..f1c9f25d 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/quality.h +++ b/inst/include/vcglib/vcg/complex/algorithms/update/quality.h @@ -8,7 +8,7 @@ * \ * * All rights reserved. * * * -* This program is free software; you can redistribute it and/or modify * +* This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * @@ -33,11 +33,11 @@ namespace vcg { namespace tri { -/// \ingroup trimesh +/// \ingroup trimesh /// \headerfile quality.h vcg/complex/algorithms/update/quality.h -/// \brief Generation of per-vertex and per-face qualities. +/// \brief Generation of per-vertex and per-face qualities. /** It works according to various strategy, like geodesic distance from the border (UpdateQuality::VertexGeodesicFromBorder) or curvature ecc. This class is templated over the mesh and (like all other Update* classes) has only static members; Typical usage: @@ -51,7 +51,7 @@ template class UpdateQuality { public: - typedef UpdateMeshType MeshType; + typedef UpdateMeshType MeshType; typedef typename MeshType::ScalarType ScalarType; typedef typename MeshType::VertexType VertexType; typedef typename MeshType::VertexPointer VertexPointer; @@ -60,133 +60,22 @@ class UpdateQuality typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FaceIterator FaceIterator; -class VQualityHeap -{ -public: - float q; - VertexPointer p; - inline VQualityHeap( VertexPointer np ) - { - q = np->Q(); - p = np; - } - // Attenzione il minore e' maggiore - inline bool operator < ( const VQualityHeap & vq ) const { return q > vq.q; } - inline bool operator == ( const VQualityHeap & vq ) const { return q == vq.q; } - inline bool operator > ( const VQualityHeap & vq ) const { return q < vq.q; } - inline bool operator != ( const VQualityHeap & vq ) const { return q != vq.q; } - inline bool operator <= ( const VQualityHeap & vq ) const { return q >= vq.q; } - inline bool operator >= ( const VQualityHeap & vq ) const { return q <= vq.q; } - inline bool is_valid() const { return q==p->Q(); } -}; - - - -// *** IMPORTANT REQUIREMENTS -// VF topology -// Border FLags -// tri::UpdateTopology::VertexFace(sm); -// tri::UpdateFlags::FaceBorderFromVF(sm); -// -// Calcola la qualita' come distanza geodesica dal bordo della mesh. -// Robusta funziona anche per mesh non manifold. -// La qualita' memorizzata indica la distanza assoluta dal bordo della mesh. -// Nota prima del 13/11/03 in alcuni casi rari SPT andava in loop perche' poteva capitare -// che per approx numeriche ben strane pw->Q() > pv->Q()+d ma durante la memorizzazione -// della nuova distanza essa rimanesse uguale a prima. Patchato rimettendo i vertici nello -// heap solo se migliorano la distanza di un epsilon == 1/100000 della mesh diag. - -/// \brief Compute, for each vertex of the mesh the geodesic distance from the border of the mesh itself. - -/** -It uses the classical Dijkstra Shortest Path Tree algorithm. -The geodesic distance is approximated by allowing to walk only along edges of the mesh. - -\warning VF topology, Per Vertex Quality and border flags already computed (see UpdateFlags::FaceBorderFromVF and UpdateTopology::VertexFace); - -*/ -static void VertexGeodesicFromBorder(MeshType &m) // R1 -{ - //Requirements - assert(HasPerVertexVFAdjacency(m) && HasPerFaceVFAdjacency(m)); - assert(HasPerVertexQuality(m)); - - std::vector< VQualityHeap > heap; - VertexIterator v; - FaceIterator f; - int j; - - for(v=m.vert.begin();v!=m.vert.end();++v) - (*v).Q() = -1; - for(f=m.face.begin();f!=m.face.end();++f) // Inserisco nell'heap i v di bordo - if(!(*f).IsD()) - for(j=0;j<3;++j) - if( (*f).IsB(j) ) - { - for(int k=0;k<2;++k) - { - VertexPointer pv = (*f).V((j+k)%3); - if( pv->Q()==-1 ) - { - pv->Q() = 0; - heap.push_back(VQualityHeap(pv)); - } - } - } - - const ScalarType loc_eps=m.bbox.Diag()/ScalarType(100000); - while( heap.size()!=0 ) // Shortest path tree - { - VertexPointer pv; - std::pop_heap(heap.begin(),heap.end()); - if( ! heap.back().is_valid() ) - { - heap.pop_back(); - continue; - } - pv = heap.back().p; - heap.pop_back(); - - for(face::VFIterator vfi(pv) ; !vfi.End(); ++vfi ) - { - for(int k=0;k<2;++k) - { - VertexPointer pw; - float d; - if(k==0) pw = vfi.f->V1(vfi.z); - else pw = vfi.f->V2(vfi.z); - d = Distance(pv->P(),pw->P()); - if( pw->Q()==-1 || pw->Q() > pv->Q()+d + loc_eps) - { - pw->Q() = pv->Q()+d; - heap.push_back(VQualityHeap(pw)); - std::push_heap(heap.begin(),heap.end()); - } - } - } - } - - for(v=m.vert.begin();v!=m.vert.end();++v) - if(v->Q()==-1) - v->Q() = 0; -} - /** Assign to each vertex of the mesh a constant quality value. Useful for initialization. */ static void VertexConstant(MeshType &m, float q) { - VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q()=q; + tri::RequirePerVertexQuality(m); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + (*vi).Q()=q; } /** Clamp each vertex of the mesh with a range of values. */ static void VertexClamp(MeshType &m, float qmin, float qmax) { - VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + tri::RequirePerVertexQuality(m); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) (*vi).Q()=std::min(qmax, std::max(qmin,(*vi).Q())); } @@ -194,6 +83,7 @@ static void VertexClamp(MeshType &m, float qmin, float qmax) */ static void VertexNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) { + tri::RequirePerVertexQuality(m); ScalarType deltaRange = qmax-qmin; std::pair minmax = tri::Stat::ComputePerVertexQualityMinMax(m); VertexIterator vi; @@ -205,10 +95,10 @@ static void VertexNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) */ static void FaceNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) { + tri::RequirePerFaceQuality(m); ScalarType deltaRange = qmax-qmin; std::pair minmax = tri::Stat::ComputePerFaceQualityMinMax(m); - FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) + for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) (*fi).Q() = qmin+deltaRange*((*fi).Q() - minmax.first)/(minmax.second - minmax.first); } @@ -216,27 +106,54 @@ static void FaceNormalize(MeshType &m, float qmin=0.0, float qmax=1.0) */ static void FaceConstant(MeshType &m, float q) { - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) - (*fi).Q()=q; + tri::RequirePerFaceQuality(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + (*fi).Q()=q; } -/** Assign to each face of the mesh its double area. +/** Assign to each face of the mesh its area. */ static void FaceArea(MeshType &m) { - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) - (*fi).Q()=vcg::DoubleArea(*fi)/2; + tri::RequirePerFaceQuality(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + (*fi).Q()=vcg::DoubleArea(*fi)/ScalarType(2.0); +} + +static void VertexFromFace( MeshType &m, bool areaWeighted=true) +{ + tri::RequirePerFaceQuality(m); + tri::RequirePerVertexQuality(m); + SimpleTempData TQ(m.vert,0); + SimpleTempData TCnt(m.vert,0); + + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + if(!(*fi).IsD()) + { + ScalarType weight=1.0; + if(areaWeighted) weight = vcg::DoubleArea(*fi); + for(int j=0;j<3;++j) + { + TQ[(*fi).V(j)]+=(*fi).Q(); + TCnt[(*fi).V(j)]+=weight; + } + } + + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + if(!(*vi).IsD() && TCnt[*vi]>0 ) + { + (*vi).Q() = TQ[*vi] / TCnt[*vi]; + } } static void FaceFromVertex( MeshType &m) { - FaceIterator fi; - for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) - { - (*fi).Q() = ((*fi).V(0)->Q()+(*fi).V(1)->Q()+(*fi).V(2)->Q())/3.0f; - } + tri::RequirePerFaceQuality(m); + tri::RequirePerVertexQuality(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) + { + (*fi).Q() = ((*fi).V(0)->Q()+(*fi).V(1)->Q()+(*fi).V(2)->Q())/3.0f; + } } static void VertexFromPlane(MeshType &m, const Plane3 &pl) @@ -246,19 +163,19 @@ static void VertexFromPlane(MeshType &m, const Plane3 &pl) } static void VertexFromGaussianCurvatureHG(MeshType &m) -{ +{ tri::RequirePerVertexQuality(m); tri::RequirePerVertexCurvature(m); for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q() = (*vi).Kg(); + (*vi).Q() = (*vi).Kg(); } static void VertexFromMeanCurvatureHG(MeshType &m) -{ +{ tri::RequirePerVertexQuality(m); tri::RequirePerVertexCurvature(m); for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q() = (*vi).Kh(); + (*vi).Q() = (*vi).Kh(); } static void VertexFromGaussianCurvatureDir(MeshType &m) @@ -278,45 +195,45 @@ static void VertexFromMeanCurvatureDir(MeshType &m) } /* - * Absolute Curvature + * Absolute Curvature * * 2|H| if K >= 0 * |k1| + |k2| = < * 2 * sqrt(|H|^2-K) otherwise * - * defs and formulas taken from - * + * defs and formulas taken from + * * Improved curvature estimation for watershed segmentation of 3-dimensional meshes * S Pulla, A Razdan, G Farin - Arizona State University, Tech. Rep, 2001 * and from - * Optimizing 3D triangulations using discrete curvature analysis - * N Dyn, K Hormann, SJ Kim, D Levin - Mathematical Methods for Curves and Surfaces: Oslo, 2000 + * Optimizing 3D triangulations using discrete curvature analysis + * N Dyn, K Hormann, SJ Kim, D Levin - Mathematical Methods for Curves and Surfaces: Oslo, 2000 */ static void VertexFromAbsoluteCurvature(MeshType &m) -{ +{ VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) { - if((*vi).Kg() >= 0) + if((*vi).Kg() >= 0) (*vi).Q() = math::Abs( 2*(*vi).Kh() ); else - (*vi).Q() = 2*math::Sqrt(math::Abs( (*vi).Kh()*(*vi).Kh() - (*vi).Kg())); + (*vi).Q() = 2*math::Sqrt(math::Abs( (*vi).Kh()*(*vi).Kh() - (*vi).Kg())); } } /* * RMS Curvature = sqrt(4H^2-2K) - * def and formula taken from - * + * def and formula taken from + * * Improved curvature estimation for watershed segmentation of 3-dimensional meshes * S Pulla, A Razdan, G Farin - Arizona State University, Tech. Rep, 2001 - */ + */ static void VertexFromRMSCurvature(MeshType &m) -{ +{ VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) - (*vi).Q() = math::Sqrt(math::Abs( 4*(*vi).Kh()*(*vi).Kh() - 2*(*vi).Kg())); + for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + (*vi).Q() = math::Sqrt(math::Abs( 4*(*vi).Kh()*(*vi).Kh() - 2*(*vi).Kg())); } diff --git a/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h b/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h index de639162..cfe68769 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h +++ b/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h @@ -8,7 +8,7 @@ * \ * * All rights reserved. * * * -* This program is free software; you can redistribute it and/or modify * +* This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * @@ -21,11 +21,9 @@ * * ****************************************************************************/ - #ifndef VORONOI_PROCESSING_H #define VORONOI_PROCESSING_H -//#include #include #include namespace vcg @@ -35,41 +33,38 @@ namespace tri template class ClusteringSampler - { - public: - typedef typename MeshType::VertexType VertexType; - - ClusteringSampler() - { - sampleVec=0; - } - ClusteringSampler(std::vector *_vec) - { - sampleVec = _vec; - } - std::vector *sampleVec; - - void AddVert(const VertexType &p) - { - sampleVec->push_back((VertexType *)(&p)); - } - }; // end class ClusteringSampler +{ +public: + typedef typename MeshType::VertexType VertexType; + + ClusteringSampler(std::vector &_vec): sampleVec(_vec) + { + sampleVec = _vec; + } + + std::vector &sampleVec; + + void AddVert(const VertexType &p) + { + sampleVec.push_back((VertexType *)(&p)); + } +}; // end class ClusteringSampler template class VoronoiProcessing { - typedef typename MeshType::CoordType CoordType; + typedef typename MeshType::CoordType CoordType; typedef typename MeshType::ScalarType ScalarType; - typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::VertexType VertexType; typedef typename MeshType::VertexPointer VertexPointer; typedef typename MeshType::VertexIterator VertexIterator; typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FaceIterator FaceIterator; typedef typename MeshType::FaceType FaceType; typedef typename MeshType::FaceContainer FaceContainer; - public: + public: // Given a vector of point3f it finds the closest vertices on the mesh. @@ -118,18 +113,18 @@ static void VoronoiColoring(MeshType &m, std::vector &seedVec, boo tri::Geodesic g; VertexPointer farthest; - if(frontierFlag) - { - //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. - //The error should have been removed from MSVS2012 - std::pair zz(0.0f,static_cast(NULL)); - std::vector< std::pair > regionArea(m.vert.size(),zz); - std::vector borderVec; - GetAreaAndFrontier(m, sources, regionArea, borderVec); - tri::Geodesic::Compute(m,borderVec); - } + if(frontierFlag) + { + //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. + //The error should have been removed from MSVS2012 + std::pair zz(0.0f,static_cast(NULL)); + std::vector< std::pair > regionArea(m.vert.size(),zz); + std::vector borderVec; + GetAreaAndFrontier(m, sources, regionArea, borderVec); + tri::Geodesic::Compute(m,borderVec); + } - tri::UpdateColor::PerVertexQualityRamp(m); + tri::UpdateColor::PerVertexQualityRamp(m); } // It associates the faces with a given vertex according to the vertex associations @@ -242,153 +237,157 @@ static void GetAreaAndFrontier(MeshType &m, PerVertexPointerHandle &sources, std::vector< std::pair > ®ionArea, std::vector &borderVec) { - tri::UpdateFlags::VertexClearV(m); - for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) - { - if( sources[(*fi).V(0)] != sources[(*fi).V(1)] || - sources[(*fi).V(0)] != sources[(*fi).V(2)] ) - { - for(int i=0;i<3;++i) - { - (*fi).V(i)->SetV(); - (*fi).V(i)->C() = Color4b::Black; - } - } - else // the face belongs to a single region; accumulate area; - { - if(sources[(*fi).V(0)] != 0) - { - int seedIndex = sources[(*fi).V(0)] - &*m.vert.begin(); - regionArea[seedIndex].first+=DoubleArea(*fi); - regionArea[seedIndex].second=sources[(*fi).V(0)]; - } - } - } - - // Collect the frontier vertexes - borderVec.clear(); - for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) - if((*vi).IsV()) borderVec.push_back(&*vi); + tri::UpdateFlags::VertexClearV(m); + for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi) + { + if( sources[(*fi).V(0)] != sources[(*fi).V(1)] || + sources[(*fi).V(0)] != sources[(*fi).V(2)] ) + { + for(int i=0;i<3;++i) + { + (*fi).V(i)->SetV(); + (*fi).V(i)->C() = Color4b::Black; + } + } + else // the face belongs to a single region; accumulate area; + { + if(sources[(*fi).V(0)] != 0) + { + int seedIndex = sources[(*fi).V(0)] - &*m.vert.begin(); + regionArea[seedIndex].first+=DoubleArea(*fi); + regionArea[seedIndex].second=sources[(*fi).V(0)]; + } + } + } + + // Collect the frontier vertexes + borderVec.clear(); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + if((*vi).IsV()) borderVec.push_back(&*vi); } static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int relaxIter, int /*percentileClamping*/, vcg::CallBackPos *cb=0) -{ - for(int iter=0;iter sources; - sources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); - - tri::Geodesic::Compute(m,seedVec,std::numeric_limits::max(),0,&sources); - - // Delete all the (hopefully) small regions that have not been reached by the seeds; - tri::UpdateFlags::VertexClearV(m); - for(int i=0;iV(0)->IsV() || fi->V(1)->IsV() || fi->V(2)->IsV() ) - { - face::VFDetach(*fi); - tri::Allocator::DeleteFace(m,*fi); - } - qDebug("Deleted faces not reached: %i -> %i",int(m.face.size()),m.fn); - tri::Clean::RemoveUnreferencedVertex(m); - tri::Allocator::CompactFaceVector(m); - tri::Allocator::CompactVertexVector(m); - - //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. - //The error should have been removed from MSVS2012 - std::pair zz(0.0f,static_cast(NULL)); - std::vector< std::pair > regionArea(m.vert.size(),zz); - std::vector borderVec; - - GetAreaAndFrontier(m, sources, regionArea, borderVec); - - // Smaller area region are discarded - Distribution H; +{ + tri::RequireVFAdjacency(m); + + typename MeshType::template PerVertexAttributeHandle sources; + sources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); + + for(int iter=0;iter::Compute(m,seedVec,std::numeric_limits::max(),0,&sources); + + // Delete all the (hopefully) small regions that have not been reached by the seeds; + tri::UpdateFlags::VertexClearV(m); + for(int i=0;iV(0)->IsV() || fi->V(1)->IsV() || fi->V(2)->IsV() ) + { + face::VFDetach(*fi); + tri::Allocator::DeleteFace(m,*fi); + } + // qDebug("Deleted faces not reached: %i -> %i",int(m.face.size()),m.fn); + tri::Clean::RemoveUnreferencedVertex(m); + tri::Allocator::CompactFaceVector(m); + tri::Allocator::CompactVertexVector(m); + + //static_cast(NULL) has been introduced just to avoid an error in the MSVS2010's compiler confusing pointer with int. You could use nullptr to avoid it, but it's not supported by all compilers. + //The error should have been removed from MSVS2012 + std::pair zz(0.0f,static_cast(NULL)); + std::vector< std::pair > regionArea(m.vert.size(),zz); + std::vector borderVec; + + GetAreaAndFrontier(m, sources, regionArea, borderVec); + + // Smaller area region are discarded + Distribution H; for(size_t i=0;i::Compute(m,borderVec); - tri::UpdateColor::PerVertexQualityRamp(m); - - // Search the local maxima for each region and use them as new seeds - std::vector< std::pair > seedMaxima(m.vert.size(),zz); - for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) - { - int seedIndex = tri::Index(m,sources[vi]); - if(seedMaxima[seedIndex].first < (*vi).Q()) - { - seedMaxima[seedIndex].first=(*vi).Q(); - seedMaxima[seedIndex].second=&*vi; - } - } - std::vector newSeeds; + if(regionArea[i].second) H.Add(regionArea[i].first); + + float areaThreshold; + if(iter==0) areaThreshold = H.Percentile(.1f); + else areaThreshold = H.Percentile(.001f); + //qDebug("We have found %i regions range (%f %f), avg area is %f, Variance is %f 10perc is %f",(int)seedVec.size(),H.Min(),H.Max(),H.Avg(),H.StandardDeviation(),areaThreshold); + + if(cb) cb(iter*100/relaxIter,"Voronoi Lloyd Relaxation: Searching New Seeds"); + + tri::Geodesic::Compute(m,borderVec); + tri::UpdateColor::PerVertexQualityRamp(m); + + // Search the local maxima for each region and use them as new seeds + std::vector< std::pair > seedMaxima(m.vert.size(),zz); + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + { + int seedIndex = tri::Index(m,sources[vi]); + if(seedMaxima[seedIndex].first < (*vi).Q()) + { + seedMaxima[seedIndex].first=(*vi).Q(); + seedMaxima[seedIndex].second=&*vi; + } + } + std::vector newSeeds; for(size_t i=0;iC() = Color4b::Gray; - if(regionArea[i].first >= areaThreshold) - newSeeds.push_back(seedMaxima[i].second); - } - - tri::UpdateColor::PerVertexQualityRamp(m); + if(seedMaxima[i].second) + { + seedMaxima[i].second->C() = Color4b::Gray; + if(regionArea[i].first >= areaThreshold) + newSeeds.push_back(seedMaxima[i].second); + } + + tri::UpdateColor::PerVertexQualityRamp(m); for(size_t i=0;iC() = Color4b::Black; - + seedVec[i]->C() = Color4b::Black; + for(size_t i=0;iC() = Color4b::Gray; - - swap(newSeeds,seedVec); - + borderVec[i]->C() = Color4b::Gray; + + swap(newSeeds,seedVec); + for(size_t i=0;iC() = Color4b::White; + seedVec[i]->C() = Color4b::White; + } + tri::Allocator::DeletePerVertexAttribute (m,"sources"); - tri::Allocator::DeletePerVertexAttribute (m,"sources"); - - } } + + // Base vertex voronoi coloring algorithm. -// it assumes VF adjacency. No attempt of computing real geodesic distnace is done. Just a BFS visit starting from the seeds. +// it assumes VF adjacency. No attempt of computing real geodesic distnace is done. Just a BFS visit starting from the seeds. static void TopologicalVertexColoring(MeshType &m, std::vector &seedVec) -{ - std::queue VQ; - - tri::UpdateQuality::VertexConstant(m,0); - - for(size_t i=0;iQ()=i+1; - } - - while(!VQ.empty()) - { - VertexPointer vp = VQ.front(); - VQ.pop(); - - std::vector vertStar; - vcg::face::VVStarVF(vp,vertStar); - for(typename std::vector::iterator vv = vertStar.begin();vv!=vertStar.end();++vv) - { - if((*vv)->Q()==0) - { - (*vv)->Q()=vp->Q(); - VQ.push(*vv); - } - } - } // end while(!VQ.empty()) +{ + std::queue VQ; - } + tri::UpdateQuality::VertexConstant(m,0); + + for(size_t i=0;iQ()=i+1; + } + + while(!VQ.empty()) + { + VertexPointer vp = VQ.front(); + VQ.pop(); + + std::vector vertStar; + vcg::face::VVStarVF(vp,vertStar); + for(typename std::vector::iterator vv = vertStar.begin();vv!=vertStar.end();++vv) + { + if((*vv)->Q()==0) + { + (*vv)->Q()=vp->Q(); + VQ.push(*vv); + } + } + } // end while(!VQ.empty()) + +} // Drastic Simplification algorithm. // Similar in philosopy to the classic grid clustering but using a voronoi partition instead of the regular grid. @@ -397,22 +396,22 @@ static void TopologicalVertexColoring(MeshType &m, std::vector &se // mNew is created by collasping onto a single vertex all the vertices that lies in the same cluster. // Non degenerate triangles are preserved. -static void VoronoiClustering(MeshType &mOld, MeshType &mNew, std::vector &seedVec) +static void VoronoiClustering(MeshType &mOld, MeshType &mNew, std::vector &seedVec) { std::set clusteredFace; FaceIterator fi; for(fi=mOld.face.begin();fi!=mOld.face.end();++fi) { - if( (fi->V(0)->Q() != fi->V(1)->Q() ) && + if( (fi->V(0)->Q() != fi->V(1)->Q() ) && (fi->V(0)->Q() != fi->V(2)->Q() ) && (fi->V(1)->Q() != fi->V(2)->Q() ) ) - clusteredFace.insert( Point3i(int(fi->V(0)->Q()), int(fi->V(1)->Q()), int(fi->V(2)->Q()))); - } + clusteredFace.insert( Point3i(int(fi->V(0)->Q()), int(fi->V(1)->Q()), int(fi->V(2)->Q()))); + } tri::Allocator::AddVertices(mNew,seedVec.size()); for(size_t i=0;i< seedVec.size();++i) - mNew.vert[i].ImportLocal(*(seedVec[i])); + mNew.vert[i].ImportData(*(seedVec[i])); tri::Allocator::AddFaces(mNew,clusteredFace.size()); std::set::iterator fsi; ; diff --git a/inst/include/vcglib/vcg/connectors/.svn/entries b/inst/include/vcglib/vcg/connectors/.svn/entries index d9864200..d0a52048 100644 --- a/inst/include/vcglib/vcg/connectors/.svn/entries +++ b/inst/include/vcglib/vcg/connectors/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/connectors svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/vcg/container/.svn/entries b/inst/include/vcglib/vcg/container/.svn/entries index 8cd81b88..93536895 100644 --- a/inst/include/vcglib/vcg/container/.svn/entries +++ b/inst/include/vcglib/vcg/container/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/container svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/vcg/math/.svn/entries b/inst/include/vcglib/vcg/math/.svn/entries index 65ac3aaa..bbd6a50c 100644 --- a/inst/include/vcglib/vcg/math/.svn/entries +++ b/inst/include/vcglib/vcg/math/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/math svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -old_matrix.h +camera.h file -2013-06-21T07:05:10.158758Z -d3146333a8b88c11933db3ef40a2e0f8 -2013-03-19T17:05:56.433202Z -4841 -cignoni +2013-06-21T07:05:10.162758Z +a868c0b2ba8b7711c30054d88e6d5bba +2012-12-05T11:37:19.944597Z +4763 +ganovelli @@ -58,16 +58,16 @@ cignoni -5522 +17605 -eigen_matrix_addons.h +quadric.h file -2013-06-21T07:05:10.158758Z -869db7b70d66dfef27765221bf826d72 +2013-06-21T07:05:10.162758Z +36fafede65aea8108942459675313ee0 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,19 +92,19 @@ cignoni -6233 +11397 -point_matching.h +old_lin_algebra.h file -2013-06-21T07:05:10.158758Z -74fc6f952931df840c965ed084ff3742 -2012-01-12T00:52:04.199938Z -4284 -pietroni +2013-06-21T07:05:10.154758Z +b8c751f39847d09e2cb7339fb5759a12 +2013-03-19T17:05:56.433202Z +4841 +cignoni @@ -126,18 +126,18 @@ pietroni -14698 +18314 -factorial.h +histogram.h file -2013-06-21T07:05:10.158758Z -c5b04285954376b8b80c5f3f8fa65aae -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:10.154758Z +5e26b0b67d0ee9311d8116c324bb6bbe +2012-05-05T14:55:50.371418Z +4399 cignoni @@ -160,18 +160,18 @@ cignoni -11968 +12916 -similarity2.h +eigen_matrixbase_addons.h file -2013-06-21T07:05:10.158758Z -bc75cb476bd474e425ae277c7e0de170 -2011-10-20T22:29:20.159536Z -4196 +2013-06-21T07:05:10.154758Z +f0aa7243461ffd3581b86f0c3eb9a8fa +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -194,18 +194,18 @@ has-props -2505 +11517 -old_matrix33.h +disjoint_set.h file -2013-06-21T07:05:10.158758Z -f8d85aa9fac646a20670980f0522ba50 -2013-03-19T21:51:13.509472Z -4846 +2013-06-21T07:05:10.154758Z +647b6198ad214b4146c8c2eb6e9a1766 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -228,18 +228,18 @@ cignoni -8725 +5440 -polar_decomposition.h +old_matrix.h file 2013-06-21T07:05:10.158758Z -822f16409d541d2fa2f396a8d7bf611a -2011-11-21T09:09:58.603625Z -4230 +d3146333a8b88c11933db3ef40a2e0f8 +2013-03-19T17:05:56.433202Z +4841 cignoni @@ -262,19 +262,19 @@ cignoni -2824 +5522 -old_matrix44.h +point_matching.h file 2013-06-21T07:05:10.158758Z -f901bc09d6b86d8fccc9e78777f730b0 -2013-03-19T21:51:13.509472Z -4846 -cignoni +74fc6f952931df840c965ed084ff3742 +2012-01-12T00:52:04.199938Z +4284 +pietroni @@ -296,18 +296,18 @@ cignoni -16502 +14698 -base.h +eigen_matrix_addons.h file 2013-06-21T07:05:10.158758Z -4717b0cfa4eb8a80d8a232a5baaef737 -2013-03-22T16:43:59.187666Z -4855 +869db7b70d66dfef27765221bf826d72 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -330,16 +330,16 @@ cignoni -7379 +6233 -linear.h +factorial.h file 2013-06-21T07:05:10.158758Z -f0497e2b2b6c931be5c7b63831f65c3b +c5b04285954376b8b80c5f3f8fa65aae 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,20 +364,19 @@ cignoni -3085 +11968 -matrix33.h +old_matrix33.h file 2013-06-21T07:05:10.158758Z -b6f9a1049ba5dc90c4a44e4aac2aa796 -2013-03-19T22:04:35.242318Z -4849 +f8d85aa9fac646a20670980f0522ba50 +2013-03-19T21:51:13.509472Z +4846 cignoni -has-props @@ -398,19 +397,20 @@ has-props -16557 + +8725 -matrix44.h +similarity2.h file 2013-06-21T07:05:10.158758Z -d672a69cf6b22fdd1cda18a47f5555de -2013-06-05T11:08:55.186300Z -4897 -tarini +bc75cb476bd474e425ae277c7e0de170 +2011-10-20T22:29:20.159536Z +4196 +cignoni has-props @@ -432,18 +432,18 @@ has-props -19871 +2505 -spherical_harmonics.h +polar_decomposition.h file 2013-06-21T07:05:10.158758Z -7e6b468d2a61f181405a2cb671e62d44 -2011-10-05T15:04:40.740408Z -4180 +822f16409d541d2fa2f396a8d7bf611a +2011-11-21T09:09:58.603625Z +4230 cignoni @@ -466,19 +466,20 @@ cignoni -6316 +2824 -shot.h +matrix33.h file 2013-06-21T07:05:10.158758Z -147ab01bd7ecb9f358e0e0fb809443fe -2012-10-08T09:07:50.965890Z -4552 +b6f9a1049ba5dc90c4a44e4aac2aa796 +2013-03-19T22:04:35.242318Z +4849 cignoni +has-props @@ -499,21 +500,19 @@ cignoni - -20685 +16557 -quadric5.h +linear.h file 2013-06-21T07:05:10.158758Z -6bd86374cd9f8dcdb4f12cb0dadc0cad +f0497e2b2b6c931be5c7b63831f65c3b 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -534,18 +533,19 @@ has-props -18070 + +3085 -gen_normal.h +base.h file 2013-06-21T07:05:10.158758Z -2646c8d33b8901dd311631eb4710f9b8 -2011-10-05T15:04:40.740408Z -4180 +4717b0cfa4eb8a80d8a232a5baaef737 +2013-03-22T16:43:59.187666Z +4855 cignoni @@ -568,20 +568,19 @@ cignoni -5953 +7379 -old_deprecated_matrix.h +old_matrix44.h file 2013-06-21T07:05:10.158758Z -17740f24ddc5a0f19aba228893b1939a -2013-03-19T21:53:52.238167Z -4848 +f901bc09d6b86d8fccc9e78777f730b0 +2013-03-19T21:51:13.509472Z +4846 cignoni -has-props @@ -602,20 +601,21 @@ has-props -20399 + +16502 -legendre.h +matrix44.h file 2013-06-21T07:05:10.158758Z -a5001bf1a84994489151f339ce858e31 -2011-10-05T15:04:40.740408Z -4180 -cignoni - +d672a69cf6b22fdd1cda18a47f5555de +2013-06-05T11:08:55.186300Z +4897 +tarini +has-props @@ -636,19 +636,20 @@ cignoni -6755 +19871 -quaternion.h +quadric5.h file 2013-06-21T07:05:10.158758Z -8584c12c6da6bc9426cbcacb07851cce +6bd86374cd9f8dcdb4f12cb0dadc0cad 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -669,19 +670,18 @@ cignoni - -13518 +18070 -perlin_noise.h +shot.h file 2013-06-21T07:05:10.158758Z -68cbe424593ee5932085c0930ef8e225 -2011-10-05T15:04:40.740408Z -4180 +147ab01bd7ecb9f358e0e0fb809443fe +2012-10-08T09:07:50.965890Z +4552 cignoni @@ -704,18 +704,18 @@ cignoni -5999 +20685 -random_generator.h +spherical_harmonics.h file -2013-06-24T13:55:27.918354Z -a3bb4a70ac48b2212439cfb7c336c871 -2013-06-24T08:34:53.914220Z -4905 +2013-06-21T07:05:10.158758Z +7e6b468d2a61f181405a2cb671e62d44 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -738,16 +738,16 @@ cignoni -14580 +6316 -similarity.h +gen_normal.h file -2013-06-21T07:05:10.162758Z -e0a966732851cb464691f8a37afce8e4 +2013-06-21T07:05:10.158758Z +2646c8d33b8901dd311631eb4710f9b8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -772,19 +772,20 @@ cignoni -9338 +5953 -eigen.h +old_deprecated_matrix.h file -2013-06-21T07:05:10.162758Z -d039d2a81714573993176cda12ac060c -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:10.158758Z +17740f24ddc5a0f19aba228893b1939a +2013-03-19T21:53:52.238167Z +4848 cignoni +has-props @@ -805,20 +806,19 @@ cignoni - -12003 +20399 -camera.h +legendre.h file -2013-06-21T07:05:10.162758Z -a868c0b2ba8b7711c30054d88e6d5bba -2012-12-05T11:37:19.944597Z -4763 -ganovelli +2013-06-21T07:05:10.158758Z +a5001bf1a84994489151f339ce858e31 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -840,16 +840,16 @@ ganovelli -17605 +6755 -quadric.h +quaternion.h file -2013-06-21T07:05:10.162758Z -36fafede65aea8108942459675313ee0 +2013-06-21T07:05:10.158758Z +8584c12c6da6bc9426cbcacb07851cce 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -874,18 +874,18 @@ cignoni -11397 +13518 -old_lin_algebra.h +perlin_noise.h file -2013-06-21T07:05:10.154758Z -b8c751f39847d09e2cb7339fb5759a12 -2013-03-19T17:05:56.433202Z -4841 +2013-06-21T07:05:10.158758Z +68cbe424593ee5932085c0930ef8e225 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -908,18 +908,18 @@ cignoni -18314 +5999 -histogram.h +random_generator.h file -2013-06-21T07:05:10.154758Z -5e26b0b67d0ee9311d8116c324bb6bbe -2012-05-05T14:55:50.371418Z -4399 +2013-06-24T13:55:27.918354Z +a3bb4a70ac48b2212439cfb7c336c871 +2013-06-24T08:34:53.914220Z +4905 cignoni @@ -942,20 +942,19 @@ cignoni -12916 +14580 -eigen_matrixbase_addons.h +similarity.h file -2013-06-21T07:05:10.154758Z -f0aa7243461ffd3581b86f0c3eb9a8fa +2013-06-21T07:05:10.162758Z +e0a966732851cb464691f8a37afce8e4 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -976,16 +975,17 @@ has-props -11517 + +9338 -disjoint_set.h +eigen.h file -2013-06-21T07:05:10.154758Z -647b6198ad214b4146c8c2eb6e9a1766 +2013-06-21T07:05:10.162758Z +d039d2a81714573993176cda12ac060c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -1010,5 +1010,5 @@ cignoni -5440 +12003 diff --git a/inst/include/vcglib/vcg/simplex/.svn/entries b/inst/include/vcglib/vcg/simplex/.svn/entries index 0658ee3f..b6043902 100644 --- a/inst/include/vcglib/vcg/simplex/.svn/entries +++ b/inst/include/vcglib/vcg/simplex/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex svn://svn.code.sf.net/p/vcg/code @@ -26,15 +26,15 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -tetrahedron +vertex dir -edge +face dir -vertex +tetrahedron dir -face +edge dir diff --git a/inst/include/vcglib/vcg/simplex/edge/.svn/entries b/inst/include/vcglib/vcg/simplex/edge/.svn/entries index 98285207..5d24c0c2 100644 --- a/inst/include/vcglib/vcg/simplex/edge/.svn/entries +++ b/inst/include/vcglib/vcg/simplex/edge/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex/edge svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -pos.h +topology.h file 2013-06-21T07:04:54.734682Z -088f52556e4dd38d0345284d35002d75 -2012-12-17T14:59:29.898891Z -4781 +009b582da51add17755ca39573fc00c8 +2012-04-27T09:23:01.738505Z +4392 cignoni +has-props @@ -57,21 +58,19 @@ cignoni - -8694 +3196 -component.h +pos.h file -2013-06-21T07:04:54.738682Z -457cd70d24bee968a947c6752c153a7b -2012-12-21T15:33:18.395499Z -4786 +2013-06-21T07:04:54.734682Z +088f52556e4dd38d0345284d35002d75 +2012-12-17T14:59:29.898891Z +4781 cignoni -has-props @@ -92,18 +91,19 @@ has-props -16575 + +8694 -base.h +component.h file -2013-06-21T07:04:54.734682Z -b15561d1ae08dd21d0a6ac05b561a9ed -2012-11-07T01:24:45.064120Z -4687 +2013-06-21T07:04:54.738682Z +457cd70d24bee968a947c6752c153a7b +2012-12-21T15:33:18.395499Z +4786 cignoni has-props @@ -126,19 +126,20 @@ has-props -9564 +16575 -distance.h +base.h file 2013-06-21T07:04:54.734682Z -4db3ac5cf829d854b4b4b5d4c4887e49 -2011-10-05T15:04:40.740408Z -4180 +b15561d1ae08dd21d0a6ac05b561a9ed +2012-11-07T01:24:45.064120Z +4687 cignoni +has-props @@ -159,21 +160,19 @@ cignoni - -3509 +9564 -topology.h +distance.h file 2013-06-21T07:04:54.734682Z -009b582da51add17755ca39573fc00c8 -2012-04-27T09:23:01.738505Z -4392 +4db3ac5cf829d854b4b4b5d4c4887e49 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -194,5 +193,6 @@ has-props -3196 + +3509 diff --git a/inst/include/vcglib/vcg/simplex/face/.svn/entries b/inst/include/vcglib/vcg/simplex/face/.svn/entries index ed800817..2a0cf3f3 100644 --- a/inst/include/vcglib/vcg/simplex/face/.svn/entries +++ b/inst/include/vcglib/vcg/simplex/face/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex/face svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,40 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +topology.h +file + + + + +2013-06-24T13:55:27.502352Z +487d1129de5921cd2945ab238a01374a +2013-06-24T07:55:54.673865Z +4902 +cignoni + + + + + + + + + + + + + + + + + + + + + +28581 + pos.h file @@ -332,37 +366,3 @@ cignoni 4164 -topology.h -file - - - - -2013-06-24T13:55:27.502352Z -487d1129de5921cd2945ab238a01374a -2013-06-24T07:55:54.673865Z -4902 -cignoni - - - - - - - - - - - - - - - - - - - - - -28581 - diff --git a/inst/include/vcglib/vcg/simplex/tetrahedron/.svn/entries b/inst/include/vcglib/vcg/simplex/tetrahedron/.svn/entries index c484cf82..c332ccaa 100644 --- a/inst/include/vcglib/vcg/simplex/tetrahedron/.svn/entries +++ b/inst/include/vcglib/vcg/simplex/tetrahedron/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex/tetrahedron svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -tetrahedron.h +base.h file 2013-06-21T07:04:54.414680Z -aad2f4c2f5e8d89c2b8e735703191c58 -2011-10-05T15:04:40.740408Z -4180 +b037afb6823837600c58fb52fb8f1c26 +2012-10-25T13:07:25.089246Z +4656 cignoni +has-props @@ -57,17 +58,16 @@ cignoni - -140 +13504 -pos.h +tetrahedron.h file 2013-06-21T07:04:54.414680Z -4e48003b02cb95ba2413f707d317f113 +aad2f4c2f5e8d89c2b8e735703191c58 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,20 +92,19 @@ cignoni -10635 +140 -component.h +pos.h file 2013-06-21T07:04:54.414680Z -b1e772441b52f93f2eaf00f8b83b7d83 -2012-10-25T13:07:25.089246Z -4656 +4e48003b02cb95ba2413f707d317f113 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -126,16 +125,17 @@ has-props -12525 + +10635 -base.h +component.h file 2013-06-21T07:04:54.414680Z -b037afb6823837600c58fb52fb8f1c26 +b1e772441b52f93f2eaf00f8b83b7d83 2012-10-25T13:07:25.089246Z 4656 cignoni @@ -160,5 +160,5 @@ has-props -13504 +12525 diff --git a/inst/include/vcglib/vcg/simplex/vertex/.svn/entries b/inst/include/vcglib/vcg/simplex/vertex/.svn/entries index cd166a6f..96c91102 100644 --- a/inst/include/vcglib/vcg/simplex/vertex/.svn/entries +++ b/inst/include/vcglib/vcg/simplex/vertex/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex/vertex svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -base.h +component_occ.h file 2013-06-21T07:04:54.890682Z -79a37d794be44163dbd4b6860027a71c -2012-11-15T19:07:34.785185Z -4732 +c2be92fae18ed8ffd71ee0881c08bcfc +2012-10-25T21:29:10.244068Z +4666 cignoni has-props @@ -58,19 +58,20 @@ has-props -8836 +11484 -distance.h +component_ocf.h file 2013-06-21T07:04:54.890682Z -d04a2a00d17d15086e2daf553c4a5ff7 -2012-11-15T19:11:28.863456Z -4733 +4ee0ed2432886acff65c9b4b71125e1f +2013-02-06T11:22:11.027627Z +4815 cignoni +has-props @@ -91,19 +92,18 @@ cignoni - -6141 +23963 -component_sph.h +base.h file 2013-06-21T07:04:54.890682Z -eb0c9ead560a74df3d0ca1210edf1889 -2011-10-05T15:04:40.740408Z -4180 +79a37d794be44163dbd4b6860027a71c +2012-11-15T19:07:34.785185Z +4732 cignoni has-props @@ -126,20 +126,19 @@ has-props -2618 +8836 -component.h +distance.h file 2013-06-21T07:04:54.890682Z -03cc7cf5ae3985e2d3a0a79440303ec7 -2013-03-13T14:02:03.583247Z -4835 +d04a2a00d17d15086e2daf553c4a5ff7 +2012-11-15T19:11:28.863456Z +4733 cignoni -has-props @@ -160,18 +159,19 @@ has-props -25013 + +6141 -component_occ.h +component_sph.h file 2013-06-21T07:04:54.890682Z -c2be92fae18ed8ffd71ee0881c08bcfc -2012-10-25T21:29:10.244068Z -4666 +eb0c9ead560a74df3d0ca1210edf1889 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -194,18 +194,18 @@ has-props -11484 +2618 -component_ocf.h +component.h file 2013-06-21T07:04:54.890682Z -4ee0ed2432886acff65c9b4b71125e1f -2013-02-06T11:22:11.027627Z -4815 +03cc7cf5ae3985e2d3a0a79440303ec7 +2013-03-13T14:02:03.583247Z +4835 cignoni has-props @@ -228,5 +228,5 @@ has-props -23963 +25013 diff --git a/inst/include/vcglib/vcg/space/.svn/entries b/inst/include/vcglib/vcg/space/.svn/entries index 12a8554e..e517b857 100644 --- a/inst/include/vcglib/vcg/space/.svn/entries +++ b/inst/include/vcglib/vcg/space/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -rasterized_outline2_packer.h +color4.h file -2013-06-21T07:05:19.038802Z -6b945db289c6162bffddbae772a4e20e -2013-03-26T23:02:23.538870Z -4875 -cignoni -has-props +2013-06-21T07:05:19.030802Z +5afd2c538331c1dda1dc498a1aba2a98 +2013-01-30T17:18:55.488904Z +4811 +ganovelli @@ -58,16 +57,17 @@ has-props -32178 + +11339 -smallest_enclosing.h +tetra3.h file -2013-06-21T07:05:19.038802Z -647907fa832532de426ece2bd09e4403 +2013-06-21T07:05:19.034802Z +ef3ef72b89421e759f9a4dfdf09de071 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,19 +92,20 @@ cignoni -4884 +13845 -fitting3.h +deprecated_point.h file -2013-06-21T07:05:19.038802Z -6365980c67418fc0652da966f48707ce -2012-11-22T23:32:35.421515Z -4744 +2013-06-21T07:05:19.034802Z +59e9b222b9e7ae8d185ed06e6e4f0ca2 +2012-07-03T09:29:48.654375Z +4457 cignoni +has-props @@ -125,19 +126,18 @@ cignoni - -5343 +27759 -intersection2.h +line2.h file 2013-06-21T07:05:19.034802Z -29f8f9365d085ab4244cbe8139bc92cb -2012-10-08T09:05:11.519307Z -4550 +037ceee14c2e90b7638a9515f84b3e12 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -160,18 +160,18 @@ cignoni -10713 +7759 -point.h +box2.h file 2013-06-21T07:05:19.034802Z -52a1c58acb8cf0d61b0aa0f0782011ea -2011-10-05T15:04:40.740408Z -4180 +897269b96beebe3adcea957f9cd78474 +2012-10-08T09:03:25.280307Z +4549 cignoni @@ -194,19 +194,19 @@ cignoni -4643 +10440 -intersection3.h +line3.h file 2013-06-21T07:05:19.034802Z -ffed4612e483af0b2bd635eb630dd3d2 -2013-03-13T09:40:55.149160Z -4833 -ganovelli +121c184b83496729d2a0ac35b5e007f0 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -228,19 +228,19 @@ ganovelli -25344 +7866 -colorspace.h +planar_polygon_tessellation.h file -2013-06-21T07:05:19.030802Z -35f9de785a719ffb8d7f1c5e019cb518 -2011-11-18T10:42:19.939072Z -4219 -granzuglia +2013-06-21T07:05:19.034802Z +254e2b48368fd1fc9942a713a46a74c9 +2012-12-02T15:07:17.950203Z +4760 +cignoni @@ -262,19 +262,19 @@ granzuglia -48608 +5196 -color4.h +box3.h file -2013-06-21T07:05:19.030802Z -5afd2c538331c1dda1dc498a1aba2a98 -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-06-21T07:05:19.034802Z +86523e598e31bb612c395babe78a7dc6 +2013-03-04T20:35:03.106156Z +4827 +ponchio @@ -296,16 +296,16 @@ ganovelli -11339 +12926 -tetra3.h +point2.h file 2013-06-21T07:05:19.034802Z -ef3ef72b89421e759f9a4dfdf09de071 +5f37808bba8992a43a292a356b87c0cc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,20 +330,19 @@ cignoni -13845 +5070 -deprecated_point.h +point3.h file 2013-06-21T07:05:19.034802Z -59e9b222b9e7ae8d185ed06e6e4f0ca2 -2012-07-03T09:29:48.654375Z -4457 +8261392e72ab65c8e5aad716752282d2 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -364,16 +363,17 @@ has-props -27759 + +6286 -line2.h +point4.h file 2013-06-21T07:05:19.034802Z -037ceee14c2e90b7638a9515f84b3e12 +d1d2e784c599e97d99c5caf4841f8b7f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -398,18 +398,21 @@ cignoni -7759 +5665 -box2.h +index +dir + +plane3.h file 2013-06-21T07:05:19.034802Z -897269b96beebe3adcea957f9cd78474 -2012-10-08T09:03:25.280307Z -4549 +c70294cb8275c887598a54e07f37d467 +2012-01-18T11:44:42.289793Z +4292 cignoni @@ -432,19 +435,20 @@ cignoni -10440 +5503 -line3.h +rect_packer.h file -2013-06-21T07:05:19.034802Z -121c184b83496729d2a0ac35b5e007f0 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.038802Z +6f6439f62d9f1fdbcd1952c533ecd051 +2013-04-15T20:56:40.165930Z +4886 cignoni +has-props @@ -465,19 +469,18 @@ cignoni - -7866 +19207 -planar_polygon_tessellation.h +segment2.h file 2013-06-21T07:05:19.034802Z -254e2b48368fd1fc9942a713a46a74c9 -2012-12-02T15:07:17.950203Z -4760 +8ff02a548c1acb174e97ee1a86e5c864 +2012-10-08T09:03:25.280307Z +4549 cignoni @@ -500,18 +503,18 @@ cignoni -5196 +5710 -point2.h +segment3.h file 2013-06-21T07:05:19.034802Z -5f37808bba8992a43a292a356b87c0cc -2011-10-05T15:04:40.740408Z -4180 +510798697acdb006898929d3f2cd51ed +2012-10-08T09:05:11.519307Z +4550 cignoni @@ -534,20 +537,20 @@ cignoni -5070 +7968 -box3.h +outline2_packer.h file -2013-06-21T07:05:19.034802Z -86523e598e31bb612c395babe78a7dc6 -2013-03-04T20:35:03.106156Z -4827 -ponchio - +2013-06-21T07:05:19.038802Z +ed41f21c73823ea35530b3464c9115b7 +2013-04-15T20:57:15.592226Z +4887 +cignoni +has-props @@ -568,19 +571,19 @@ ponchio -12926 +7250 -point3.h +triangle2.h file -2013-06-21T07:05:19.034802Z -8261392e72ab65c8e5aad716752282d2 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:05:19.038802Z +1808dfb7c9dd1c10afd22f41eea74869 +2012-10-03T16:39:29.913144Z +4522 +pietroni @@ -602,18 +605,18 @@ cignoni -6286 +5451 -point4.h +triangle3.h file -2013-06-21T07:05:19.034802Z -d1d2e784c599e97d99c5caf4841f8b7f -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.038802Z +5a03a0131af081c0febbca9a91cf6e62 +2012-11-15T19:14:29.014670Z +4734 cignoni @@ -636,23 +639,19 @@ cignoni -5665 - -index -dir +11833 -rect_packer.h +box.h file 2013-06-21T07:05:19.038802Z -6f6439f62d9f1fdbcd1952c533ecd051 -2013-04-15T20:56:40.165930Z -4886 +6d0e9d983af93715154acc4518e4e70d +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -673,18 +672,19 @@ has-props -19207 + +11166 -plane3.h +obox3.h file -2013-06-21T07:05:19.034802Z -c70294cb8275c887598a54e07f37d467 -2012-01-18T11:44:42.289793Z -4292 +2013-06-21T07:05:19.030802Z +09af389baf2ee42700e15fea73556b8b +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -707,18 +707,18 @@ cignoni -5503 +3215 -segment2.h +space.h file -2013-06-21T07:05:19.034802Z -8ff02a548c1acb174e97ee1a86e5c864 -2012-10-08T09:03:25.280307Z -4549 +2013-06-21T07:05:19.030802Z +48ccedd0a4d8211f37bf9d933dd9a161 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -741,19 +741,20 @@ cignoni -5710 +3170 -segment3.h +deprecated_point2.h file -2013-06-21T07:05:19.034802Z -510798697acdb006898929d3f2cd51ed -2012-10-08T09:05:11.519307Z -4550 +2013-06-21T07:05:19.030802Z +6de492d52f538e805bade7cab9b53341 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -774,19 +775,18 @@ cignoni - -7968 +10377 -outline2_packer.h +deprecated_point3.h file -2013-06-21T07:05:19.038802Z -ed41f21c73823ea35530b3464c9115b7 -2013-04-15T20:57:15.592226Z -4887 +2013-06-21T07:05:19.030802Z +d1d97918a3aa2057c5f1198407d4062e +2012-10-22T18:43:24.627255Z +4649 cignoni has-props @@ -809,20 +809,20 @@ has-props -7250 +16545 -triangle2.h +deprecated_point4.h file -2013-06-21T07:05:19.038802Z -1808dfb7c9dd1c10afd22f41eea74869 -2012-10-03T16:39:29.913144Z -4522 -pietroni - +2013-06-21T07:05:19.030802Z +a833f725f0df1e167b1405f22629e61a +2012-10-11T10:48:55.487939Z +4573 +cignoni +has-props @@ -843,19 +843,20 @@ pietroni -5451 +11145 -box.h +point_matching.h file -2013-06-21T07:05:19.038802Z -6d0e9d983af93715154acc4518e4e70d -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.034802Z +d587853663bdd83d9c288f4ca777cfc8 +2012-11-27T22:49:21.711917Z +4753 cignoni +has-props @@ -876,20 +877,19 @@ cignoni - -11166 +6217 -triangle3.h +sphere3.h file -2013-06-21T07:05:19.038802Z -5a03a0131af081c0febbca9a91cf6e62 -2012-11-15T19:14:29.014670Z -4734 -cignoni +2013-06-21T07:05:19.034802Z +a47baec2253f399adc0a0fefe322ef0c +2012-06-14T09:40:26.368718Z +4431 +ponchio @@ -911,16 +911,16 @@ cignoni -11833 +8188 -obox3.h +texcoord2.h file -2013-06-21T07:05:19.030802Z -09af389baf2ee42700e15fea73556b8b +2013-06-21T07:05:19.034802Z +d8aa8259dda93f3bd9928ba824b88dbf 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -945,20 +945,19 @@ cignoni -3215 +7413 -deprecated_point2.h +distance2.h file -2013-06-21T07:05:19.030802Z -6de492d52f538e805bade7cab9b53341 -2011-10-05T15:04:40.740408Z -4180 -cignoni -has-props +2013-06-21T07:05:19.034802Z +801945cd32314026009d573486246af1 +2012-06-22T14:25:35.235717Z +4438 +pietroni @@ -979,19 +978,20 @@ has-props -10377 + +3025 -space.h +ray2.h file -2013-06-21T07:05:19.030802Z -48ccedd0a4d8211f37bf9d933dd9a161 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:05:19.034802Z +d3a9c3f291990d0ee70d7fd8acfbd556 +2012-06-22T14:23:33.652600Z +4437 +pietroni @@ -1013,20 +1013,19 @@ cignoni -3170 +7239 -deprecated_point3.h +distance3.h file -2013-06-21T07:05:19.030802Z -d1d97918a3aa2057c5f1198407d4062e -2012-10-22T18:43:24.627255Z -4649 +2013-06-21T07:05:19.034802Z +4905fdaf208b2f8f94d6fb71c97c9499 +2012-07-02T16:45:49.420129Z +4454 cignoni -has-props @@ -1047,20 +1046,20 @@ has-props -16545 + +16510 -deprecated_point4.h +ray3.h file -2013-06-21T07:05:19.030802Z -a833f725f0df1e167b1405f22629e61a -2012-10-11T10:48:55.487939Z -4573 +2013-06-21T07:05:19.034802Z +701f60dcf47d96cae84763beb09ac085 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -1081,18 +1080,22 @@ has-props -11145 + +7402 -point_matching.h +intersection +dir + +rasterized_outline2_packer.h file -2013-06-21T07:05:19.034802Z -d587853663bdd83d9c288f4ca777cfc8 -2012-11-27T22:49:21.711917Z -4753 +2013-06-21T07:05:19.038802Z +6b945db289c6162bffddbae772a4e20e +2013-03-26T23:02:23.538870Z +4875 cignoni has-props @@ -1115,19 +1118,19 @@ has-props -6217 +32178 -sphere3.h +smallest_enclosing.h file -2013-06-21T07:05:19.034802Z -a47baec2253f399adc0a0fefe322ef0c -2012-06-14T09:40:26.368718Z -4431 -ponchio +2013-06-21T07:05:19.038802Z +647907fa832532de426ece2bd09e4403 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -1149,18 +1152,18 @@ ponchio -8188 +4884 -texcoord2.h +fitting3.h file -2013-06-21T07:05:19.034802Z -d8aa8259dda93f3bd9928ba824b88dbf -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.038802Z +6365980c67418fc0652da966f48707ce +2012-11-22T23:32:35.421515Z +4744 cignoni @@ -1183,19 +1186,19 @@ cignoni -7413 +5343 -distance2.h +intersection2.h file 2013-06-21T07:05:19.034802Z -801945cd32314026009d573486246af1 -2012-06-22T14:25:35.235717Z -4438 -pietroni +29f8f9365d085ab4244cbe8139bc92cb +2012-10-08T09:05:11.519307Z +4550 +cignoni @@ -1217,19 +1220,19 @@ pietroni -3025 +10713 -ray2.h +point.h file 2013-06-21T07:05:19.034802Z -d3a9c3f291990d0ee70d7fd8acfbd556 -2012-06-22T14:23:33.652600Z -4437 -pietroni +52a1c58acb8cf0d61b0aa0f0782011ea +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -1251,19 +1254,19 @@ pietroni -7239 +4643 -distance3.h +intersection3.h file 2013-06-21T07:05:19.034802Z -4905fdaf208b2f8f94d6fb71c97c9499 -2012-07-02T16:45:49.420129Z -4454 -cignoni +ffed4612e483af0b2bd635eb630dd3d2 +2013-03-13T09:40:55.149160Z +4833 +ganovelli @@ -1285,19 +1288,19 @@ cignoni -16510 +25344 -ray3.h +colorspace.h file -2013-06-21T07:05:19.034802Z -701f60dcf47d96cae84763beb09ac085 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:05:19.030802Z +35f9de785a719ffb8d7f1c5e019cb518 +2011-11-18T10:42:19.939072Z +4219 +granzuglia @@ -1319,8 +1322,5 @@ cignoni -7402 - -intersection -dir +48608 diff --git a/inst/include/vcglib/vcg/space/index/.svn/entries b/inst/include/vcglib/vcg/space/index/.svn/entries index e0274e72..800e5acb 100644 --- a/inst/include/vcglib/vcg/space/index/.svn/entries +++ b/inst/include/vcglib/vcg/space/index/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space/index svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -base.h +spatial_hashing.h file -2013-06-21T07:05:18.326798Z -12ab5a5a3d0b63355ec44bd47e088a78 -2011-10-05T15:04:40.740408Z -4180 +2013-06-24T13:55:27.938354Z +7373d02031cce29f6e69d2c6beee6a8a +2013-06-24T07:57:18.546668Z +4903 cignoni @@ -58,18 +58,18 @@ cignoni -13535 +15850 -octree_template.h +grid_closest.h file 2013-06-21T07:05:18.326798Z -51e308755cf0321d17ece75970a42c8d -2012-11-07T17:56:07.089933Z -4693 +6baac47bc92d67c887388ab64507f268 +2012-10-18T08:44:11.950287Z +4625 cignoni @@ -92,18 +92,18 @@ cignoni -22647 +11029 -spatial_hashing.h +grid_static_ptr.h file -2013-06-24T13:55:27.938354Z -7373d02031cce29f6e69d2c6beee6a8a -2013-06-24T07:57:18.546668Z -4903 +2013-06-21T07:05:18.326798Z +dc3db3fd7cb1ad4d3f076098872a7cba +2012-07-06T09:40:09.291611Z +4473 cignoni @@ -126,19 +126,19 @@ cignoni -15850 +16810 -grid_closest.h +octree.h file 2013-06-21T07:05:18.326798Z -6baac47bc92d67c887388ab64507f268 -2012-10-18T08:44:11.950287Z -4625 -cignoni +18d62e3b99885ab199e0a1b64d6ae1cd +2012-07-23T12:16:17.067296Z +4487 +granzuglia @@ -160,18 +160,21 @@ cignoni -11029 +25192 -grid_static_ptr.h +aabb_binary_tree +dir + +grid_util.h file 2013-06-21T07:05:18.326798Z -dc3db3fd7cb1ad4d3f076098872a7cba -2012-07-06T09:40:09.291611Z -4473 +2917c9420b91bbaca062c26498cfb5a1 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -194,19 +197,19 @@ cignoni -16810 +9494 -octree.h +grid_static_obj.h file 2013-06-21T07:05:18.326798Z -18d62e3b99885ab199e0a1b64d6ae1cd -2012-07-23T12:16:17.067296Z -4487 -granzuglia +41e9b09264ddcd8098143dae4d3df9d1 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -228,19 +231,16 @@ granzuglia -25192 - -aabb_binary_tree -dir +4648 -grid_util.h +perfect_spatial_hashing.h file 2013-06-21T07:05:18.326798Z -2917c9420b91bbaca062c26498cfb5a1 +3cd2fda22348c5648ac20b8abd68fc19 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -265,18 +265,21 @@ cignoni -9494 +60505 -grid_static_obj.h +index2D +dir + +space_iterators.h file 2013-06-21T07:05:18.326798Z -41e9b09264ddcd8098143dae4d3df9d1 -2011-10-05T15:04:40.740408Z -4180 +d8002e2f7c6825e6ac833e5716795f23 +2012-10-18T09:01:51.587393Z +4626 cignoni @@ -299,16 +302,19 @@ cignoni -4648 +14628 -perfect_spatial_hashing.h +kdtree +dir + +base.h file 2013-06-21T07:05:18.326798Z -3cd2fda22348c5648ac20b8abd68fc19 +12ab5a5a3d0b63355ec44bd47e088a78 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -333,21 +339,18 @@ cignoni -60505 - -index2D -dir +13535 -space_iterators.h +octree_template.h file 2013-06-21T07:05:18.326798Z -d8002e2f7c6825e6ac833e5716795f23 -2012-10-18T09:01:51.587393Z -4626 +51e308755cf0321d17ece75970a42c8d +2012-11-07T17:56:07.089933Z +4693 cignoni @@ -370,8 +373,5 @@ cignoni -14628 - -kdtree -dir +22647 diff --git a/inst/include/vcglib/vcg/space/index/aabb_binary_tree/.svn/entries b/inst/include/vcglib/vcg/space/index/aabb_binary_tree/.svn/entries index 7b1f6f55..7e503ce3 100644 --- a/inst/include/vcglib/vcg/space/index/aabb_binary_tree/.svn/entries +++ b/inst/include/vcglib/vcg/space/index/aabb_binary_tree/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space/index/aabb_binary_tree svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -frustum_cull.h +base.h file 2013-06-21T07:05:17.046792Z -494457d2acdba023c3e9a8ee9d3ee64e +2c350a0a0022be010f369e5bed8c3d36 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -9526 +14392 -kclosest.h +ray.h file 2013-06-21T07:05:17.046792Z -e5d36358aa8d1318215a7be89b423ceb +2032468416a9c1a47c65bb97f027e950 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -5485 +5973 -aabb_binary_tree.h +closest.h file 2013-06-21T07:05:17.046792Z -709bb1af5cf46be3d831529325287452 +b48c747f7abe788d26cd328d847bfc42 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -6313 +5308 -base.h +frustum_cull.h file 2013-06-21T07:05:17.046792Z -2c350a0a0022be010f369e5bed8c3d36 +494457d2acdba023c3e9a8ee9d3ee64e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -14392 +9526 -ray.h +kclosest.h file 2013-06-21T07:05:17.046792Z -2032468416a9c1a47c65bb97f027e950 +e5d36358aa8d1318215a7be89b423ceb 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -5973 +5485 -closest.h +aabb_binary_tree.h file 2013-06-21T07:05:17.046792Z -b48c747f7abe788d26cd328d847bfc42 +709bb1af5cf46be3d831529325287452 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,5 +228,5 @@ cignoni -5308 +6313 diff --git a/inst/include/vcglib/vcg/space/index/index2D/.svn/entries b/inst/include/vcglib/vcg/space/index/index2D/.svn/entries index 380392fb..cc099076 100644 --- a/inst/include/vcglib/vcg/space/index/index2D/.svn/entries +++ b/inst/include/vcglib/vcg/space/index/index2D/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space/index/index2D svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ corsini e8973e21-934d-0410-ac44-de4585f5606d -base_2d.h +spatial_hashing_2D.h file 2013-06-21T07:05:17.926797Z -7dae8fb1e5eaa2b58a1cdd5a79756447 -2012-06-22T14:27:33.221037Z -4439 -pietroni +65eff96795cf0d1ba18677659dec1474 +2012-09-19T09:05:40.634269Z +4515 +corsini @@ -58,19 +58,19 @@ pietroni -13508 +17945 -spatial_hashing_2D.h +grid_closest_2D.h file 2013-06-21T07:05:17.926797Z -65eff96795cf0d1ba18677659dec1474 -2012-09-19T09:05:40.634269Z -4515 -corsini +d83571668bd6e06cc1ac56468e1adc8d +2012-08-27T12:47:12.424377Z +4499 +pietroni @@ -92,18 +92,18 @@ corsini -17945 +5691 -grid_closest_2D.h +grid_util_2D.h file 2013-06-21T07:05:17.926797Z -d83571668bd6e06cc1ac56468e1adc8d -2012-08-27T12:47:12.424377Z -4499 +8f79a27d1de5c56d8c65314a15df8c56 +2012-06-22T14:27:33.221037Z +4439 pietroni @@ -126,16 +126,16 @@ pietroni -5691 +7405 -grid_util_2D.h +base_2d.h file 2013-06-21T07:05:17.926797Z -8f79a27d1de5c56d8c65314a15df8c56 +7dae8fb1e5eaa2b58a1cdd5a79756447 2012-06-22T14:27:33.221037Z 4439 pietroni @@ -160,5 +160,5 @@ pietroni -7405 +13508 diff --git a/inst/include/vcglib/vcg/space/index/kdtree/.svn/entries b/inst/include/vcglib/vcg/space/index/kdtree/.svn/entries index 57593eeb..2565667c 100644 --- a/inst/include/vcglib/vcg/space/index/kdtree/.svn/entries +++ b/inst/include/vcglib/vcg/space/index/kdtree/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space/index/kdtree svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -priorityqueue.h +mlsutils.h file 2013-06-21T07:05:18.322798Z -2f02f547dbc35ff6b19b2f23d14dd2e8 -2012-02-22T16:57:44.619581Z -4334 +99f6b0adc42604eeed342c905caf9927 +2012-07-04T15:27:17.564256Z +4463 cignoni has-props @@ -58,18 +58,18 @@ has-props -3618 +3373 -mlsutils.h +kdtree.h file 2013-06-21T07:05:18.322798Z -99f6b0adc42604eeed342c905caf9927 -2012-07-04T15:27:17.564256Z -4463 +fc64d5b7ce0a6ca7a198485299ec0efb +2013-01-31T10:44:44.180922Z +4812 cignoni has-props @@ -92,18 +92,18 @@ has-props -3373 +13285 -kdtree.h +priorityqueue.h file 2013-06-21T07:05:18.322798Z -fc64d5b7ce0a6ca7a198485299ec0efb -2013-01-31T10:44:44.180922Z -4812 +2f02f547dbc35ff6b19b2f23d14dd2e8 +2012-02-22T16:57:44.619581Z +4334 cignoni has-props @@ -126,5 +126,5 @@ has-props -13285 +3618 diff --git a/inst/include/vcglib/vcg/space/intersection/.svn/entries b/inst/include/vcglib/vcg/space/intersection/.svn/entries index 6ead57cf..7d86e65b 100644 --- a/inst/include/vcglib/vcg/space/intersection/.svn/entries +++ b/inst/include/vcglib/vcg/space/intersection/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space/intersection svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/.svn/entries b/inst/include/vcglib/wrap/.svn/entries index a6e9b925..bec0495d 100644 --- a/inst/include/vcglib/wrap/.svn/entries +++ b/inst/include/vcglib/wrap/.svn/entries @@ -1,15 +1,15 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap svn://svn.code.sf.net/p/vcg/code -2013-06-24T08:34:01.960887Z -4904 -cignoni +2013-07-23T11:24:38.954326Z +4927 +pietroni @@ -26,12 +26,33 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +tsai +dir + +io_trimesh +dir + +gl +dir + +ply +dir + +io_edgemesh +dir + gcache dir mt dir +minpack +dir + +bmt +dir + callback.h file @@ -66,22 +87,19 @@ cignoni 2760 -bmt +io_tetramesh dir -minpack +gui dir -io_tetramesh +qt dir system dir -qt -dir - -gui +miq dir utils.h @@ -118,33 +136,15 @@ cignoni 3295 -miq -dir - -math +dae dir glw dir -dae +math dir opensg dir -tsai -dir - -io_trimesh -dir - -gl -dir - -ply -dir - -io_edgemesh -dir - diff --git a/inst/include/vcglib/wrap/bmt/.svn/entries b/inst/include/vcglib/wrap/bmt/.svn/entries index 2ea262bb..5b46c3f4 100644 --- a/inst/include/vcglib/wrap/bmt/.svn/entries +++ b/inst/include/vcglib/wrap/bmt/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/bmt svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -bmt.cpp +bmt.h file 2013-06-21T07:08:07.531638Z -625d0805cc87a919ba2ef36583ed83a6 +37b71b585b4d43d268ef20cf291b923a 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -6952 +3609 -strip_mesh.h +bmt.cpp file 2013-06-21T07:08:07.531638Z -98f127b06a6d1fa7ec023d630a114084 +625d0805cc87a919ba2ef36583ed83a6 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -2688 +6952 -bmt.h +strip_mesh.h file 2013-06-21T07:08:07.531638Z -37b71b585b4d43d268ef20cf291b923a +98f127b06a6d1fa7ec023d630a114084 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,5 +126,5 @@ cignoni -3609 +2688 diff --git a/inst/include/vcglib/wrap/dae/.svn/entries b/inst/include/vcglib/wrap/dae/.svn/entries index db069fce..944571e0 100644 --- a/inst/include/vcglib/wrap/dae/.svn/entries +++ b/inst/include/vcglib/wrap/dae/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/dae svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ granzuglia e8973e21-934d-0410-ac44-de4585f5606d -xmldocumentmanaging.h +colladaformat.h file 2013-06-21T07:08:11.943659Z -969210814cc75f7a96412ce5a56af47a -2013-03-24T19:51:43.635840Z -4861 -granzuglia +cc4e88cb75a79515a85f772727458dc3 +2012-11-27T22:31:48.050124Z +4752 +cignoni @@ -58,19 +58,19 @@ granzuglia -5199 +34333 -util_dae.h +xmldocumentmanaging.cpp file 2013-06-21T07:08:11.943659Z -75425bcfd03bc40b6051a569e613049e -2013-03-24T19:51:43.635840Z -4861 -granzuglia +52451ec4c3dfdef735e869cca73f6a24 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -92,19 +92,19 @@ granzuglia -18205 +2469 -colladaformat.h +xmldocumentmanaging.h file 2013-06-21T07:08:11.943659Z -cc4e88cb75a79515a85f772727458dc3 -2012-11-27T22:31:48.050124Z -4752 -cignoni +969210814cc75f7a96412ce5a56af47a +2013-03-24T19:51:43.635840Z +4861 +granzuglia @@ -126,19 +126,19 @@ cignoni -34333 +5199 -xmldocumentmanaging.cpp +util_dae.h file 2013-06-21T07:08:11.943659Z -52451ec4c3dfdef735e869cca73f6a24 -2011-10-05T15:04:40.740408Z -4180 -cignoni +75425bcfd03bc40b6051a569e613049e +2013-03-24T19:51:43.635840Z +4861 +granzuglia @@ -160,5 +160,5 @@ cignoni -2469 +18205 diff --git a/inst/include/vcglib/wrap/gcache/.svn/entries b/inst/include/vcglib/wrap/gcache/.svn/entries index e525c163..9e363d8f 100644 --- a/inst/include/vcglib/wrap/gcache/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache svn://svn.code.sf.net/p/vcg/code @@ -26,40 +26,6 @@ ponchio e8973e21-934d-0410-ac44-de4585f5606d -token.h -file - - - - -2013-06-21T07:08:21.863709Z -582013e42ef3cb389a4def477851b609 -2013-03-19T19:46:24.889400Z -4845 -ponchio - - - - - - - - - - - - - - - - - - - - - -3461 - dheap.h file @@ -239,3 +205,37 @@ ponchio 2286 +token.h +file + + + + +2013-06-21T07:08:21.863709Z +582013e42ef3cb389a4def477851b609 +2013-03-19T19:46:24.889400Z +4845 +ponchio + + + + + + + + + + + + + + + + + + + + + +3461 + diff --git a/inst/include/vcglib/wrap/gcache/docs/.svn/entries b/inst/include/vcglib/wrap/gcache/docs/.svn/entries index 8e796268..9120c39d 100644 --- a/inst/include/vcglib/wrap/gcache/docs/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/docs/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/docs svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,15 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +css +dir + +img +dir + +js +dir + readme.html file @@ -97,12 +106,3 @@ cignoni html dir -css -dir - -img -dir - -js -dir - diff --git a/inst/include/vcglib/wrap/gcache/docs/css/.svn/entries b/inst/include/vcglib/wrap/gcache/docs/css/.svn/entries index 129f3f6f..a4edb3a7 100644 --- a/inst/include/vcglib/wrap/gcache/docs/css/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/docs/css/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/docs/css svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/gcache/docs/html/.svn/entries b/inst/include/vcglib/wrap/gcache/docs/html/.svn/entries index fff7481d..fe4b4b40 100644 --- a/inst/include/vcglib/wrap/gcache/docs/html/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/docs/html/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/docs/html svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/gcache/docs/img/.svn/entries b/inst/include/vcglib/wrap/gcache/docs/img/.svn/entries index 41ab3eda..70799447 100644 --- a/inst/include/vcglib/wrap/gcache/docs/img/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/docs/img/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/docs/img svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/gcache/docs/js/.svn/entries b/inst/include/vcglib/wrap/gcache/docs/js/.svn/entries index f4d142f3..27978460 100644 --- a/inst/include/vcglib/wrap/gcache/docs/js/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/docs/js/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/docs/js svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -prettify.js +prettify.css file 2013-06-21T07:08:21.687708Z -872e112ccd26dc15e635b977d5235d8c +65a9f734e81153feb6f7a48145dc3fe4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -15549 +391 -prettify.css +prettify.js file 2013-06-21T07:08:21.687708Z -65a9f734e81153feb6f7a48145dc3fe4 +872e112ccd26dc15e635b977d5235d8c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,5 +92,5 @@ cignoni -391 +15549 diff --git a/inst/include/vcglib/wrap/gcache/example/.svn/entries b/inst/include/vcglib/wrap/gcache/example/.svn/entries index 7322e828..465073e1 100644 --- a/inst/include/vcglib/wrap/gcache/example/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/example/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/example svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/gcache/test/.svn/entries b/inst/include/vcglib/wrap/gcache/test/.svn/entries index 861555a4..dbdea308 100644 --- a/inst/include/vcglib/wrap/gcache/test/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/test/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/test svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/gl/.svn/entries b/inst/include/vcglib/wrap/gl/.svn/entries index 73cd1736..f6aa8a46 100644 --- a/inst/include/vcglib/wrap/gl/.svn/entries +++ b/inst/include/vcglib/wrap/gl/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gl svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ granzuglia e8973e21-934d-0410-ac44-de4585f5606d -fbo.h +pick.h file 2013-06-21T07:08:18.515692Z -bf9eb9f9c63f17998884daa590418d04 +bef8ed5101748f2cb192c62e8226e040 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,18 +58,18 @@ cignoni -18100 +12975 -addons.h +gl_object.h file 2013-06-21T07:08:18.515692Z -f600f2d33ea632dbaec92e4cb1d57e3c -2012-12-21T15:34:32.227365Z -4787 +b09309ab9910a1b170ccc8aca05f7af0 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -92,20 +92,19 @@ cignoni -12945 +2490 -deprecated_math.h +camera.h file 2013-06-21T07:08:18.515692Z -345d06e3ed55df748b9bace87dac35f7 -2011-12-14T08:53:56.142796Z -4254 +789277da9a30a3f93ee1e90e00ca5729 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -126,16 +125,17 @@ has-props -3988 + +32921 -gl_surface.h +math.h file 2013-06-21T07:08:18.515692Z -76c60d83b8c0d9b71d33b4db87e1c9a3 +25ff776fd76c9938b1536514ae6e95b2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,19 +160,19 @@ cignoni -14023 +5870 -trimesh.h +shaders.h file 2013-06-21T07:08:18.515692Z -e83cc6afc22fdfefeb55f942349616bc -2012-10-08T05:30:34.906568Z -4545 -cignoni +93a8cf5bb11526bfc27342ee1a732062 +2011-12-09T16:06:08.628319Z +4246 +ponchio @@ -194,18 +194,18 @@ cignoni -24154 +12478 -deprecated_space.h +glu_tessellator_cap.h file 2013-06-21T07:08:18.515692Z -1b3f55b4072639ee0e055a15f57cc091 -2011-10-05T15:04:40.740408Z -4180 +9399f318ecaaeaeae68ed7ba501b9059 +2012-01-18T16:48:06.042804Z +4296 cignoni has-props @@ -228,19 +228,19 @@ has-props -12065 +2276 -shot.h +space.h file 2013-06-21T07:08:18.515692Z -48e2b71ff858bcee7e164545c20c0bab -2011-10-12T07:52:07.888838Z -4185 -corsini +7da71ef8551e40e249f824d56867f995 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -262,18 +262,18 @@ corsini -7800 +13275 -gl_geometry.h +glu_tesselator.h file 2013-06-21T07:08:18.515692Z -3c1f0c863b67496cdb3f4b97f889d75b -2012-12-02T14:57:08.898510Z -4759 +480cea7fe7b7329cdd6a7c099fe18781 +2012-05-23T08:50:03.107360Z +4414 cignoni @@ -296,18 +296,18 @@ cignoni -5068 +7351 -picking.h +tetramesh.h file 2013-06-21T07:08:18.515692Z -8ffeb8601ba65733f726365d0541a966 -2012-05-23T08:50:03.107360Z -4414 +96de94bf320449bb4b9c506a3bf44e73 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -330,16 +330,16 @@ cignoni -5251 +10655 -pick.h +pos.h file 2013-06-21T07:08:18.515692Z -bef8ed5101748f2cb192c62e8226e040 +e11024d8db8b6280750f54232e17ba47 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,19 +364,22 @@ cignoni -12975 +3419 -camera.h +splatting_apss +dir + +gl_field.h file 2013-06-21T07:08:18.515692Z -789277da9a30a3f93ee1e90e00ca5729 -2011-10-05T15:04:40.740408Z -4180 -cignoni +b18a36b82658964c0f8f0e16f85ca31d +2012-11-18T18:07:39.226469Z +4736 +pietroni @@ -398,16 +401,16 @@ cignoni -32921 +6538 -gl_object.h +fbo.h file 2013-06-21T07:08:18.515692Z -b09309ab9910a1b170ccc8aca05f7af0 +bf9eb9f9c63f17998884daa590418d04 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -432,19 +435,19 @@ cignoni -2490 +18100 -shaders.h +addons.h file 2013-06-21T07:08:18.515692Z -93a8cf5bb11526bfc27342ee1a732062 -2011-12-09T16:06:08.628319Z -4246 -ponchio +f600f2d33ea632dbaec92e4cb1d57e3c +2012-12-21T15:34:32.227365Z +4787 +cignoni @@ -466,19 +469,20 @@ ponchio -12478 +12945 -math.h +deprecated_math.h file 2013-06-21T07:08:18.515692Z -25ff776fd76c9938b1536514ae6e95b2 -2011-10-05T15:04:40.740408Z -4180 +345d06e3ed55df748b9bace87dac35f7 +2011-12-14T08:53:56.142796Z +4254 cignoni +has-props @@ -499,21 +503,19 @@ cignoni - -5870 +3988 -glu_tessellator_cap.h +gl_surface.h file 2013-06-21T07:08:18.515692Z -9399f318ecaaeaeae68ed7ba501b9059 -2012-01-18T16:48:06.042804Z -4296 +76c60d83b8c0d9b71d33b4db87e1c9a3 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -534,19 +536,21 @@ has-props -2276 + +14023 -space.h +deprecated_space.h file 2013-06-21T07:08:18.515692Z -7da71ef8551e40e249f824d56867f995 +1b3f55b4072639ee0e055a15f57cc091 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -567,19 +571,18 @@ cignoni - -13275 +12065 -glu_tesselator.h +trimesh.h file 2013-06-21T07:08:18.515692Z -480cea7fe7b7329cdd6a7c099fe18781 -2012-05-23T08:50:03.107360Z -4414 +e83cc6afc22fdfefeb55f942349616bc +2012-10-08T05:30:34.906568Z +4545 cignoni @@ -602,18 +605,18 @@ cignoni -7351 +24154 -tetramesh.h +gl_geometry.h file 2013-06-21T07:08:18.515692Z -96de94bf320449bb4b9c506a3bf44e73 -2011-10-05T15:04:40.740408Z -4180 +3c1f0c863b67496cdb3f4b97f889d75b +2012-12-02T14:57:08.898510Z +4759 cignoni @@ -636,19 +639,19 @@ cignoni -10655 +5068 -pos.h +shot.h file 2013-06-21T07:08:18.515692Z -e11024d8db8b6280750f54232e17ba47 -2011-10-05T15:04:40.740408Z -4180 -cignoni +48e2b71ff858bcee7e164545c20c0bab +2011-10-12T07:52:07.888838Z +4185 +corsini @@ -670,22 +673,19 @@ cignoni -3419 - -splatting_apss -dir +7800 -gl_field.h +picking.h file 2013-06-21T07:08:18.515692Z -b18a36b82658964c0f8f0e16f85ca31d -2012-11-18T18:07:39.226469Z -4736 -pietroni +8ffeb8601ba65733f726365d0541a966 +2012-05-23T08:50:03.107360Z +4414 +cignoni @@ -707,5 +707,5 @@ pietroni -6538 +5251 diff --git a/inst/include/vcglib/wrap/gl/splatting_apss/.svn/entries b/inst/include/vcglib/wrap/gl/splatting_apss/.svn/entries index 52e0011e..72862644 100644 --- a/inst/include/vcglib/wrap/gl/splatting_apss/.svn/entries +++ b/inst/include/vcglib/wrap/gl/splatting_apss/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gl/splatting_apss svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,20 @@ granzuglia e8973e21-934d-0410-ac44-de4585f5606d -splatrenderer.h +shaders +dir + +splatrenderer.qrc file 2013-06-21T07:08:17.459687Z -760e87d6e2e39a68d784c408241548ce -2013-05-24T16:31:16.302391Z -4895 -granzuglia +a43439b38365ed6d3dee360a4491bcbb +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -58,22 +61,19 @@ granzuglia -26394 - -shaders -dir +174 -splatrenderer.qrc +splatrenderer.h file 2013-06-21T07:08:17.459687Z -a43439b38365ed6d3dee360a4491bcbb -2011-10-05T15:04:40.740408Z -4180 -cignoni +760e87d6e2e39a68d784c408241548ce +2013-05-24T16:31:16.302391Z +4895 +granzuglia @@ -95,5 +95,5 @@ cignoni -174 +26394 diff --git a/inst/include/vcglib/wrap/gl/splatting_apss/shaders/.svn/entries b/inst/include/vcglib/wrap/gl/splatting_apss/shaders/.svn/entries index 5eaa1838..391d99de 100644 --- a/inst/include/vcglib/wrap/gl/splatting_apss/shaders/.svn/entries +++ b/inst/include/vcglib/wrap/gl/splatting_apss/shaders/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gl/splatting_apss/shaders svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Raycasting.glsl +Finalization.glsl file 2013-06-21T07:08:17.459687Z -61b63926aa876894c485bd7d5ea863b8 +10d49abb263d93dc7c5bfccc513278cb 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -10525 +3814 -Finalization.glsl +Raycasting.glsl file 2013-06-21T07:08:17.459687Z -10d49abb263d93dc7c5bfccc513278cb +61b63926aa876894c485bd7d5ea863b8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,5 +92,5 @@ cignoni -3814 +10525 diff --git a/inst/include/vcglib/wrap/glw/.svn/entries b/inst/include/vcglib/wrap/glw/.svn/entries index ae16838a..e0632d9d 100644 --- a/inst/include/vcglib/wrap/glw/.svn/entries +++ b/inst/include/vcglib/wrap/glw/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/glw svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ has-props e8973e21-934d-0410-ac44-de4585f5606d -texture2d.h +type.h file 2013-06-21T07:08:13.003665Z -c379454b35d23afc4a9c60116cce8d2a -2012-08-29T23:25:28.287404Z -4502 +633f5a482c088d413246695d7eb1bf58 +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -58,16 +58,16 @@ dibenedetto -7845 +321 -common.h +geometryshader.h file 2013-06-21T07:08:13.003665Z -d30a208790046f71d30d9ae44b84408c +ddf2efdf95a0c40c7a18ca7d89eb3bd8 2012-05-07T13:18:05.629767Z 4407 dibenedetto @@ -92,18 +92,18 @@ dibenedetto -831 +3743 -glw.h +context.h file -2013-06-21T07:08:12.999665Z -c7f0beb83214272f04b49af0b6048446 -2012-04-30T18:23:53.926492Z -4393 +2013-06-21T07:08:13.003665Z +a31b0bc5d7678847034456800a9779c2 +2013-02-05T18:43:59.934417Z +4814 dibenedetto @@ -126,18 +126,18 @@ dibenedetto -111 +23112 -fragmentshader.h +framebuffer.h file -2013-06-21T07:08:12.999665Z -966abfbc41b8b94503719043bd798e61 -2012-05-07T13:18:05.629767Z -4407 +2013-06-21T07:08:13.003665Z +eb53ca2bac75d7d68e89be63b2fd731c +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -160,18 +160,18 @@ dibenedetto -3743 +21046 -bookkeeping.h +texture2d.h file 2013-06-21T07:08:13.003665Z -63c8c17de4ebeb7a7e6b8fae5c4f773e -2012-05-07T19:21:47.050983Z -4409 +c379454b35d23afc4a9c60116cce8d2a +2012-08-29T23:25:28.287404Z +4502 dibenedetto @@ -194,18 +194,18 @@ dibenedetto -8803 +7845 -glheaders.h +common.h file 2013-06-21T07:08:13.003665Z -a7818439ef0798f3438d138c45a0574c -2012-04-30T18:23:53.926492Z -4393 +d30a208790046f71d30d9ae44b84408c +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -228,18 +228,18 @@ dibenedetto -103 +831 -texturecube.h +glw.h file -2013-06-21T07:08:13.003665Z -4abec5478c3c76188520b579d07693c3 -2012-08-22T12:38:09.043025Z -4494 +2013-06-21T07:08:12.999665Z +c7f0beb83214272f04b49af0b6048446 +2012-04-30T18:23:53.926492Z +4393 dibenedetto @@ -262,18 +262,18 @@ dibenedetto -7874 +111 -texture.h +fragmentshader.h file -2013-06-21T07:08:13.003665Z -ecc5efa79af0ab929afb8e97315e9117 -2012-05-23T18:02:22.047197Z -4415 +2013-06-21T07:08:12.999665Z +966abfbc41b8b94503719043bd798e61 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -296,18 +296,18 @@ dibenedetto -5033 +3743 -renderable.h +bookkeeping.h file 2013-06-21T07:08:13.003665Z -c2ea3af781b1896708c02823f10ad111 -2012-05-07T13:18:05.629767Z -4407 +63c8c17de4ebeb7a7e6b8fae5c4f773e +2012-05-07T19:21:47.050983Z +4409 dibenedetto @@ -330,18 +330,18 @@ dibenedetto -4137 +8803 -utility.h +glheaders.h file 2013-06-21T07:08:13.003665Z -45c8e5efbea5a1450ba7baad4fce89ce -2012-08-22T12:38:09.043025Z -4494 +a7818439ef0798f3438d138c45a0574c +2012-04-30T18:23:53.926492Z +4393 dibenedetto @@ -364,18 +364,18 @@ dibenedetto -9606 +103 -vertexshader.h +texturecube.h file 2013-06-21T07:08:13.003665Z -5a50bbdcef70e77779c0e12191f35191 -2012-05-07T13:18:05.629767Z -4407 +4abec5478c3c76188520b579d07693c3 +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -398,18 +398,18 @@ dibenedetto -3631 +7874 -config.h +texture.h file 2013-06-21T07:08:13.003665Z -1fb26369d111ad673dd30faa30e124d6 -2012-05-19T17:59:50.630000Z -4412 +ecc5efa79af0ab929afb8e97315e9117 +2012-05-23T18:02:22.047197Z +4415 dibenedetto @@ -432,18 +432,18 @@ dibenedetto -383 +5033 -object.h +utility.h file 2013-06-21T07:08:13.003665Z -2bdb0781f1868004aa819a95d08ae925 -2012-05-07T19:21:47.050983Z -4409 +45c8e5efbea5a1450ba7baad4fce89ce +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -466,18 +466,18 @@ dibenedetto -6020 +9606 -shader.h +renderable.h file 2013-06-21T07:08:13.003665Z -cb9c4ffb901f6ceb1afa813952322db8 -2012-05-07T16:12:40.729865Z -4408 +c2ea3af781b1896708c02823f10ad111 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -500,18 +500,18 @@ dibenedetto -6055 +4137 -program.h +vertexshader.h file 2013-06-21T07:08:13.003665Z -4701baa400535ea381716b34b255b0c2 -2012-06-02T00:35:04.072474Z -4429 +5a50bbdcef70e77779c0e12191f35191 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -534,18 +534,18 @@ dibenedetto -20908 +3631 -renderbuffer.h +config.h file 2013-06-21T07:08:13.003665Z -b80c38d5bd5df6491480227ac61e1d66 -2012-05-08T10:46:00.837775Z -4410 +1fb26369d111ad673dd30faa30e124d6 +2012-05-19T17:59:50.630000Z +4412 dibenedetto @@ -568,18 +568,18 @@ dibenedetto -5938 +383 -buffer.h +shader.h file 2013-06-21T07:08:13.003665Z -fe9edbd618d2a1de8a8bc35935241792 -2012-05-07T13:18:05.629767Z -4407 +cb9c4ffb901f6ceb1afa813952322db8 +2012-05-07T16:12:40.729865Z +4408 dibenedetto @@ -602,18 +602,18 @@ dibenedetto -16754 +6055 -noncopyable.h +object.h file 2013-06-21T07:08:13.003665Z -daa0a22ee1378fd0bafd0dd881b4295a -2012-04-30T18:23:53.926492Z -4393 +2bdb0781f1868004aa819a95d08ae925 +2012-05-07T19:21:47.050983Z +4409 dibenedetto @@ -636,18 +636,18 @@ dibenedetto -486 +6020 -objectdeleter.h +program.h file 2013-06-21T07:08:13.003665Z -38a9b9e89291d009f13bea2d48cd8b28 -2012-05-07T13:18:05.629767Z -4407 +4701baa400535ea381716b34b255b0c2 +2012-06-02T00:35:04.072474Z +4429 dibenedetto @@ -670,18 +670,18 @@ dibenedetto -354 +20908 -type.h +renderbuffer.h file 2013-06-21T07:08:13.003665Z -633f5a482c088d413246695d7eb1bf58 -2012-08-22T12:38:09.043025Z -4494 +b80c38d5bd5df6491480227ac61e1d66 +2012-05-08T10:46:00.837775Z +4410 dibenedetto @@ -704,16 +704,16 @@ dibenedetto -321 +5938 -geometryshader.h +buffer.h file 2013-06-21T07:08:13.003665Z -ddf2efdf95a0c40c7a18ca7d89eb3bd8 +fe9edbd618d2a1de8a8bc35935241792 2012-05-07T13:18:05.629767Z 4407 dibenedetto @@ -738,18 +738,18 @@ dibenedetto -3743 +16754 -context.h +noncopyable.h file 2013-06-21T07:08:13.003665Z -a31b0bc5d7678847034456800a9779c2 -2013-02-05T18:43:59.934417Z -4814 +daa0a22ee1378fd0bafd0dd881b4295a +2012-04-30T18:23:53.926492Z +4393 dibenedetto @@ -772,18 +772,18 @@ dibenedetto -23112 +486 -framebuffer.h +objectdeleter.h file 2013-06-21T07:08:13.003665Z -eb53ca2bac75d7d68e89be63b2fd731c -2012-08-22T12:38:09.043025Z -4494 +38a9b9e89291d009f13bea2d48cd8b28 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -806,5 +806,5 @@ dibenedetto -21046 +354 diff --git a/inst/include/vcglib/wrap/gui/.svn/entries b/inst/include/vcglib/wrap/gui/.svn/entries index e9f59123..390f5d3a 100644 --- a/inst/include/vcglib/wrap/gui/.svn/entries +++ b/inst/include/vcglib/wrap/gui/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gui svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -activecoordinateframe.cpp +frustum.h file 2013-06-21T07:08:10.531652Z -217a733adec6833e1fbb89ae9953ea4e -2013-01-28T15:15:14.079360Z -4807 -cignoni +ede0ae4bc332aa3e30845f174cb58b3e +2012-07-02T14:38:10.168389Z +4451 +ganovelli @@ -58,18 +58,18 @@ cignoni -9307 +6671 -trackmode.h +trackutils.h file 2013-06-21T07:08:10.531652Z -666eedfe949a321037b438161184c302 -2011-10-05T15:04:40.740408Z -4180 +9d083b474d7941386c468ac5c713ca38 +2012-03-06T11:52:00.209520Z +4341 cignoni @@ -92,18 +92,18 @@ cignoni -31973 +36969 -trackball.cpp +rubberband.h file 2013-06-21T07:08:10.531652Z -4293a38a8710094303bf6f6af9aa286d -2013-01-28T15:15:14.079360Z -4807 +991d12f12eb2b8178e0d2ac4ed497825 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -126,18 +126,18 @@ cignoni -12372 +4509 -trackrecorder.h +activecoordinateframe.cpp file 2013-06-21T07:08:10.531652Z -402ee54496fbab82c0940985ec9b6cb1 -2011-10-05T15:04:40.740408Z -4180 +217a733adec6833e1fbb89ae9953ea4e +2013-01-28T15:15:14.079360Z +4807 cignoni @@ -160,18 +160,18 @@ cignoni -3088 +9307 -view.h +trackmode.h file 2013-06-21T07:08:10.531652Z -84eb9b6274e66b5b00c0b8d3c2abed83 -2013-03-19T16:59:45.458763Z -4839 +666eedfe949a321037b438161184c302 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -194,18 +194,18 @@ cignoni -7834 +31973 -coordinateframe.cpp +trackball.cpp file 2013-06-21T07:08:10.531652Z -167072b45b9d4ebf3bc00c9cc60a94a1 -2011-10-05T15:04:40.740408Z -4180 +4293a38a8710094303bf6f6af9aa286d +2013-01-28T15:15:14.079360Z +4807 cignoni @@ -228,16 +228,16 @@ cignoni -12284 +12372 -activecoordinateframe.h +trackrecorder.h file 2013-06-21T07:08:10.531652Z -13496db648681f2f16cf7eaa951e0944 +402ee54496fbab82c0940985ec9b6cb1 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,18 +262,18 @@ cignoni -6522 +3088 -trackball.h +view.h file 2013-06-21T07:08:10.531652Z -d042f42bcb6e676a9a064f4855f4efe8 -2013-01-28T15:15:14.079360Z -4807 +84eb9b6274e66b5b00c0b8d3c2abed83 +2013-03-19T16:59:45.458763Z +4839 cignoni @@ -296,16 +296,16 @@ cignoni -17237 +7834 -rubberband.cpp +coordinateframe.cpp file 2013-06-21T07:08:10.531652Z -566b4a5045292e3721d5e2361460a614 +167072b45b9d4ebf3bc00c9cc60a94a1 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,16 +330,16 @@ cignoni -7231 +12284 -coordinateframe.h +activecoordinateframe.h file 2013-06-21T07:08:10.531652Z -35c6b9bd0432192b26e5e4f35137c88e +13496db648681f2f16cf7eaa951e0944 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,18 +364,18 @@ cignoni -7557 +6522 -trackmode.cpp +trackball.h file 2013-06-21T07:08:10.531652Z -a0d0924119fe2f608774e06a6950f237 -2012-03-06T11:52:00.209520Z -4341 +d042f42bcb6e676a9a064f4855f4efe8 +2013-01-28T15:15:14.079360Z +4807 cignoni @@ -398,19 +398,19 @@ cignoni -24818 +17237 -frustum.h +rubberband.cpp file 2013-06-21T07:08:10.531652Z -ede0ae4bc332aa3e30845f174cb58b3e -2012-07-02T14:38:10.168389Z -4451 -ganovelli +566b4a5045292e3721d5e2361460a614 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -432,18 +432,18 @@ ganovelli -6671 +7231 -trackutils.h +coordinateframe.h file 2013-06-21T07:08:10.531652Z -9d083b474d7941386c468ac5c713ca38 -2012-03-06T11:52:00.209520Z -4341 +35c6b9bd0432192b26e5e4f35137c88e +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -466,18 +466,18 @@ cignoni -36969 +7557 -rubberband.h +trackmode.cpp file 2013-06-21T07:08:10.531652Z -991d12f12eb2b8178e0d2ac4ed497825 -2011-10-05T15:04:40.740408Z -4180 +a0d0924119fe2f608774e06a6950f237 +2012-03-06T11:52:00.209520Z +4341 cignoni @@ -500,5 +500,5 @@ cignoni -4509 +24818 diff --git a/inst/include/vcglib/wrap/io_edgemesh/.svn/entries b/inst/include/vcglib/wrap/io_edgemesh/.svn/entries index 15be1a9a..86619f4c 100644 --- a/inst/include/vcglib/wrap/io_edgemesh/.svn/entries +++ b/inst/include/vcglib/wrap/io_edgemesh/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/io_edgemesh svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/io_tetramesh/.svn/entries b/inst/include/vcglib/wrap/io_tetramesh/.svn/entries index 5e5df110..030fe021 100644 --- a/inst/include/vcglib/wrap/io_tetramesh/.svn/entries +++ b/inst/include/vcglib/wrap/io_tetramesh/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/io_tetramesh svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -io_ply.h +export_ts.h file 2013-06-21T07:08:07.883639Z -e1cbee1b2a751006a01cf244c46982bf +3de894d4df6bf0ccfb64fa88345fbaed 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,18 +58,18 @@ cignoni -4081 +3714 -import_ply.h +io_ply.h file 2013-06-21T07:08:07.883639Z -f7fd992c0b8b35d2c564d1234ac8c3dd -2012-10-25T13:17:47.287786Z -4658 +e1cbee1b2a751006a01cf244c46982bf +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -92,16 +92,16 @@ cignoni -23404 +4081 -import_ts.h +import_ply.h file 2013-06-21T07:08:07.883639Z -fc46e6d26f17e052e1984763c9682748 +f7fd992c0b8b35d2c564d1234ac8c3dd 2012-10-25T13:17:47.287786Z 4658 cignoni @@ -126,16 +126,16 @@ cignoni -3881 +23404 -export_ply.h +import_ts.h file 2013-06-21T07:08:07.883639Z -c4f5afa10f32cdd4329f723cbdd77485 +fc46e6d26f17e052e1984763c9682748 2012-10-25T13:17:47.287786Z 4658 cignoni @@ -160,18 +160,18 @@ cignoni -17990 +3881 -export_ts.h +export_ply.h file 2013-06-21T07:08:07.883639Z -3de894d4df6bf0ccfb64fa88345fbaed -2011-10-05T15:04:40.740408Z -4180 +c4f5afa10f32cdd4329f723cbdd77485 +2012-10-25T13:17:47.287786Z +4658 cignoni @@ -194,5 +194,5 @@ cignoni -3714 +17990 diff --git a/inst/include/vcglib/wrap/io_trimesh/.svn/entries b/inst/include/vcglib/wrap/io_trimesh/.svn/entries index 79bb149e..f2c09a34 100644 --- a/inst/include/vcglib/wrap/io_trimesh/.svn/entries +++ b/inst/include/vcglib/wrap/io_trimesh/.svn/entries @@ -1,15 +1,15 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/io_trimesh svn://svn.code.sf.net/p/vcg/code -2013-06-24T08:34:01.960887Z -4904 -cignoni +2013-07-07T22:26:45.051813Z +4917 +granzuglia @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -import_fbx.h +import_ctm.h file 2013-06-21T07:08:16.811684Z -3d966d3234f9296aac4592864ce2ebe0 -2011-10-05T15:04:40.740408Z -4180 +62b3fcd1d8979a7208396fec962ac771 +2011-10-06T14:00:54.207830Z +4183 cignoni has-props @@ -58,16 +58,16 @@ has-props -21364 +5479 -import.h +export_iv.h file -2013-06-21T07:08:16.811684Z -0fe86e5506f544ffae5833418e6c5485 +2013-06-21T07:08:16.815684Z +bdfdd627e01a83d6162ba5da4eaf024e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,19 +92,20 @@ cignoni -6529 +3158 -export_off.h +export_fbx.h file 2013-06-21T07:08:16.811684Z -3cccdab271934b38cb88fa2c06888b80 -2012-10-25T13:17:47.287786Z -4658 +241aec436da087a7d7177e142c205231 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -125,20 +126,19 @@ cignoni - -6784 +11169 -export_obj.h +export.h file 2013-06-21T07:08:16.811684Z -9475db627c89e7cf09509cd8a1111cfa -2013-04-15T12:29:54.226667Z -4883 -corsini +2f151766a7e494f22be8505a02e2ea3b +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -160,20 +160,19 @@ corsini -13039 +5244 -import_ctm.h +export_dxf.h file 2013-06-21T07:08:16.811684Z -62b3fcd1d8979a7208396fec962ac771 -2011-10-06T14:00:54.207830Z -4183 +21f41d4ebfc787ffe892a575ee9dc579 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -194,20 +193,20 @@ has-props -5479 + +4172 -export_fbx.h +import_dae.h file 2013-06-21T07:08:16.811684Z -241aec436da087a7d7177e142c205231 +fb723590f2ef15ea4b7a7c0c6e6f8f50 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -228,19 +227,21 @@ has-props -11169 + +41259 -export.h +export_ctm.h file -2013-06-21T07:08:16.811684Z -2f151766a7e494f22be8505a02e2ea3b -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:16.815684Z +6da45d8b006c0ab478098f1e4817cd45 +2011-10-06T14:00:54.207830Z +4183 cignoni +has-props @@ -261,17 +262,16 @@ cignoni - -5244 +6566 -export_vrml.h +additionalinfo.h file -2013-06-21T07:08:16.811684Z -fcc58e4693b42c3acc97db992c01d0b6 +2013-06-21T07:08:16.815684Z +d77ea3ef72311f41e4c81d3a00a2d983 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ cignoni -9824 +1973 -export_dxf.h +io_material.h file -2013-06-21T07:08:16.811684Z -21f41d4ebfc787ffe892a575ee9dc579 +2013-06-21T07:08:16.819684Z +ca5761162e3908bd1c2325cf7bc9e0db 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,19 +330,20 @@ cignoni -4172 +5166 -io_mask.h +import_gts.h file -2013-06-21T07:08:16.811684Z -27e26a5315ed15d68f60fdb72fef87c8 -2012-01-20T07:44:55.724259Z -4299 +2013-06-21T07:08:16.815684Z +0f46db10354d3047addae8505574163e +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -363,20 +364,19 @@ cignoni - -4802 +8847 -import_dae.h +export_idtf.h file -2013-06-21T07:08:16.811684Z -fb723590f2ef15ea4b7a7c0c6e6f8f50 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-07-25T06:52:24.830399Z +c083ab1284193ae3e0c3d09525cf13f6 +2013-07-01T08:32:58.213815Z +4911 +granzuglia @@ -398,20 +398,19 @@ cignoni -41259 +21039 -export_ctm.h +export_dae.h file 2013-06-21T07:08:16.815684Z -6da45d8b006c0ab478098f1e4817cd45 -2011-10-06T14:00:54.207830Z -4183 +16ce5c00cf35d329d677eb90d91b1f63 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -432,16 +431,17 @@ has-props -6566 + +2831 -additionalinfo.h +export_3ds.h file 2013-06-21T07:08:16.815684Z -d77ea3ef72311f41e4c81d3a00a2d983 +47adec58ebc9d5b556338bbb2b1e6aa3 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -466,20 +466,19 @@ cignoni -1973 +16467 -import_gts.h +import_nvm.h file 2013-06-21T07:08:16.815684Z -0f46db10354d3047addae8505574163e -2011-10-05T15:04:40.740408Z -4180 -cignoni -has-props +2d495400f4fae4dad33c90ae5b9947ea +2013-01-30T17:18:55.488904Z +4811 +ganovelli @@ -500,19 +499,20 @@ has-props -8847 + +8105 -import_nvm.h +io_ply.h file 2013-06-21T07:08:16.815684Z -2d495400f4fae4dad33c90ae5b9947ea -2013-01-30T17:18:55.488904Z -4811 -ganovelli +f532e60a9e62ce375770e896193a3e8f +2011-12-12T23:25:39.996917Z +4248 +cignoni @@ -534,19 +534,19 @@ ganovelli -8105 +4373 -export_3ds.h +import_stl.h file -2013-06-21T07:08:16.815684Z -47adec58ebc9d5b556338bbb2b1e6aa3 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-07-25T06:52:24.826399Z +8d5bda2921b2d66d596743c216aa2d0d +2013-07-07T22:26:45.051813Z +4917 +granzuglia @@ -568,19 +568,20 @@ cignoni -16467 +8991 -export_dae.h +export_gts.h file 2013-06-21T07:08:16.815684Z -16ce5c00cf35d329d677eb90d91b1f63 -2011-10-05T15:04:40.740408Z -4180 +10928d7f7ca81c56619f5ba2e8b9c4f7 +2012-10-25T13:17:47.287786Z +4658 cignoni +has-props @@ -601,20 +602,19 @@ cignoni - -2831 +6344 -io_ply.h +import_ply.h file 2013-06-21T07:08:16.815684Z -f532e60a9e62ce375770e896193a3e8f -2011-12-12T23:25:39.996917Z -4248 -cignoni +839dc5cb21f8da87c68cec351f9c6583 +2013-06-04T11:55:33.377527Z +4896 +tarini @@ -636,18 +636,18 @@ cignoni -4373 +40202 -import_stl.h +import_asc.h file 2013-06-21T07:08:16.815684Z -0f51eb932c62b28beead6612f38c891b -2012-11-27T07:05:38.064450Z -4746 +c2d9a6b17a2f81d9f74026b4f2df3252 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -670,19 +670,19 @@ cignoni -8985 +5057 -import_ply.h +export_stl.h file 2013-06-21T07:08:16.815684Z -839dc5cb21f8da87c68cec351f9c6583 -2013-06-04T11:55:33.377527Z -4896 -tarini +b1d7fcc6fca8a57fed7bbda16de3eff2 +2012-11-27T07:05:38.064450Z +4746 +cignoni @@ -704,20 +704,19 @@ tarini -40202 +6307 -export_gts.h +import_ptx.h file 2013-06-21T07:08:16.815684Z -10928d7f7ca81c56619f5ba2e8b9c4f7 -2012-10-25T13:17:47.287786Z -4658 +b0792b8b93aec745dbe26a8bdf880146 +2012-10-11T11:20:55.820886Z +4580 cignoni -has-props @@ -738,18 +737,19 @@ has-props -6344 + +14800 -import_asc.h +export_ply.h file 2013-06-21T07:08:16.815684Z -c2d9a6b17a2f81d9f74026b4f2df3252 -2011-10-05T15:04:40.740408Z -4180 +587f287a6bdb94dea9472d027f21d6bd +2012-11-08T18:48:07.067992Z +4706 cignoni @@ -772,20 +772,20 @@ cignoni -5057 +26842 -export_stl.h +import_field.h file 2013-06-21T07:08:16.815684Z -b1d7fcc6fca8a57fed7bbda16de3eff2 -2012-11-27T07:05:38.064450Z -4746 -cignoni - +98df142bd291faae5c16a1fd739f554b +2013-01-30T17:18:55.488904Z +4811 +ganovelli +has-props @@ -806,18 +806,18 @@ cignoni -6307 +9550 -export_ply.h +import_smf.h file 2013-06-21T07:08:16.815684Z -587f287a6bdb94dea9472d027f21d6bd -2012-11-08T18:48:07.067992Z -4706 +e15080b83d5e36827ff95dc0fb01e204 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -840,18 +840,18 @@ cignoni -26842 +4399 -import_ptx.h +export_vrml.h file -2013-06-21T07:08:16.815684Z -b0792b8b93aec745dbe26a8bdf880146 -2012-10-11T11:20:55.820886Z -4580 +2013-06-21T07:08:16.811684Z +fcc58e4693b42c3acc97db992c01d0b6 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -874,18 +874,18 @@ cignoni -14800 +9824 -how_to_write_an_io_filter.txt +io_mask.h file -2013-06-21T07:08:16.815684Z -06ff7e7f6533e155afd18462e1453202 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:16.811684Z +27e26a5315ed15d68f60fdb72fef87c8 +2012-01-20T07:44:55.724259Z +4299 cignoni @@ -908,20 +908,19 @@ cignoni -1945 +4802 -import_field.h +import_raw.h file 2013-06-21T07:08:16.815684Z -98df142bd291faae5c16a1fd739f554b -2013-01-30T17:18:55.488904Z -4811 -ganovelli -has-props +de453b16118f7e40b322d5107c4b3b8e +2012-01-20T07:44:55.724259Z +4299 +cignoni @@ -942,20 +941,21 @@ has-props -9550 + +12587 -export_iv.h +export_field.h file 2013-06-21T07:08:16.815684Z -bdfdd627e01a83d6162ba5da4eaf024e -2011-10-05T15:04:40.740408Z -4180 -cignoni - +d46e9f7d57ad23ae4a1141d26c8b7772 +2013-01-22T10:04:28.267703Z +4802 +pietroni +has-props @@ -976,19 +976,19 @@ cignoni -3158 +3591 -import_smf.h +import_vmi.h file -2013-06-21T07:08:16.815684Z -e15080b83d5e36827ff95dc0fb01e204 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:08:16.819684Z +55359ab1da2ffff6f0a1b647583d1d8a +2013-01-03T09:33:41.553814Z +4797 +granzuglia @@ -1010,18 +1010,18 @@ cignoni -4399 +35703 -import_raw.h +export_smf.h file -2013-06-21T07:08:16.815684Z -de453b16118f7e40b322d5107c4b3b8e -2012-01-20T07:44:55.724259Z -4299 +2013-06-21T07:08:16.819684Z +9d256b9288d5c716e2de4fb25efc047a +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -1044,20 +1044,19 @@ cignoni -12587 +3908 -export_field.h +export_vmi.h file -2013-06-21T07:08:16.815684Z -d46e9f7d57ad23ae4a1141d26c8b7772 -2013-01-22T10:04:28.267703Z -4802 -pietroni -has-props +2013-06-21T07:08:16.811684Z +42c382fb2385c7b346bcc9f234cb092d +2012-07-02T14:38:10.168389Z +4451 +ganovelli @@ -1078,16 +1077,17 @@ has-props -3591 + +19104 -io_material.h +export_u3d.h file -2013-06-21T07:08:16.819684Z -ca5761162e3908bd1c2325cf7bc9e0db +2013-06-21T07:08:16.811684Z +29b4f69a7de16a0c6433fc63bdcb6fec 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -1112,19 +1112,19 @@ cignoni -5166 +9984 -import_vmi.h +import_out.h file -2013-06-21T07:08:16.819684Z -55359ab1da2ffff6f0a1b647583d1d8a -2013-01-03T09:33:41.553814Z -4797 -granzuglia +2013-06-21T07:08:16.811684Z +15d87b7d458b69a232879cb1f484d19e +2013-01-30T17:18:55.488904Z +4811 +ganovelli @@ -1146,18 +1146,18 @@ granzuglia -35703 +8190 -export_smf.h +import_off.h file -2013-06-21T07:08:16.819684Z -9d256b9288d5c716e2de4fb25efc047a -2011-10-05T15:04:40.740408Z -4180 +2013-06-24T13:55:27.978354Z +a350a51928f05cb1c5977b2ac9ec0550 +2013-06-24T08:34:01.960887Z +4904 cignoni @@ -1180,18 +1180,18 @@ cignoni -3908 +27610 -export_idtf.h +import_obj.h file -2013-06-21T07:08:16.819684Z -6d5c68c6bbeee324746ec4e75ed32794 -2012-11-27T22:31:48.050124Z -4752 +2013-06-21T07:08:16.811684Z +73e16fce5090359c126e09d7e18c8644 +2013-04-12T09:49:51.257901Z +4882 cignoni @@ -1214,20 +1214,20 @@ cignoni -21012 +38948 -export_vmi.h +import_fbx.h file 2013-06-21T07:08:16.811684Z -42c382fb2385c7b346bcc9f234cb092d -2012-07-02T14:38:10.168389Z -4451 -ganovelli - +3d966d3234f9296aac4592864ce2ebe0 +2011-10-05T15:04:40.740408Z +4180 +cignoni +has-props @@ -1248,16 +1248,16 @@ ganovelli -19104 +21364 -export_u3d.h +import.h file 2013-06-21T07:08:16.811684Z -29b4f69a7de16a0c6433fc63bdcb6fec +0fe86e5506f544ffae5833418e6c5485 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -1282,19 +1282,19 @@ cignoni -9984 +6529 -import_out.h +how_to_write_an_io_filter.txt file -2013-06-21T07:08:16.811684Z -15d87b7d458b69a232879cb1f484d19e -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-06-21T07:08:16.815684Z +06ff7e7f6533e155afd18462e1453202 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -1316,18 +1316,18 @@ ganovelli -8190 +1945 -import_off.h +export_off.h file -2013-06-24T13:55:27.978354Z -a350a51928f05cb1c5977b2ac9ec0550 -2013-06-24T08:34:01.960887Z -4904 +2013-06-21T07:08:16.811684Z +3cccdab271934b38cb88fa2c06888b80 +2012-10-25T13:17:47.287786Z +4658 cignoni @@ -1350,19 +1350,19 @@ cignoni -27610 +6784 -import_obj.h +export_obj.h file 2013-06-21T07:08:16.811684Z -73e16fce5090359c126e09d7e18c8644 -2013-04-12T09:49:51.257901Z -4882 -cignoni +9475db627c89e7cf09509cd8a1111cfa +2013-04-15T12:29:54.226667Z +4883 +corsini @@ -1384,5 +1384,5 @@ cignoni -38948 +13039 diff --git a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_idtf.h.svn-base b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_idtf.h.svn-base index 2cf6be0d..5c0aae81 100644 --- a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_idtf.h.svn-base +++ b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_idtf.h.svn-base @@ -247,7 +247,7 @@ public: static void removeConvertedTexturesFiles(const QStringList& conv_file) { - for(unsigned int ii = 0;ii < conv_file.size();++ii) + for(QStringList::size_type ii = 0;ii < conv_file.size();++ii) { QDir dir(QtUtilityFunctions::pathWithoutFileName(conv_file[ii])); dir.remove(QtUtilityFunctions::fileNameFromPath(conv_file[ii])); @@ -375,9 +375,8 @@ typedef typename SaveMeshType::CoordType CoordType; idtf.write(2,"}"); } - + idtf.write(1,"}"); } - idtf.write(1,"}"); idtf.write(0,"}"); idtf.write(0,""); } diff --git a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/import_stl.h.svn-base b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/import_stl.h.svn-base index f82cd4da..68bbfcff 100644 --- a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/import_stl.h.svn-base +++ b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/import_stl.h.svn-base @@ -98,8 +98,9 @@ static bool LoadMask(const char * filename, int &mask) */ static bool IsSTLColored(const char * filename, bool &magicsMode) { - if(IsSTLBinary(filename)==false) return false; - FILE *fp = fopen(filename, "r"); + if(IsSTLBinary(filename)==false) + return false; + FILE *fp = fopen(filename, "rb"); char buf[STL_LABEL_SIZE+1]; fread(buf,sizeof(char),STL_LABEL_SIZE,fp); std::string strInput(buf); @@ -122,7 +123,8 @@ static bool IsSTLColored(const char * filename, bool &magicsMode) fread(&attr,sizeof(unsigned short),1,fp); if(attr!=0) { - if(Color4b::FromUnsignedR5G5B5(attr) != Color4b(Color4b::White)) return true; + if(Color4b::FromUnsignedR5G5B5(attr) != Color4b(Color4b::White)) + return true; } } diff --git a/inst/include/vcglib/wrap/io_trimesh/export_idtf.h b/inst/include/vcglib/wrap/io_trimesh/export_idtf.h index 2cf6be0d..5c0aae81 100644 --- a/inst/include/vcglib/wrap/io_trimesh/export_idtf.h +++ b/inst/include/vcglib/wrap/io_trimesh/export_idtf.h @@ -247,7 +247,7 @@ class TGA_Exporter static void removeConvertedTexturesFiles(const QStringList& conv_file) { - for(unsigned int ii = 0;ii < conv_file.size();++ii) + for(QStringList::size_type ii = 0;ii < conv_file.size();++ii) { QDir dir(QtUtilityFunctions::pathWithoutFileName(conv_file[ii])); dir.remove(QtUtilityFunctions::fileNameFromPath(conv_file[ii])); @@ -375,9 +375,8 @@ typedef typename SaveMeshType::CoordType CoordType; idtf.write(2,"}"); } - + idtf.write(1,"}"); } - idtf.write(1,"}"); idtf.write(0,"}"); idtf.write(0,""); } diff --git a/inst/include/vcglib/wrap/io_trimesh/import_stl.h b/inst/include/vcglib/wrap/io_trimesh/import_stl.h index f82cd4da..68bbfcff 100644 --- a/inst/include/vcglib/wrap/io_trimesh/import_stl.h +++ b/inst/include/vcglib/wrap/io_trimesh/import_stl.h @@ -98,8 +98,9 @@ static bool LoadMask(const char * filename, int &mask) */ static bool IsSTLColored(const char * filename, bool &magicsMode) { - if(IsSTLBinary(filename)==false) return false; - FILE *fp = fopen(filename, "r"); + if(IsSTLBinary(filename)==false) + return false; + FILE *fp = fopen(filename, "rb"); char buf[STL_LABEL_SIZE+1]; fread(buf,sizeof(char),STL_LABEL_SIZE,fp); std::string strInput(buf); @@ -122,7 +123,8 @@ static bool IsSTLColored(const char * filename, bool &magicsMode) fread(&attr,sizeof(unsigned short),1,fp); if(attr!=0) { - if(Color4b::FromUnsignedR5G5B5(attr) != Color4b(Color4b::White)) return true; + if(Color4b::FromUnsignedR5G5B5(attr) != Color4b(Color4b::White)) + return true; } } diff --git a/inst/include/vcglib/wrap/math/.svn/entries b/inst/include/vcglib/wrap/math/.svn/entries index 26871512..55e1d72e 100644 --- a/inst/include/vcglib/wrap/math/.svn/entries +++ b/inst/include/vcglib/wrap/math/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/math svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -sparse_matrix.h +system_interface_ldl.h file 2013-06-21T07:08:13.351666Z -6d54687262b73355d5e16491e20f3ba9 +89f7e14abd56152ad49a717f5219e234 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -1052 +3416 -system_interface_ldl.h +sparse_matrix.h file 2013-06-21T07:08:13.351666Z -89f7e14abd56152ad49a717f5219e234 +6d54687262b73355d5e16491e20f3ba9 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,5 +92,5 @@ cignoni -3416 +1052 diff --git a/inst/include/vcglib/wrap/minpack/.svn/entries b/inst/include/vcglib/wrap/minpack/.svn/entries index 5eaa8057..9d847b3c 100644 --- a/inst/include/vcglib/wrap/minpack/.svn/entries +++ b/inst/include/vcglib/wrap/minpack/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/minpack svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/miq/.svn/entries b/inst/include/vcglib/wrap/miq/.svn/entries index f336052c..242e072f 100644 --- a/inst/include/vcglib/wrap/miq/.svn/entries +++ b/inst/include/vcglib/wrap/miq/.svn/entries @@ -1,15 +1,15 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/miq svn://svn.code.sf.net/p/vcg/code -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-07-23T11:24:38.954326Z +4927 +pietroni @@ -26,9 +26,6 @@ ganovelli e8973e21-934d-0410-ac44-de4585f5606d -core -dir - MIQ.h file @@ -69,10 +66,10 @@ file -2013-06-21T07:08:11.595658Z -e7680e2d4da646a564fbb8d1d6ff7401 -2012-10-18T00:44:25.431471Z -4624 +2013-07-25T06:52:24.802399Z +83f2ac052f4fc184cac7e837485dd183 +2013-07-23T11:24:05.089690Z +4926 pietroni has-props @@ -95,5 +92,8 @@ has-props -18180 +18233 + +core +dir diff --git a/inst/include/vcglib/wrap/miq/.svn/text-base/quadrangulator.h.svn-base b/inst/include/vcglib/wrap/miq/.svn/text-base/quadrangulator.h.svn-base index 3cc7c43d..180c3b19 100644 --- a/inst/include/vcglib/wrap/miq/.svn/text-base/quadrangulator.h.svn-base +++ b/inst/include/vcglib/wrap/miq/.svn/text-base/quadrangulator.h.svn-base @@ -148,9 +148,9 @@ private: vcg::TexCoord2 &t1) { vcg::TexCoord2 tmp; - if (t0.n() != t1.n()) - cerr << "Failed assertion: Quadrangulator::WedgeInterp1" << endl; - // assert(t0.n()== t1.n()); TODO put back +// if (t0.n() != t1.n()) +// cerr << "Failed assertion: Quadrangulator::WedgeInterp1" << endl; +// // assert(t0.n()== t1.n()); TODO put back tmp.n()=t0.n(); // assert(alpha>=0); TODO put back if (alpha<0) @@ -466,7 +466,8 @@ public: ///then split the tris SplitTris(Tmesh,factor,tolerance); ///join the vertices back! - ScalarType EPS=(ScalarType)0.00000001; + //ScalarType EPS=(ScalarType)0.00000001; + ScalarType EPS=(ScalarType)0.000001; vcg::tri::Clean::MergeCloseVertex(Tmesh,EPS); vcg::tri::UpdateNormal::PerFaceNormalized(Tmesh); // update Normals diff --git a/inst/include/vcglib/wrap/miq/core/.svn/entries b/inst/include/vcglib/wrap/miq/core/.svn/entries index 5e3ce123..118273aa 100644 --- a/inst/include/vcglib/wrap/miq/core/.svn/entries +++ b/inst/include/vcglib/wrap/miq/core/.svn/entries @@ -1,15 +1,15 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/miq/core svn://svn.code.sf.net/p/vcg/code -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-07-23T11:24:38.954326Z +4927 +pietroni @@ -26,16 +26,16 @@ ganovelli e8973e21-934d-0410-ac44-de4585f5606d -auxmath.h +glUtils.h file -2013-06-21T07:08:11.595658Z -db38d9059f3c4f87c4ca22725ae00c8d -2012-10-17T12:27:02.302460Z -4620 +2013-07-25T06:52:24.794399Z +8a995c21525f5103c79ab7d5bbebbcd7 +2013-07-23T11:24:38.954326Z +4927 pietroni has-props @@ -58,19 +58,19 @@ has-props -873 +8703 -seams_initializer.h +poisson_solver.h file -2013-06-21T07:08:11.591658Z -517214a90be99a4e8c9350ad9f3a3cc2 -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-06-21T07:08:11.595658Z +f9f333fe6c5c4d2b98507248d51daa25 +2012-11-12T11:17:33.619286Z +4719 +pietroni has-props @@ -92,16 +92,16 @@ has-props -12077 +25718 -sparsesystemdata.h +auxmath.h file -2013-06-21T07:08:11.591658Z -841bc605464a44754ae145cd5862278b +2013-06-21T07:08:11.595658Z +db38d9059f3c4f87c4ca22725ae00c8d 2012-10-17T12:27:02.302460Z 4620 pietroni @@ -126,19 +126,19 @@ has-props -8465 +873 -stiffening.h +seams_initializer.h file -2013-06-21T07:08:11.591658Z -c476d42c4fcb28a23b8aedbf9ad5992c -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-07-25T06:52:24.794399Z +5e09fca1481b5bac024c7350cc08d699 +2013-07-23T11:23:21.585077Z +4925 +pietroni has-props @@ -160,19 +160,19 @@ has-props -6364 +12138 -param_stats.h +sparsesystemdata.h file 2013-06-21T07:08:11.591658Z -f7c0d6ee9cba8445af0c7facad5c0efc -2013-01-30T17:18:55.488904Z -4811 -ganovelli +841bc605464a44754ae145cd5862278b +2012-10-17T12:27:02.302460Z +4620 +pietroni has-props @@ -194,16 +194,16 @@ has-props -7224 +8465 -vertex_indexing.h +stiffening.h file 2013-06-21T07:08:11.591658Z -a2a3cfcd8b99b21b0042f9ad0abdd23d +c476d42c4fcb28a23b8aedbf9ad5992c 2013-01-30T17:18:55.488904Z 4811 ganovelli @@ -228,19 +228,19 @@ has-props -14249 +6364 -glUtils.h +param_stats.h file 2013-06-21T07:08:11.591658Z -37dc409ac2fc3c46fda7ac8f4f960b6b -2013-01-22T10:02:05.894642Z -4800 -pietroni +f7c0d6ee9cba8445af0c7facad5c0efc +2013-01-30T17:18:55.488904Z +4811 +ganovelli has-props @@ -262,19 +262,19 @@ has-props -8639 +7224 -poisson_solver.h +vertex_indexing.h file -2013-06-21T07:08:11.595658Z -f9f333fe6c5c4d2b98507248d51daa25 -2012-11-12T11:17:33.619286Z -4719 -pietroni +2013-06-21T07:08:11.591658Z +a2a3cfcd8b99b21b0042f9ad0abdd23d +2013-01-30T17:18:55.488904Z +4811 +ganovelli has-props @@ -296,5 +296,5 @@ has-props -25718 +14249 diff --git a/inst/include/vcglib/wrap/miq/core/.svn/text-base/glUtils.h.svn-base b/inst/include/vcglib/wrap/miq/core/.svn/text-base/glUtils.h.svn-base index dd6c0957..3eb05ea8 100644 --- a/inst/include/vcglib/wrap/miq/core/.svn/text-base/glUtils.h.svn-base +++ b/inst/include/vcglib/wrap/miq/core/.svn/text-base/glUtils.h.svn-base @@ -95,7 +95,7 @@ public: static void GLDrawSeams(MeshType &mesh, float size=3, bool UV=false, - int numCuts=200) + int numCuts=400) { bool hasSeam = vcg::tri::HasPerFaceAttribute(mesh,std::string("Seams")); if(!hasSeam)return; @@ -131,7 +131,8 @@ public: int index=Handle_SeamIndex[i][j]; //assert(index>0); if (index>=0) - seamCol[j]=vcg::Color4b::Scatter(numCuts,index); + seamCol[j]=vcg::Color4b(255,0,0,255); + //seamCol[j]=vcg::Color4b::Scatter(numCuts,index); } } diff --git a/inst/include/vcglib/wrap/miq/core/.svn/text-base/seams_initializer.h.svn-base b/inst/include/vcglib/wrap/miq/core/.svn/text-base/seams_initializer.h.svn-base index e76b01b1..076fd518 100644 --- a/inst/include/vcglib/wrap/miq/core/.svn/text-base/seams_initializer.h.svn-base +++ b/inst/include/vcglib/wrap/miq/core/.svn/text-base/seams_initializer.h.svn-base @@ -162,7 +162,7 @@ private: bool isSing=IsSingularByMMatch(mesh->vert[i],missmatch); if (isSing) { - //mesh->vert[i].SetS(); + mesh->vert[i].SetS(); Handle_Singular[i]=true; if (missmatch==3)missmatch=1; else @@ -171,7 +171,7 @@ private: } else { - //mesh->vert[i].ClearS(); + mesh->vert[i].ClearS(); Handle_Singular[i]=false; Handle_SingularDegree[i]=0; } @@ -345,8 +345,10 @@ public: mesh=_mesh; - vcg::tri::UpdateFlags::VertexBorderFromNone(*mesh); - vcg::tri::UpdateFlags::FaceBorderFromNone(*mesh); + vcg::tri::UpdateTopology::FaceFace(*_mesh); + vcg::tri::UpdateFlags::FaceBorderFromFF(*_mesh); + vcg::tri::UpdateFlags::VertexBorderFromFace(*_mesh); + AddAttributesIfNeeded(); if (orient_globally) @@ -359,7 +361,7 @@ public: InitTopologycalCuts(); AddSeamsByMM(); } - InitSeamIndexes(); + //InitSeamIndexes(); } SeamsInitializer(){mesh=NULL;} diff --git a/inst/include/vcglib/wrap/miq/core/glUtils.h b/inst/include/vcglib/wrap/miq/core/glUtils.h index dd6c0957..3eb05ea8 100644 --- a/inst/include/vcglib/wrap/miq/core/glUtils.h +++ b/inst/include/vcglib/wrap/miq/core/glUtils.h @@ -95,7 +95,7 @@ class Miq_Gl_Utils static void GLDrawSeams(MeshType &mesh, float size=3, bool UV=false, - int numCuts=200) + int numCuts=400) { bool hasSeam = vcg::tri::HasPerFaceAttribute(mesh,std::string("Seams")); if(!hasSeam)return; @@ -131,7 +131,8 @@ class Miq_Gl_Utils int index=Handle_SeamIndex[i][j]; //assert(index>0); if (index>=0) - seamCol[j]=vcg::Color4b::Scatter(numCuts,index); + seamCol[j]=vcg::Color4b(255,0,0,255); + //seamCol[j]=vcg::Color4b::Scatter(numCuts,index); } } diff --git a/inst/include/vcglib/wrap/miq/core/seams_initializer.h b/inst/include/vcglib/wrap/miq/core/seams_initializer.h index e76b01b1..076fd518 100644 --- a/inst/include/vcglib/wrap/miq/core/seams_initializer.h +++ b/inst/include/vcglib/wrap/miq/core/seams_initializer.h @@ -162,7 +162,7 @@ class SeamsInitializer bool isSing=IsSingularByMMatch(mesh->vert[i],missmatch); if (isSing) { - //mesh->vert[i].SetS(); + mesh->vert[i].SetS(); Handle_Singular[i]=true; if (missmatch==3)missmatch=1; else @@ -171,7 +171,7 @@ class SeamsInitializer } else { - //mesh->vert[i].ClearS(); + mesh->vert[i].ClearS(); Handle_Singular[i]=false; Handle_SingularDegree[i]=0; } @@ -345,8 +345,10 @@ class SeamsInitializer mesh=_mesh; - vcg::tri::UpdateFlags::VertexBorderFromNone(*mesh); - vcg::tri::UpdateFlags::FaceBorderFromNone(*mesh); + vcg::tri::UpdateTopology::FaceFace(*_mesh); + vcg::tri::UpdateFlags::FaceBorderFromFF(*_mesh); + vcg::tri::UpdateFlags::VertexBorderFromFace(*_mesh); + AddAttributesIfNeeded(); if (orient_globally) @@ -359,7 +361,7 @@ class SeamsInitializer InitTopologycalCuts(); AddSeamsByMM(); } - InitSeamIndexes(); + //InitSeamIndexes(); } SeamsInitializer(){mesh=NULL;} diff --git a/inst/include/vcglib/wrap/miq/quadrangulator.h b/inst/include/vcglib/wrap/miq/quadrangulator.h index 3cc7c43d..180c3b19 100644 --- a/inst/include/vcglib/wrap/miq/quadrangulator.h +++ b/inst/include/vcglib/wrap/miq/quadrangulator.h @@ -148,9 +148,9 @@ class Quadrangulator vcg::TexCoord2 &t1) { vcg::TexCoord2 tmp; - if (t0.n() != t1.n()) - cerr << "Failed assertion: Quadrangulator::WedgeInterp1" << endl; - // assert(t0.n()== t1.n()); TODO put back +// if (t0.n() != t1.n()) +// cerr << "Failed assertion: Quadrangulator::WedgeInterp1" << endl; +// // assert(t0.n()== t1.n()); TODO put back tmp.n()=t0.n(); // assert(alpha>=0); TODO put back if (alpha<0) @@ -466,7 +466,8 @@ class Quadrangulator ///then split the tris SplitTris(Tmesh,factor,tolerance); ///join the vertices back! - ScalarType EPS=(ScalarType)0.00000001; + //ScalarType EPS=(ScalarType)0.00000001; + ScalarType EPS=(ScalarType)0.000001; vcg::tri::Clean::MergeCloseVertex(Tmesh,EPS); vcg::tri::UpdateNormal::PerFaceNormalized(Tmesh); // update Normals diff --git a/inst/include/vcglib/wrap/mt/.svn/entries b/inst/include/vcglib/wrap/mt/.svn/entries index f9fd3589..846940f4 100644 --- a/inst/include/vcglib/wrap/mt/.svn/entries +++ b/inst/include/vcglib/wrap/mt/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/mt svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/opensg/.svn/entries b/inst/include/vcglib/wrap/opensg/.svn/entries index 5f6c5cde..83055eb1 100644 --- a/inst/include/vcglib/wrap/opensg/.svn/entries +++ b/inst/include/vcglib/wrap/opensg/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/opensg svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/ply/.svn/entries b/inst/include/vcglib/wrap/ply/.svn/entries index c2e6c2b6..7a81a2cb 100644 --- a/inst/include/vcglib/wrap/ply/.svn/entries +++ b/inst/include/vcglib/wrap/ply/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/ply svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -plylib.h +plylib.cpp file 2013-06-21T07:08:18.867694Z -42f906d8b81428f23ba29652b56fac26 +4898296162fa9cc9282affbd74e4d19c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -8887 +82266 -plystuff.h +plylib.h file 2013-06-21T07:08:18.867694Z -50360ba5a653f235ad1260d87b17553f +42f906d8b81428f23ba29652b56fac26 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -10445 +8887 -plylib.cpp +plystuff.h file 2013-06-21T07:08:18.867694Z -4898296162fa9cc9282affbd74e4d19c +50360ba5a653f235ad1260d87b17553f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,5 +126,5 @@ cignoni -82266 +10445 diff --git a/inst/include/vcglib/wrap/qt/.svn/entries b/inst/include/vcglib/wrap/qt/.svn/entries index 626e749d..0c020bfd 100644 --- a/inst/include/vcglib/wrap/qt/.svn/entries +++ b/inst/include/vcglib/wrap/qt/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/qt svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ granzuglia e8973e21-934d-0410-ac44-de4585f5606d -outline2_rasterizer.cpp +gl_label.h file 2013-06-21T07:08:08.987645Z -fc967031ddeb9a8015394a4e92ddc4f9 -2013-03-26T11:22:27.229142Z -4871 -cignoni +e5cb0c889dfb5888f373f3db88fff461 +2013-03-24T19:50:48.636151Z +4860 +granzuglia has-props @@ -58,18 +58,18 @@ has-props -6341 +6444 -img_qt_io.h +anttweakbarMapper.cpp file -2013-06-21T07:08:08.991645Z -2e51cc90d0b91d17904bb459a9035750 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:08.987645Z +f0ccfabdba5f40bca4a6a182136107ce +2012-03-04T16:27:02.381539Z +4339 cignoni has-props @@ -92,19 +92,19 @@ has-props -9196 +2688 -anttweakbarMapper.h +outline2_rasterizer.cpp file -2013-06-21T07:08:08.991645Z -5a6df9f04a3049c41a3d5251907e3391 -2012-02-14T11:39:27.403341Z -4330 -malomo +2013-06-21T07:08:08.987645Z +fc967031ddeb9a8015394a4e92ddc4f9 +2013-03-26T11:22:27.229142Z +4871 +cignoni has-props @@ -126,16 +126,16 @@ has-props -419 +6341 -to_string.h +img_qt_io.h file 2013-06-21T07:08:08.991645Z -014ba50cb2a7f46671b157ff2ae00686 +2e51cc90d0b91d17904bb459a9035750 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,19 +160,19 @@ has-props -744 +9196 -checkGLError.h +to_string.h file -2013-06-21T07:08:08.987645Z -aca006dfcdf6585bb77e3cf3a39ac804 -2013-03-24T19:50:48.636151Z -4860 -granzuglia +2013-06-21T07:08:08.991645Z +014ba50cb2a7f46671b157ff2ae00686 +2011-10-05T15:04:40.740408Z +4180 +cignoni has-props @@ -194,19 +194,19 @@ has-props -2803 +744 -outline2_rasterizer.h +anttweakbarMapper.h file -2013-06-21T07:08:08.987645Z -09523485b6ce973ff0ac2fbcccc60f3e -2013-04-03T14:26:30.561941Z -4880 -granzuglia +2013-06-21T07:08:08.991645Z +5a6df9f04a3049c41a3d5251907e3391 +2012-02-14T11:39:27.403341Z +4330 +malomo has-props @@ -228,19 +228,19 @@ has-props -713 +419 -img_qt.h +checkGLError.h file 2013-06-21T07:08:08.987645Z -10781583b22685222c6c415b0118f33b -2011-10-05T15:04:40.740408Z -4180 -cignoni +aca006dfcdf6585bb77e3cf3a39ac804 +2013-03-24T19:50:48.636151Z +4860 +granzuglia has-props @@ -262,19 +262,19 @@ has-props -221 +2803 -img_qt_convert.h +outline2_rasterizer.h file 2013-06-21T07:08:08.987645Z -62eac7a5457e18e8e5122801994fb6a1 -2011-10-05T15:04:40.740408Z -4180 -cignoni +09523485b6ce973ff0ac2fbcccc60f3e +2013-04-03T14:26:30.561941Z +4880 +granzuglia has-props @@ -296,19 +296,20 @@ has-props -5200 +713 -col_qt_convert.h +img_qt_convert.h file 2013-06-21T07:08:08.987645Z -8c042a9aac22615df1c0efadc2d9d6c8 +62eac7a5457e18e8e5122801994fb6a1 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -329,17 +330,16 @@ cignoni - -421 +5200 -shot_qt.h +img_qt.h file 2013-06-21T07:08:08.987645Z -77bfd209c52a449f61147a2c31d58c6b +10781583b22685222c6c415b0118f33b 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,18 +364,18 @@ has-props -5837 +221 -Outline2ToQImage.cpp +shot_qt.h file 2013-06-21T07:08:08.987645Z -cffdca71f68ca7bdb89cfa659799be21 -2013-03-26T11:22:27.229142Z -4871 +77bfd209c52a449f61147a2c31d58c6b +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -398,20 +398,19 @@ has-props -13898 +5837 -Outline2ToQImage.h +col_qt_convert.h file -2013-06-21T07:08:08.991645Z -4e015e7240c139e5b4f435d039412a1a -2013-03-26T11:22:27.229142Z -4871 +2013-06-21T07:08:08.987645Z +8c042a9aac22615df1c0efadc2d9d6c8 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -432,19 +431,21 @@ has-props -5577 + +421 -trackball.h +Outline2ToQImage.cpp file 2013-06-21T07:08:08.987645Z -f2dfa4f4a8ba5e0ec9b70483fb07affd -2011-10-05T15:04:40.740408Z -4180 +cffdca71f68ca7bdb89cfa659799be21 +2013-03-26T11:22:27.229142Z +4871 cignoni +has-props @@ -465,20 +466,19 @@ cignoni - -4195 +13898 -gl_label.h +Outline2ToQImage.h file -2013-06-21T07:08:08.987645Z -e5cb0c889dfb5888f373f3db88fff461 -2013-03-24T19:50:48.636151Z -4860 -granzuglia +2013-06-21T07:08:08.991645Z +4e015e7240c139e5b4f435d039412a1a +2013-03-26T11:22:27.229142Z +4871 +cignoni has-props @@ -500,20 +500,19 @@ has-props -6444 +5577 -anttweakbarMapper.cpp +trackball.h file 2013-06-21T07:08:08.987645Z -f0ccfabdba5f40bca4a6a182136107ce -2012-03-04T16:27:02.381539Z -4339 +f2dfa4f4a8ba5e0ec9b70483fb07affd +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -534,5 +533,6 @@ has-props -2688 + +4195 diff --git a/inst/include/vcglib/wrap/system/.svn/entries b/inst/include/vcglib/wrap/system/.svn/entries index d24127fc..26d05bb5 100644 --- a/inst/include/vcglib/wrap/system/.svn/entries +++ b/inst/include/vcglib/wrap/system/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/system svn://svn.code.sf.net/p/vcg/code @@ -26,20 +26,14 @@ ponchio e8973e21-934d-0410-ac44-de4585f5606d -time -dir - -multithreading -dir - -getopt.cpp +getopt.h file 2013-06-21T07:08:08.455642Z -cc0fd9f2a9d754a540d678eb9cc7f256 +4fa0be0d909a37f303717ddab672c3cd 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -64,18 +58,18 @@ cignoni -23483 +3955 -qgetopt.cpp +qgetopt.h file 2013-06-21T07:08:08.455642Z -92ea0f12e34e16a8f82acbea056b53f8 -2013-03-20T12:50:07.069886Z -4854 +3df64eb589f57bdc52f865d7d009db7c +2013-03-20T12:48:17.394132Z +4853 ponchio @@ -98,16 +92,22 @@ ponchio -11162 +5078 -getopt.h +time +dir + +multithreading +dir + +getopt.cpp file 2013-06-21T07:08:08.455642Z -4fa0be0d909a37f303717ddab672c3cd +cc0fd9f2a9d754a540d678eb9cc7f256 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -132,18 +132,18 @@ cignoni -3955 +23483 -qgetopt.h +qgetopt.cpp file 2013-06-21T07:08:08.455642Z -3df64eb589f57bdc52f865d7d009db7c -2013-03-20T12:48:17.394132Z -4853 +92ea0f12e34e16a8f82acbea056b53f8 +2013-03-20T12:50:07.069886Z +4854 ponchio @@ -166,5 +166,5 @@ ponchio -5078 +11162 diff --git a/inst/include/vcglib/wrap/system/multithreading/.svn/entries b/inst/include/vcglib/wrap/system/multithreading/.svn/entries index c357db32..3b3e379c 100644 --- a/inst/include/vcglib/wrap/system/multithreading/.svn/entries +++ b/inst/include/vcglib/wrap/system/multithreading/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/system/multithreading svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/system/time/.svn/entries b/inst/include/vcglib/wrap/system/time/.svn/entries index 48577dac..5ea0d257 100644 --- a/inst/include/vcglib/wrap/system/time/.svn/entries +++ b/inst/include/vcglib/wrap/system/time/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/system/time svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/tsai/.svn/entries b/inst/include/vcglib/wrap/tsai/.svn/entries index 5fac8c85..5d86f7f8 100644 --- a/inst/include/vcglib/wrap/tsai/.svn/entries +++ b/inst/include/vcglib/wrap/tsai/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4909 +4928 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/tsai svn://svn.code.sf.net/p/vcg/code