diff --git a/inst/include/vcglib/.svn/entries b/inst/include/vcglib/.svn/entries index 81f2dfbf..1ca3fb60 100644 --- a/inst/include/vcglib/.svn/entries +++ b/inst/include/vcglib/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib svn://svn.code.sf.net/p/vcg/code -2013-07-24T12:00:47.297259Z -4928 +2013-07-26T14:01:17.531085Z +4937 cignoni @@ -26,9 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -img -dir - eigenlib dir @@ -44,3 +41,6 @@ dir wrap dir +img +dir + diff --git a/inst/include/vcglib/apps/.svn/entries b/inst/include/vcglib/apps/.svn/entries index e9e15dc6..b4af895f 100644 --- a/inst/include/vcglib/apps/.svn/entries +++ b/inst/include/vcglib/apps/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps svn://svn.code.sf.net/p/vcg/code -2013-07-23T07:37:29.006637Z -4922 +2013-07-26T12:16:02.285007Z +4934 cignoni @@ -26,6 +26,9 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +plyrefine +dir + pivoting dir @@ -50,6 +53,3 @@ dir quadrangulator dir -plyrefine -dir - diff --git a/inst/include/vcglib/apps/metro/.svn/entries b/inst/include/vcglib/apps/metro/.svn/entries index 6e27cf8d..01b73677 100644 --- a/inst/include/vcglib/apps/metro/.svn/entries +++ b/inst/include/vcglib/apps/metro/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 -readme.txt +history.txt file 2013-06-21T07:05:38.870900Z -bf1187cf03700d0b8964aaadaa0de30d +49ba9fc018d874d6070fc7bf397c9628 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,18 +58,18 @@ cignoni -5248 +1532 -history.txt +sampling.h file 2013-06-21T07:05:38.870900Z -49ba9fc018d874d6070fc7bf397c9628 -2011-10-05T15:04:40.740408Z -4180 +f69eeb2895b63391231a220239def025 +2013-02-20T21:21:49.121709Z +4820 cignoni @@ -92,18 +92,21 @@ cignoni -1532 +21639 -sampling.h +sample +dir + +metro.pro file 2013-06-21T07:05:38.870900Z -f69eeb2895b63391231a220239def025 -2013-02-20T21:21:49.121709Z -4820 +d27b36a76f14cf2609d1665a9054c2fb +2012-10-04T16:28:41.586955Z +4534 cignoni @@ -126,21 +129,18 @@ cignoni -21639 - -sample -dir +235 -metro.pro +metro.cpp file 2013-06-21T07:05:38.870900Z -d27b36a76f14cf2609d1665a9054c2fb -2012-10-04T16:28:41.586955Z -4534 +e441fb7182b5f1eae8be6aa98adb3cac +2013-02-20T21:21:49.121709Z +4820 cignoni @@ -163,18 +163,18 @@ cignoni -235 +17897 -metro.cpp +readme.txt file 2013-06-21T07:05:38.870900Z -e441fb7182b5f1eae8be6aa98adb3cac -2013-02-20T21:21:49.121709Z -4820 +bf1187cf03700d0b8964aaadaa0de30d +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -197,5 +197,5 @@ cignoni -17897 +5248 diff --git a/inst/include/vcglib/apps/metro/sample/.svn/entries b/inst/include/vcglib/apps/metro/sample/.svn/entries index 1a6130c9..e9431db2 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/metro/sample svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -knot_vcg_simplified_metro.ply +knot_max_simplified.STL file 2013-06-21T07:05:38.694899Z -761e69a79a781e8cca19aeff1573696d +7c72cdea4936d011a15e426b84697a5e 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -58,16 +58,16 @@ has-props -37103 +80084 -readme.txt +knot_vcg_simplified_metro.ply file 2013-06-21T07:05:38.694899Z -9f2dd78b2d4accd3ee7c7e2b6b6f1d3e +761e69a79a781e8cca19aeff1573696d 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -92,16 +92,16 @@ has-props -589 +37103 -knot_subsampled.ply +readme.txt file 2013-06-21T07:05:38.694899Z -d18f0f86446c47d706df75049603a897 +9f2dd78b2d4accd3ee7c7e2b6b6f1d3e 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -126,16 +126,16 @@ has-props -40237 +589 -knot_orig.ply +knot_subsampled.ply file -2013-06-21T07:05:38.698900Z -e4f7264e614cae0ea21553d0326efce4 +2013-06-21T07:05:38.694899Z +d18f0f86446c47d706df75049603a897 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -160,16 +160,16 @@ has-props -640240 +40237 -knot_vcg_simplified.ply +knot_orig.ply file -2013-06-21T07:05:38.694899Z -ff0ea0d89e68f4b9a53d9d079427c456 +2013-06-21T07:05:38.698900Z +e4f7264e614cae0ea21553d0326efce4 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -194,16 +194,16 @@ has-props -40237 +640240 -knot_subsampled_metro.ply +knot_vcg_simplified.ply file 2013-06-21T07:05:38.694899Z -81fad14917eb80ebfb41776adb72123a +ff0ea0d89e68f4b9a53d9d079427c456 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -228,16 +228,16 @@ has-props -37103 +40237 -knot_orig_metro.ply +knot_subsampled_metro.ply file 2013-06-21T07:05:38.694899Z -c860559adab31daf8801ba0244486a4b +81fad14917eb80ebfb41776adb72123a 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -262,16 +262,16 @@ has-props -589106 +37103 -knot_max_simplified.STL +knot_orig_metro.ply file 2013-06-21T07:05:38.694899Z -7c72cdea4936d011a15e426b84697a5e +c860559adab31daf8801ba0244486a4b 2013-04-15T20:59:56.745507Z 4888 cignoni @@ -296,5 +296,5 @@ has-props -80084 +589106 diff --git a/inst/include/vcglib/apps/pivoting/.svn/entries b/inst/include/vcglib/apps/pivoting/.svn/entries index 4af9b98c..3c154d82 100644 --- a/inst/include/vcglib/apps/pivoting/.svn/entries +++ b/inst/include/vcglib/apps/pivoting/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 -glarea.h +glarea.cpp file 2013-06-21T07:05:19.734806Z -9143f6bf6489f475621bf70a74327234 +c635c532a4736a381d9c06c7d0d9463b 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -1495 +10547 -cmesh.h +pivot.dev file 2013-06-21T07:05:19.734806Z -93e1bc536bf02decdc0130a34a7aaa97 +8d909c6421cead640e3fdc28e313dcf2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -1236 +3477 -main.cpp +glarea.h file 2013-06-21T07:05:19.734806Z -a401ac6309efff5bc9f8129ef8a6dfd4 +9143f6bf6489f475621bf70a74327234 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -2726 +1495 -ring.h +cmesh.h file 2013-06-21T07:05:19.734806Z -27dbfbd26c2234512f1e716e5b408e16 +93e1bc536bf02decdc0130a34a7aaa97 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -2687 +1236 -curvature.h +main.cpp file 2013-06-21T07:05:19.734806Z -d41d8cd98f00b204e9800998ecf8427e +a401ac6309efff5bc9f8129ef8a6dfd4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -0 +2726 -pivot.h +ring.h file 2013-06-21T07:05:19.734806Z -4689440620650d16d25dd2414eaba261 +27dbfbd26c2234512f1e716e5b408e16 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -24872 +2687 -mainwindow.ui +curvature.h file 2013-06-21T07:05:19.734806Z -94ee5c97a0bd48b74e437aac1c18b149 +d41d8cd98f00b204e9800998ecf8427e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -10927 +0 -glarea.cpp +pivot.h file 2013-06-21T07:05:19.734806Z -c635c532a4736a381d9c06c7d0d9463b +4689440620650d16d25dd2414eaba261 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ cignoni -10547 +24872 -pivot.dev +mainwindow.ui file 2013-06-21T07:05:19.734806Z -8d909c6421cead640e3fdc28e313dcf2 +94ee5c97a0bd48b74e437aac1c18b149 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,5 +330,5 @@ cignoni -3477 +10927 diff --git a/inst/include/vcglib/apps/plyrefine/.svn/entries b/inst/include/vcglib/apps/plyrefine/.svn/entries index da2bd433..26cf3fb8 100644 --- a/inst/include/vcglib/apps/plyrefine/.svn/entries +++ b/inst/include/vcglib/apps/plyrefine/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 106c0b99..1d53a59d 100644 --- a/inst/include/vcglib/apps/quadrangulator/.svn/entries +++ b/inst/include/vcglib/apps/quadrangulator/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 -quadrangulator.pro +bunny.ffield file 2013-06-21T07:07:56.167581Z -ec79d976137b2ab83bca54ca366fad71 -2012-10-18T16:49:26.212527Z -4635 -cignoni +5e031ebf78cd290ad1e6392623741ba3 +2012-10-18T00:42:37.833083Z +4622 +pietroni has-props @@ -58,19 +58,19 @@ has-props -1853 +4719438 -quadrangulator.cpp +configuration.txt file 2013-06-21T07:07:56.167581Z -a173410b72079a72c1adcdc1738a15be -2012-10-18T16:49:26.212527Z -4635 -cignoni +7ae62afd3fec3ad709a9616f489ce673 +2012-10-18T00:42:37.833083Z +4622 +pietroni has-props @@ -92,19 +92,19 @@ has-props -6374 +95 -bunny.ply +quadrangulator.pro file -2013-06-21T07:07:56.171581Z -697df49e2f53d06103aa61687ce1dd01 -2012-10-18T00:42:37.833083Z -4622 -pietroni +2013-06-21T07:07:56.167581Z +ec79d976137b2ab83bca54ca366fad71 +2012-10-18T16:49:26.212527Z +4635 +cignoni has-props @@ -126,19 +126,19 @@ has-props -1393631 +1853 -bunny.ffield +quadrangulator.cpp file 2013-06-21T07:07:56.167581Z -5e031ebf78cd290ad1e6392623741ba3 -2012-10-18T00:42:37.833083Z -4622 -pietroni +a173410b72079a72c1adcdc1738a15be +2012-10-18T16:49:26.212527Z +4635 +cignoni has-props @@ -160,16 +160,16 @@ has-props -4719438 +6374 -configuration.txt +bunny.ply file -2013-06-21T07:07:56.167581Z -7ae62afd3fec3ad709a9616f489ce673 +2013-06-21T07:07:56.171581Z +697df49e2f53d06103aa61687ce1dd01 2012-10-18T00:42:37.833083Z 4622 pietroni @@ -194,5 +194,5 @@ has-props -95 +1393631 diff --git a/inst/include/vcglib/apps/sample/.svn/entries b/inst/include/vcglib/apps/sample/.svn/entries index f20bc6bd..fa781bf0 100644 --- a/inst/include/vcglib/apps/sample/.svn/entries +++ b/inst/include/vcglib/apps/sample/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample svn://svn.code.sf.net/p/vcg/code -2013-07-23T07:36:40.054633Z -4921 +2013-07-26T12:16:02.285007Z +4934 cignoni @@ -26,70 +26,34 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_texture -dir - -trimesh_isosurface -dir - -polygonmesh_base -dir - -trimesh_pointmatching -dir - -space_minimal -dir - -trimesh_intersection -dir - -trimesh_refine -dir - -img_filters -dir - -trimesh_voroatlas -dir - -trimesh_base -dir - -trimesh_diskparam -dir - -hashing_2D -dir - -trimesh_closest +trimesh_kdtree dir -trimesh_kdtree +trimesh_ant_freeglut dir trimesh_clustering dir -trimesh_ant_freeglut +trimesh_curvature dir -trimesh_curvature +polygonmesh_zonohedra dir trimesh_geodesic dir -polygonmesh_zonohedra +trimesh_allocate dir trimesh_QT dir -trimesh_allocate +trimesh_optional dir -trimesh_optional +trimesh_ant_qt dir common.pri @@ -126,7 +90,7 @@ has-props 177 -trimesh_ant_qt +trimesh_voronoisampling dir trimesh_ball_pivoting @@ -135,19 +99,19 @@ dir trimesh_inertia dir -trimesh_join +colorspace dir -colorspace +trimesh_join dir trimesh_attribute dir -trimesh_edge +trimesh_fitting dir -trimesh_fitting +trimesh_edge dir trimesh_pos_demo @@ -226,3 +190,42 @@ dir trimesh_voronoiclustering dir +trimesh_texture +dir + +trimesh_isosurface +dir + +polygonmesh_base +dir + +trimesh_pointmatching +dir + +space_minimal +dir + +trimesh_intersection +dir + +trimesh_refine +dir + +img_filters +dir + +trimesh_voroatlas +dir + +trimesh_base +dir + +trimesh_diskparam +dir + +hashing_2D +dir + +trimesh_closest +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 53566b84..64ad77a3 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/aabb_binary_tree svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -aabb_binary_tree.cpp +aabb_binary_tree.pro file 2013-06-21T07:05:24.234828Z -b9decd0a6de9c91c2e5ef39d74567cab +8acd520a079bbac47aacafd4e450f8df 2012-10-09T08:43:35.607016Z 4566 cignoni @@ -58,16 +58,16 @@ cignoni -5726 +81 -aabb_binary_tree.pro +aabb_binary_tree.cpp file 2013-06-21T07:05:24.234828Z -8acd520a079bbac47aacafd4e450f8df +b9decd0a6de9c91c2e5ef39d74567cab 2012-10-09T08:43:35.607016Z 4566 cignoni @@ -92,5 +92,5 @@ cignoni -81 +5726 diff --git a/inst/include/vcglib/apps/sample/colorspace/.svn/entries b/inst/include/vcglib/apps/sample/colorspace/.svn/entries index 9f7d8e68..11f9a051 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 -4928 +4937 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 217925bf..def53582 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/hashing_2D svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/img_filters/.svn/entries b/inst/include/vcglib/apps/sample/img_filters/.svn/entries index 8d3ab40c..ceeeb634 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 -4928 +4937 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 037d260c..a339a1b2 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 -4928 +4937 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_base.pro +polygonmesh.cpp file 2013-06-21T07:05:21.178813Z -f14b34dbb8f70017d1069225eebf7801 +5c693b95ec6e5ae854da2c3d89439fb9 2012-10-09T08:43:35.607016Z 4566 cignoni @@ -58,16 +58,16 @@ cignoni -108 +8537 -polygonmesh.cpp +polygonmesh_base.pro file 2013-06-21T07:05:21.178813Z -5c693b95ec6e5ae854da2c3d89439fb9 +f14b34dbb8f70017d1069225eebf7801 2012-10-09T08:43:35.607016Z 4566 cignoni @@ -92,5 +92,5 @@ cignoni -8537 +108 diff --git a/inst/include/vcglib/apps/sample/polygonmesh_quadsimpl/.svn/entries b/inst/include/vcglib/apps/sample/polygonmesh_quadsimpl/.svn/entries index 2ff6a500..709d8a50 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/polygonmesh_quadsimpl svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/polygonmesh_zonohedra/.svn/entries b/inst/include/vcglib/apps/sample/polygonmesh_zonohedra/.svn/entries index 50b76e70..8f5001ab 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 -4928 +4937 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 d4a95322..4d4d6461 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 -4928 +4937 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 f7bdb738..7553b43e 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 -4928 +4937 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 b440a09f..59ae0068 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_QT svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_allocate/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_allocate/.svn/entries index b22305e0..281eb54e 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 -4928 +4937 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 5bbd0ceb..98ce2a6a 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 -4928 +4937 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 06a5c281..d6fe61ab 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 -4928 +4937 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 ba214238..7938f6cc 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 -4928 +4937 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 cf97a4e7..9d652acc 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 -4928 +4937 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 fb1c1d28..2902c440 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 -4928 +4937 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 c906cea8..9a812533 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_closest svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_closest.pro +trimesh_closest.cpp file 2013-06-21T07:05:24.178828Z -f23faee02a9bd1607875f7a32086e853 +73e5aa915114f1c6634fa31309c34684 2012-10-19T11:48:33.877458Z 4637 cignoni @@ -58,16 +58,16 @@ has-props -108 +7951 -trimesh_closest.cpp +trimesh_closest.pro file 2013-06-21T07:05:24.178828Z -73e5aa915114f1c6634fa31309c34684 +f23faee02a9bd1607875f7a32086e853 2012-10-19T11:48:33.877458Z 4637 cignoni @@ -92,5 +92,5 @@ has-props -7951 +108 diff --git a/inst/include/vcglib/apps/sample/trimesh_clustering/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_clustering/.svn/entries index 8edf1ce2..2d6d2701 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_clustering svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries index 44525242..08aa6d65 100644 --- a/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_color/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_color svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_color.pro +trimesh_color.cpp file -2013-06-21T07:05:21.710815Z -77b7a303e762c2d5e7843e3bd966ff9d -2012-10-19T11:48:33.877458Z -4637 +2013-07-25T06:52:24.618398Z +58337c4816719f0621302fbd3574e9fa +2013-07-23T07:33:48.618537Z +4920 cignoni has-props @@ -58,18 +58,18 @@ has-props -104 +3276 -trimesh_color.cpp +trimesh_color.pro file -2013-07-25T06:52:24.618398Z -58337c4816719f0621302fbd3574e9fa -2013-07-23T07:33:48.618537Z -4920 +2013-06-21T07:05:21.710815Z +77b7a303e762c2d5e7843e3bd966ff9d +2012-10-19T11:48:33.877458Z +4637 cignoni has-props @@ -92,5 +92,5 @@ has-props -3276 +104 diff --git a/inst/include/vcglib/apps/sample/trimesh_copy/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_copy/.svn/entries index 161ef5a5..97bee38e 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 -4928 +4937 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 11adec0e..2200fb31 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_curvature svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_diskparam/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_diskparam/.svn/entries index 724d1567..a216ea78 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 -4928 +4937 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 2b0288c4..de584ea7 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 -4928 +4937 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 7cb245f0..e31aafdc 100644 --- a/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_fitting/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_fitting svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_fitting.pro +trimesh_fitting.cpp file -2013-06-21T07:05:21.182813Z -c852adee3658691d6d1bccc2fd11f425 -2012-10-22T18:27:30.323922Z -4645 +2013-07-25T06:52:24.590398Z +6db8de0180d7d6a7b64902709c618fba +2013-07-23T07:33:48.618537Z +4920 cignoni has-props @@ -58,18 +58,18 @@ has-props -79 +5054 -trimesh_fitting.cpp +trimesh_fitting.pro file -2013-07-25T06:52:24.590398Z -6db8de0180d7d6a7b64902709c618fba -2013-07-23T07:33:48.618537Z -4920 +2013-06-21T07:05:21.182813Z +c852adee3658691d6d1bccc2fd11f425 +2012-10-22T18:27:30.323922Z +4645 cignoni has-props @@ -92,5 +92,5 @@ has-props -5054 +79 diff --git a/inst/include/vcglib/apps/sample/trimesh_geodesic/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_geodesic/.svn/entries index 05460ede..b989e50e 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_geodesic svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_hole/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_hole/.svn/entries index a458dc8d..fbc0b7f1 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 -4928 +4937 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 437bdc65..2d23d0b6 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 -4928 +4937 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 33eefc7d..2a32ad45 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 -4928 +4937 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 57fe743f..d42aa649 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 -4928 +4937 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 -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 @@ -58,18 +58,18 @@ cignoni -3422 +114 -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 @@ -92,18 +92,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 @@ -126,5 +126,5 @@ cignoni -114 +2692 diff --git a/inst/include/vcglib/apps/sample/trimesh_join/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_join/.svn/entries index 5ca2c7ba..1bce3efe 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 -4928 +4937 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 ad60104f..bdc8c5e6 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 -4928 +4937 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 16c96f3c..70827e3c 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 -4928 +4937 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 86789a68..72aad81f 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_optional svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_pointmatching/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_pointmatching/.svn/entries index ab7eff05..ba4b0522 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_pointmatching svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_pointmatching.pro +trimesh_pointmatching.cpp file 2013-06-21T07:05:23.166823Z -cafb9ccc3b68b14b1b3b769651901f94 +1551385a53ba96823bf8699b2c2721c9 2012-11-22T23:30:42.326518Z 4743 cignoni @@ -58,16 +58,16 @@ has-props -91 +4409 -trimesh_pointmatching.cpp +trimesh_pointmatching.pro file 2013-06-21T07:05:23.166823Z -1551385a53ba96823bf8699b2c2721c9 +cafb9ccc3b68b14b1b3b769651901f94 2012-11-22T23:30:42.326518Z 4743 cignoni @@ -92,5 +92,5 @@ has-props -4409 +91 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 3b880557..3ba1a9ee 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 -4928 +4937 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 -trimesh_pos_demo.cpp +trimesh_pos_demo.pro file 2013-06-21T07:05:23.646825Z -4f675c91a5ef2448c132a1927e178bd5 +7d9de2ae210674db7a5cd8727bc64d52 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -1423 +563 -mesh_type.h +trimesh_vfiter_demo.cpp file 2013-06-21T07:05:23.646825Z -9b4780a7db6801cd5ff4121926dd9125 +4f0b76310bbb55d494c0ceef09fac12c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -3421 +1084 -main.cpp +trimesh_pos_demo.cpp file 2013-06-21T07:05:23.646825Z -e238ece8d9e7dbbfdbafafbdcbd78f15 +4f675c91a5ef2448c132a1927e178bd5 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -172 +1423 -glwidget.cpp +mesh_type.h file 2013-06-21T07:05:23.646825Z -a06f324d96506e8aa61ecb7d61f6cb15 +9b4780a7db6801cd5ff4121926dd9125 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,16 @@ cignoni -7931 +3421 -window.cpp +main.cpp file 2013-06-21T07:05:23.646825Z -45559167cfe8402eb67407c511bd5ed9 +e238ece8d9e7dbbfdbafafbdcbd78f15 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -3190 +172 -glwidget.h +glwidget.cpp file -2013-06-21T07:05:23.650825Z -f2344b5abc5f60dff29ca97a7ac56867 +2013-06-21T07:05:23.646825Z +a06f324d96506e8aa61ecb7d61f6cb15 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -3795 +7931 -window.h +window.cpp file -2013-06-21T07:05:23.650825Z -fc69f2effa4e99f24aef70e5acec9af2 +2013-06-21T07:05:23.646825Z +45559167cfe8402eb67407c511bd5ed9 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -2368 +3190 -trimesh_pos_demo.pro +glwidget.h file -2013-06-21T07:05:23.646825Z -7d9de2ae210674db7a5cd8727bc64d52 +2013-06-21T07:05:23.650825Z +f2344b5abc5f60dff29ca97a7ac56867 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ cignoni -563 +3795 -trimesh_vfiter_demo.cpp +window.h file -2013-06-21T07:05:23.646825Z -4f0b76310bbb55d494c0ceef09fac12c +2013-06-21T07:05:23.650825Z +fc69f2effa4e99f24aef70e5acec9af2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,5 +330,5 @@ cignoni -1084 +2368 diff --git a/inst/include/vcglib/apps/sample/trimesh_ray/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_ray/.svn/entries index 5e8ae0ca..382d7cf0 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 -4928 +4937 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 a58f428a..b56ff4cb 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 -4928 +4937 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 bc5457c6..c0d690f0 100644 --- a/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_sampling/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_sampling svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_smooth/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_smooth/.svn/entries index 90a85d2d..09c866ba 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_smooth svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimesh_smooth.pro +trimesh_smooth.cpp file 2013-06-21T07:05:23.822826Z -a6e93e14ba465a630c783d9baa7dfc0d -2012-10-09T08:43:35.607016Z -4566 +a43a7bf51f713eddcb3a831fc7d28faa +2012-10-11T10:40:07.933527Z +4572 cignoni @@ -58,18 +58,18 @@ cignoni -106 +3738 -trimesh_smooth.cpp +trimesh_smooth.pro file 2013-06-21T07:05:23.822826Z -a43a7bf51f713eddcb3a831fc7d28faa -2012-10-11T10:40:07.933527Z -4572 +a6e93e14ba465a630c783d9baa7dfc0d +2012-10-09T08:43:35.607016Z +4566 cignoni @@ -92,5 +92,5 @@ cignoni -3738 +106 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 5eda1974..a7b68978 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_split_vertex svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_texture/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_texture/.svn/entries index 50058ce8..fbf95771 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 -4928 +4937 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 8cf7327e..3123777f 100644 --- a/inst/include/vcglib/apps/sample/trimesh_topology/.svn/entries +++ b/inst/include/vcglib/apps/sample/trimesh_topology/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_topology svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/sample/trimesh_voroatlas/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_voroatlas/.svn/entries index 54704696..cf6532df 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 -4928 +4937 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/sample/trimesh_voronoiclustering/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/entries new file mode 100644 index 00000000..3d2b7028 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +4937 +svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_voronoiclustering +svn://svn.code.sf.net/p/vcg/code + + + +2013-07-05T14:21:48.086758Z +4915 +cignoni + + + + + + + + + + + + + + +e8973e21-934d-0410-ac44-de4585f5606d + +trimesh_voronoiclustering.cpp +file + + + + +2013-07-25T06:52:24.622398Z +a3f419a7876da59434e35edf887d3589 +2013-07-05T14:21:48.086758Z +4915 +cignoni +has-props + + + + + + + + + + + + + + + + + + + + +4005 + +trimesh_voronoiclustering.pro +file + + + + +2013-07-25T06:52:24.622398Z +0f47c32a7578761c61b6d6f8f71a9352 +2013-07-05T14:21:48.086758Z +4915 +cignoni +has-props + + + + + + + + + + + + + + + + + + + + +128 + diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/prop-base/trimesh_voronoiclustering.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/prop-base/trimesh_voronoiclustering.cpp.svn-base new file mode 100644 index 00000000..bdbd3051 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/prop-base/trimesh_voronoiclustering.cpp.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/prop-base/trimesh_voronoiclustering.pro.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/prop-base/trimesh_voronoiclustering.pro.svn-base new file mode 100644 index 00000000..bdbd3051 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/prop-base/trimesh_voronoiclustering.pro.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/text-base/trimesh_voronoiclustering.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/text-base/trimesh_voronoiclustering.cpp.svn-base new file mode 100644 index 00000000..680a4cb7 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/text-base/trimesh_voronoiclustering.cpp.svn-base @@ -0,0 +1,80 @@ +/**************************************************************************** +* VCGLib o o * +* Visual and Computer Graphics Library o o * +* _ O _ * +* Copyright(C) 2004-2009 \/)\/ * +* Visual Computing Lab /\/| * +* ISTI - Italian National Research Council | * +* \ * +* All rights reserved. * +* * +* 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. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * +* for more details. * +* * +****************************************************************************/ + +#include +#include +#include +#include +#include +#include + + +using namespace vcg; +using namespace std; + +class MyEdge; +class MyFace; +class MyVertex; +struct MyUsedTypes : public UsedTypes< Use ::AsVertexType, + Use ::AsEdgeType, + Use ::AsFaceType>{}; + +class MyVertex : public Vertex{}; +class MyFace : public Face< MyUsedTypes, face::VertexRef, face::BitFlags, face::VFAdj > {}; +class MyEdge : public Edge< MyUsedTypes>{}; +class MyMesh : public tri::TriMesh< vector, vector , vector > {}; + + + +int main( int argc, char **argv ) +{ + MyMesh baseMesh, clusteredMesh; + if(argc < 4 ) + { + printf("Usage trimesh_voronoiclustering mesh region_num iterNum\n"); + return -1; + } + int seed = atoi(argv[2]); + int iterNum = atoi(argv[3]); + printf("Reading %s and sampling %i \n",argv[1],seed); + int ret= tri::io::ImporterPLY::Open(baseMesh,argv[1]); + if(ret!=0) + { + printf("Unable to open %s for '%s'\n",argv[1],tri::io::ImporterPLY::ErrorMsg(ret)); + return -1; + } + + int randSeed=time(0); + tri::UpdateTopology::VertexFace(baseMesh); + std::vector seedVec; + vcg::tri::ClusteringSampler cs(seedVec); + vcg::tri::SurfaceSampling >::SamplingRandomGenerator().initialize(randSeed); + vcg::tri::SurfaceSampling >::VertexUniform(baseMesh,cs,seed); + vcg::tri::VoronoiProcessing::VoronoiRelaxing(baseMesh, seedVec, iterNum,0); + vcg::tri::VoronoiProcessing::TopologicalVertexColoring(baseMesh, seedVec); + tri::VoronoiProcessing::VoronoiClustering(baseMesh,clusteredMesh,seedVec); + + tri::io::ExporterPLY::Save(baseMesh,"base.ply",tri::io::Mask::IOM_VERTCOLOR ); + tri::io::ExporterPLY::Save(clusteredMesh,"clustered.ply"); + return 0; +} diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/text-base/trimesh_voronoiclustering.pro.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/text-base/trimesh_voronoiclustering.pro.svn-base new file mode 100644 index 00000000..6607a92e --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/.svn/text-base/trimesh_voronoiclustering.pro.svn-base @@ -0,0 +1,3 @@ +include(../common.pri) +TARGET = trimesh_voronoiclustering +SOURCES += trimesh_voronoiclustering.cpp ../../../wrap/ply/plylib.cpp diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/trimesh_voronoiclustering.cpp b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/trimesh_voronoiclustering.cpp new file mode 100644 index 00000000..680a4cb7 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/trimesh_voronoiclustering.cpp @@ -0,0 +1,80 @@ +/**************************************************************************** +* VCGLib o o * +* Visual and Computer Graphics Library o o * +* _ O _ * +* Copyright(C) 2004-2009 \/)\/ * +* Visual Computing Lab /\/| * +* ISTI - Italian National Research Council | * +* \ * +* All rights reserved. * +* * +* 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. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * +* for more details. * +* * +****************************************************************************/ + +#include +#include +#include +#include +#include +#include + + +using namespace vcg; +using namespace std; + +class MyEdge; +class MyFace; +class MyVertex; +struct MyUsedTypes : public UsedTypes< Use ::AsVertexType, + Use ::AsEdgeType, + Use ::AsFaceType>{}; + +class MyVertex : public Vertex{}; +class MyFace : public Face< MyUsedTypes, face::VertexRef, face::BitFlags, face::VFAdj > {}; +class MyEdge : public Edge< MyUsedTypes>{}; +class MyMesh : public tri::TriMesh< vector, vector , vector > {}; + + + +int main( int argc, char **argv ) +{ + MyMesh baseMesh, clusteredMesh; + if(argc < 4 ) + { + printf("Usage trimesh_voronoiclustering mesh region_num iterNum\n"); + return -1; + } + int seed = atoi(argv[2]); + int iterNum = atoi(argv[3]); + printf("Reading %s and sampling %i \n",argv[1],seed); + int ret= tri::io::ImporterPLY::Open(baseMesh,argv[1]); + if(ret!=0) + { + printf("Unable to open %s for '%s'\n",argv[1],tri::io::ImporterPLY::ErrorMsg(ret)); + return -1; + } + + int randSeed=time(0); + tri::UpdateTopology::VertexFace(baseMesh); + std::vector seedVec; + vcg::tri::ClusteringSampler cs(seedVec); + vcg::tri::SurfaceSampling >::SamplingRandomGenerator().initialize(randSeed); + vcg::tri::SurfaceSampling >::VertexUniform(baseMesh,cs,seed); + vcg::tri::VoronoiProcessing::VoronoiRelaxing(baseMesh, seedVec, iterNum,0); + vcg::tri::VoronoiProcessing::TopologicalVertexColoring(baseMesh, seedVec); + tri::VoronoiProcessing::VoronoiClustering(baseMesh,clusteredMesh,seedVec); + + tri::io::ExporterPLY::Save(baseMesh,"base.ply",tri::io::Mask::IOM_VERTCOLOR ); + tri::io::ExporterPLY::Save(clusteredMesh,"clustered.ply"); + return 0; +} diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/trimesh_voronoiclustering.pro b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/trimesh_voronoiclustering.pro new file mode 100644 index 00000000..6607a92e --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoiclustering/trimesh_voronoiclustering.pro @@ -0,0 +1,3 @@ +include(../common.pri) +TARGET = trimesh_voronoiclustering +SOURCES += trimesh_voronoiclustering.cpp ../../../wrap/ply/plylib.cpp diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/entries b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/entries new file mode 100644 index 00000000..51423725 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +4937 +svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/sample/trimesh_voronoisampling +svn://svn.code.sf.net/p/vcg/code + + + +2013-07-26T12:16:02.285007Z +4934 +cignoni + + + + + + + + + + + + + + +e8973e21-934d-0410-ac44-de4585f5606d + +trimesh_voronoisampling.pro +file + + + + +2013-08-01T07:24:02.786588Z +e4717ee442ad5b115f0fd26233358bc7 +2013-07-26T12:16:02.285007Z +4934 +cignoni +has-props + + + + + + + + + + + + + + + + + + + + +124 + +trimesh_voronoisampling.cpp +file + + + + +2013-08-01T07:24:02.786588Z +1d11f232ef040d35438561f283b93a97 +2013-07-26T12:16:02.285007Z +4934 +cignoni +has-props + + + + + + + + + + + + + + + + + + + + +5854 + diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/prop-base/trimesh_voronoisampling.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/prop-base/trimesh_voronoisampling.cpp.svn-base new file mode 100644 index 00000000..bdbd3051 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/prop-base/trimesh_voronoisampling.cpp.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/prop-base/trimesh_voronoisampling.pro.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/prop-base/trimesh_voronoisampling.pro.svn-base new file mode 100644 index 00000000..bdbd3051 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/prop-base/trimesh_voronoisampling.pro.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/text-base/trimesh_voronoisampling.cpp.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/text-base/trimesh_voronoisampling.cpp.svn-base new file mode 100644 index 00000000..3063dafc --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/text-base/trimesh_voronoisampling.cpp.svn-base @@ -0,0 +1,110 @@ +/**************************************************************************** +* VCGLib o o * +* Visual and Computer Graphics Library o o * +* _ O _ * +* Copyright(C) 2004-2009 \/)\/ * +* Visual Computing Lab /\/| * +* ISTI - Italian National Research Council | * +* \ * +* All rights reserved. * +* * +* 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. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * +* for more details. * +* * +****************************************************************************/ + +#include +#include +#include +#include +#include +#include + + +using namespace vcg; +using namespace std; + +class MyEdge; +class MyFace; +class MyVertex; +struct MyUsedTypes : public UsedTypes< Use ::AsVertexType, + Use ::AsEdgeType, + Use ::AsFaceType>{}; + +class MyVertex : public Vertex{}; +class MyFace : public Face< MyUsedTypes, face::VertexRef, face::BitFlags, face::VFAdj > {}; +//class MyEdge : public Edge< MyUsedTypes> {}; +class MyEdge : public Edge< MyUsedTypes, edge::VertexRef, edge::BitFlags>{}; +class MyMesh : public tri::TriMesh< vector, vector, vector > {}; + +class EmEdge; +class EmFace; +class EmVertex; +struct EmUsedTypes : public UsedTypes< Use ::AsVertexType, + Use ::AsEdgeType, + Use ::AsFaceType>{}; + +class EmVertex : public Vertex{}; +class EmFace : public Face< EmUsedTypes, face::VertexRef, face::BitFlags, face::VFAdj > {}; +class EmEdge : public Edge< EmUsedTypes, edge::VertexRef> {}; +//class EmEdge : public Edge< EmUsedTypes, edge::VertexRef, edge::BitFlags>{}; +class EmMesh : public tri::TriMesh< vector, vector, vector > {}; + + +int main( int argc, char **argv ) +{ + MyMesh baseMesh, outMesh, polyMesh; + if(argc < 4 ) + { + printf("Usage trimesh_voronoisampling mesh sampleNum variance iterNum\n"); + return -1; + } + int sampleNum = atoi(argv[2]); + int iterNum = atoi(argv[3]); + float radiusVariance = atof(argv[4]); + + printf("Reading %s and sampling %i points with %i iteration and using %f variance\n",argv[1],sampleNum,iterNum,radiusVariance); + int ret= tri::io::ImporterPLY::Open(baseMesh,argv[1]); + if(ret!=0) + { + printf("Unable to open %s for '%s'\n",argv[1],tri::io::ImporterPLY::ErrorMsg(ret)); + return -1; + } + + tri::UpdateTopology::VertexFace(baseMesh); + std::vector seedVec; + vector pointVec; + float radius=0; + tri::VoronoiProcessingParameter vpp; + vpp.deleteUnreachedRegionFlag=true; + + + tri::PoissonSampling(baseMesh,pointVec,sampleNum,radius); + tri::VoronoiProcessing::SeedToVertexConversion(baseMesh,pointVec,seedVec); + + tri::EuclideanDistance dd; + tri::VoronoiProcessing >::VoronoiRelaxing(baseMesh, seedVec, iterNum, dd, vpp); + tri::VoronoiProcessing >::ConvertVoronoiDiagramToMesh(baseMesh,outMesh,polyMesh,seedVec, dd, vpp); + tri::io::ExporterPLY::Save(outMesh,"out.ply",tri::io::Mask::IOM_VERTCOLOR ); + tri::io::ExporterPLY::Save(polyMesh,"poly.ply",tri::io::Mask::IOM_VERTCOLOR| tri::io::Mask::IOM_EDGEINDEX ,false); + + tri::io::ImporterPLY::Open(baseMesh,argv[1]); + tri::UpdateTopology::VertexFace(baseMesh); + tri::PoissonSampling(baseMesh,pointVec,sampleNum,radius,radiusVariance); + tri::VoronoiProcessing::SeedToVertexConversion(baseMesh,pointVec,seedVec); + tri::IsotropicDistance id(baseMesh,radiusVariance); + tri::VoronoiProcessing >::VoronoiRelaxing(baseMesh, seedVec, iterNum,id,vpp); + tri::VoronoiProcessing >::ConvertVoronoiDiagramToMesh(baseMesh,outMesh,polyMesh,seedVec, id, vpp); + + tri::io::ExporterPLY::Save(outMesh,"outW.ply",tri::io::Mask::IOM_VERTCOLOR ); + tri::io::ExporterPLY::Save(polyMesh,"polyW.ply",tri::io::Mask::IOM_VERTCOLOR | tri::io::Mask::IOM_EDGEINDEX,false); + return 0; +} diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/text-base/trimesh_voronoisampling.pro.svn-base b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/text-base/trimesh_voronoisampling.pro.svn-base new file mode 100644 index 00000000..a11d3478 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/.svn/text-base/trimesh_voronoisampling.pro.svn-base @@ -0,0 +1,3 @@ +include(../common.pri) +TARGET = trimesh_voronoisampling +SOURCES += trimesh_voronoisampling.cpp ../../../wrap/ply/plylib.cpp diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp new file mode 100644 index 00000000..3063dafc --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp @@ -0,0 +1,110 @@ +/**************************************************************************** +* VCGLib o o * +* Visual and Computer Graphics Library o o * +* _ O _ * +* Copyright(C) 2004-2009 \/)\/ * +* Visual Computing Lab /\/| * +* ISTI - Italian National Research Council | * +* \ * +* All rights reserved. * +* * +* 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. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * +* for more details. * +* * +****************************************************************************/ + +#include +#include +#include +#include +#include +#include + + +using namespace vcg; +using namespace std; + +class MyEdge; +class MyFace; +class MyVertex; +struct MyUsedTypes : public UsedTypes< Use ::AsVertexType, + Use ::AsEdgeType, + Use ::AsFaceType>{}; + +class MyVertex : public Vertex{}; +class MyFace : public Face< MyUsedTypes, face::VertexRef, face::BitFlags, face::VFAdj > {}; +//class MyEdge : public Edge< MyUsedTypes> {}; +class MyEdge : public Edge< MyUsedTypes, edge::VertexRef, edge::BitFlags>{}; +class MyMesh : public tri::TriMesh< vector, vector, vector > {}; + +class EmEdge; +class EmFace; +class EmVertex; +struct EmUsedTypes : public UsedTypes< Use ::AsVertexType, + Use ::AsEdgeType, + Use ::AsFaceType>{}; + +class EmVertex : public Vertex{}; +class EmFace : public Face< EmUsedTypes, face::VertexRef, face::BitFlags, face::VFAdj > {}; +class EmEdge : public Edge< EmUsedTypes, edge::VertexRef> {}; +//class EmEdge : public Edge< EmUsedTypes, edge::VertexRef, edge::BitFlags>{}; +class EmMesh : public tri::TriMesh< vector, vector, vector > {}; + + +int main( int argc, char **argv ) +{ + MyMesh baseMesh, outMesh, polyMesh; + if(argc < 4 ) + { + printf("Usage trimesh_voronoisampling mesh sampleNum variance iterNum\n"); + return -1; + } + int sampleNum = atoi(argv[2]); + int iterNum = atoi(argv[3]); + float radiusVariance = atof(argv[4]); + + printf("Reading %s and sampling %i points with %i iteration and using %f variance\n",argv[1],sampleNum,iterNum,radiusVariance); + int ret= tri::io::ImporterPLY::Open(baseMesh,argv[1]); + if(ret!=0) + { + printf("Unable to open %s for '%s'\n",argv[1],tri::io::ImporterPLY::ErrorMsg(ret)); + return -1; + } + + tri::UpdateTopology::VertexFace(baseMesh); + std::vector seedVec; + vector pointVec; + float radius=0; + tri::VoronoiProcessingParameter vpp; + vpp.deleteUnreachedRegionFlag=true; + + + tri::PoissonSampling(baseMesh,pointVec,sampleNum,radius); + tri::VoronoiProcessing::SeedToVertexConversion(baseMesh,pointVec,seedVec); + + tri::EuclideanDistance dd; + tri::VoronoiProcessing >::VoronoiRelaxing(baseMesh, seedVec, iterNum, dd, vpp); + tri::VoronoiProcessing >::ConvertVoronoiDiagramToMesh(baseMesh,outMesh,polyMesh,seedVec, dd, vpp); + tri::io::ExporterPLY::Save(outMesh,"out.ply",tri::io::Mask::IOM_VERTCOLOR ); + tri::io::ExporterPLY::Save(polyMesh,"poly.ply",tri::io::Mask::IOM_VERTCOLOR| tri::io::Mask::IOM_EDGEINDEX ,false); + + tri::io::ImporterPLY::Open(baseMesh,argv[1]); + tri::UpdateTopology::VertexFace(baseMesh); + tri::PoissonSampling(baseMesh,pointVec,sampleNum,radius,radiusVariance); + tri::VoronoiProcessing::SeedToVertexConversion(baseMesh,pointVec,seedVec); + tri::IsotropicDistance id(baseMesh,radiusVariance); + tri::VoronoiProcessing >::VoronoiRelaxing(baseMesh, seedVec, iterNum,id,vpp); + tri::VoronoiProcessing >::ConvertVoronoiDiagramToMesh(baseMesh,outMesh,polyMesh,seedVec, id, vpp); + + tri::io::ExporterPLY::Save(outMesh,"outW.ply",tri::io::Mask::IOM_VERTCOLOR ); + tri::io::ExporterPLY::Save(polyMesh,"polyW.ply",tri::io::Mask::IOM_VERTCOLOR | tri::io::Mask::IOM_EDGEINDEX,false); + return 0; +} diff --git a/inst/include/vcglib/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.pro b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.pro new file mode 100644 index 00000000..a11d3478 --- /dev/null +++ b/inst/include/vcglib/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.pro @@ -0,0 +1,3 @@ +include(../common.pri) +TARGET = trimesh_voronoisampling +SOURCES += trimesh_voronoisampling.cpp ../../../wrap/ply/plylib.cpp diff --git a/inst/include/vcglib/apps/test/.svn/entries b/inst/include/vcglib/apps/test/.svn/entries index 7d7649d0..aa1b9c1b 100644 --- a/inst/include/vcglib/apps/test/.svn/entries +++ b/inst/include/vcglib/apps/test/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/test/camerashot/.svn/entries b/inst/include/vcglib/apps/test/camerashot/.svn/entries index 6d0ad9e1..6ceb462a 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 -4928 +4937 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 24db0fef..b1c59f2e 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 -4928 +4937 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 ee7679bd..478a0191 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 -4928 +4937 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 acd6e006..04ecb47e 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/test/tetramesh/test svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/test/trackball/.svn/entries b/inst/include/vcglib/apps/test/trackball/.svn/entries index abeaa153..5d3b61ee 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 -4928 +4937 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 -main.cpp +trackball.sln file 2013-06-21T07:05:19.758806Z -40c2a744b92b4f4c66db7486c727970e +aacf1c2381e68117d09b57a38f66c840 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,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 @@ -92,16 +92,16 @@ cignoni -897 +3808 -trackball.vcproj +main.cpp file 2013-06-21T07:05:19.758806Z -2e02a9a9c9a5ca68ab3fcf7a6738e406 +40c2a744b92b4f4c66db7486c727970e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,5 +126,5 @@ cignoni -3808 +3751 diff --git a/inst/include/vcglib/apps/tridecimator/.svn/entries b/inst/include/vcglib/apps/tridecimator/.svn/entries index d31db231..638aec9d 100644 --- a/inst/include/vcglib/apps/tridecimator/.svn/entries +++ b/inst/include/vcglib/apps/tridecimator/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/tridecimator svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Tetraascii.ply +quad4.ply file -2013-06-21T07:05:39.226902Z -100eb0b32068b6ef3a92dd33673c4c98 +2013-06-21T07:05:39.222902Z +ccdf9315040f2b02d6fbaa569ce69d32 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -249 +255 -readme.txt +quad5.ply file -2013-06-21T07:05:39.226902Z -361fc05609729993b227b02f9f7296e2 +2013-06-21T07:05:39.222902Z +d01c6f662c761f92641659a7ae726df8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,18 +92,18 @@ cignoni -3672 +286 -quad.ply +tridecimator.pro file -2013-06-21T07:05:39.226902Z -4be5a093d04f456acd25b125d9796f15 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:39.222902Z +5fa76e530f94a9a23dc90962fe103d54 +2011-10-24T11:23:49.777468Z +4198 cignoni @@ -126,18 +126,18 @@ cignoni -233 +278 -history.txt +tridecimator.cpp file -2013-06-21T07:05:39.222902Z -eb6dd981d51f855b29f42e388cb5f742 -2011-10-05T15:04:40.740408Z -4180 +2013-07-25T06:52:24.690398Z +0226dc43a2102cf7304b640635fc3a64 +2013-07-23T07:37:29.006637Z +4922 cignoni @@ -160,16 +160,16 @@ cignoni -1119 +7770 -quad4.ply +Tetraascii.ply file -2013-06-21T07:05:39.222902Z -ccdf9315040f2b02d6fbaa569ce69d32 +2013-06-21T07:05:39.226902Z +100eb0b32068b6ef3a92dd33673c4c98 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -255 +249 -quad5.ply +readme.txt file -2013-06-21T07:05:39.222902Z -d01c6f662c761f92641659a7ae726df8 +2013-06-21T07:05:39.226902Z +361fc05609729993b227b02f9f7296e2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,18 +228,18 @@ cignoni -286 +3672 -tridecimator.pro +quad.ply file -2013-06-21T07:05:39.222902Z -5fa76e530f94a9a23dc90962fe103d54 -2011-10-24T11:23:49.777468Z -4198 +2013-06-21T07:05:39.226902Z +4be5a093d04f456acd25b125d9796f15 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -262,18 +262,18 @@ cignoni -278 +233 -tridecimator.cpp +history.txt file -2013-07-25T06:52:24.690398Z -0226dc43a2102cf7304b640635fc3a64 -2013-07-23T07:37:29.006637Z -4922 +2013-06-21T07:05:39.222902Z +eb6dd981d51f855b29f42e388cb5f742 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -296,5 +296,5 @@ cignoni -7770 +1119 diff --git a/inst/include/vcglib/apps/trimeshinfo/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/.svn/entries index ff2f02a5..6b3be000 100644 --- a/inst/include/vcglib/apps/trimeshinfo/.svn/entries +++ b/inst/include/vcglib/apps/trimeshinfo/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimeshinfo1.00 -dir - -XMLTree.h +Node.h file 2013-06-21T07:06:52.687266Z -dcaff322a66161fcecddb411cb8fb72a +1f2992d8de47d90f0294e35caa4d6c1c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -61,16 +58,16 @@ cignoni -7781 +1434 -trimeshinfo.pro +readme.txt file 2013-06-21T07:06:52.687266Z -e470696e137658fa3484c04e37e843e1 +2c250b50e64c981b40724e8a06977ac5 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -95,19 +92,16 @@ cignoni -175 - -trimeshinfo1.01 -dir +3798 -defs.h +history.txt file 2013-06-21T07:06:52.687266Z -8d255752bc13f0331315b5d1df5f4c86 +458251c57f95ec9ff06b4ce597ea9442 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -132,19 +126,16 @@ cignoni -2557 - -trimeshinfo1.02 -dir +1734 -trimeshinfo.cpp +SlotsNode.h file 2013-06-21T07:06:52.687266Z -35eea92bd225650a00599ed06f73c864 +22252a5d5536ee5c5e9061509b545464 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -169,16 +160,16 @@ cignoni -22810 +3087 -ClassesNode.h +InstancesNode.h file 2013-06-21T07:06:52.687266Z -0daa1a4126b7cf771f6f34e5721313e0 +063adf58feb2a3e6fde5a6512ffed176 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -203,16 +194,19 @@ cignoni -2042 +1413 -Node.h +trimeshinfo1.00 +dir + +XMLTree.h file 2013-06-21T07:06:52.687266Z -1f2992d8de47d90f0294e35caa4d6c1c +dcaff322a66161fcecddb411cb8fb72a 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -237,16 +231,16 @@ cignoni -1434 +7781 -readme.txt +trimeshinfo.pro file 2013-06-21T07:06:52.687266Z -2c250b50e64c981b40724e8a06977ac5 +e470696e137658fa3484c04e37e843e1 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -271,16 +265,19 @@ cignoni -3798 +175 -history.txt +trimeshinfo1.01 +dir + +defs.h file 2013-06-21T07:06:52.687266Z -458251c57f95ec9ff06b4ce597ea9442 +8d255752bc13f0331315b5d1df5f4c86 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -305,16 +302,19 @@ cignoni -1734 +2557 -SlotsNode.h +trimeshinfo1.02 +dir + +trimeshinfo.cpp file 2013-06-21T07:06:52.687266Z -22252a5d5536ee5c5e9061509b545464 +35eea92bd225650a00599ed06f73c864 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -339,16 +339,16 @@ cignoni -3087 +22810 -InstancesNode.h +ClassesNode.h file 2013-06-21T07:06:52.687266Z -063adf58feb2a3e6fde5a6512ffed176 +0daa1a4126b7cf771f6f34e5721313e0 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -373,5 +373,5 @@ cignoni -1413 +2042 diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.00/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.00/.svn/entries index a1b46caa..7557c279 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 -4928 +4937 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 c784d7dc..b3684c24 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 -4928 +4937 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 33eaeb4d..7d32e634 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 -4928 +4937 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 -main.cpp +readme.txt file 2013-06-21T07:05:41.426913Z -e2d58cd95563ff050893e31d60043eae +6aac9018e4543948d39078efe5e2968f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -15429 +3054 -defs.h +resource.h file 2013-06-21T07:05:41.426913Z -9c5143baa3ad0f1cf7e8695d092bfd22 +ae60eaab9009168284919bf3c5f33686 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -2162 +482 -readme.txt +main.cpp file 2013-06-21T07:05:41.426913Z -6aac9018e4543948d39078efe5e2968f +e2d58cd95563ff050893e31d60043eae 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -3054 +15429 -resource.h +defs.h file 2013-06-21T07:05:41.426913Z -ae60eaab9009168284919bf3c5f33686 +9c5143baa3ad0f1cf7e8695d092bfd22 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,5 +160,5 @@ cignoni -482 +2162 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 b1333cc9..d37b6dd1 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.01/trimeshinfosample svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -readme.txt +knot_vcg_simplified.ply file -2013-06-21T07:05:48.434948Z -c4f1b81ca822a834bdb8f5a851df28f5 +2013-06-21T07:05:48.430948Z +ff0ea0d89e68f4b9a53d9d079427c456 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -57,17 +58,16 @@ cignoni - -716 +40237 -moebius_big.ply2.html +knot_orig.ply2.html file -2013-06-21T07:05:48.434948Z -91e476744d3e6997c7559f155be2f72a +2013-06-21T07:05:48.430948Z +43a60c2545c82ae0a68b270b2459b29d 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -580 +582 -knot_subsampled.ply +moebius.ply file -2013-06-21T07:05:48.434948Z -d18f0f86446c47d706df75049603a897 +2013-06-21T07:05:48.430948Z +072c2bf9d305462f5d4bc43cfb2dce25 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ has-props -40237 +3275 -knot_orig.ply +moebius_big.ply file -2013-06-21T07:05:48.434948Z -e4f7264e614cae0ea21553d0326efce4 +2013-06-21T07:05:48.430948Z +5e2cfae711e2ec5bf89dae46c8315e06 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,19 +160,20 @@ has-props -640240 +14877 -kleine.ply2.html +kleine.ply file 2013-06-21T07:05:48.430948Z -ac07dfe7afad9fa6f142430a903171c3 +c077677d86622fd459bbcb3dff836fcf 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -193,21 +194,19 @@ cignoni - -522 +14257 -knot_vcg_simplified.ply +readme.txt file -2013-06-21T07:05:48.430948Z -ff0ea0d89e68f4b9a53d9d079427c456 +2013-06-21T07:05:48.434948Z +c4f1b81ca822a834bdb8f5a851df28f5 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -228,16 +227,17 @@ has-props -40237 + +716 -knot_orig.ply2.html +moebius_big.ply2.html file -2013-06-21T07:05:48.430948Z -43a60c2545c82ae0a68b270b2459b29d +2013-06-21T07:05:48.434948Z +91e476744d3e6997c7559f155be2f72a 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -582 +580 -moebius.ply +knot_subsampled.ply file -2013-06-21T07:05:48.430948Z -072c2bf9d305462f5d4bc43cfb2dce25 +2013-06-21T07:05:48.434948Z +d18f0f86446c47d706df75049603a897 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ has-props -3275 +40237 -moebius_big.ply +knot_orig.ply file -2013-06-21T07:05:48.430948Z -5e2cfae711e2ec5bf89dae46c8315e06 +2013-06-21T07:05:48.434948Z +e4f7264e614cae0ea21553d0326efce4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,20 +330,19 @@ has-props -14877 +640240 -kleine.ply +kleine.ply2.html file 2013-06-21T07:05:48.430948Z -c077677d86622fd459bbcb3dff836fcf +ac07dfe7afad9fa6f142430a903171c3 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -364,5 +363,6 @@ has-props -14257 + +522 diff --git a/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/.svn/entries b/inst/include/vcglib/apps/trimeshinfo/trimeshinfo1.02/.svn/entries index 58f0da73..737276a4 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.02 svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,12 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +trimeshinfo1.02 +dir + +trimeshinfosample +dir + trimeshinfosample.zip file @@ -94,9 +100,3 @@ 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 031772db..3358ed34 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfo1.02 svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -trimeshinfo.exe +readme.txt file 2013-06-21T07:06:01.159011Z -4c26f3992a63806d3e28c947aa432418 +3a66faa47550611474d56920a691595d 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -58,19 +57,21 @@ has-props -225280 + +2832 -readme.txt +trimeshinfo.exe file 2013-06-21T07:06:01.159011Z -3a66faa47550611474d56920a691595d +4c26f3992a63806d3e28c947aa432418 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -91,6 +92,5 @@ cignoni - -2832 +225280 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 3514b931..3c103a72 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/trimeshinfo/trimeshinfo1.02/trimeshinfosample svn://svn.code.sf.net/p/vcg/code @@ -60,14 +60,14 @@ cignoni 830367 -kite_degenerate2.ply +test2.ply file 2013-06-21T07:06:43.851223Z -a94506c94b26603e70cc8a77d0214bfc +3b169ce102732dab40da9b62651eb35e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -414 +1568040 -test2.ply +kite_degenerate2.ply file 2013-06-21T07:06:43.851223Z -3b169ce102732dab40da9b62651eb35e +a94506c94b26603e70cc8a77d0214bfc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,7 +126,7 @@ cignoni -1568040 +414 test3.ply file @@ -162,18 +162,17 @@ cignoni 3660031 -moebius.ply +degenerate.ply file 2013-06-21T07:06:43.859223Z -072c2bf9d305462f5d4bc43cfb2dce25 +df7c679d70946c70b9608ae29789a46a 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -194,7 +193,8 @@ has-props -3275 + +245 kite_hole.ply file @@ -230,17 +230,18 @@ cignoni 445 -degenerate.ply +moebius.ply file 2013-06-21T07:06:43.859223Z -df7c679d70946c70b9608ae29789a46a +072c2bf9d305462f5d4bc43cfb2dce25 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -261,8 +262,7 @@ cignoni - -245 +3275 nonmanifold.ply file @@ -298,18 +298,17 @@ cignoni 307 -kleine.ply +three.ply file 2013-06-21T07:06:43.859223Z -c077677d86622fd459bbcb3dff836fcf +3795db7fea5dc9cdd3258c316c3017ac 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -330,19 +329,21 @@ has-props -14257 + +275 -three.ply +kleine.ply file 2013-06-21T07:06:43.859223Z -3795db7fea5dc9cdd3258c316c3017ac +c077677d86622fd459bbcb3dff836fcf 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -363,8 +364,7 @@ cignoni - -275 +14257 readme.txt file @@ -468,17 +468,18 @@ cignoni 0 -kite_degenerate.ply +knot_vcg_simplified.ply file 2013-06-21T07:06:43.847223Z -eacba21b0aee8d6899bccae9a1e8835f +ff0ea0d89e68f4b9a53d9d079427c456 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -499,21 +500,19 @@ cignoni - -412 +40237 -knot_vcg_simplified.ply +kite_degenerate.ply file 2013-06-21T07:06:43.847223Z -ff0ea0d89e68f4b9a53d9d079427c456 +eacba21b0aee8d6899bccae9a1e8835f 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -534,7 +533,8 @@ has-props -40237 + +412 one.ply file diff --git a/inst/include/vcglib/apps/unsupported/.svn/entries b/inst/include/vcglib/apps/unsupported/.svn/entries index ac0415ab..13cbe117 100644 --- a/inst/include/vcglib/apps/unsupported/.svn/entries +++ b/inst/include/vcglib/apps/unsupported/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/unsupported/extractors/.svn/entries b/inst/include/vcglib/apps/unsupported/extractors/.svn/entries index efc1412e..4b2662ba 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/extractors svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -extractors.ncb +extractors.sln file 2013-06-21T07:06:56.059283Z -bd6038877b6fe9292b2691a44769c903 +8d4efa75b2c43778e05477adf4131303 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -58,16 +57,20 @@ has-props -322560 + +896 -extractors.suo +extractor +dir + +extractors.ncb file 2013-06-21T07:06:56.059283Z -520b5e7387db298e8a77d2e1b341bdff +bd6038877b6fe9292b2691a44769c903 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,19 +95,20 @@ has-props -11776 +322560 -extractors.sln +extractors.suo file 2013-06-21T07:06:56.059283Z -8d4efa75b2c43778e05477adf4131303 +520b5e7387db298e8a77d2e1b341bdff 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -125,9 +129,5 @@ cignoni - -896 - -extractor -dir +11776 diff --git a/inst/include/vcglib/apps/unsupported/extractors/extractor/.svn/entries b/inst/include/vcglib/apps/unsupported/extractors/extractor/.svn/entries index 50e7283d..b23a1c7e 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/extractors/extractor svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -extractor.pro +SphereUnion.h file 2013-06-21T07:06:56.059283Z -fb0c0e36cdfc636537d2f6a33360214c -2013-04-15T20:17:43.978734Z -4885 +e7666f6d3b1805bec7af283be990bc80 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -58,16 +57,17 @@ has-props -318 + +1514 -Walker.h +main.cpp file 2013-06-21T07:06:56.059283Z -3c7fc62cd76007351a865d780d53b8bc +10facd982d2cbb6aab3fcdfb353d6915 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -7503 +1185 -Volume.h +ImplicitSphere.h file 2013-06-21T07:06:56.059283Z -1844b0251f7c6d69e4216a93e22dbba2 +7930ebfaeb5da95f69330c6b5d77b0f8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -2058 +2019 -extractor.vcproj +SphereDifference.h file 2013-06-21T07:06:56.059283Z -f45e2db6b351cbf1ec8cf32e1fdc1e0f +8d78b7ec569d7a7b8b8e94d21d5eb6bf 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,19 +160,20 @@ cignoni -3761 +1221 -Implicit.h +extractor.pro file 2013-06-21T07:06:56.059283Z -7e7c04cb1f442ef3fe233a0e7af069f8 -2011-10-05T15:04:40.740408Z -4180 +fb0c0e36cdfc636537d2f6a33360214c +2013-04-15T20:17:43.978734Z +4885 cignoni +has-props @@ -193,17 +194,16 @@ cignoni - -292 +318 -Definitions.h +Walker.h file 2013-06-21T07:06:56.059283Z -31c324b44e8b0d9198990833af265e45 +3c7fc62cd76007351a865d780d53b8bc 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,16 +228,16 @@ cignoni -656 +7503 -SphereUnion.h +Volume.h file 2013-06-21T07:06:56.059283Z -e7666f6d3b1805bec7af283be990bc80 +1844b0251f7c6d69e4216a93e22dbba2 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +262,16 @@ cignoni -1514 +2058 -main.cpp +extractor.vcproj file 2013-06-21T07:06:56.059283Z -10facd982d2cbb6aab3fcdfb353d6915 +f45e2db6b351cbf1ec8cf32e1fdc1e0f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ cignoni -1185 +3761 -ImplicitSphere.h +Implicit.h file 2013-06-21T07:06:56.059283Z -7930ebfaeb5da95f69330c6b5d77b0f8 +7e7c04cb1f442ef3fe233a0e7af069f8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,16 +330,16 @@ cignoni -2019 +292 -SphereDifference.h +Definitions.h file 2013-06-21T07:06:56.059283Z -8d78b7ec569d7a7b8b8e94d21d5eb6bf +31c324b44e8b0d9198990833af265e45 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,5 +364,5 @@ cignoni -1221 +656 diff --git a/inst/include/vcglib/apps/unsupported/ptx2ply/.svn/entries b/inst/include/vcglib/apps/unsupported/ptx2ply/.svn/entries index a2e30cd8..7a0cf6ef 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/ptx2ply svn://svn.code.sf.net/p/vcg/code @@ -26,18 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -ptx2ply.pro +ptx2ply.cpp file 2013-06-21T07:06:52.879267Z -fdf38d31ba6f205450ec90ea9d089ff3 +c1e92f30d6db82b11e18713583f27aa6 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -58,16 +57,17 @@ has-props -286 + +19883 -ptx2ply.cpp +ptx2ply.vcproj file 2013-06-21T07:06:52.879267Z -c1e92f30d6db82b11e18713583f27aa6 +0f78c84da5d4f55c990f37feceb83b4c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -19883 +3418 -ptx2ply.vcproj +ptx2ply.sln file 2013-06-21T07:06:52.879267Z -0f78c84da5d4f55c990f37feceb83b4c +ea9fbc432b9d630167de3f8ceba44bc4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,19 +126,20 @@ cignoni -3418 +882 -ptx2ply.sln +ptx2ply.pro file 2013-06-21T07:06:52.879267Z -ea9fbc432b9d630167de3f8ceba44bc4 +fdf38d31ba6f205450ec90ea9d089ff3 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -159,6 +160,5 @@ cignoni - -882 +286 diff --git a/inst/include/vcglib/apps/unsupported/shadevis/.svn/entries b/inst/include/vcglib/apps/unsupported/shadevis/.svn/entries index f663e140..52dcdcf0 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/shadevis svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/apps/unsupported/texdeci/.svn/entries b/inst/include/vcglib/apps/unsupported/texdeci/.svn/entries index 825cacdd..9018f936 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 -4928 +4937 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 e88fa2ed..05b6e743 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 -4928 +4937 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 4ac310a4..81aa8bfc 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/apps/unsupported/trimesh_SDL svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/docs/.svn/entries b/inst/include/vcglib/docs/.svn/entries index 662a674b..bf7d8859 100644 --- a/inst/include/vcglib/docs/.svn/entries +++ b/inst/include/vcglib/docs/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/docs svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,9 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +Doxygen +dir + StyleGuide.html file @@ -94,6 +97,3 @@ has-props 465408 -Doxygen -dir - diff --git a/inst/include/vcglib/docs/Doxygen/.svn/entries b/inst/include/vcglib/docs/Doxygen/.svn/entries index 0c704d68..9ca0e1da 100644 --- a/inst/include/vcglib/docs/Doxygen/.svn/entries +++ b/inst/include/vcglib/docs/Doxygen/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/docs/Doxygen svn://svn.code.sf.net/p/vcg/code @@ -26,21 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -img -dir - -shot.dxy +vcg.css file -2013-06-21T07:08:07.223636Z -7c4a303f245a64ece7f529d4118ddc6d -2012-10-26T06:16:15.203769Z -4672 +2013-06-21T07:08:07.227636Z +c9433629e608b2b61a4ec501bf5ef5a1 +2012-10-15T07:59:28.051873Z +4591 cignoni -has-props @@ -61,18 +57,19 @@ has-props -6227 + +145 -examples.dxy +install.dxy file -2013-06-21T07:08:07.223636Z -f4de58063389d8fc270d794abcac2197 -2012-10-11T10:36:05.183822Z -4571 +2013-07-25T06:52:24.722399Z +58303b504d74221c5c9ff12d748630cc +2013-06-25T10:23:25.607913Z +4910 cignoni has-props @@ -95,18 +92,18 @@ has-props -194 +2375 -namespaces.dxy +index.dxy file -2013-06-21T07:08:07.223636Z -d5357ce38a222f6062f9d637f191b349 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:07.227636Z +f2c2b4995df5739fc744bdb3bafc75a8 +2012-10-30T18:49:32.008158Z +4678 cignoni @@ -129,19 +126,23 @@ cignoni -1016 +2707 -groups.dxy +img +dir + +shot.dxy file 2013-06-21T07:08:07.223636Z -ed0a39d6089374c3c96c5324774a0273 -2012-11-07T01:24:45.064120Z -4687 +7c4a303f245a64ece7f529d4118ddc6d +2012-10-26T06:16:15.203769Z +4672 cignoni +has-props @@ -162,20 +163,20 @@ cignoni - -1165 +6227 -doxyfile +examples.dxy file 2013-06-21T07:08:07.223636Z -a5a0efc4e951887da3a0bba35ef6f15c -2012-12-10T12:40:21.652204Z -4776 +f4de58063389d8fc270d794abcac2197 +2012-10-11T10:36:05.183822Z +4571 cignoni +has-props @@ -196,19 +197,18 @@ cignoni - -79882 +194 -adjacency.dxy +groups.dxy file -2013-06-21T07:08:07.227636Z -915b0dc615dc87dca74d1c42a29bb4c0 -2013-06-19T05:36:49.475981Z -4898 +2013-06-21T07:08:07.223636Z +ed0a39d6089374c3c96c5324774a0273 +2012-11-07T01:24:45.064120Z +4687 cignoni @@ -231,20 +231,19 @@ cignoni -11328 +1165 -allocation.dxy +namespaces.dxy file -2013-06-21T07:08:07.227636Z -8e496c4a8a8d2d0a5f40e5d1d1ce187a -2012-10-30T18:49:32.008158Z -4678 +2013-06-21T07:08:07.223636Z +d5357ce38a222f6062f9d637f191b349 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -265,20 +264,20 @@ has-props -4040 + +1016 -metro.dxy +doxyfile file -2013-06-21T07:08:07.227636Z -6341575fb2b96c2d33b60fb029492030 -2012-10-04T15:30:56.073172Z -4527 +2013-06-21T07:08:07.223636Z +a5a0efc4e951887da3a0bba35ef6f15c +2012-12-10T12:40:21.652204Z +4776 cignoni -has-props @@ -299,20 +298,20 @@ has-props -2488 + +79882 -attributes.dxy +adjacency.dxy file 2013-06-21T07:08:07.227636Z -a2a63e0e1199b1b1d8574ca9a009daff -2012-10-11T10:36:05.183822Z -4571 +915b0dc615dc87dca74d1c42a29bb4c0 +2013-06-19T05:36:49.475981Z +4898 cignoni -has-props @@ -333,18 +332,19 @@ has-props -2819 + +11328 -fileformat.dxy +allocation.dxy file 2013-06-21T07:08:07.227636Z -500d9acd01cd81cd3bc9b05449f7592b -2012-10-03T17:58:12.891124Z -4523 +8e496c4a8a8d2d0a5f40e5d1d1ce187a +2012-10-30T18:49:32.008158Z +4678 cignoni has-props @@ -367,18 +367,18 @@ has-props -4131 +4040 -flags.dxy +attributes.dxy file 2013-06-21T07:08:07.227636Z -aee2630e5b4440e58a04730027dad455 -2012-10-15T07:59:28.051873Z -4591 +a2a63e0e1199b1b1d8574ca9a009daff +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -401,19 +401,20 @@ has-props -2318 +2819 -footer.html +metro.dxy file 2013-06-21T07:08:07.227636Z -d7a6f43a1f50c2c3db4eb80b8333b0c0 -2011-10-05T15:04:40.740408Z -4180 +6341575fb2b96c2d33b60fb029492030 +2012-10-04T15:30:56.073172Z +4527 cignoni +has-props @@ -434,20 +435,20 @@ cignoni - -241 +2488 -main_concept.dxy +fileformat.dxy file 2013-06-21T07:08:07.227636Z -6e0228d7fde530bcf1f207654fcc5512 -2012-11-07T01:24:45.064120Z -4687 +500d9acd01cd81cd3bc9b05449f7592b +2012-10-03T17:58:12.891124Z +4523 cignoni +has-props @@ -468,20 +469,20 @@ cignoni - -7584 +4131 -style.dxy +flags.dxy file 2013-06-21T07:08:07.227636Z -ee891eda5280ce4df71236002e81ae5a -2013-06-19T05:36:49.475981Z -4898 +aee2630e5b4440e58a04730027dad455 +2012-10-15T07:59:28.051873Z +4591 cignoni +has-props @@ -502,19 +503,18 @@ cignoni - -3124 +2318 -vcg.css +footer.html file 2013-06-21T07:08:07.227636Z -c9433629e608b2b61a4ec501bf5ef5a1 -2012-10-15T07:59:28.051873Z -4591 +d7a6f43a1f50c2c3db4eb80b8333b0c0 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -537,20 +537,19 @@ cignoni -145 +241 -install.dxy +main_concept.dxy file -2013-07-25T06:52:24.722399Z -58303b504d74221c5c9ff12d748630cc -2013-06-25T10:23:25.607913Z -4910 +2013-06-21T07:08:07.227636Z +6e0228d7fde530bcf1f207654fcc5512 +2012-11-07T01:24:45.064120Z +4687 cignoni -has-props @@ -571,18 +570,19 @@ has-props -2375 + +7584 -index.dxy +style.dxy file 2013-06-21T07:08:07.227636Z -f2c2b4995df5739fc744bdb3bafc75a8 -2012-10-30T18:49:32.008158Z -4678 +ee891eda5280ce4df71236002e81ae5a +2013-06-19T05:36:49.475981Z +4898 cignoni @@ -605,5 +605,5 @@ cignoni -2707 +3124 diff --git a/inst/include/vcglib/docs/Doxygen/img/.svn/entries b/inst/include/vcglib/docs/Doxygen/img/.svn/entries index 6bd8abeb..bca43d9e 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 -4928 +4937 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 -VertexStar.png +figure.xar file 2013-06-21T07:08:07.223636Z -1f53e7e2b4134eda82496b6680636089 -2012-10-03T11:56:27.764346Z -4520 +9b749651b9ae58f90e27427d744c562e +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,18 +58,18 @@ has-props -35531 +4351 -FF_Adj.png +shot-Projection.png file 2013-06-21T07:08:07.223636Z -3c6840568393f712c212fa7ecc19ccdf -2012-10-03T11:56:27.764346Z -4520 +974711af310c5c9287fb0038c89cd253 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -92,18 +92,18 @@ has-props -6717 +2964 -vcglogo.svg +ff.png file 2013-06-21T07:08:07.223636Z -2b73f5cf1b97f891bd4107345fcd6903 -2012-10-03T11:56:27.764346Z -4520 +f1e586645e9f349f530b53195ade55b2 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -126,18 +126,18 @@ has-props -21446 +12637 -pos_example.png +shot-Focal.jpg file -2013-06-21T07:08:07.219636Z -060dab58524c2f47aabbf4be67b48c00 -2012-10-03T11:56:27.764346Z -4520 +2013-06-21T07:08:07.223636Z +68ed835909d9ff8c14416a5dd02a4058 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -160,16 +160,16 @@ has-props -14073 +3239 -FF_nonmanifold.png +vcglogo.png file 2013-06-21T07:08:07.219636Z -19642dd0692ffb1131ebe5be08fe7fd6 +e63e6a66836b1245fe345d3eae494cf4 2012-10-03T11:56:27.764346Z 4520 cignoni @@ -194,18 +194,18 @@ has-props -11255 +30286 -shot-Distort1.jpg +triord.png file -2013-06-21T07:08:07.219636Z -25a4ffb7a56c834fb14fedc318a99d75 -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.223636Z +f5125245bb1a1e01f1912ed462c244de +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -228,18 +228,18 @@ has-props -4133 +2392 -shot-Distort2.jpg +VertexStar.png file -2013-06-21T07:08:07.219636Z -939a69cebd231b584fd95e393b3ed17c -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.223636Z +1f53e7e2b4134eda82496b6680636089 +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -262,18 +262,18 @@ has-props -7230 +35531 -shot-Distort3.jpg +FF_Adj.png file -2013-06-21T07:08:07.219636Z -53f4dc45d2b53642753d1a1cdbbcc0c6 -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.223636Z +3c6840568393f712c212fa7ecc19ccdf +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -296,18 +296,18 @@ has-props -3061 +6717 -shot-Camera_model.png +vcglogo.svg file -2013-06-21T07:08:07.219636Z -b311d22b240d3fec290134068da756c6 -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.223636Z +2b73f5cf1b97f891bd4107345fcd6903 +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -330,18 +330,18 @@ has-props -37995 +21446 -shot-Projection.png +pos_example.png file -2013-06-21T07:08:07.223636Z -974711af310c5c9287fb0038c89cd253 -2012-10-11T10:36:05.183822Z -4571 +2013-06-21T07:08:07.219636Z +060dab58524c2f47aabbf4be67b48c00 +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -364,18 +364,18 @@ has-props -2964 +14073 -figure.xar +FF_nonmanifold.png file -2013-06-21T07:08:07.223636Z -9b749651b9ae58f90e27427d744c562e -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:07.219636Z +19642dd0692ffb1131ebe5be08fe7fd6 +2012-10-03T11:56:27.764346Z +4520 cignoni has-props @@ -398,16 +398,16 @@ has-props -4351 +11255 -shot-Focal.jpg +shot-Distort1.jpg file -2013-06-21T07:08:07.223636Z -68ed835909d9ff8c14416a5dd02a4058 +2013-06-21T07:08:07.219636Z +25a4ffb7a56c834fb14fedc318a99d75 2012-10-11T10:36:05.183822Z 4571 cignoni @@ -432,18 +432,18 @@ has-props -3239 +4133 -ff.png +shot-Distort2.jpg file -2013-06-21T07:08:07.223636Z -f1e586645e9f349f530b53195ade55b2 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:07.219636Z +939a69cebd231b584fd95e393b3ed17c +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -466,18 +466,18 @@ has-props -12637 +7230 -vcglogo.png +shot-Distort3.jpg file 2013-06-21T07:08:07.219636Z -e63e6a66836b1245fe345d3eae494cf4 -2012-10-03T11:56:27.764346Z -4520 +53f4dc45d2b53642753d1a1cdbbcc0c6 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -500,18 +500,18 @@ has-props -30286 +3061 -triord.png +shot-Camera_model.png file -2013-06-21T07:08:07.223636Z -f5125245bb1a1e01f1912ed462c244de -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:07.219636Z +b311d22b240d3fec290134068da756c6 +2012-10-11T10:36:05.183822Z +4571 cignoni has-props @@ -534,5 +534,5 @@ has-props -2392 +37995 diff --git a/inst/include/vcglib/eigenlib/.svn/entries b/inst/include/vcglib/eigenlib/.svn/entries index d1c00fd6..20d773ca 100644 --- a/inst/include/vcglib/eigenlib/.svn/entries +++ b/inst/include/vcglib/eigenlib/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,12 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +Eigen +dir + +unsupported +dir + howto.txt file @@ -60,9 +66,3 @@ has-props 366 -Eigen -dir - -unsupported -dir - diff --git a/inst/include/vcglib/eigenlib/Eigen/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/.svn/entries index 74ea48ba..14b4f496 100644 --- a/inst/include/vcglib/eigenlib/Eigen/.svn/entries +++ b/inst/include/vcglib/eigenlib/Eigen/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 -Core +Householder file -2013-06-21T07:08:41.531806Z -441c9278fb9256a43e60f7e51d7f187e +2013-06-21T07:08:41.527806Z +0e1a42f1f2babc77852672cd6624f270 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -12199 +580 -Geometry +Cholesky file -2013-06-21T07:08:41.531806Z -487e560825b2f7ea00b15f39a2249717 +2013-06-21T07:08:41.527806Z +cab478a04db5276e45971c6a605db842 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -1605 +775 -SVD +CholmodSupport file -2013-06-21T07:08:41.531806Z -e7d000f56e20c39db2371e8f541548a9 +2013-06-21T07:08:41.527806Z +4e24337b58c851f124e313d3383c8c72 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -858 +1696 -SuperLUSupport +QR file -2013-06-21T07:08:41.531806Z -a3290fa13f66c58f9c4306172efb9c9b +2013-06-21T07:08:41.527806Z +cea968edf0dd761028216cdd23b0f5e8 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -1904 +926 -Sparse +UmfPackSupport file -2013-06-21T07:08:41.531806Z -e1567d379ec542a0cdb1b2bfa0d2c310 +2013-06-21T07:08:41.527806Z +699921c9285ce7a774f570ae78939c19 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -449 +1177 -OrderingMethods +StdList file -2013-06-21T07:08:41.531806Z -bdabf44d15eb731f0f632b543a5fd585 +2013-06-21T07:08:41.527806Z +14b24bb8d1a65ab65f32ac09ddb5c32f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +228,19 @@ has-props -500 +682 -Dense +src +dir + +Eigen file -2013-06-21T07:08:41.531806Z -d83e7f96733d79a7a1a38630c4287e85 +2013-06-21T07:08:41.527806Z +434431e5a962b9e2e7f785b36fbcbd27 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,16 +265,16 @@ has-props -122 +37 -PardisoSupport +Jacobi file 2013-06-21T07:08:41.531806Z -9a31cf511f6c6943b078ee70e0b47a68 +924f127376e826e39c3dec5a30edbbf9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +299,16 @@ has-props -864 +645 -SparseCholesky +Core file 2013-06-21T07:08:41.531806Z -8801a8f66e72643e191b9d41a56af224 +441c9278fb9256a43e60f7e51d7f187e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,18 +333,18 @@ has-props -872 +12199 -QtAlignedMalloc +Geometry file 2013-06-21T07:08:41.531806Z -2a9d42bb6b8417d78354a261b9fba46d -2011-10-05T15:04:40.740408Z -4180 +487e560825b2f7ea00b15f39a2249717 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -364,16 +367,16 @@ has-props -637 +1605 -PaStiXSupport +SuperLUSupport file 2013-06-21T07:08:41.531806Z -3d816111cd741761cd0327e110dfc228 +a3290fa13f66c58f9c4306172efb9c9b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +401,16 @@ has-props -1467 +1904 -IterativeLinearSolvers +SVD file 2013-06-21T07:08:41.531806Z -ceb2f24ad7ade75204f671fab2dd2809 +e7d000f56e20c39db2371e8f541548a9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,16 +435,16 @@ has-props -1617 +858 -SparseCore +OrderingMethods file 2013-06-21T07:08:41.531806Z -2884d0272700d7e0cd8c6238904222e1 +bdabf44d15eb731f0f632b543a5fd585 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -466,16 +469,16 @@ has-props -1940 +500 -Eigen2Support +Sparse file 2013-06-21T07:08:41.531806Z -d4c4328a53193013b8abbe8e32b38e43 +e1567d379ec542a0cdb1b2bfa0d2c310 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -500,16 +503,16 @@ has-props -2686 +449 -Eigenvalues +PardisoSupport file 2013-06-21T07:08:41.531806Z -bdfff180c7b7ad5240099e39b17ce7d0 +9a31cf511f6c6943b078ee70e0b47a68 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -534,18 +537,18 @@ has-props -1306 +864 -LeastSquares +Dense file -2013-06-21T07:08:41.535806Z -987b95885498ec70eff400222266a5cd -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.531806Z +d83e7f96733d79a7a1a38630c4287e85 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -568,18 +571,18 @@ has-props -712 +122 -CMakeLists.txt +SparseCholesky file -2013-06-21T07:08:41.535806Z -8356f203720db32a51ace30ea0c5222a -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.531806Z +8801a8f66e72643e191b9d41a56af224 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -602,18 +605,18 @@ has-props -607 +872 -StdVector +QtAlignedMalloc file -2013-06-21T07:08:41.535806Z -7b21216e9765b2377f896e03125cb770 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.531806Z +2a9d42bb6b8417d78354a261b9fba46d +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -636,18 +639,18 @@ has-props -755 +637 -Array +IterativeLinearSolvers file -2013-06-21T07:08:41.535806Z -fa5316eb01fca98c95b06f387528371c -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.531806Z +ceb2f24ad7ade75204f671fab2dd2809 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -670,16 +673,16 @@ has-props -304 +1617 -StdDeque +PaStiXSupport file -2013-06-21T07:08:41.535806Z -a7fc70b0b4bdaae815e1cc3ab2ed397f +2013-06-21T07:08:41.531806Z +3d816111cd741761cd0327e110dfc228 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -704,16 +707,16 @@ has-props -749 +1467 -LU +Eigen2Support file -2013-06-21T07:08:41.527806Z -a5cc6bd7d4224de467d608d8089cf654 +2013-06-21T07:08:41.531806Z +d4c4328a53193013b8abbe8e32b38e43 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -738,16 +741,16 @@ has-props -983 +2686 -Householder +SparseCore file -2013-06-21T07:08:41.527806Z -0e1a42f1f2babc77852672cd6624f270 +2013-06-21T07:08:41.531806Z +2884d0272700d7e0cd8c6238904222e1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -772,16 +775,16 @@ has-props -580 +1940 -Cholesky +Eigenvalues file -2013-06-21T07:08:41.527806Z -cab478a04db5276e45971c6a605db842 +2013-06-21T07:08:41.531806Z +bdfff180c7b7ad5240099e39b17ce7d0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -806,16 +809,16 @@ has-props -775 +1306 -CholmodSupport +LeastSquares file -2013-06-21T07:08:41.527806Z -4e24337b58c851f124e313d3383c8c72 +2013-06-21T07:08:41.535806Z +987b95885498ec70eff400222266a5cd 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -840,18 +843,18 @@ has-props -1696 +712 -QR +CMakeLists.txt file -2013-06-21T07:08:41.527806Z -cea968edf0dd761028216cdd23b0f5e8 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.535806Z +8356f203720db32a51ace30ea0c5222a +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -874,16 +877,16 @@ has-props -926 +607 -UmfPackSupport +StdVector file -2013-06-21T07:08:41.527806Z -699921c9285ce7a774f570ae78939c19 +2013-06-21T07:08:41.535806Z +7b21216e9765b2377f896e03125cb770 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -908,18 +911,18 @@ has-props -1177 +755 -StdList +Array file -2013-06-21T07:08:41.527806Z -14b24bb8d1a65ab65f32ac09ddb5c32f -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:41.535806Z +fa5316eb01fca98c95b06f387528371c +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -942,21 +945,18 @@ has-props -682 - -src -dir +304 -Eigen +StdDeque file -2013-06-21T07:08:41.527806Z -434431e5a962b9e2e7f785b36fbcbd27 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:41.535806Z +a7fc70b0b4bdaae815e1cc3ab2ed397f +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -979,16 +979,16 @@ has-props -37 +749 -Jacobi +LU file -2013-06-21T07:08:41.531806Z -924f127376e826e39c3dec5a30edbbf9 +2013-06-21T07:08:41.527806Z +a5cc6bd7d4224de467d608d8089cf654 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1013,5 +1013,5 @@ has-props -645 +983 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/.svn/entries index 9c82700e..89629ba8 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src svn://svn.code.sf.net/p/vcg/code @@ -26,51 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Jacobi -dir - -Core -dir - -Geometry -dir - -misc -dir - -SVD -dir - -SuperLUSupport -dir - -Sparse -dir - -OrderingMethods -dir - -PardisoSupport -dir - -StlSupport -dir - -SparseCholesky +PaStiXSupport dir IterativeLinearSolvers dir -PaStiXSupport +Eigen2Support dir SparseCore dir -Eigen2Support -dir - Eigenvalues dir @@ -129,3 +96,36 @@ dir UmfPackSupport dir +Jacobi +dir + +Core +dir + +misc +dir + +Geometry +dir + +SuperLUSupport +dir + +SVD +dir + +OrderingMethods +dir + +Sparse +dir + +PardisoSupport +dir + +SparseCholesky +dir + +StlSupport +dir + diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Cholesky/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Cholesky/.svn/entries index 176c8c9c..a5473a59 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 -4928 +4937 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 7def16ea..e295774b 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/CholmodSupport svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -CMakeLists.txt +CholmodSupport.h file 2013-06-21T07:08:24.159720Z -6e832bd8b597cb46a61946d3ee1d5a29 +6c28da158f94a163c3c4f488c347e47a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -172 +19328 -CholmodSupport.h +CMakeLists.txt file 2013-06-21T07:08:24.159720Z -6c28da158f94a163c3c4f488c347e47a +6e832bd8b597cb46a61946d3ee1d5a29 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,5 +92,5 @@ has-props -19328 +172 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Core/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Core/.svn/entries index fd64c31b..5fcc35ff 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -PermutationMatrix.h +StableNorm.h file 2013-06-21T07:08:32.627762Z -87c3f8d6d8de2b710f2963e901d82b31 -2012-10-05T07:27:34.803522Z -4539 +8d3248372c871fee3e3c78842e9a0850 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -58,18 +58,18 @@ has-props -23841 +6238 -DiagonalMatrix.h +IO.h file 2013-06-21T07:08:32.627762Z -a89ef32b9c37c332169c3c5de12e7621 -2013-02-27T21:07:14.867394Z -4823 +5aa0cbdeeb9abbd4e8cd8d5831f50193 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -92,18 +92,18 @@ has-props -11366 +7523 -StableNorm.h +ReturnByValue.h file -2013-06-21T07:08:32.627762Z -8d3248372c871fee3e3c78842e9a0850 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.643762Z +14eaea14b369a4fe9abd6da8fb273dff +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -126,16 +126,16 @@ has-props -6238 +3158 -IO.h +Replicate.h file -2013-06-21T07:08:32.627762Z -5aa0cbdeeb9abbd4e8cd8d5831f50193 +2013-06-21T07:08:32.643762Z +7ab66e44a14765478f2667f5ff03959b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -7523 +6967 -Map.h +Diagonal.h file 2013-06-21T07:08:32.631762Z -87ade0ef792240f927852ad7cadbc89b +537f7ea841770cb9818c110d2d9cef47 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -8091 +8995 -Product.h +Array.h file -2013-06-21T07:08:32.631762Z -1ad45c0afe96c427e10c7ca84ba2a4af +2013-06-21T07:08:32.647762Z +90ad1c46199ee95a81e8645fcfb35992 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +228,16 @@ has-props -3758 +11613 -CwiseNullaryOp.h +GenericPacketMath.h file -2013-06-21T07:08:32.631762Z -9bac5e85dcb7bfd3015756f9cd86bf6c +2013-06-21T07:08:32.647762Z +90d46fb05b82d3a0252dea1bc7b572ed 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,18 +262,18 @@ has-props -29228 +11300 -MathFunctions.h +ArrayWrapper.h file -2013-06-21T07:08:32.635762Z -78f6aea2d3e1a2874c63411830dc01ea -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.631762Z +1ac230d4cb5ee8e36ae2ccc23c56f757 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -296,16 +296,16 @@ has-props -24671 +7905 -DenseStorage.h +CwiseNullaryOp.h file -2013-06-21T07:08:32.635762Z -b6129541a313a5a1de459969de903ee1 +2013-06-21T07:08:32.631762Z +9bac5e85dcb7bfd3015756f9cd86bf6c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -13407 +29228 -Redux.h +NumTraits.h file -2013-06-21T07:08:32.635762Z -cbc7bdb2d9a119071ff938453748c91c +2013-06-21T07:08:32.651762Z +de50a3c8247c282bea2618dfd5ba9863 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,18 +364,18 @@ has-props -13968 +6177 -Assign_MKL.h +CMakeLists.txt file -2013-06-21T07:08:32.639762Z -d967574a5cfced88f97c5c9db5019898 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.635762Z +099895d1839148dc196c4caea197a70e +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -398,16 +398,16 @@ has-props -11282 +215 -CwiseUnaryOp.h +BooleanRedux.h file -2013-06-21T07:08:32.639762Z -0519135fb76561894bd6ac135a91dd4d +2013-06-21T07:08:32.635762Z +b404bc5f1787969ef5d5b8b1b63fe0d0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,16 +432,16 @@ has-props -4705 +3519 -DenseBase.h +Assign_MKL.h file 2013-06-21T07:08:32.639762Z -d607f4f9afb512a42c4a3e16be3a3821 +d967574a5cfced88f97c5c9db5019898 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -466,16 +466,16 @@ has-props -23660 +11282 -SelfAdjointView.h +GlobalFunctions.h file -2013-06-21T07:08:32.639762Z -d98fa4497657aae306d56eb5203d9cf7 +2013-06-21T07:08:32.623762Z +1679ebe7251cafe4c75fcacfe7e9e18f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -500,16 +500,16 @@ has-props -11510 +4204 -NestByValue.h +VectorwiseOp.h file -2013-06-21T07:08:32.643762Z -fd4b5acc96fba4a2fe9db88caad9a3f7 +2013-06-21T07:08:32.639762Z +a11cab920bb89acbb7fead4611870295 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -534,18 +534,18 @@ has-props -3211 +24824 -ReturnByValue.h +Functors.h file 2013-06-21T07:08:32.643762Z -14eaea14b369a4fe9abd6da8fb273dff -2012-10-05T07:27:34.803522Z -4539 +9c04fe18787d99d0771762b3169cd489 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -568,16 +568,16 @@ has-props -3158 +36372 -Replicate.h +ArrayBase.h file -2013-06-21T07:08:32.643762Z -7ab66e44a14765478f2667f5ff03959b +2013-06-21T07:08:32.631762Z +c75ec7425327feb064640f5acc1e8163 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -602,16 +602,16 @@ has-props -6967 +8497 -MapBase.h +Map.h file -2013-06-21T07:08:32.643762Z -e9b634f15d4fc7fa92e3f60b40fba29c +2013-06-21T07:08:32.631762Z +87ade0ef792240f927852ad7cadbc89b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -636,16 +636,16 @@ has-props -8156 +8091 -Swap.h +CwiseBinaryOp.h file -2013-06-21T07:08:32.643762Z -0ffd749278fa6a1010caaeb9a27ba86a +2013-06-21T07:08:32.631762Z +a0c5304488d2631eafb6b2a113259a53 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -670,16 +670,16 @@ has-props -4326 +9831 -ProductBase.h +GeneralProduct.h file -2013-06-21T07:08:32.643762Z -26e89fd7434018579d5f2b94f5a1cef5 +2013-06-21T07:08:32.647762Z +12b7110a96a06e476c86196e716ec487 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -704,16 +704,16 @@ has-props -10489 +27005 -VectorBlock.h +Select.h file -2013-06-21T07:08:32.643762Z -233c51e4e7deca76a23c9b746b35dfaf +2013-06-21T07:08:32.647762Z +2793c6b7a5ed2700a0afe8ddf08226a6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -738,16 +738,16 @@ has-props -9638 +6073 -GeneralProduct.h +Product.h file -2013-06-21T07:08:32.647762Z -12b7110a96a06e476c86196e716ec487 +2013-06-21T07:08:32.631762Z +1ad45c0afe96c427e10c7ca84ba2a4af 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -772,16 +772,16 @@ has-props -27005 +3758 -Array.h +EigenBase.h file -2013-06-21T07:08:32.647762Z -90ad1c46199ee95a81e8645fcfb35992 +2013-06-21T07:08:32.635762Z +35761152c8c49a74dfe53389e4ff34d7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -806,16 +806,16 @@ has-props -11613 +5659 -GenericPacketMath.h +CwiseUnaryView.h file 2013-06-21T07:08:32.647762Z -90d46fb05b82d3a0252dea1bc7b572ed +8111736861bb1a88e1510771ab1c1867 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -840,16 +840,16 @@ has-props -11300 +5102 -Select.h +Fuzzy.h file -2013-06-21T07:08:32.647762Z -2793c6b7a5ed2700a0afe8ddf08226a6 +2013-06-21T07:08:32.639762Z +2d21a8e62ac10c8530bbc431d8ae470f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -874,16 +874,19 @@ has-props -6073 +5509 -DiagonalProduct.h +util +dir + +Block.h file -2013-06-21T07:08:32.647762Z -28cec217ada5069565486d4522a237db +2013-06-21T07:08:32.639762Z +ba1e11d992b3d69f7113303a4914e950 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -908,16 +911,16 @@ has-props -5387 +14169 -DenseCoeffsBase.h +SelfAdjointView.h file -2013-06-21T07:08:32.647762Z -38621510e6bcb803660672e663b79fc2 +2013-06-21T07:08:32.639762Z +d98fa4497657aae306d56eb5203d9cf7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -942,16 +945,16 @@ has-props -27623 +11510 -SolveTriangular.h +NestByValue.h file -2013-06-21T07:08:32.647762Z -86772a7a09b6e5737c62f2ec036fe145 +2013-06-21T07:08:32.643762Z +fd4b5acc96fba4a2fe9db88caad9a3f7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -976,16 +979,16 @@ has-props -10229 +3211 -CwiseUnaryView.h +ForceAlignedAccess.h file -2013-06-21T07:08:32.647762Z -8111736861bb1a88e1510771ab1c1867 +2013-06-21T07:08:32.627762Z +111ea74b2d24c6052f9312029747d569 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1010,16 +1013,16 @@ has-props -5102 +4460 -NumTraits.h +Matrix.h file -2013-06-21T07:08:32.651762Z -de50a3c8247c282bea2618dfd5ba9863 +2013-06-21T07:08:32.627762Z +b26fa0e9ee2a4d9fc1a7c99ec825f9d4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1044,16 +1047,16 @@ has-props -6177 +17030 -NoAlias.h +MapBase.h file -2013-06-21T07:08:32.651762Z -d1b0cf6f0af1ad2519c05de472e00cfd +2013-06-21T07:08:32.643762Z +e9b634f15d4fc7fa92e3f60b40fba29c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1078,19 +1081,16 @@ has-props -5128 - -util -dir +8156 -Flagged.h +ProductBase.h file -2013-06-21T07:08:32.623762Z -51c5bb653576b4a179710b4dc6d53423 +2013-06-21T07:08:32.643762Z +26e89fd7434018579d5f2b94f5a1cef5 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1115,18 +1115,18 @@ has-props -4199 +10489 -TriangularMatrix.h +VectorBlock.h file -2013-06-21T07:08:32.627762Z -12dd2e6f2ac801aeb021c40ee0516e12 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.643762Z +233c51e4e7deca76a23c9b746b35dfaf +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1149,18 +1149,18 @@ has-props -29906 +9638 -CommaInitializer.h +Transpose.h file -2013-06-21T07:08:32.627762Z -aab3dbaf965cd7413cb9c7c3e01f55c2 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.647762Z +05af8c5427afacaa47265b7be14b867c +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1183,16 +1183,16 @@ has-props -4779 +14430 -Matrix.h +DiagonalProduct.h file -2013-06-21T07:08:32.627762Z -b26fa0e9ee2a4d9fc1a7c99ec825f9d4 +2013-06-21T07:08:32.647762Z +28cec217ada5069565486d4522a237db 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1217,16 +1217,16 @@ has-props -17030 +5387 -ForceAlignedAccess.h +DenseCoeffsBase.h file -2013-06-21T07:08:32.627762Z -111ea74b2d24c6052f9312029747d569 +2013-06-21T07:08:32.647762Z +38621510e6bcb803660672e663b79fc2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1251,16 +1251,16 @@ has-props -4460 +27623 -ArrayBase.h +Random.h file 2013-06-21T07:08:32.631762Z -c75ec7425327feb064640f5acc1e8163 +0f1b31343cc0b429204869647ac4905a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1285,16 +1285,16 @@ has-props -8497 +5396 -Reverse.h +SolveTriangular.h file -2013-06-21T07:08:32.631762Z -395a13564d5f6e9179a8d5815f9f69ff +2013-06-21T07:08:32.647762Z +86772a7a09b6e5737c62f2ec036fe145 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1319,16 +1319,16 @@ has-props -7795 +10229 -Diagonal.h +DenseStorage.h file -2013-06-21T07:08:32.631762Z -537f7ea841770cb9818c110d2d9cef47 +2013-06-21T07:08:32.635762Z +b6129541a313a5a1de459969de903ee1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1353,16 +1353,16 @@ has-props -8995 +13407 -CwiseBinaryOp.h +Assign.h file -2013-06-21T07:08:32.631762Z -a0c5304488d2631eafb6b2a113259a53 +2013-06-21T07:08:32.635762Z +482fe85673d7f948e8a43955f2341016 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1387,18 +1387,18 @@ has-props -9831 +22859 -ArrayWrapper.h +NoAlias.h file -2013-06-21T07:08:32.631762Z -1ac230d4cb5ee8e36ae2ccc23c56f757 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.651762Z +d1b0cf6f0af1ad2519c05de472e00cfd +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1421,16 +1421,19 @@ has-props -7905 +5128 -Random.h +arch +dir + +SelfCwiseBinaryOp.h file -2013-06-21T07:08:32.631762Z -0f1b31343cc0b429204869647ac4905a +2013-06-21T07:08:32.651762Z +5b24aac48c52749578a9fed263139b02 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1455,16 +1458,16 @@ has-props -5396 +7147 -EigenBase.h +CwiseUnaryOp.h file -2013-06-21T07:08:32.635762Z -35761152c8c49a74dfe53389e4ff34d7 +2013-06-21T07:08:32.639762Z +0519135fb76561894bd6ac135a91dd4d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1489,16 +1492,16 @@ has-props -5659 +4705 -Assign.h +Flagged.h file -2013-06-21T07:08:32.635762Z -482fe85673d7f948e8a43955f2341016 +2013-06-21T07:08:32.623762Z +51c5bb653576b4a179710b4dc6d53423 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1523,16 +1526,16 @@ has-props -22859 +4199 -PlainObjectBase.h +Stride.h file -2013-06-21T07:08:32.635762Z -f302498950da9575afe4e7b4ff825eae +2013-06-21T07:08:32.639762Z +ce6a2b32531f88448dff0cb2d47c0e7d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1557,16 +1560,16 @@ has-props -33745 +3620 -Dot.h +PermutationMatrix.h file -2013-06-21T07:08:32.635762Z -e1be0965f84db120861eb1e20a92774a +2013-06-21T07:08:32.627762Z +87c3f8d6d8de2b710f2963e901d82b31 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1591,21 +1594,18 @@ has-props -9390 - -arch -dir +23841 -BooleanRedux.h +MatrixBase.h file -2013-06-21T07:08:32.635762Z -b404bc5f1787969ef5d5b8b1b63fe0d0 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.639762Z +275760eeba960ed03649fb4374f37e1a +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -1628,18 +1628,18 @@ has-props -3519 +22569 -CMakeLists.txt +Transpositions.h file -2013-06-21T07:08:32.635762Z -099895d1839148dc196c4caea197a70e -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:32.643762Z +975dfb0b55a71265c50b5775dd4c241c +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1662,16 +1662,16 @@ has-props -215 +15331 -Fuzzy.h +Swap.h file -2013-06-21T07:08:32.639762Z -2d21a8e62ac10c8530bbc431d8ae470f +2013-06-21T07:08:32.643762Z +0ffd749278fa6a1010caaeb9a27ba86a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1696,16 +1696,16 @@ has-props -5509 +4326 -VectorwiseOp.h +Reverse.h file -2013-06-21T07:08:32.639762Z -a11cab920bb89acbb7fead4611870295 +2013-06-21T07:08:32.631762Z +395a13564d5f6e9179a8d5815f9f69ff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1730,16 +1730,19 @@ has-props -24824 +7795 -Block.h +products +dir + +MathFunctions.h file -2013-06-21T07:08:32.639762Z -ba1e11d992b3d69f7113303a4914e950 +2013-06-21T07:08:32.635762Z +78f6aea2d3e1a2874c63411830dc01ea 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1764,16 +1767,16 @@ has-props -14169 +24671 -Stride.h +PlainObjectBase.h file -2013-06-21T07:08:32.639762Z -ce6a2b32531f88448dff0cb2d47c0e7d +2013-06-21T07:08:32.635762Z +f302498950da9575afe4e7b4ff825eae 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1798,16 +1801,16 @@ has-props -3620 +33745 -Visitor.h +Dot.h file -2013-06-21T07:08:32.643762Z -8baaf9f57bd8211cd18f6b74d3a42671 +2013-06-21T07:08:32.635762Z +e1be0965f84db120861eb1e20a92774a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1832,16 +1835,16 @@ has-props -6834 +9390 -Transpositions.h +Redux.h file -2013-06-21T07:08:32.643762Z -975dfb0b55a71265c50b5775dd4c241c +2013-06-21T07:08:32.635762Z +cbc7bdb2d9a119071ff938453748c91c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -1866,18 +1869,18 @@ has-props -15331 +13968 -MatrixBase.h +BandMatrix.h file -2013-06-21T07:08:32.639762Z -275760eeba960ed03649fb4374f37e1a -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.627762Z +ba6d139a70d94d92f8686ea213608cfb +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1900,18 +1903,18 @@ has-props -22569 +13049 -Functors.h +DenseBase.h file -2013-06-21T07:08:32.643762Z -9c04fe18787d99d0771762b3169cd489 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:32.639762Z +d607f4f9afb512a42c4a3e16be3a3821 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -1934,21 +1937,18 @@ has-props -36372 - -products -dir +23660 -Transpose.h +TriangularMatrix.h file -2013-06-21T07:08:32.647762Z -05af8c5427afacaa47265b7be14b867c -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.627762Z +12dd2e6f2ac801aeb021c40ee0516e12 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -1971,16 +1971,16 @@ has-props -14430 +29906 -SelfCwiseBinaryOp.h +Visitor.h file -2013-06-21T07:08:32.651762Z -5b24aac48c52749578a9fed263139b02 +2013-06-21T07:08:32.643762Z +8baaf9f57bd8211cd18f6b74d3a42671 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -2005,18 +2005,18 @@ has-props -7147 +6834 -GlobalFunctions.h +CommaInitializer.h file -2013-06-21T07:08:32.623762Z -1679ebe7251cafe4c75fcacfe7e9e18f -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.627762Z +aab3dbaf965cd7413cb9c7c3e01f55c2 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -2039,18 +2039,18 @@ has-props -4204 +4779 -BandMatrix.h +DiagonalMatrix.h file 2013-06-21T07:08:32.627762Z -ba6d139a70d94d92f8686ea213608cfb -2012-10-05T07:27:34.803522Z -4539 +a89ef32b9c37c332169c3c5de12e7621 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -2073,5 +2073,5 @@ has-props -13049 +11366 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 8de34037..8549a635 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/arch svn://svn.code.sf.net/p/vcg/code @@ -26,9 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -AltiVec -dir - SSE dir @@ -72,3 +69,6 @@ dir Default dir +AltiVec +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 2b4b6c70..bde09685 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 -4928 +4937 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 f1371dd1..9c54ca02 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 -4928 +4937 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 35562848..bfc67539 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 -4928 +4937 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 7ae0e022..028935c2 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 -4928 +4937 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 f680f053..a9eef6f6 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/products svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -GeneralBlockPanelKernel.h +CMakeLists.txt file -2013-06-21T07:08:30.855753Z -15954fbeae387f2dbb26b28035da8309 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:30.863753Z +e91ebbb6023c74df6d3042f9eb133978 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,16 +58,16 @@ has-props -45030 +166 -SelfadjointMatrixVector.h +GeneralMatrixMatrix.h file -2013-06-21T07:08:30.859753Z -4bd1d2900a19275f31e9d7785a89cc30 +2013-06-21T07:08:30.863753Z +7b8e76dadb260d340a1ce3492e7b9687 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -10426 +16084 -SelfadjointMatrixMatrix.h +TriangularSolverMatrix.h file -2013-06-21T07:08:30.859753Z -82b33fabe2e29d187eaf82304c1ec9ee +2013-06-21T07:08:30.863753Z +346c8c57ddb5b3b7108d250786bb49bc 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -14668 +13191 -SelfadjointMatrixVector_MKL.h +GeneralMatrixVector_MKL.h file -2013-06-21T07:08:30.859753Z -892fc0da96ecbe146325e2d705f5104c +2013-06-21T07:08:30.863753Z +f820242e95fdfa01bd52ebd4aa7e32e9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -5062 +5701 -SelfadjointMatrixMatrix_MKL.h +GeneralMatrixMatrix_MKL.h file -2013-06-21T07:08:30.859753Z -2bdcb1ad1fa18218748bc05009f8a79d +2013-06-21T07:08:30.855753Z +615326b097524ba7056428ca0d5dcbd5 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -10419 +4652 -GeneralMatrixMatrixTriangular.h +TriangularSolverMatrix_MKL.h file -2013-06-21T07:08:30.859753Z -a455b6c4e2a3bb19e64dbbe780263d48 +2013-06-21T07:08:30.855753Z +844610dc286c1c9546fe4413c7d04291 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +228,16 @@ has-props -10367 +5877 -TriangularMatrixVector.h +SelfadjointProduct.h file -2013-06-21T07:08:30.859753Z -0ab4ef300a2c636bc3023553573e0ed3 +2013-06-21T07:08:30.855753Z +41d52b3cd6e8cbb035b98021178a1ff0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,16 +262,16 @@ has-props -14083 +5863 -CoeffBasedProduct.h +SelfadjointRank2Update.h file -2013-06-21T07:08:30.859753Z -095c6f13c0889be5d160bc4e8d3af9ad +2013-06-21T07:08:30.855753Z +73c174248ab4f9aba6262d5e604c75b4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +296,16 @@ has-props -18474 +3950 -TriangularMatrixMatrix.h +GeneralBlockPanelKernel.h file -2013-06-21T07:08:30.859753Z -53dbf059d962fa83f7af5a6c75a64896 +2013-06-21T07:08:30.855753Z +15954fbeae387f2dbb26b28035da8309 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -17048 +45030 -GeneralMatrixMatrixTriangular_MKL.h +SelfadjointMatrixVector.h file -2013-06-21T07:08:30.863753Z -41f9a143ca46f157ee71c2035817ad36 +2013-06-21T07:08:30.859753Z +4bd1d2900a19275f31e9d7785a89cc30 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,18 +364,18 @@ has-props -6537 +10426 -TriangularMatrixVector_MKL.h +SelfadjointMatrixMatrix.h file 2013-06-21T07:08:30.859753Z -8b0d93528c7bc2ec4afea6433f1161ea -2013-02-27T21:07:14.867394Z -4823 +82b33fabe2e29d187eaf82304c1ec9ee +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -398,18 +398,18 @@ has-props -9887 +14668 -GeneralMatrixVector.h +SelfadjointMatrixVector_MKL.h file -2013-06-21T07:08:30.863753Z -8e3c189a625544ba73f9dcc2a0d78ee6 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:30.859753Z +892fc0da96ecbe146325e2d705f5104c +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -432,18 +432,18 @@ has-props -22147 +5062 -TriangularMatrixMatrix_MKL.h +SelfadjointMatrixMatrix_MKL.h file -2013-06-21T07:08:30.863753Z -11b00717714c8c071927f8de83db6c27 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:30.859753Z +2bdcb1ad1fa18218748bc05009f8a79d +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -466,16 +466,16 @@ has-props -13025 +10419 -TriangularSolverVector.h +TriangularMatrixVector.h file -2013-06-21T07:08:30.863753Z -cff686d97576a6c53728b2a28e92ab55 +2013-06-21T07:08:30.859753Z +0ab4ef300a2c636bc3023553573e0ed3 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -500,16 +500,16 @@ has-props -5380 +14083 -Parallelizer.h +GeneralMatrixMatrixTriangular.h file -2013-06-21T07:08:30.863753Z -232c1391681fdead8643f048beb0f3a7 +2013-06-21T07:08:30.859753Z +a455b6c4e2a3bb19e64dbbe780263d48 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -534,18 +534,18 @@ has-props -4137 +10367 -CMakeLists.txt +TriangularMatrixMatrix.h file -2013-06-21T07:08:30.863753Z -e91ebbb6023c74df6d3042f9eb133978 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:30.859753Z +53dbf059d962fa83f7af5a6c75a64896 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -568,16 +568,16 @@ has-props -166 +17048 -GeneralMatrixMatrix.h +CoeffBasedProduct.h file -2013-06-21T07:08:30.863753Z -7b8e76dadb260d340a1ce3492e7b9687 +2013-06-21T07:08:30.859753Z +095c6f13c0889be5d160bc4e8d3af9ad 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -602,18 +602,18 @@ has-props -16084 +18474 -TriangularSolverMatrix.h +TriangularMatrixVector_MKL.h file -2013-06-21T07:08:30.863753Z -346c8c57ddb5b3b7108d250786bb49bc -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:30.859753Z +8b0d93528c7bc2ec4afea6433f1161ea +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -636,16 +636,16 @@ has-props -13191 +9887 -GeneralMatrixVector_MKL.h +GeneralMatrixMatrixTriangular_MKL.h file 2013-06-21T07:08:30.863753Z -f820242e95fdfa01bd52ebd4aa7e32e9 +41f9a143ca46f157ee71c2035817ad36 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -670,18 +670,18 @@ has-props -5701 +6537 -GeneralMatrixMatrix_MKL.h +TriangularMatrixMatrix_MKL.h file -2013-06-21T07:08:30.855753Z -615326b097524ba7056428ca0d5dcbd5 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:30.863753Z +11b00717714c8c071927f8de83db6c27 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -704,18 +704,18 @@ has-props -4652 +13025 -TriangularSolverMatrix_MKL.h +GeneralMatrixVector.h file -2013-06-21T07:08:30.855753Z -844610dc286c1c9546fe4413c7d04291 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:30.863753Z +8e3c189a625544ba73f9dcc2a0d78ee6 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -738,16 +738,16 @@ has-props -5877 +22147 -SelfadjointProduct.h +Parallelizer.h file -2013-06-21T07:08:30.855753Z -41d52b3cd6e8cbb035b98021178a1ff0 +2013-06-21T07:08:30.863753Z +232c1391681fdead8643f048beb0f3a7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -772,16 +772,16 @@ has-props -5863 +4137 -SelfadjointRank2Update.h +TriangularSolverVector.h file -2013-06-21T07:08:30.855753Z -73c174248ab4f9aba6262d5e604c75b4 +2013-06-21T07:08:30.863753Z +cff686d97576a6c53728b2a28e92ab55 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -806,5 +806,5 @@ has-props -3950 +5380 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 dd46ec24..74eb9167 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Core/util svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -BlasUtil.h +Constants.h file 2013-06-21T07:08:32.619762Z -67643926f9a4ff6b1897f62deb6a5b92 +2f4366a1704d786dfec33e4eeadc9df2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -10157 +16782 -MKL_support.h +ForwardDeclarations.h file 2013-06-21T07:08:32.619762Z -7e11f8d538ce6cd16a6a7a6c745fc2eb +7b34de7f1fcf13200c2a991dd2d834ff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -3733 +13636 -ReenableStupidWarnings.h +BlasUtil.h file 2013-06-21T07:08:32.619762Z -e0abd50c752bd47acdcebe62b325fcab -2011-10-05T15:04:40.740408Z -4180 +67643926f9a4ff6b1897f62deb6a5b92 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -126,18 +126,18 @@ has-props -325 +10157 -Macros.h +MKL_support.h file 2013-06-21T07:08:32.619762Z -ced0ddb886a820afc0ba7884e6b6a90c -2013-02-27T21:07:14.867394Z -4823 +7e11f8d538ce6cd16a6a7a6c745fc2eb +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,18 +160,18 @@ has-props -16969 +3733 -DisableStupidWarnings.h +ReenableStupidWarnings.h file -2013-06-21T07:08:32.623762Z -6e693a3812ad0e47d1c38666ecc8094b -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.619762Z +e0abd50c752bd47acdcebe62b325fcab +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -194,18 +194,18 @@ has-props -2089 +325 -NonMPL2.h +Macros.h file -2013-06-21T07:08:32.623762Z -c4ca2e16c302c71df98732240109e7e0 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.619762Z +ced0ddb886a820afc0ba7884e6b6a90c +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -228,16 +228,16 @@ has-props -85 +16969 -Meta.h +DisableStupidWarnings.h file 2013-06-21T07:08:32.623762Z -83daf5b96c24b8162581accd796d2166 +6e693a3812ad0e47d1c38666ecc8094b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,18 +262,18 @@ has-props -9718 +2089 -CMakeLists.txt +NonMPL2.h file 2013-06-21T07:08:32.623762Z -9cc3f7fa207b677c45f30be2628adb4a -2011-10-05T15:04:40.740408Z -4180 +c4ca2e16c302c71df98732240109e7e0 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -296,18 +296,18 @@ has-props -157 +85 -Memory.h +Meta.h file 2013-06-21T07:08:32.623762Z -ed6341d5e65761a6dfacd9ecc24b19a1 -2013-02-27T21:07:14.867394Z -4823 +83daf5b96c24b8162581accd796d2166 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -330,18 +330,18 @@ has-props -36469 +9718 -StaticAssert.h +CMakeLists.txt file -2013-06-21T07:08:32.619762Z -437be1565a772d4585e17cdab102dca9 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:32.623762Z +9cc3f7fa207b677c45f30be2628adb4a +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -364,16 +364,16 @@ has-props -9190 +157 -XprHelper.h +Memory.h file -2013-06-21T07:08:32.619762Z -f9291d1f0ae551bbe27bb79bfaccd8ef +2013-06-21T07:08:32.623762Z +ed6341d5e65761a6dfacd9ecc24b19a1 2013-02-27T21:07:14.867394Z 4823 cignoni @@ -398,16 +398,16 @@ has-props -16554 +36469 -Constants.h +StaticAssert.h file 2013-06-21T07:08:32.619762Z -2f4366a1704d786dfec33e4eeadc9df2 +437be1565a772d4585e17cdab102dca9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,18 +432,18 @@ has-props -16782 +9190 -ForwardDeclarations.h +XprHelper.h file 2013-06-21T07:08:32.619762Z -7b34de7f1fcf13200c2a991dd2d834ff -2012-10-05T07:27:34.803522Z -4539 +f9291d1f0ae551bbe27bb79bfaccd8ef +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -466,5 +466,5 @@ has-props -13636 +16554 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Eigen2Support/.svn/entries index 9c45b4e6..e30fc866 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Eigen2Support svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -Memory.h +MathFunctions.h file -2013-06-21T07:08:38.091789Z -3bac2f559e79cd9deae4af862443502d +2013-06-21T07:08:38.095789Z +4df3219aec2bcbd94caae9e1d9f3c3ea 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -1666 +2761 -CwiseOperators.h +QR.h file -2013-06-21T07:08:38.091789Z -70103664f189154659a85dbb90d8240a +2013-06-21T07:08:38.095789Z +0e9cd9501ae65f8630ce4a87961afe70 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -10098 +1781 -Cwise.h +Minor.h file -2013-06-21T07:08:38.091789Z -12a2ba0a322b07a2388a2ae8d684d447 +2013-06-21T07:08:38.095789Z +bfbef3f4ebb36efe4cac736cc751d4d3 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -7473 +3624 -LeastSquares.h +Macros.h file -2013-06-21T07:08:38.091789Z -548af4a0985b709dc3c172ea41e695da +2013-06-21T07:08:38.095789Z +fc41d545289111054b2e8a9cc041b063 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -7022 +613 -VectorBlock.h +Meta.h file -2013-06-21T07:08:38.091789Z -010d50101f7895f7db32d4d8543e3885 +2013-06-21T07:08:38.095789Z +eaf98f745a47c8e52714d681d83a32c0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -2664 +2964 -Lazy.h +CMakeLists.txt file 2013-06-21T07:08:38.095789Z -604654cf987390b057d64db7d325f6fe -2012-10-05T07:27:34.803522Z -4539 +5d2b979149ffec2ff2b2bb198f358c6c +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -228,16 +228,16 @@ has-props -2134 +195 -LU.h +Block.h file -2013-06-21T07:08:38.095789Z -4a75986b5f87a0c54b77cfeb5fa07220 +2013-06-21T07:08:38.091789Z +330b11313a4ab17c6c145c0aa14382dd 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,16 +262,16 @@ has-props -4466 +4287 -QR.h +SVD.h file -2013-06-21T07:08:38.095789Z -0e9cd9501ae65f8630ce4a87961afe70 +2013-06-21T07:08:38.091789Z +19d7cee471a2e639c57ae8b1923da883 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +296,16 @@ has-props -1781 +18545 -MathFunctions.h +TriangularSolver.h file -2013-06-21T07:08:38.095789Z -4df3219aec2bcbd94caae9e1d9f3c3ea +2013-06-21T07:08:38.091789Z +018d77ccbe68578d1385a3c9d4747b84 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,19 @@ has-props -2761 +1525 -Macros.h +Geometry +dir + +Memory.h file -2013-06-21T07:08:38.095789Z -fc41d545289111054b2e8a9cc041b063 +2013-06-21T07:08:38.091789Z +3bac2f559e79cd9deae4af862443502d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,16 +367,16 @@ has-props -613 +1666 -Minor.h +CwiseOperators.h file -2013-06-21T07:08:38.095789Z -bfbef3f4ebb36efe4cac736cc751d4d3 +2013-06-21T07:08:38.091789Z +70103664f189154659a85dbb90d8240a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +401,16 @@ has-props -3624 +10098 -Meta.h +Cwise.h file -2013-06-21T07:08:38.095789Z -eaf98f745a47c8e52714d681d83a32c0 +2013-06-21T07:08:38.091789Z +12a2ba0a322b07a2388a2ae8d684d447 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,18 +435,18 @@ has-props -2964 +7473 -CMakeLists.txt +LeastSquares.h file -2013-06-21T07:08:38.095789Z -5d2b979149ffec2ff2b2bb198f358c6c -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:38.091789Z +548af4a0985b709dc3c172ea41e695da +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -466,16 +469,16 @@ has-props -195 +7022 -Block.h +VectorBlock.h file 2013-06-21T07:08:38.091789Z -330b11313a4ab17c6c145c0aa14382dd +010d50101f7895f7db32d4d8543e3885 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -500,16 +503,16 @@ has-props -4287 +2664 -SVD.h +Lazy.h file -2013-06-21T07:08:38.091789Z -19d7cee471a2e639c57ae8b1923da883 +2013-06-21T07:08:38.095789Z +604654cf987390b057d64db7d325f6fe 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -534,16 +537,16 @@ has-props -18545 +2134 -TriangularSolver.h +LU.h file -2013-06-21T07:08:38.091789Z -018d77ccbe68578d1385a3c9d4747b84 +2013-06-21T07:08:38.095789Z +4a75986b5f87a0c54b77cfeb5fa07220 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -568,8 +571,5 @@ has-props -1525 - -Geometry -dir +4466 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 5cac7877..7d88e80a 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 -4928 +4937 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 -Quaternion.h +AlignedBox.h file 2013-06-21T07:08:37.563787Z -8b3c5602504a37040ff7cc32d0e57fd2 +32b8aad8b076fac443d5e60b2c7ae87e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,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 @@ -92,18 +92,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 @@ -126,16 +126,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 @@ -160,16 +160,16 @@ has-props -10615 +5700 -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 @@ -194,16 +194,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 @@ -228,18 +228,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 @@ -262,16 +262,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 @@ -296,16 +296,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 @@ -330,16 +330,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 @@ -364,16 +364,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 @@ -398,16 +398,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 @@ -432,5 +432,5 @@ has-props -5700 +28270 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Eigenvalues/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Eigenvalues/.svn/entries index e84d429c..701771fc 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Eigenvalues svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -EigenSolver.h +ComplexSchur.h file 2013-06-21T07:08:40.963803Z -ef428ca242d4503f62f8fd46b115df25 -2012-10-05T07:27:34.803522Z -4539 +775c549597f6db19ef6da80ca18df92c +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -58,18 +58,18 @@ has-props -21370 +14686 -HessenbergDecomposition.h +ComplexSchur_MKL.h file 2013-06-21T07:08:40.963803Z -abe3f16cc6730229c0b8bd06ae23de81 -2012-10-05T07:27:34.803522Z -4539 +f49cfc44998d5f9899db09ccccf9226f +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -92,18 +92,18 @@ has-props -14213 +4009 -SelfAdjointEigenSolver.h +GeneralizedSelfAdjointEigenSolver.h file 2013-06-21T07:08:40.963803Z -bc1d0d59d15ab44c5142d96f34f1d421 -2013-02-27T21:07:14.867394Z -4823 +afb0465080f0bd8f5bf9d270585f9bd5 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -126,18 +126,18 @@ has-props -29539 +9746 -CMakeLists.txt +EigenSolver.h file -2013-06-21T07:08:40.967803Z -3d3aea060e420e2bc4d53920c2c6a159 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:40.963803Z +ef428ca242d4503f62f8fd46b115df25 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,16 +160,16 @@ has-props -162 +21370 -MatrixBaseEigenvalues.h +HessenbergDecomposition.h file -2013-06-21T07:08:40.967803Z -130e579dd1fc043c2a60e9de7ca4be07 +2013-06-21T07:08:40.963803Z +abe3f16cc6730229c0b8bd06ae23de81 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -5670 +14213 -RealSchur.h +SelfAdjointEigenSolver.h file -2013-06-21T07:08:40.967803Z -e832762668491ef937ba8776eaa4967d +2013-06-21T07:08:40.963803Z +bc1d0d59d15ab44c5142d96f34f1d421 2013-02-27T21:07:14.867394Z 4823 cignoni @@ -228,18 +228,18 @@ has-props -17458 +29539 -SelfAdjointEigenSolver_MKL.h +CMakeLists.txt file 2013-06-21T07:08:40.967803Z -e24ad847b6204287343fa30cc8a369c0 -2013-02-27T21:07:14.867394Z -4823 +3d3aea060e420e2bc4d53920c2c6a159 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -262,16 +262,16 @@ has-props -4198 +162 -ComplexEigenSolver.h +MatrixBaseEigenvalues.h file -2013-06-21T07:08:40.963803Z -54752aecee93c9d8edad3c1119ac70c7 +2013-06-21T07:08:40.967803Z +130e579dd1fc043c2a60e9de7ca4be07 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,18 +296,18 @@ has-props -11787 +5670 -RealSchur_MKL.h +RealSchur.h file -2013-06-21T07:08:40.963803Z -3514117d974b165cadb78bb70cbf77e4 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:40.967803Z +e832762668491ef937ba8776eaa4967d +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -330,18 +330,18 @@ has-props -3645 +17458 -Tridiagonalization.h +SelfAdjointEigenSolver_MKL.h file -2013-06-21T07:08:40.963803Z -4980b7835e463a3191ee25a19e214c2b -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:40.967803Z +e24ad847b6204287343fa30cc8a369c0 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -364,18 +364,18 @@ has-props -22383 +4198 -ComplexSchur.h +ComplexEigenSolver.h file 2013-06-21T07:08:40.963803Z -775c549597f6db19ef6da80ca18df92c -2013-02-27T21:07:14.867394Z -4823 +54752aecee93c9d8edad3c1119ac70c7 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -398,18 +398,18 @@ has-props -14686 +11787 -ComplexSchur_MKL.h +RealSchur_MKL.h file 2013-06-21T07:08:40.963803Z -f49cfc44998d5f9899db09ccccf9226f -2013-02-27T21:07:14.867394Z -4823 +3514117d974b165cadb78bb70cbf77e4 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -432,16 +432,16 @@ has-props -4009 +3645 -GeneralizedSelfAdjointEigenSolver.h +Tridiagonalization.h file 2013-06-21T07:08:40.963803Z -afb0465080f0bd8f5bf9d270585f9bd5 +4980b7835e463a3191ee25a19e214c2b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -466,5 +466,5 @@ has-props -9746 +22383 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Geometry/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Geometry/.svn/entries index b408f5b3..d996dfc9 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 -4928 +4937 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 -OrthoMethods.h +Quaternion.h file 2013-06-21T07:08:34.219770Z -9ffe0d95389c4f0f0d51758a7243baf9 +062b05edab48be3facd026c5c71ba448 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -8278 +28929 -Scaling.h +Rotation2D.h file 2013-06-21T07:08:34.219770Z -129abb6c5c244875378e67ff25edc187 +dfc053d090bef9d2069ceee7a0554c7f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,21 @@ has-props -6248 +5075 -Rotation2D.h +arch +dir + +CMakeLists.txt file 2013-06-21T07:08:34.219770Z -dfc053d090bef9d2069ceee7a0554c7f -2012-10-05T07:27:34.803522Z -4539 +bc30b159413527da749fb4bc005b63c8 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -126,16 +129,16 @@ has-props -5075 +177 -Quaternion.h +Homogeneous.h file 2013-06-21T07:08:34.219770Z -062b05edab48be3facd026c5c71ba448 +d42483d2e40df345d33b8991017fe594 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,18 +163,18 @@ has-props -28929 +11621 -CMakeLists.txt +RotationBase.h file -2013-06-21T07:08:34.219770Z -bc30b159413527da749fb4bc005b63c8 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:34.215770Z +ac1283a265cf68e93f943b6654a72f53 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -194,19 +197,16 @@ has-props -177 - -arch -dir +7699 -Homogeneous.h +Translation.h file -2013-06-21T07:08:34.219770Z -d42483d2e40df345d33b8991017fe594 +2013-06-21T07:08:34.215770Z +dec6dc21c3491f84d18cda35e92c8061 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -231,16 +231,16 @@ has-props -11621 +7201 -RotationBase.h +Umeyama.h file 2013-06-21T07:08:34.215770Z -ac1283a265cf68e93f943b6654a72f53 +a44f265790dc6fd0beb78b4809b08ce6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -265,16 +265,16 @@ has-props -7699 +6652 -Umeyama.h +ParametrizedLine.h file 2013-06-21T07:08:34.215770Z -a44f265790dc6fd0beb78b4809b08ce6 +d81954ff78c032de4f68a7cfe1c942bc 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -299,16 +299,16 @@ has-props -6652 +7760 -Translation.h +EulerAngles.h file 2013-06-21T07:08:34.215770Z -dec6dc21c3491f84d18cda35e92c8061 +3677ffbf9d2dd2a75dcfb08d8bc61511 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -333,16 +333,16 @@ has-props -7201 +2620 -ParametrizedLine.h +Hyperplane.h file 2013-06-21T07:08:34.215770Z -d81954ff78c032de4f68a7cfe1c942bc +09d385dd0db821c00a4133c2e384920e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -367,16 +367,16 @@ has-props -7760 +11053 -EulerAngles.h +AngleAxis.h file 2013-06-21T07:08:34.215770Z -3677ffbf9d2dd2a75dcfb08d8bc61511 +2df2928a2efffdb647e756458faa2240 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -401,16 +401,16 @@ has-props -2620 +7542 -Hyperplane.h +Transform.h file -2013-06-21T07:08:34.215770Z -09d385dd0db821c00a4133c2e384920e +2013-06-21T07:08:34.219770Z +6a51d80694868cbc90681257fa29411e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -435,18 +435,18 @@ has-props -11053 +55634 -Transform.h +AlignedBox.h file 2013-06-21T07:08:34.219770Z -6a51d80694868cbc90681257fa29411e -2012-10-05T07:27:34.803522Z -4539 +6a7cc62cd70c86b54ba6881f14cd22e6 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -469,16 +469,16 @@ has-props -55634 +12802 -AngleAxis.h +OrthoMethods.h file -2013-06-21T07:08:34.215770Z -2df2928a2efffdb647e756458faa2240 +2013-06-21T07:08:34.219770Z +9ffe0d95389c4f0f0d51758a7243baf9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -503,18 +503,18 @@ has-props -7542 +8278 -AlignedBox.h +Scaling.h file 2013-06-21T07:08:34.219770Z -6a7cc62cd70c86b54ba6881f14cd22e6 -2013-02-27T21:07:14.867394Z -4823 +129abb6c5c244875378e67ff25edc187 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -537,5 +537,5 @@ has-props -12802 +6248 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 38fd0871..da81ff33 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 -4928 +4937 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 771bf2cc..75b61df0 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/Householder svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/IterativeLinearSolvers/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/IterativeLinearSolvers/.svn/entries index 3ab1a238..ae1f51c6 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 -4928 +4937 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 -IncompleteLUT.h +CMakeLists.txt file 2013-06-21T07:08:36.507781Z -34ce9f3229ce3bf1bc1a5a813d2b5246 +bfd10f4c9c652cae30f71cb47ee57a89 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -14759 +195 -CMakeLists.txt +BasicPreconditioners.h file 2013-06-21T07:08:36.507781Z -bfd10f4c9c652cae30f71cb47ee57a89 +6838798fd76bd49ca3ddf238ccebddf2 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -195 +4423 -BasicPreconditioners.h +ConjugateGradient.h file 2013-06-21T07:08:36.507781Z -6838798fd76bd49ca3ddf238ccebddf2 +15a125e42712cc03c1d19fd3146d2f0a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -4423 +8684 -ConjugateGradient.h +BiCGSTAB.h file 2013-06-21T07:08:36.507781Z -15a125e42712cc03c1d19fd3146d2f0a +6cf9848dbc0bd64c6a1a0c167fd4628d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -8684 +8037 -BiCGSTAB.h +IterativeSolverBase.h file 2013-06-21T07:08:36.507781Z -6cf9848dbc0bd64c6a1a0c167fd4628d +75906a1399197f77cddb34579220c4f1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -8037 +8253 -IterativeSolverBase.h +IncompleteLUT.h file 2013-06-21T07:08:36.507781Z -75906a1399197f77cddb34579220c4f1 +34ce9f3229ce3bf1bc1a5a813d2b5246 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,5 +228,5 @@ has-props -8253 +14759 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Jacobi/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Jacobi/.svn/entries index 06b9d0aa..7f8a8a18 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 -4928 +4937 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 dd8fc80b..1f4c0f76 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/LU svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -FullPivLU.h +Determinant.h file 2013-06-21T07:08:22.939714Z -d5f6b9a618e19aea6590f4c315236946 +f4d248b7f950fe4304b5638ca18513d7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,21 +58,18 @@ has-props -27914 - -arch -dir +3046 -CMakeLists.txt +Inverse.h file 2013-06-21T07:08:22.939714Z -112fd354b8da1eab31ec9e683761a7f4 -2011-10-05T15:04:40.740408Z -4180 +555366d062b1115a8a77c1cbb3b34b6f +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -95,16 +92,16 @@ has-props -160 +14366 -Determinant.h +PartialPivLU.h file 2013-06-21T07:08:22.939714Z -f4d248b7f950fe4304b5638ca18513d7 +bd1a6903e73bd63d375946b67cb05f2e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -129,16 +126,16 @@ has-props -3046 +17909 -Inverse.h +PartialPivLU_MKL.h file 2013-06-21T07:08:22.939714Z -555366d062b1115a8a77c1cbb3b34b6f +118169bc6c115432bd8bc83cc0a4f2e4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -163,16 +160,16 @@ has-props -14366 +3479 -PartialPivLU.h +FullPivLU.h file 2013-06-21T07:08:22.939714Z -bd1a6903e73bd63d375946b67cb05f2e +d5f6b9a618e19aea6590f4c315236946 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -197,18 +194,21 @@ has-props -17909 +27914 -PartialPivLU_MKL.h +arch +dir + +CMakeLists.txt file 2013-06-21T07:08:22.939714Z -118169bc6c115432bd8bc83cc0a4f2e4 -2012-10-05T07:27:34.803522Z -4539 +112fd354b8da1eab31ec9e683761a7f4 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -231,5 +231,5 @@ has-props -3479 +160 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 3a2c5942..0c3ed6a9 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 -4928 +4937 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 a2479cca..896e01ff 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/OrderingMethods svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/PaStiXSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/PaStiXSupport/.svn/entries index ab984f47..aafe9bff 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/PaStiXSupport svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -PaStiXSupport.h +CMakeLists.txt file 2013-06-21T07:08:35.979779Z -5438e98668ba67ffe86a0b4247818476 +da15f126c71f043de455049418280314 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -24395 +169 -CMakeLists.txt +PaStiXSupport.h file 2013-06-21T07:08:35.979779Z -da15f126c71f043de455049418280314 +5438e98668ba67ffe86a0b4247818476 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,5 +92,5 @@ has-props -169 +24395 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/PardisoSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/PardisoSupport/.svn/entries index 1786872e..be178bcc 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/PardisoSupport svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/QR/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/QR/.svn/entries index 05b0198b..aa697bc9 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 -4928 +4937 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_MKL.h +ColPivHouseholderQR.h file 2013-06-21T07:08:24.511722Z -5b56a84272f4e3ac10a2424aecf84c82 -2013-02-27T21:07:14.867394Z -4823 +7e1d4cb995fe330dc84dac4e7a1237de +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -58,18 +58,18 @@ has-props -4478 +20149 -HouseholderQR.h +ColPivHouseholderQR_MKL.h file 2013-06-21T07:08:24.511722Z -8c706205c70ac501032003cbed5dc35d -2012-10-05T07:27:34.803522Z -4539 +5b56a84272f4e3ac10a2424aecf84c82 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -92,16 +92,16 @@ has-props -11678 +4478 -FullPivHouseholderQR.h +HouseholderQR.h file 2013-06-21T07:08:24.511722Z -6fc6da2e09bbfef7e5a6eb0dbcc544af +8c706205c70ac501032003cbed5dc35d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -22664 +11678 -CMakeLists.txt +FullPivHouseholderQR.h file 2013-06-21T07:08:24.511722Z -728eaf2cda49b033d11fded23649187c -2011-10-05T15:04:40.740408Z -4180 +6fc6da2e09bbfef7e5a6eb0dbcc544af +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,18 +160,18 @@ has-props -135 +22664 -HouseholderQR_MKL.h +CMakeLists.txt file 2013-06-21T07:08:24.511722Z -f7742a734cb1beee55423d87879742c7 -2012-10-05T07:27:34.803522Z -4539 +728eaf2cda49b033d11fded23649187c +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -194,16 +194,16 @@ has-props -2944 +135 -ColPivHouseholderQR.h +HouseholderQR_MKL.h file 2013-06-21T07:08:24.511722Z -7e1d4cb995fe330dc84dac4e7a1237de +f7742a734cb1beee55423d87879742c7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,5 +228,5 @@ has-props -20149 +2944 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/SVD/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/SVD/.svn/entries index 1cfae7e5..a053cf0b 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/SVD svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/Sparse/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/Sparse/.svn/entries index 90ca1376..be3ae52e 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 -4928 +4937 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 716261c7..af23c6eb 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 -4928 +4937 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 fe51c4ad..b8960e56 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 -4928 +4937 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 -CMakeLists.txt +TriangularSolver.h file -2013-06-21T07:08:39.739797Z -f3611b2cfcd36603f08751241a1532a9 +2013-06-21T07:08:39.731797Z +2876fbf9d9a295bd676d07b20387a99d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -160 +10092 -SparseView.h +SparseDot.h file -2013-06-21T07:08:39.739797Z -b0dc8d0529c1b72f4dfc0438e41ec486 +2013-06-21T07:08:39.731797Z +31092a444c3e1acdd4337e669430fd00 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -2725 +2981 -CompressedStorage.h +SparseFuzzy.h file 2013-06-21T07:08:39.731797Z -e1c3404ba1e0dd5797a20e628cc86b46 +d654b4b494899499fd9f24556ee7dd97 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -6631 +984 -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 @@ -160,16 +160,16 @@ has-props -6472 +8383 -AmbiVector.h +SparseRedux.h file 2013-06-21T07:08:39.731797Z -5dfa4d56f822a6420fb7e2785b3a72a4 +5ffed040d24b36bc28ec3a0a77c94629 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -10005 +1560 -SparseCwiseBinaryOp.h +SparseCwiseUnaryOp.h file 2013-06-21T07:08:39.731797Z -68e041c40b2ec20e7deee0cf5a8274da +5255ffa2b32777f6afae9ad5c3c70ebb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +228,16 @@ has-props -11957 +5961 -SparseTranspose.h +SparseBlock.h file -2013-06-21T07:08:39.731797Z -ceb1adefd2154fba0b1b2b1b94334458 +2013-06-21T07:08:39.735797Z +2fbb9db4db65818833ee01dccc7299b0 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,18 +262,18 @@ has-props -2413 +15288 -SparseDiagonalProduct.h +MappedSparseMatrix.h file -2013-06-21T07:08:39.731797Z -e2866a91ee0c3bcdc810bb90cc61aec0 -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:39.735797Z +3224bb5abe1661580028f316dd975353 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -296,16 +296,16 @@ has-props -7405 +6198 -SparseProduct.h +SparseSelfAdjointView.h file -2013-06-21T07:08:39.731797Z -ea6242f35aadbb10b489dcb959be94e0 +2013-06-21T07:08:39.735797Z +d9ee10f7812f01f8a74ecb05eb541351 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -6785 +16820 -SparseAssign.h +SparseSparseProductWithPruning.h file -2013-06-21T07:08:39.731797Z -d41d8cd98f00b204e9800998ecf8427e +2013-06-21T07:08:39.735797Z +b48270546540d754a4a4b16b3a7721eb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,16 +364,16 @@ has-props -0 +6153 -TriangularSolver.h +SparseMatrixBase.h file -2013-06-21T07:08:39.731797Z -2876fbf9d9a295bd676d07b20387a99d +2013-06-21T07:08:39.735797Z +0d802a7609086d2c83a9cfd991f6e8a1 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +398,16 @@ has-props -10092 +18639 -SparseDot.h +SparseDenseProduct.h file -2013-06-21T07:08:39.731797Z -31092a444c3e1acdd4337e669430fd00 +2013-06-21T07:08:39.735797Z +bf3f0bcf3a37be95cae836ec7de6f082 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,16 +432,16 @@ has-props -2981 +10583 -SparseRedux.h +SparseVector.h file -2013-06-21T07:08:39.731797Z -5ffed040d24b36bc28ec3a0a77c94629 +2013-06-21T07:08:39.735797Z +b3e44f0d9d446ddde6c0be66365404d3 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -466,16 +466,16 @@ has-props -1560 +11495 -ConservativeSparseSparseProduct.h +SparseTriangularView.h file -2013-06-21T07:08:39.731797Z -5ca6f2ec4f3bef3ed2697061eac1feca +2013-06-21T07:08:39.735797Z +ed8654be411da47896945fa22ba2e26c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -500,18 +500,18 @@ has-props -8383 +5261 -SparseFuzzy.h +SparseMatrix.h file -2013-06-21T07:08:39.731797Z -d654b4b494899499fd9f24556ee7dd97 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:39.739797Z +0c894182032312bdea24a580f76570b7 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -534,16 +534,16 @@ has-props -984 +39999 -SparseCwiseUnaryOp.h +SparsePermutation.h file -2013-06-21T07:08:39.731797Z -5255ffa2b32777f6afae9ad5c3c70ebb +2013-06-21T07:08:39.739797Z +8d1b3ec8be754aa514572f71bd2eb9ff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -568,16 +568,16 @@ has-props -5961 +6293 -SparseBlock.h +CoreIterators.h file -2013-06-21T07:08:39.735797Z -2fbb9db4db65818833ee01dccc7299b0 +2013-06-21T07:08:39.739797Z +ddccc519c5632052b038522c4bcb058f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -602,16 +602,16 @@ has-props -15288 +1941 -MappedSparseMatrix.h +CMakeLists.txt file -2013-06-21T07:08:39.735797Z -3224bb5abe1661580028f316dd975353 +2013-06-21T07:08:39.739797Z +f3611b2cfcd36603f08751241a1532a9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -636,16 +636,16 @@ has-props -6198 +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 @@ -670,16 +670,16 @@ has-props -16820 +2725 -SparseSparseProductWithPruning.h +CompressedStorage.h file -2013-06-21T07:08:39.735797Z -b48270546540d754a4a4b16b3a7721eb +2013-06-21T07:08:39.731797Z +e1c3404ba1e0dd5797a20e628cc86b46 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -704,16 +704,16 @@ has-props -6153 +6631 -SparseMatrixBase.h +AmbiVector.h file -2013-06-21T07:08:39.735797Z -0d802a7609086d2c83a9cfd991f6e8a1 +2013-06-21T07:08:39.731797Z +5dfa4d56f822a6420fb7e2785b3a72a4 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -738,18 +738,18 @@ has-props -18639 +10005 -SparseDenseProduct.h +SparseUtil.h file -2013-06-21T07:08:39.735797Z -bf3f0bcf3a37be95cae836ec7de6f082 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:39.731797Z +4ab051d7b0dd186c97b1204a6f28a53d +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -772,16 +772,16 @@ has-props -10583 +6472 -SparseVector.h +SparseTranspose.h file -2013-06-21T07:08:39.735797Z -b3e44f0d9d446ddde6c0be66365404d3 +2013-06-21T07:08:39.731797Z +ceb1adefd2154fba0b1b2b1b94334458 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -806,16 +806,16 @@ has-props -11495 +2413 -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 @@ -840,16 +840,16 @@ has-props -5261 +11957 -SparseMatrix.h +SparseDiagonalProduct.h file -2013-06-21T07:08:39.739797Z -0c894182032312bdea24a580f76570b7 +2013-06-21T07:08:39.731797Z +e2866a91ee0c3bcdc810bb90cc61aec0 2013-02-27T21:07:14.867394Z 4823 cignoni @@ -874,16 +874,16 @@ has-props -39999 +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 @@ -908,16 +908,16 @@ has-props -6293 +6785 -CoreIterators.h +SparseAssign.h file -2013-06-21T07:08:39.739797Z -ddccc519c5632052b038522c4bcb058f +2013-06-21T07:08:39.731797Z +d41d8cd98f00b204e9800998ecf8427e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -942,5 +942,5 @@ has-props -1941 +0 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/StlSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/StlSupport/.svn/entries index 8fcd59ec..e33551b9 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/StlSupport svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/Eigen/src/SuperLUSupport/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/SuperLUSupport/.svn/entries index c7c3d919..a455078a 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 -4928 +4937 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 2b142671..20a047ee 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/UmfPackSupport svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -UmfPackSupport.h +CMakeLists.txt file 2013-06-21T07:08:24.687723Z -f854cfdf44a0af47fd9876c8aa09b36c +e433b51ad8750a2d1607aa58354e1273 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -14536 +172 -CMakeLists.txt +UmfPackSupport.h file 2013-06-21T07:08:24.687723Z -e433b51ad8750a2d1607aa58354e1273 +f854cfdf44a0af47fd9876c8aa09b36c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,5 +92,5 @@ has-props -172 +14536 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/misc/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/misc/.svn/entries index 679c372f..a157589b 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/misc svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -SparseSolve.h +blas.h file 2013-06-21T07:08:32.803763Z -18113d6699287edfece941bb736eabec +6086de631f531453f22076b595de09c9 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -3826 +33603 -CMakeLists.txt +Image.h file 2013-06-21T07:08:32.803763Z -1d70a57aa07c443de2b43d2cce566c35 -2011-10-05T15:04:40.740408Z -4180 +8006cce739d813e07222b6968125bda6 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -92,16 +92,16 @@ has-props -141 +2997 -Solve.h +SparseSolve.h file 2013-06-21T07:08:32.803763Z -a3bf5e486981fb9574b15d0c10994cda +18113d6699287edfece941bb736eabec 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -2485 +3826 -Kernel.h +CMakeLists.txt file 2013-06-21T07:08:32.803763Z -8ed55214a4a05f1ae5112ecf534e7553 -2012-10-05T07:27:34.803522Z -4539 +1d70a57aa07c443de2b43d2cce566c35 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -160,16 +160,16 @@ has-props -2817 +141 -blas.h +Solve.h file 2013-06-21T07:08:32.803763Z -6086de631f531453f22076b595de09c9 +a3bf5e486981fb9574b15d0c10994cda 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -33603 +2485 -Image.h +Kernel.h file 2013-06-21T07:08:32.803763Z -8006cce739d813e07222b6968125bda6 +8ed55214a4a05f1ae5112ecf534e7553 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,5 +228,5 @@ has-props -2997 +2817 diff --git a/inst/include/vcglib/eigenlib/Eigen/src/plugins/.svn/entries b/inst/include/vcglib/eigenlib/Eigen/src/plugins/.svn/entries index 3ae0b86b..0e3b97d7 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/Eigen/src/plugins svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -BlockMethods.h +MatrixCwiseBinaryOps.h file 2013-06-21T07:08:23.275716Z -f84e85f8fb623df2f89c653c4bb781ce +312894849505619846dbe58ab5ac260a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -19218 +5320 -ArrayCwiseBinaryOps.h +CMakeLists.txt file 2013-06-21T07:08:23.275716Z -2191ddda84e1faf10578db326c56c888 -2013-02-27T21:07:14.867394Z -4823 +300b33e24241d19a9d457e755b2747b8 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -92,18 +92,18 @@ has-props -7518 +150 -MatrixCwiseUnaryOps.h +ArrayCwiseUnaryOps.h file -2013-06-21T07:08:23.275716Z -17b3c347113258e434b8ac42b2f3d49d -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:23.271716Z +41b797a706b028ff9133494e7f52677b +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -126,16 +126,16 @@ has-props -2617 +5052 -CommonCwiseUnaryOps.h +CommonCwiseBinaryOps.h file -2013-06-21T07:08:23.275716Z -700240826de57d08f778e0e5daa7a22e +2013-06-21T07:08:23.271716Z +cbd65be692bfa660e5c49b7f72cb923a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -6603 +1938 -MatrixCwiseBinaryOps.h +BlockMethods.h file 2013-06-21T07:08:23.275716Z -312894849505619846dbe58ab5ac260a +f84e85f8fb623df2f89c653c4bb781ce 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -5320 +19218 -CMakeLists.txt +ArrayCwiseBinaryOps.h file 2013-06-21T07:08:23.275716Z -300b33e24241d19a9d457e755b2747b8 -2011-10-05T15:04:40.740408Z -4180 +2191ddda84e1faf10578db326c56c888 +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -228,18 +228,18 @@ has-props -150 +7518 -ArrayCwiseUnaryOps.h +MatrixCwiseUnaryOps.h file -2013-06-21T07:08:23.271716Z -41b797a706b028ff9133494e7f52677b -2013-02-27T21:07:14.867394Z -4823 +2013-06-21T07:08:23.275716Z +17b3c347113258e434b8ac42b2f3d49d +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -262,16 +262,16 @@ has-props -5052 +2617 -CommonCwiseBinaryOps.h +CommonCwiseUnaryOps.h file -2013-06-21T07:08:23.271716Z -cbd65be692bfa660e5c49b7f72cb923a +2013-06-21T07:08:23.275716Z +700240826de57d08f778e0e5daa7a22e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,5 +296,5 @@ has-props -1938 +6603 diff --git a/inst/include/vcglib/eigenlib/unsupported/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/.svn/entries index 281dbada..8ab79e49 100644 --- a/inst/include/vcglib/eigenlib/unsupported/.svn/entries +++ b/inst/include/vcglib/eigenlib/unsupported/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,20 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -CMakeLists.txt +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 @@ -58,25 +64,16 @@ has-props -227 - -test -dir - -doc -dir - -Eigen -dir +1875 -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 @@ -101,5 +98,8 @@ has-props -1875 +227 + +test +dir diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/.svn/entries index c5fe88b4..f65f9b38 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 -4928 +4937 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 -MoreVectorization +SparseExtra file 2013-06-21T07:08:51.419855Z -7475a69194352f145ab4a516d296e2ae +e4ab405d155f1ea64aeb041ce7750235 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -318 +1083 -KroneckerProduct +AutoDiff file 2013-06-21T07:08:51.419855Z -bdde6f91e05d06a178b646ab5c5bb04b +068021dc4d23601124e5dfe53087b39e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,19 +92,16 @@ has-props -624 - -src -dir +1083 -NonLinearOptimization +Polynomials file 2013-06-21T07:08:51.419855Z -ef8b75b85ca2fdcb98f3c72b88349ddb +406461028c22b8cbc2e4ef529a8ee7a7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -129,16 +126,16 @@ has-props -5807 +4514 -MatrixFunctions +AdolcForward file 2013-06-21T07:08:51.419855Z -04a51f27b0f72d06516dc2be5921e3cf +83b14b0d2f120cc1676ef30e4a795915 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -163,16 +160,16 @@ has-props -13532 +4273 -AutoDiff +NumericalDiff file 2013-06-21T07:08:51.419855Z -068021dc4d23601124e5dfe53087b39e +60acfeec432d596f8009a4096c5880d6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -197,16 +194,16 @@ has-props -1083 +1802 -SparseExtra +AlignedVector3 file 2013-06-21T07:08:51.419855Z -e4ab405d155f1ea64aeb041ce7750235 +f9889c573d59529ddf26d30eb91ff4a8 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -231,16 +228,16 @@ has-props -1083 +5195 -Polynomials +IterativeSolvers file 2013-06-21T07:08:51.419855Z -406461028c22b8cbc2e4ef529a8ee7a7 +83772b4b82305dd245e149af30929b58 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -265,16 +262,16 @@ has-props -4514 +1297 -AdolcForward +Splines file 2013-06-21T07:08:51.419855Z -83b14b0d2f120cc1676ef30e4a795915 +36e3071c1350bb2e8b4fa9f8ee015e9e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -299,16 +296,16 @@ has-props -4273 +900 -NumericalDiff +CMakeLists.txt file 2013-06-21T07:08:51.419855Z -60acfeec432d596f8009a4096c5880d6 +1ccc84aecda9fa1a49033a7a57c3ea5c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -333,16 +330,16 @@ has-props -1802 +425 -AlignedVector3 +MPRealSupport file 2013-06-21T07:08:51.419855Z -f9889c573d59529ddf26d30eb91ff4a8 +2d8c00320d91bda5cf0f2ff1d03547cd 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -367,16 +364,16 @@ has-props -5195 +4538 -IterativeSolvers +Skyline file 2013-06-21T07:08:51.419855Z -83772b4b82305dd245e149af30929b58 +c510b8875613fe21944b5730bbb4c204 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -401,16 +398,16 @@ has-props -1297 +644 -MPRealSupport +BVH file 2013-06-21T07:08:51.419855Z -2d8c00320d91bda5cf0f2ff1d03547cd +38ff422557baef97ce47f9916baf352c 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -435,16 +432,16 @@ has-props -4538 +5534 -CMakeLists.txt +FFT file 2013-06-21T07:08:51.419855Z -1ccc84aecda9fa1a49033a7a57c3ea5c +6b9d7b187d9a7262c921ad627f7bc4ff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -469,16 +466,16 @@ has-props -425 +13945 -Splines +OpenGLSupport file 2013-06-21T07:08:51.419855Z -36e3071c1350bb2e8b4fa9f8ee015e9e +0d6c94b93bd7b947bdde0a95a3176221 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -503,16 +500,16 @@ has-props -900 +19012 -Skyline +MoreVectorization file 2013-06-21T07:08:51.419855Z -c510b8875613fe21944b5730bbb4c204 +7475a69194352f145ab4a516d296e2ae 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -537,16 +534,16 @@ has-props -644 +318 -BVH +KroneckerProduct file 2013-06-21T07:08:51.419855Z -38ff422557baef97ce47f9916baf352c +bdde6f91e05d06a178b646ab5c5bb04b 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -571,16 +568,19 @@ has-props -5534 +624 -FFT +src +dir + +NonLinearOptimization file 2013-06-21T07:08:51.419855Z -6b9d7b187d9a7262c921ad627f7bc4ff +ef8b75b85ca2fdcb98f3c72b88349ddb 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -605,16 +605,16 @@ has-props -13945 +5807 -OpenGLSupport +MatrixFunctions file 2013-06-21T07:08:51.419855Z -0d6c94b93bd7b947bdde0a95a3176221 +04a51f27b0f72d06516dc2be5921e3cf 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -639,5 +639,5 @@ has-props -19012 +13532 diff --git a/inst/include/vcglib/eigenlib/unsupported/Eigen/src/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/Eigen/src/.svn/entries index 940daff1..87216806 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src svn://svn.code.sf.net/p/vcg/code @@ -26,15 +26,6 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -KroneckerProduct -dir - -Polynomials -dir - -NumericalDiff -dir - IterativeSolvers dir @@ -99,3 +90,12 @@ dir MoreVectorization dir +KroneckerProduct +dir + +Polynomials +dir + +NumericalDiff +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 a0e9742d..50029c58 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 -4928 +4937 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 0e0cd5c5..c0c97f9b 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/BVH svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -CMakeLists.txt +KdBVH.h file 2013-06-21T07:08:45.551826Z -c67da942c9e5f0a2f97bd635f5609d91 -2011-10-05T15:04:40.740408Z -4180 +ff8196f551b4560fab1089182eb0ffed +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -58,16 +58,16 @@ has-props -150 +9126 -KdBVH.h +BVAlgorithms.h file 2013-06-21T07:08:45.551826Z -ff8196f551b4560fab1089182eb0ffed +34dfaba8d6f166c72d23baac2f9fc351 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,18 +92,18 @@ has-props -9126 +12978 -BVAlgorithms.h +CMakeLists.txt file 2013-06-21T07:08:45.551826Z -34dfaba8d6f166c72d23baac2f9fc351 -2012-10-05T07:27:34.803522Z -4539 +c67da942c9e5f0a2f97bd635f5609d91 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -126,5 +126,5 @@ has-props -12978 +150 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 be711e40..bbd56d59 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 -4928 +4937 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 470bd933..8fb21380 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 -4928 +4937 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 -ConstrainedConjGrad.h +GMRES.h file 2013-06-21T07:08:47.315835Z -1da228336288de955dfb8b050699f80a +4e00fb7184de3a5481c0bd81e71e917a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,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 @@ -92,18 +92,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 @@ -126,16 +126,16 @@ has-props -189 +5701 -GMRES.h +ConstrainedConjGrad.h file 2013-06-21T07:08:47.315835Z -4e00fb7184de3a5481c0bd81e71e917a +1da228336288de955dfb8b050699f80a 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,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 @@ -194,18 +194,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 @@ -228,5 +228,5 @@ has-props -5701 +189 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 6daa7e81..3165f934 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/KroneckerProduct svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -CMakeLists.txt +KroneckerTensorProduct.h file 2013-06-21T07:08:46.435831Z -8b3828512c367ef457655ea50812bc96 +e8c7079bbb37b01049ed6d4cb27c20ab 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -189 +4862 -KroneckerTensorProduct.h +CMakeLists.txt file 2013-06-21T07:08:46.435831Z -e8c7079bbb37b01049ed6d4cb27c20ab +8b3828512c367ef457655ea50812bc96 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,5 +92,5 @@ has-props -4862 +189 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 a2716573..7a208279 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/MatrixFunctions svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -MatrixExponential.h +CMakeLists.txt file 2013-06-21T07:08:49.295845Z -b2c5d89238f15ea23c10114a227ade1e -2012-10-05T07:27:34.803522Z -4539 +a0f4c75a7bd54bf8b7b8ae476e90ac32 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -58,18 +58,18 @@ has-props -15110 +186 -MatrixLogarithm.h +MatrixFunctionAtomic.h file 2013-06-21T07:08:49.295845Z -fc751bff35417a16c89b1ac86f38eead -2013-02-27T21:07:14.867394Z -4823 +67654bc1f82effb3bb2f794fe689c983 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -92,16 +92,16 @@ has-props -23413 +4378 -StemFunction.h +MatrixSquareRoot.h file 2013-06-21T07:08:49.295845Z -4ebd6bbb8528727c398f3c6f1c863569 +f8e13ddbc674dfc2161442543c28464f 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -2053 +17334 -CMakeLists.txt +MatrixFunction.h file 2013-06-21T07:08:49.295845Z -a0f4c75a7bd54bf8b7b8ae476e90ac32 -2011-10-05T15:04:40.740408Z -4180 +7da7156a13cfe635305b839178fe985f +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -160,16 +160,16 @@ has-props -186 +22312 -MatrixFunctionAtomic.h +MatrixExponential.h file 2013-06-21T07:08:49.295845Z -67654bc1f82effb3bb2f794fe689c983 +b2c5d89238f15ea23c10114a227ade1e 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -4378 +15110 -MatrixSquareRoot.h +MatrixLogarithm.h file 2013-06-21T07:08:49.295845Z -f8e13ddbc674dfc2161442543c28464f -2012-10-05T07:27:34.803522Z -4539 +fc751bff35417a16c89b1ac86f38eead +2013-02-27T21:07:14.867394Z +4823 cignoni has-props @@ -228,16 +228,16 @@ has-props -17334 +23413 -MatrixFunction.h +StemFunction.h file 2013-06-21T07:08:49.295845Z -7da7156a13cfe635305b839178fe985f +4ebd6bbb8528727c398f3c6f1c863569 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,5 +262,5 @@ has-props -22312 +2053 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 2899a333..c39d5444 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 -4928 +4937 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 -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 @@ -58,18 +58,18 @@ has-props -192 +3035 -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 @@ -92,5 +92,5 @@ has-props -3035 +192 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 e09bf0ea..e8b6cd1c 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 -4928 +4937 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 -qrsolv.h +HybridNonLinearSolver.h file 2013-06-21T07:08:48.375840Z -0d49b2d974445a92028da7a50f4fc940 +03c23d5c68cb824328408ea88e9e7139 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -3263 +19782 -CMakeLists.txt +rwupdt.h file 2013-06-21T07:08:48.375840Z -7dac94e4373b0fa23415c08c31278564 -2011-10-05T15:04:40.740408Z -4180 +ad3c34be2984b0c7a5f6db4ea4041533 +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -92,16 +92,16 @@ has-props -204 +1356 -fdjac1.h +qrsolv.h file 2013-06-21T07:08:48.375840Z -a5749af0b5f11ca2ae1b147bfd2af096 +0d49b2d974445a92028da7a50f4fc940 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,18 +126,18 @@ has-props -2173 +3263 -r1mpyq.h +CMakeLists.txt file 2013-06-21T07:08:48.375840Z -383cf032d01af4567d1f02d11897fb7d -2012-10-05T07:27:34.803522Z -4539 +7dac94e4373b0fa23415c08c31278564 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -160,16 +160,16 @@ has-props -1081 +204 -LevenbergMarquardt.h +fdjac1.h file 2013-06-21T07:08:48.375840Z -5aec351a3ff2c19182915113d5da9d09 +a5749af0b5f11ca2ae1b147bfd2af096 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,16 +194,16 @@ has-props -22154 +2173 -covar.h +r1mpyq.h file 2013-06-21T07:08:48.375840Z -988035a7a73603e450a4875f4292a989 +383cf032d01af4567d1f02d11897fb7d 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -228,16 +228,16 @@ has-props -1884 +1081 -lmpar.h +LevenbergMarquardt.h file 2013-06-21T07:08:48.375840Z -fbf88fe20a14472bc9d9c7b73d991512 +5aec351a3ff2c19182915113d5da9d09 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -262,16 +262,16 @@ has-props -8995 +22154 -r1updt.h +covar.h file 2013-06-21T07:08:48.375840Z -a2efc5516d5643ccdeb47741ab4b3981 +988035a7a73603e450a4875f4292a989 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -296,16 +296,16 @@ has-props -3058 +1884 -chkder.h +lmpar.h file 2013-06-21T07:08:48.375840Z -9ef23f88b622d464fedda85398c47520 +fbf88fe20a14472bc9d9c7b73d991512 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -330,16 +330,16 @@ has-props -1798 +8995 -dogleg.h +r1updt.h file 2013-06-21T07:08:48.375840Z -f70da358b566aecc9260af5745d20b76 +a2efc5516d5643ccdeb47741ab4b3981 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -364,16 +364,16 @@ has-props -3193 +3058 -HybridNonLinearSolver.h +chkder.h file 2013-06-21T07:08:48.375840Z -03c23d5c68cb824328408ea88e9e7139 +9ef23f88b622d464fedda85398c47520 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -398,16 +398,16 @@ has-props -19782 +1798 -rwupdt.h +dogleg.h file 2013-06-21T07:08:48.375840Z -ad3c34be2984b0c7a5f6db4ea4041533 +f70da358b566aecc9260af5745d20b76 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -432,5 +432,5 @@ has-props -1356 +3193 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 386703e8..f353f9dd 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 -4928 +4937 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 7a27778a..0388e512 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/Eigen/src/Polynomials svn://svn.code.sf.net/p/vcg/code 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 4066a78a..a7a11189 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 -4928 +4937 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 -SkylineUtil.h +SkylineInplaceLU.h file 2013-06-21T07:08:50.315850Z -3fde3a91d55eb2fafb974de05722a571 +408e7c33174077874e802f3a14e5ebee 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,16 @@ has-props -3153 +11358 -SkylineMatrixBase.h +SkylineUtil.h file 2013-06-21T07:08:50.315850Z -ea8f6ba4c64ab6a4448899e13f772aff +3fde3a91d55eb2fafb974de05722a571 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -92,16 +92,16 @@ has-props -7745 +3153 -SkylineProduct.h +SkylineMatrixBase.h file 2013-06-21T07:08:50.315850Z -66081be474e4d0fc0eaac9fa8407aaa7 +ea8f6ba4c64ab6a4448899e13f772aff 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,16 @@ has-props -10842 +7745 -SkylineMatrix.h +SkylineProduct.h file 2013-06-21T07:08:50.315850Z -2efac347bce0237002d9eafe921ad2de +66081be474e4d0fc0eaac9fa8407aaa7 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -160,16 +160,16 @@ has-props -31065 +10842 -SkylineStorage.h +SkylineMatrix.h file 2013-06-21T07:08:50.315850Z -15568a241e9d760618cbb32f23fae05d +2efac347bce0237002d9eafe921ad2de 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -194,18 +194,18 @@ has-props -7969 +31065 -CMakeLists.txt +SkylineStorage.h file 2013-06-21T07:08:50.315850Z -f4676f144d14d6192d125ad006d118c6 -2011-10-05T15:04:40.740408Z -4180 +15568a241e9d760618cbb32f23fae05d +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -228,18 +228,18 @@ has-props -162 +7969 -SkylineInplaceLU.h +CMakeLists.txt file 2013-06-21T07:08:50.315850Z -408e7c33174077874e802f3a14e5ebee -2012-10-05T07:27:34.803522Z -4539 +f4676f144d14d6192d125ad006d118c6 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -262,5 +262,5 @@ has-props -11358 +162 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 a9bab51b..dcd59e5f 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 -4928 +4937 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 86212482..71a33e68 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 -4928 +4937 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 -SplineFwd.h +CMakeLists.txt file 2013-06-21T07:08:49.479846Z -d45df26162f67bb3fa2b8f6e5c8fc9b6 +844d689dc6933b8ddafc990d7b4de0cf 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,16 +58,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 @@ -92,16 +92,16 @@ has-props -5656 +16407 -CMakeLists.txt +SplineFwd.h file 2013-06-21T07:08:49.479846Z -844d689dc6933b8ddafc990d7b4de0cf +d45df26162f67bb3fa2b8f6e5c8fc9b6 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -126,16 +126,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 @@ -160,5 +160,5 @@ has-props -16407 +5656 diff --git a/inst/include/vcglib/eigenlib/unsupported/doc/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/doc/.svn/entries index a0448f29..83c3c225 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 -4928 +4937 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 -CMakeLists.txt +Doxyfile.in file 2013-06-21T07:08:45.203824Z -fb6aae85e8fb807af1aaab8c05347584 -2011-10-05T15:04:40.740408Z -4180 +eb7ce2f8118537ae6a4692b369a772ed +2012-10-05T07:27:34.803522Z +4539 cignoni has-props @@ -58,21 +58,18 @@ has-props -114 - -examples -dir +62221 -Overview.dox +CMakeLists.txt file 2013-06-21T07:08:45.203824Z -8283d3b775fd6b3665b29701a7aae48c -2012-06-14T13:31:05.191445Z -4432 +fb6aae85e8fb807af1aaab8c05347584 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -95,21 +92,21 @@ has-props -644 +114 -snippets +examples dir -Doxyfile.in +Overview.dox file 2013-06-21T07:08:45.203824Z -eb7ce2f8118537ae6a4692b369a772ed -2012-10-05T07:27:34.803522Z -4539 +8283d3b775fd6b3665b29701a7aae48c +2012-06-14T13:31:05.191445Z +4432 cignoni has-props @@ -132,5 +129,8 @@ has-props -62221 +644 + +snippets +dir diff --git a/inst/include/vcglib/eigenlib/unsupported/doc/examples/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/doc/examples/.svn/entries index 0ad5f03e..0babd274 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/doc/examples svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/eigenlib/unsupported/doc/snippets/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/doc/snippets/.svn/entries index 1744c524..6d609ad2 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 -4928 +4937 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 0d3758a8..de25de34 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 -4928 +4937 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 -kronecker_product.cpp +matrix_square_root.cpp file 2013-06-21T07:08:44.495821Z -94525d168bf87069c660e0fa7d9de395 +9cd68bee9d3bd8505a8b96c2e56e4129 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -58,18 +58,18 @@ has-props -6622 +2100 -matrix_square_root.cpp +NonLinearOptimization.cpp file -2013-06-21T07:08:44.495821Z -9cd68bee9d3bd8505a8b96c2e56e4129 -2012-10-05T07:27:34.803522Z -4539 +2013-06-21T07:08:44.499821Z +10dbbbd9e12de7b30ed546f2541fbdfc +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -92,7 +92,7 @@ has-props -2100 +65196 CMakeLists.txt file @@ -128,40 +128,6 @@ has-props 2591 -NonLinearOptimization.cpp -file - - - - -2013-06-21T07:08:44.499821Z -10dbbbd9e12de7b30ed546f2541fbdfc -2011-10-05T15:04:40.740408Z -4180 -cignoni -has-props - - - - - - - - - - - - - - - - - - - - -65196 - mpreal dir @@ -267,14 +233,14 @@ has-props 3574 -forward_adolc.cpp +FFTW.cpp file 2013-06-21T07:08:44.491821Z -e605a33f050be498e8f310f8bea0d459 +21735718ebf3a35d0b7be3d485a662db 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -299,16 +265,16 @@ has-props -3839 +9160 -FFTW.cpp +forward_adolc.cpp file 2013-06-21T07:08:44.491821Z -21735718ebf3a35d0b7be3d485a662db +e605a33f050be498e8f310f8bea0d459 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -333,7 +299,7 @@ has-props -9160 +3839 NumericalDiff.cpp file @@ -369,14 +335,14 @@ has-props 2850 -matrix_function.cpp +alignedvector3.cpp file 2013-06-21T07:08:44.491821Z -8df6d6152fbc025cef84c443fb2abc38 +50a08f595e261b7fb368c7102ab46504 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -401,16 +367,16 @@ has-props -6730 +1816 -alignedvector3.cpp +matrix_function.cpp file 2013-06-21T07:08:44.491821Z -50a08f595e261b7fb368c7102ab46504 +8df6d6152fbc025cef84c443fb2abc38 2012-10-05T07:27:34.803522Z 4539 cignoni @@ -435,7 +401,7 @@ has-props -1816 +6730 matrix_exponential.cpp file @@ -709,3 +675,37 @@ has-props 10694 +kronecker_product.cpp +file + + + + +2013-06-21T07:08:44.495821Z +94525d168bf87069c660e0fa7d9de395 +2012-10-05T07:27:34.803522Z +4539 +cignoni +has-props + + + + + + + + + + + + + + + + + + + + +6622 + diff --git a/inst/include/vcglib/eigenlib/unsupported/test/mpreal/.svn/entries b/inst/include/vcglib/eigenlib/unsupported/test/mpreal/.svn/entries index c94508ee..bff05969 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/eigenlib/unsupported/test/mpreal svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/img/.svn/entries b/inst/include/vcglib/img/.svn/entries index d9c5b7e9..d1d4ae0f 100644 --- a/inst/include/vcglib/img/.svn/entries +++ b/inst/include/vcglib/img/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/img svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -img_cs_base.h +img_io.h file 2013-06-21T07:08:22.215710Z -a4facfddd994c040bac9318dd9942cad +b10c3b01612e19e788177a3bb8e15c13 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -57,17 +58,16 @@ cignoni - -13273 +2647 -img.h +img_base.h file 2013-06-21T07:08:22.215710Z -08dc3ae286092984eca4eba81c168925 +e5563e454c9ab6f19f30597e117c6464 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ has-props -381 +1912 -img_convert.h +img_info.h file 2013-06-21T07:08:22.215710Z -f76d93751f21949ba5fb039bcda22ee7 +a8505acdd1405960d53f859647c1a34a 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,20 +126,19 @@ has-props -8179 +1102 -img_image.h +img_cs_base.h file 2013-06-21T07:08:22.215710Z -a4bd121acc6e99766f5f43d65d6b54e7 +a4facfddd994c040bac9318dd9942cad 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -160,16 +159,17 @@ has-props -17749 + +13273 -img_filter.h +img.h file 2013-06-21T07:08:22.215710Z -c41bbf61b2892bb1e9b18d64c260e1c8 +08dc3ae286092984eca4eba81c168925 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ has-props -14420 +381 -img_scalar.h +img_convert.h file 2013-06-21T07:08:22.215710Z -3592408bb16b01278e7e12db0817b413 +f76d93751f21949ba5fb039bcda22ee7 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -228,19 +228,20 @@ has-props -3032 +8179 -img_attributes.h +img_image.h file 2013-06-21T07:08:22.215710Z -3ec852b7e386051298fc2314510567a8 +a4bd121acc6e99766f5f43d65d6b54e7 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -261,17 +262,16 @@ cignoni - -7781 +17749 -img_io.h +img_filter.h file 2013-06-21T07:08:22.215710Z -b10c3b01612e19e788177a3bb8e15c13 +c41bbf61b2892bb1e9b18d64c260e1c8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -296,16 +296,16 @@ has-props -2647 +14420 -img_base.h +img_scalar.h file 2013-06-21T07:08:22.215710Z -e5563e454c9ab6f19f30597e117c6464 +3592408bb16b01278e7e12db0817b413 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,20 +330,19 @@ has-props -1912 +3032 -img_info.h +img_attributes.h file 2013-06-21T07:08:22.215710Z -a8505acdd1405960d53f859647c1a34a +3ec852b7e386051298fc2314510567a8 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -364,5 +363,6 @@ has-props -1102 + +7781 diff --git a/inst/include/vcglib/vcg/.svn/entries b/inst/include/vcglib/vcg/.svn/entries index b06e2097..6a31eabf 100644 --- a/inst/include/vcglib/vcg/.svn/entries +++ b/inst/include/vcglib/vcg/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg svn://svn.code.sf.net/p/vcg/code -2013-07-24T12:00:47.297259Z -4928 +2013-07-26T12:21:40.300260Z +4936 cignoni @@ -26,6 +26,9 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d +simplex +dir + container dir @@ -41,6 +44,3 @@ dir connectors dir -simplex -dir - diff --git a/inst/include/vcglib/vcg/complex/.svn/entries b/inst/include/vcglib/vcg/complex/.svn/entries index cace91df..8ff05fc7 100644 --- a/inst/include/vcglib/vcg/complex/.svn/entries +++ b/inst/include/vcglib/vcg/complex/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex svn://svn.code.sf.net/p/vcg/code -2013-07-24T12:00:47.297259Z -4928 +2013-07-26T12:21:40.300260Z +4936 cignoni @@ -26,17 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -append.h +exception.h file 2013-06-21T07:05:06.454740Z -7924fcb30c27c6aab659fbcb8d3b38f6 -2013-03-11T11:53:26.500988Z -4829 -ganovelli +626d9f80a8e2627010d878b946129292 +2012-12-10T09:10:19.054723Z +4773 +cignoni @@ -58,18 +58,21 @@ ganovelli -15976 +2198 -complex.h +algorithms +dir + +allocate.h file -2013-06-21T07:05:06.454740Z -816a500b5b5b705fc260617ed11e09a1 -2012-12-06T10:59:18.361375Z -4767 +2013-08-01T07:24:02.650588Z +a03e17b68222ce994abaca960da67974 +2013-07-26T09:34:41.444134Z +4931 cignoni @@ -92,18 +95,18 @@ cignoni -2077 +56632 -base.h +used_types.h file 2013-06-21T07:05:06.454740Z -b318c4d1aefddb4459f851357a24ba34 -2013-04-12T09:16:49.539437Z -4881 +4be901fe98a851d5d1f3f986d6bef320 +2012-10-15T09:17:48.998055Z +4593 cignoni has-props @@ -126,20 +129,19 @@ has-props -35386 +3243 -all_types.h +append.h file 2013-06-21T07:05:06.454740Z -49afa293f65150231283a59de336445c -2012-10-04T20:41:28.156725Z -4538 -cignoni -has-props +7924fcb30c27c6aab659fbcb8d3b38f6 +2013-03-11T11:53:26.500988Z +4829 +ganovelli @@ -160,18 +162,19 @@ has-props -208 + +15976 -exception.h +complex.h file 2013-06-21T07:05:06.454740Z -626d9f80a8e2627010d878b946129292 -2012-12-10T09:10:19.054723Z -4773 +816a500b5b5b705fc260617ed11e09a1 +2012-12-06T10:59:18.361375Z +4767 cignoni @@ -194,22 +197,20 @@ cignoni -2198 - -algorithms -dir +2077 -allocate.h +base.h file 2013-06-21T07:05:06.454740Z -95ce6e94f5d76e71c8f3022bbde4e0c2 -2013-03-20T08:28:30.558674Z -4850 +b318c4d1aefddb4459f851357a24ba34 +2013-04-12T09:16:49.539437Z +4881 cignoni +has-props @@ -230,19 +231,18 @@ cignoni - -56094 +35386 -used_types.h +all_types.h file 2013-06-21T07:05:06.454740Z -4be901fe98a851d5d1f3f986d6bef320 -2012-10-15T09:17:48.998055Z -4593 +49afa293f65150231283a59de336445c +2012-10-04T20:41:28.156725Z +4538 cignoni has-props @@ -265,5 +265,5 @@ has-props -3243 +208 diff --git a/inst/include/vcglib/vcg/complex/.svn/text-base/allocate.h.svn-base b/inst/include/vcglib/vcg/complex/.svn/text-base/allocate.h.svn-base index dc554ea8..d8793f2d 100644 --- a/inst/include/vcglib/vcg/complex/.svn/text-base/allocate.h.svn-base +++ b/inst/include/vcglib/vcg/complex/.svn/text-base/allocate.h.svn-base @@ -243,58 +243,62 @@ namespace tri { */ static EdgeIterator AddEdges(MeshType &m,int n, PointerUpdater &pu) { - EdgeIterator last; - if(n == 0) return m.edge.end(); - pu.Clear(); - if(m.edge.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element - else { - pu.oldBase=&*m.edge.begin(); - pu.oldEnd=&m.edge.back()+1; - } - - m.edge.resize(m.edge.size()+n); - m.en+=n; - - typename std::set::iterator ai; - for(ai = m.edge_attr.begin(); ai != m.edge_attr.end(); ++ai) - ((typename MeshType::PointerToAttribute)(*ai)).Resize(m.edge.size()); - - pu.newBase = &*m.edge.begin(); - pu.newEnd = &m.edge.back()+1; - if(pu.NeedUpdate()) - { - FaceIterator fi; - for (fi=m.face.begin(); fi!=m.face.end(); ++fi){ - //if(HasFHEAdjacency(m)) - // pu.Update((*fi).FHEp()); - if(!(*fi).IsD()) - for(int i=0; i < (*fi).VN(); ++i) - if ((*fi).cFEp(i)!=0) pu.Update((*fi).FEp(i)); - } - - VertexIterator vi; - if(HasVEAdjacency(m)) - for (vi=m.vert.begin(); vi!=m.vert.end(); ++vi) - if(!(*vi).IsD()) - if ((*vi).cVEp()!=0) pu.Update((*vi).VEp()); - - HEdgeIterator hi; - if(HasHEAdjacency(m)) - for (hi=m.hedge.begin(); hi!=m.hedge.end(); ++hi) - if(!(*hi).IsD()) - if ((*hi).cHEp()!=0) pu.Update((*hi).HEp()); - - - - } - unsigned int siz=(unsigned int)m.edge.size()-n; - - last = m.edge.begin(); - advance(last,siz); + EdgeIterator last; + if(n == 0) return m.edge.end(); + pu.Clear(); + if(m.edge.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element + else { + pu.oldBase=&*m.edge.begin(); + pu.oldEnd=&m.edge.back()+1; + } + + m.edge.resize(m.edge.size()+n); + m.en+=n; + + typename std::set::iterator ai; + for(ai = m.edge_attr.begin(); ai != m.edge_attr.end(); ++ai) + ((typename MeshType::PointerToAttribute)(*ai)).Resize(m.edge.size()); + + pu.newBase = &*m.edge.begin(); + pu.newEnd = &m.edge.back()+1; + if(pu.NeedUpdate()) + { + if(HasFEAdjacency(m)) + for (FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi){ + if(!(*fi).IsD()) + for(int i=0; i < (*fi).VN(); ++i) + if ((*fi).cFEp(i)!=0) pu.Update((*fi).FEp(i)); + } + + if(HasVEAdjacency(m)) + for (VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi) + if(!(*vi).IsD()) + if ((*vi).cVEp()!=0) pu.Update((*vi).VEp()); + + if(HasHEAdjacency(m)) + for (HEdgeIterator hi=m.hedge.begin(); hi!=m.hedge.end(); ++hi) + if(!(*hi).IsD()) + if ((*hi).cHEp()!=0) pu.Update((*hi).HEp()); + } + unsigned int siz=(unsigned int)m.edge.size()-n; + + last = m.edge.begin(); + advance(last,siz); + + return last;// deve restituire l'iteratore alla prima faccia aggiunta; + } - return last;// deve restituire l'iteratore alla prima faccia aggiunta; + /** Function to add a single edge to the mesh. and initializing it with two VertexPointer + */ + static EdgeIterator AddEdge(MeshType &m, VertexPointer v0, VertexPointer v1) + { + EdgeIterator ei= AddEdges(m, 1); + ei->V(0)=v0; + ei->V(1)=v1; + return ei; } + /** Function to add n edges to the mesh. First wrapper, with no parameters */ @@ -423,6 +427,19 @@ namespace tri { } + /** Function to add a face to the mesh and initializing it with the three given VertexPointers + First wrapper, with no parameters + */ + static FaceIterator AddFace(MeshType &m, VertexPointer v0, VertexPointer v1, VertexPointer v2) + { + PointerUpdater pu; + FaceIterator fi = AddFaces(m,1,pu); + fi->V(0)=v0; + fi->V(1)=v1; + fi->V(2)=v2; + return fi; + } + /** Function to add n faces to the mesh. First wrapper, with no parameters */ diff --git a/inst/include/vcglib/vcg/complex/algorithms/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/.svn/entries index b05d70bc..d3e26eef 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms svn://svn.code.sf.net/p/vcg/code -2013-07-24T12:00:47.297259Z -4928 +2013-07-26T12:21:40.300260Z +4936 cignoni @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -local_optimization.h +refine_loop.h file 2013-06-21T07:05:06.106738Z -553ce9a4409c09c806664019cb25f200 -2011-10-05T15:04:40.740408Z -4180 +57a6168c0978e49acbe1d5244f30093c +2012-11-27T12:19:09.668963Z +4749 cignoni +has-props @@ -57,8 +58,7 @@ cignoni - -13900 +18248 attribute_seam.h file @@ -128,17 +128,18 @@ cignoni 41882 -autoalign_4pcs.h +halfedge_quad_clean.h file 2013-06-21T07:05:06.106738Z -669c1da5355a4133ed9facfbb753fd60 -2013-02-28T15:51:38.503682Z -4825 +0af1fd2081c41004538268d4cb5b8569 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -159,20 +160,20 @@ cignoni - -20814 +24521 -closest.h +outline_support.h file -2013-06-21T07:05:06.102738Z -9493c1ad3e5f32240431deefd34b0860 -2012-10-11T11:19:37.211062Z -4579 +2013-06-21T07:05:06.106738Z +f3e8680823f27e2b22a7e86747342501 +2013-04-03T10:02:19.303093Z +4878 cignoni +has-props @@ -193,20 +194,19 @@ cignoni - -19338 +8336 -bitquad_creation.h +autoalign_4pcs.h file 2013-06-21T07:05:06.106738Z -3604ec9d81e6a734b5796473600ff664 -2012-07-20T13:50:08.804768Z -4486 -tarini +669c1da5355a4133ed9facfbb753fd60 +2013-02-28T15:51:38.503682Z +4825 +cignoni @@ -228,24 +228,18 @@ tarini -26860 - -create -dir - -parametrization -dir +20814 -bitquad_support.h +nring.h file -2013-06-21T07:05:06.102738Z -22f97d677895e74de1b3f193f49e85b0 -2012-11-15T19:07:34.785185Z -4732 +2013-06-21T07:05:06.106738Z +a14ebb4e1f3743f9e37f6fc18eb94587 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -268,19 +262,19 @@ cignoni -33733 +4536 -edge_collapse.h +bitquad_creation.h file -2013-06-21T07:05:06.102738Z -56b1a5139e96db3f1289edd9a3f67e24 -2012-02-25T14:40:23.718510Z -4335 -cignoni +2013-06-21T07:05:06.106738Z +3604ec9d81e6a734b5796473600ff664 +2012-07-20T13:50:08.804768Z +4486 +tarini @@ -302,18 +296,21 @@ cignoni -9762 +26860 -hole.h +create +dir + +clean.h file -2013-06-21T07:05:06.106738Z -1d86039f0fa7d2c30ac97c0e798d6a3a -2012-12-02T14:57:08.898510Z -4759 +2013-06-24T13:55:27.906354Z +f5017bcad6b6ca7b1b57165c707f0cec +2013-06-24T10:50:14.179533Z +4908 cignoni @@ -336,18 +333,18 @@ cignoni -25558 +60801 -clip.h +polygon_support.h file 2013-06-21T07:05:06.106738Z -fcac01c7ed56654ba2b99d6e82d69660 -2012-11-15T19:07:34.785185Z -4732 +4865806d61b65854d870e5de59f463e9 +2012-10-23T23:41:41.113838Z +4652 cignoni @@ -370,18 +367,18 @@ cignoni -28570 +8144 -inertia.h +hole.h file -2013-07-25T06:52:24.542398Z -3a00cd388c546e3f29f0d89dbbf8e657 -2013-07-03T21:44:39.487228Z -4914 +2013-06-21T07:05:06.106738Z +1d86039f0fa7d2c30ac97c0e798d6a3a +2012-12-02T14:57:08.898510Z +4759 cignoni @@ -404,18 +401,18 @@ cignoni -11991 +25558 -bitquad_optimization.h +clip.h file -2013-06-21T07:05:06.098738Z -a7b9e0a986a22041ce8bc13e4689d19d -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:06.106738Z +fcac01c7ed56654ba2b99d6e82d69660 +2012-11-15T19:07:34.785185Z +4732 cignoni @@ -438,18 +435,18 @@ cignoni -10449 +28570 -refine_loop.h +pointcloud_normal.h file -2013-06-21T07:05:06.106738Z -57a6168c0978e49acbe1d5244f30093c -2012-11-27T12:19:09.668963Z -4749 +2013-06-24T13:55:27.906354Z +6ed8d833318ecf0a9ad18d628d2c7b44 +2013-06-24T08:36:08.849269Z +4906 cignoni has-props @@ -472,16 +469,16 @@ has-props -18248 +4404 -overlap_estimation.h +bitquad_optimization.h file -2013-06-21T07:05:06.102738Z -729081bd2d0aa5a2dce1ca047bc90395 +2013-06-21T07:05:06.098738Z +a7b9e0a986a22041ce8bc13e4689d19d 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -506,19 +503,19 @@ cignoni -16310 +10449 -intersection.h +overlap_estimation.h file 2013-06-21T07:05:06.102738Z -f7eb2203ac270f584aeaddc98b209d47 -2012-12-10T17:15:55.528150Z -4777 -pietroni +729081bd2d0aa5a2dce1ca047bc90395 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -540,19 +537,19 @@ pietroni -16629 +16310 -refine.h +intersection.h file 2013-06-21T07:05:06.102738Z -fcdbd66eacf51ec60bcc8fa7857a3727 -2012-12-17T15:31:28.958351Z -4783 -cignoni +f7eb2203ac270f584aeaddc98b209d47 +2012-12-10T17:15:55.528150Z +4777 +pietroni @@ -574,23 +571,19 @@ cignoni -31299 - -local_optimization -dir +16629 -outline_support.h +refine.h file -2013-06-21T07:05:06.106738Z -f3e8680823f27e2b22a7e86747342501 -2013-04-03T10:02:19.303093Z -4878 +2013-06-21T07:05:06.102738Z +fcdbd66eacf51ec60bcc8fa7857a3727 +2012-12-17T15:31:28.958351Z +4783 cignoni -has-props @@ -611,20 +604,23 @@ has-props -8336 + +31299 -halfedge_quad_clean.h +local_optimization +dir + +inside.h file -2013-06-21T07:05:06.106738Z -0af1fd2081c41004538268d4cb5b8569 +2013-06-21T07:05:06.102738Z +8be5cc4d635dcf1fc16f1f87a49db28c 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -645,7 +641,8 @@ has-props -24521 + +4609 stat.h file @@ -681,16 +678,16 @@ cignoni 10534 -inside.h +closest.h file 2013-06-21T07:05:06.102738Z -8be5cc4d635dcf1fc16f1f87a49db28c -2011-10-05T15:04:40.740408Z -4180 +9493c1ad3e5f32240431deefd34b0860 +2012-10-11T11:19:37.211062Z +4579 cignoni @@ -713,7 +710,7 @@ cignoni -4609 +19338 crease_cut.h file @@ -749,16 +746,16 @@ cignoni 6087 -nring.h +clustering.h file -2013-06-21T07:05:06.106738Z -a14ebb4e1f3743f9e37f6fc18eb94587 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:06.102738Z +7c4f985fd10e4e2640053d44c130d679 +2012-10-08T09:05:11.519307Z +4550 cignoni @@ -781,18 +778,18 @@ cignoni -4536 +13543 -clustering.h +textcoord_optimization.h file 2013-06-21T07:05:06.102738Z -7c4f985fd10e4e2640053d44c130d679 -2012-10-08T09:05:11.519307Z -4550 +2f9afad89a6915348f80e36250d6c76a +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -815,18 +812,18 @@ cignoni -13543 +13483 -textcoord_optimization.h +geodesic.h file -2013-06-21T07:05:06.102738Z -2f9afad89a6915348f80e36250d6c76a -2011-10-05T15:04:40.740408Z -4180 +2013-08-01T07:24:02.618587Z +ce1b01b4db25f18253a0fbd94b1f68ff +2013-07-26T12:13:45.424205Z +4933 cignoni @@ -849,20 +846,20 @@ cignoni -13483 +23456 -geodesic.h +point_sampling.h file -2013-06-21T07:05:06.102738Z -fa066dd7421d3032b6fde8e5e92d5311 -2013-01-30T17:14:47.671353Z -4810 -ganovelli - +2013-07-25T06:52:24.542398Z +528a9fe997b030933f56f6915ca676c8 +2013-07-23T07:32:12.864713Z +4919 +cignoni +has-props @@ -883,18 +880,21 @@ ganovelli -19706 +61860 -clean.h +parametrization +dir + +bitquad_support.h file -2013-06-24T13:55:27.906354Z -f5017bcad6b6ca7b1b57165c707f0cec -2013-06-24T10:50:14.179533Z -4908 +2013-06-21T07:05:06.102738Z +22f97d677895e74de1b3f193f49e85b0 +2012-11-15T19:07:34.785185Z +4732 cignoni @@ -917,20 +917,19 @@ cignoni -60801 +33733 -point_sampling.h +edge_collapse.h file -2013-07-25T06:52:24.542398Z -528a9fe997b030933f56f6915ca676c8 -2013-07-23T07:32:12.864713Z -4919 +2013-06-21T07:05:06.102738Z +56b1a5139e96db3f1289edd9a3f67e24 +2012-02-25T14:40:23.718510Z +4335 cignoni -has-props @@ -951,19 +950,21 @@ has-props -61860 + +9762 -polygon_support.h +voronoi_clustering.h file -2013-06-21T07:05:06.106738Z -4865806d61b65854d870e5de59f463e9 -2012-10-23T23:41:41.113838Z -4652 +2013-08-01T07:24:02.618587Z +337a0f58dc416d8227bd366b68664ae9 +2013-07-26T12:20:40.442418Z +4935 cignoni +has-props @@ -984,21 +985,19 @@ cignoni - -8144 +23340 -pointcloud_normal.h +inertia.h file -2013-06-24T13:55:27.906354Z -6ed8d833318ecf0a9ad18d628d2c7b44 -2013-06-24T08:36:08.849269Z -4906 +2013-07-25T06:52:24.542398Z +3a00cd388c546e3f29f0d89dbbf8e657 +2013-07-03T21:44:39.487228Z +4914 cignoni -has-props @@ -1019,20 +1018,23 @@ has-props -4404 + +11991 -voronoi_clustering.h +update +dir + +local_optimization.h file -2013-07-25T06:52:24.542398Z -bb9f1a3f83d1c9f3591739aadee914b2 -2013-07-05T14:46:48.577791Z -4916 +2013-06-21T07:05:06.106738Z +553ce9a4409c09c806664019cb25f200 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -1053,8 +1055,6 @@ has-props -15808 - -update -dir + +13900 diff --git a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/geodesic.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/geodesic.h.svn-base index afa4e305..67bbf4e5 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/geodesic.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/geodesic.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. * @@ -46,13 +46,110 @@ struct EuclideanDistance{ {return vcg::Distance(Barycenter(*f0),Barycenter(*f1));} }; + +template +class IsotropicDistance{ +private: + // The only member of this class. The attribute handle used to + typename MeshType::template PerVertexAttributeHandle wH; +public: + typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::ScalarType ScalarType; + typedef typename MeshType::FacePointer FacePointer; + + /// The constructor reads per vertex quality and transfer it into a per vertex attribute mapping it into the specified range. + /// The variance parameter specify how the distance is biased by the quality + /// the distance is scaled by a factor that range from 1/variance to variance according to a linear mapping of quality range. + /// So for example if you have a quality distributed in the 0..1 range and you specify a variance of 2 it means + /// that the distance will be scaled from 0.5 to 2 their original values. + + IsotropicDistance(MeshType &m, float variance) + { + // the wH attribute store the scaling factor to be applied to the distance + wH = tri::Allocator:: template GetPerVertexAttribute (m,"distW"); + float qmin = 1.0f/variance; + float qmax = variance; + float qrange = qmax-qmin; + std::pair minmax = Stat::ComputePerVertexQualityMinMax(m); + float range = minmax.second-minmax.first; + for(int i=0;icP(),v1->cP()); + } +}; + + +template +struct BasicCrossFunctor +{ + BasicCrossFunctor(MeshType &m) { tri::RequirePerVertexCurvatureDir(m); } + typedef typename MeshType::VertexType VertexType; + + Point3f D1(VertexType &v) { return v.PD1(); } + Point3f D2(VertexType &v) { return v.PD1(); } +}; + +/** + * Anisotropic Distance Functor + * + * Given a couple of vertexes over the surface (usually an edge) + * it returns a distance value that is biased according to a tangential cross field. + * It is assumed that the cross field is smooth enough so that you can safely blend the two directions + * + */ +template +class AnisotropicDistance{ + typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::ScalarType ScalarType; + typedef typename MeshType::VertexIterator VertexIterator; + + typename MeshType::template PerVertexAttributeHandle wxH,wyH; +public: + template AnisotropicDistance(MeshType &m, CrossFunctor &cf) + { + wxH = tri::Allocator:: template GetPerVertexAttribute (m,"distDirX"); + wyH = tri::Allocator:: template GetPerVertexAttribute (m,"distDirY"); + + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + { + wxH[vi]=cf.D1(*vi); + wyH[vi]=cf.D2(*vi); + } + } + + ScalarType operator()( VertexType * v0, VertexType * v1) + { + Point3f dd = v0->cP()-v1->cP(); + float x = dd * (wxH[v0]+wxH[v1])/2.0f; + float y = dd * (wyH[v0]+wyH[v1])/2.0f; + + return sqrt(x*x+y*y); + } +}; + + + + + + + + + + /*! \brief class for computing approximate geodesic distances on a mesh require VF Adjacency relation \sa trimesh_geodesic.cpp */ -template > +template class Geodesic{ public: @@ -129,7 +226,9 @@ public: //************** calcolo della distanza di pw in base alle distanze note di pw1 e curr //************** sapendo che (curr,pw,pw1) e'una faccia della mesh //************** (vedi figura in file distance.gif) - static ScalarType Distance(const VertexPointer &pw, + template + static ScalarType Distance(DistanceFunctor &distFunc, + const VertexPointer &pw, const VertexPointer &pw1, const VertexPointer &curr, const ScalarType &d_pw1, @@ -137,9 +236,9 @@ public: { ScalarType curr_d=0; - ScalarType ew_c = DistanceFunctor()(pw,curr); - ScalarType ew_w1 = DistanceFunctor()(pw,pw1); - ScalarType ec_w1 = DistanceFunctor()(pw1,curr); + ScalarType ew_c = distFunc(pw,curr); + ScalarType ew_w1 = distFunc(pw,pw1); + ScalarType ec_w1 = distFunc(pw1,curr); CoordType w_c = (pw->cP()-curr->cP()).Normalize() * ew_c; CoordType w_w1 = (pw->cP() - pw1->cP()).Normalize() * ew_w1; CoordType w1_c = (pw1->cP() - curr->cP()).Normalize() * ec_w1; @@ -179,10 +278,12 @@ approximated geodesic distance to the closest seeds. This is function is not meant to be called (although is not prevented). Instead, it is invoked by wrapping function. */ + template static VertexPointer Visit( MeshType & m, std::vector & seedVec, // the set of seed to start from - bool farthestOnBorder = false, + DistanceFunctor &distFunc, +// bool farthestOnBorder = false, ScalarType distance_threshold = std::numeric_limits::max(), // cut off distance (do no compute anything farther than this value) typename MeshType::template PerVertexAttributeHandle * vertSource = NULL, // if present we put in this attribute the closest source for each vertex typename MeshType::template PerVertexAttributeHandle * vertParent = NULL, // if present we put in this attribute the parent in the path that goes from the vertex to the closest source @@ -231,7 +332,7 @@ wrapping function. d_curr = TD[curr].d; - bool isLeaf = (!farthestOnBorder || curr->IsB()); +// bool isLeaf = (!farthestOnBorder || curr->IsB()); face::VFIterator x;int k; @@ -249,7 +350,7 @@ wrapping function. const ScalarType & d_pw1 = TD[pw1].d; { - const ScalarType inter = DistanceFunctor()(curr,pw1);//(curr->P() - pw1->P()).Norm(); + const ScalarType inter = distFunc(curr,pw1);//(curr->P() - pw1->P()).Norm(); const ScalarType tol = (inter + d_curr + d_pw1)*.0001f; if ( (TD[pw1].source != TD[curr].source)||// not the same source @@ -257,9 +358,9 @@ wrapping function. (inter + d_pw1 < d_curr +tol ) || (d_curr + d_pw1 < inter +tol ) // triangular inequality ) - curr_d = d_curr + DistanceFunctor()(pw,curr);//(pw->P()-curr->P()).Norm(); + curr_d = d_curr + distFunc(pw,curr);//(pw->P()-curr->P()).Norm(); else - curr_d = Distance(pw,pw1,curr,d_pw1,d_curr); + curr_d = Distance(distFunc,pw,pw1,curr,d_pw1,d_curr); } if(TD[pw].d > curr_d){ @@ -269,12 +370,12 @@ wrapping function. frontier.push_back(VertDist(pw,curr_d)); push_heap(frontier.begin(),frontier.end(),pred()); } - if(isLeaf){ +// if(isLeaf){ if(d_curr > max_distance){ max_distance = d_curr; farthest = curr; } - } +// } } }// end while @@ -326,8 +427,17 @@ It requires per vertex Quality (e.g. vertex::Quality component) \warning that this function has ALWAYS at least a linear cost (it use additional attributes that have a linear initialization) \todo make it O(output) by using incremental mark and persistent attributes. */ + static bool Compute( MeshType & m, + const std::vector & seedVec) + { + EuclideanDistance dd; + return Compute(m,seedVec,dd); + } + + template static bool Compute( MeshType & m, const std::vector & seedVec, + DistanceFunctor &distFunc, ScalarType maxDistanceThr = std::numeric_limits::max(), std::vector *withinDistanceVec=NULL, typename MeshType::template PerVertexAttributeHandle * sourceSeed = NULL, @@ -339,8 +449,7 @@ It requires per vertex Quality (e.g. vertex::Quality component) typename std::vector::const_iterator fi; for( fi = seedVec.begin(); fi != seedVec.end() ; ++fi) vdSeedVec.push_back(VertDist(*fi,0.0)); - - Visit(m, vdSeedVec, false, maxDistanceThr, sourceSeed, parentSeed, withinDistanceVec); + Visit(m, vdSeedVec, distFunc, maxDistanceThr, sourceSeed, parentSeed, withinDistanceVec); return true; } @@ -358,9 +467,9 @@ It is just a simple wrapper of the basic Compute() if( (*vi).IsB()) fro.push_back(&(*vi)); if(fro.empty()) return false; - + EuclideanDistance dd; tri::UpdateQuality::VertexConstant(m,0); - return Compute(m,fro,std::numeric_limits::max(),0,sources); + return Compute(m,fro,dd,std::numeric_limits::max(),0,sources); } @@ -384,8 +493,9 @@ It is just a simple wrapper of the basic Compute() return true; } - + template static void PerFaceDijsktraCompute(MeshType &m, const std::vector &seedVec, + DistanceFunctor &distFunc, ScalarType maxDistanceThr = std::numeric_limits::max(), std::vector *InInterval=NULL, FacePointer FaceTarget=NULL, @@ -426,7 +536,7 @@ It is just a simple wrapper of the basic Compute() if(!face::IsBorder(*curr,i) ) { FacePointer nextF = curr->FFp(i); - ScalarType nextDist = curr->Q() + DistanceFunctor()(curr,nextF); + ScalarType nextDist = curr->Q() + distFunc(curr,nextF); if( (nextDist < maxDistanceThr) && (!tri::IsMarked(m,nextF) || nextDist < nextF->Q()) ) { @@ -448,7 +558,9 @@ It is just a simple wrapper of the basic Compute() + template static void PerVertexDijsktraCompute(MeshType &m, const std::vector &seedVec, + DistanceFunctor &distFunc, ScalarType maxDistanceThr = std::numeric_limits::max(), std::vector *InInterval=NULL,bool avoid_selected=false, VertexPointer target=NULL) @@ -490,7 +602,7 @@ It is just a simple wrapper of the basic Compute() { VertexPointer nextV = vertVec[i]; if ((avoid_selected)&&(nextV->IsS()))continue; - ScalarType nextDist = curr->Q() + DistanceFunctor()(curr,nextV); + ScalarType nextDist = curr->Q() + distFunc(curr,nextV); if( (nextDist < maxDistanceThr) && (!tri::IsMarked(m,nextV) || nextDist < nextV->Q()) ) { diff --git a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/voronoi_clustering.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/voronoi_clustering.h.svn-base index cfe68769..9116fb44 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/voronoi_clustering.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/.svn/text-base/voronoi_clustering.h.svn-base @@ -51,20 +51,39 @@ public: }; // end class ClusteringSampler +struct VoronoiProcessingParameter +{ + enum { + None=0, + DistanceFromSeed=1, + DistanceFromBorder=2, + RegionArea=3 + }; + + VoronoiProcessingParameter() + { + colorStrategy = DistanceFromSeed; + areaThresholdPerc=0; + deleteUnreachedRegionFlag=false; + } + int colorStrategy; + float areaThresholdPerc; + bool deleteUnreachedRegionFlag; +}; -template +template > class VoronoiProcessing { - typedef typename MeshType::CoordType CoordType; - typedef typename MeshType::ScalarType ScalarType; - 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: + typedef typename MeshType::CoordType CoordType; + typedef typename MeshType::ScalarType ScalarType; + 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: // Given a vector of point3f it finds the closest vertices on the mesh. @@ -94,7 +113,7 @@ static void SeedToVertexConversion(MeshType &m,std::vector &seedPVec, typedef typename MeshType::template PerVertexAttributeHandle PerVertexPointerHandle; typedef typename MeshType::template PerFaceAttributeHandle PerFacePointerHandle; -static void ComputePerVertexSources(MeshType &m, std::vector &seedVec) +static void ComputePerVertexSources(MeshType &m, std::vector &seedVec, DistanceFunctor &df) { tri::Allocator::DeletePerVertexAttribute(m,"sources"); // delete any conflicting handle regardless of the type... PerVertexPointerHandle vertexSources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); @@ -103,7 +122,8 @@ static void ComputePerVertexSources(MeshType &m, std::vector &seed PerFacePointerHandle faceSources = tri::Allocator:: template AddPerFaceAttribute (m,"sources"); assert(tri::Allocator::IsValidHandle(m,vertexSources)); - tri::Geodesic::Compute(m,seedVec,std::numeric_limits::max(),0,&vertexSources); + + tri::Geodesic::Compute(m,seedVec,df,std::numeric_limits::max(),0,&vertexSources); } static void VoronoiColoring(MeshType &m, std::vector &seedVec, bool frontierFlag=true) @@ -120,7 +140,9 @@ static void VoronoiColoring(MeshType &m, std::vector &seedVec, boo 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); + std::vector cornerVec; + std::vector borderCornerVec; + GetAreaAndFrontier(m, sources, regionArea, borderVec, cornerVec, borderCornerVec); tri::Geodesic::Compute(m,borderVec); } @@ -231,98 +253,264 @@ static int FaceSelectRegion(MeshType &m, VertexPointer vp) return selCnt; } -// find the vertexes of frontier faces -// and compute Area of all the regions +/// Given a mesh with geodesic sources for all vertexes +/// (e.g. for all vertexes we know what is the corresponding voronoi region) +/// we compute Area of all the regions +/// Area is computed only for triangles that fully belong to a given source. + static void GetAreaAndFrontier(MeshType &m, PerVertexPointerHandle &sources, - std::vector< std::pair > ®ionArea, - std::vector &borderVec) + std::vector< std::pair > ®ionArea, + std::vector &borderVec, + std::vector &cornerVec, + std::vector &borderCornerVec) { tri::UpdateFlags::VertexClearV(m); + cornerVec.clear(); + borderVec.clear(); 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)] ) + VertexPointer s0 = sources[(*fi).V(0)]; + VertexPointer s1 = sources[(*fi).V(1)]; + VertexPointer s2 = sources[(*fi).V(2)]; + if((s0 != s1) || (s0 != s2) ) { for(int i=0;i<3;++i) + borderVec.push_back(fi->V(i)); + + if(s1!=s2 && s0!=s1 && s0!=s2) { + cornerVec.push_back(&*fi); + } + else { - (*fi).V(i)->SetV(); - (*fi).V(i)->C() = Color4b::Black; + for(int i=0;i<3;++i) + { + if(sources[(*fi).V0(i)] != sources[(*fi).V1(i)] && fi->IsB(i)) + borderCornerVec.push_back(&*fi); + } } } else // the face belongs to a single region; accumulate area; { - if(sources[(*fi).V(0)] != 0) + if(s0 != 0) { - int seedIndex = sources[(*fi).V(0)] - &*m.vert.begin(); - regionArea[seedIndex].first+=DoubleArea(*fi); - regionArea[seedIndex].second=sources[(*fi).V(0)]; + int seedIndex = tri::Index(m,s0); + regionArea[seedIndex].first+=DoubleArea(*fi)*0.5f; + regionArea[seedIndex].second=s0; } } } +} - // 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 ConvertVoronoiDiagramToMesh(MeshType &m, MeshType &outM, MeshType &poly, std::vector &seedVec, DistanceFunctor &df, VoronoiProcessingParameter &vpp ) +{ + typename MeshType::template PerVertexAttributeHandle sources; + sources = tri::Allocator:: template GetPerVertexAttribute (m,"sources"); + + tri::Geodesic::Compute(m,seedVec, df,std::numeric_limits::max(),0,&sources); + + std::map seedMap; + for(size_t i=0;i zz(0.0f,VertexPointer(NULL)); + std::vector< std::pair > regionArea(m.vert.size(),zz); + std::vector borderVec; + std::vector cornerVec; + std::vector borderCornerVec; + GetAreaAndFrontier(m, sources, regionArea, borderVec, cornerVec, borderCornerVec); + outM.Clear(); + poly.Clear(); + + std::map cornerMap; + for(size_t i=0;i::AddVertices(outM,seedVec.size()+cornerVec.size()+borderCornerVec.size()); + + for(size_t i=0;iP(); + outM.vert[i].C()=Color4b::White; + } + + int cOff = seedVec.size(); + for(size_t i=0;i::MeshCopy(poly,outM); + + // There is a voronoi edge if there are two corner face that share two sources. + // In such a case we add a pair of triangles with an edge connecting these two corner faces + // and with the two involved sources + std::map, FacePointer > VoronoiEdge; + + for(size_t i=0;iV0(j)]; + VertexPointer v1 = sources[cornerVec[i]->V1(j)]; + if(v1::AddFace(outM,&(outM.vert[seedMap[v0]]), corner0, corner1); + fi->SetF(0); fi->SetF(2); + fi = tri::Allocator::AddFace(outM,&(outM.vert[seedMap[v1]]), corner0, corner1); + fi->SetF(0); fi->SetF(2); + + tri::Allocator::AddEdge(poly,&(poly.vert[tri::Index(outM,corner0)]),&(poly.vert[tri::Index(outM,corner1)]) ); + } + } + } + + // Now build the boundary facets, e.g. the triangles with an edge on the boundary that connects two bordercorner face. + for(size_t i=0;iV(0)]; + VertexPointer v1 = sources[borderCornerVec[i]->V(1)]; + if(v1==v0) v1 = sources[borderCornerVec[i]->V(2)]; + if(v1::AddFace(outM,&(outM.vert[seedMap[v0]]), corner0, corner1); + fi->SetF(0);fi->SetF(2); + } + if(VoronoiEdge[std::make_pair(VertexPointer(0),v1)] == 0) + VoronoiEdge[std::make_pair(VertexPointer(0),v1)] = borderCornerVec[i]; + else + { + int otherCorner = cornerMap[VoronoiEdge[std::make_pair(VertexPointer(0),v1)]]; + FaceIterator fi=tri::Allocator::AddFaces(outM,1); + VertexPointer corner0 = &(outM.vert[bcOff+i]); + VertexPointer corner1 = &(outM.vert[bcOff+otherCorner]); + fi->V(0) = &(outM.vert[seedMap[v1]]); + fi->V(1) = corner0; + fi->V(2) = corner1; + fi->SetF(0);fi->SetF(2); + } + if(VoronoiEdge[std::make_pair(v0,v1)] == 0) + assert(0); + else + { + int otherCorner = cornerMap[VoronoiEdge[std::make_pair(v0,v1)]]; + FaceIterator fi=tri::Allocator::AddFaces(outM,2); + VertexPointer corner0 = &(outM.vert[bcOff+i]); + VertexPointer corner1 = &(outM.vert[cOff+otherCorner]); + fi->V(0) = &(outM.vert[seedMap[v0]]); + fi->V(1) = corner0; + fi->V(2) = corner1; + fi->SetF(0);fi->SetF(2); + tri::Allocator::AddEdge(poly,&(poly.vert[tri::Index(outM,corner0)]),&(poly.vert[tri::Index(outM,corner1)]) ); + + ++fi; + fi->V(0) = &(outM.vert[seedMap[v1]]); + fi->V(1) = corner0; + fi->V(2) = corner1; + fi->SetF(0);fi->SetF(2); + tri::Allocator::AddEdge(poly,&(poly.vert[tri::Index(outM,corner0)]),&(poly.vert[tri::Index(outM,corner1)]) ); + + } + } +} +static void DeleteUnreachedRegions(MeshType &m, PerVertexPointerHandle &sources) +{ + tri::UpdateFlags::VertexClearV(m); + for(size_t 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::CompactEveryVector(m); } -static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int relaxIter, int /*percentileClamping*/, vcg::CallBackPos *cb=0) +static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int relaxIter, DistanceFunctor &df, VoronoiProcessingParameter &vpp, vcg::CallBackPos *cb=0) { tri::RequireVFAdjacency(m); - + tri::UpdateFlags::FaceBorderFromVF(m); typename MeshType::template PerVertexAttributeHandle sources; - sources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); + sources = tri::Allocator:: template GetPerVertexAttribute (m,"sources"); for(int iter=0;iter::Compute(m,seedVec,std::numeric_limits::max(),0,&sources); - + tri::Geodesic::Compute(m,seedVec, df,std::numeric_limits::max(),0,&sources); + if(vpp.colorStrategy == VoronoiProcessingParameter::DistanceFromSeed) + tri::UpdateColor::PerVertexQualityRamp(m); // 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); + if(vpp.deleteUnreachedRegionFlag) + DeleteUnreachedRegions(m,sources); //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; + std::vector cornerVec; + std::vector borderCornerVec; - GetAreaAndFrontier(m, sources, regionArea, borderVec); + GetAreaAndFrontier(m, sources, regionArea, borderVec, cornerVec,borderCornerVec); // Smaller area region are discarded Distribution H; for(size_t i=0;i::ComputeMeshArea(m); + float expectedArea = meshArea/float(seedVec.size()); + for(size_t i=0;i::Compute(m,borderVec); - tri::UpdateColor::PerVertexQualityRamp(m); + tri::Geodesic::Compute(m,borderVec,df); + + if(vpp.colorStrategy == VoronoiProcessingParameter::DistanceFromBorder) + 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) { + assert(sources[vi]!=0); int seedIndex = tri::Index(m,sources[vi]); if(seedMaxima[seedIndex].first < (*vi).Q()) { @@ -339,20 +527,24 @@ static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int newSeeds.push_back(seedMaxima[i].second); } - tri::UpdateColor::PerVertexQualityRamp(m); - for(size_t i=0;iC() = Color4b::Black; for(size_t i=0;iC() = Color4b::Gray; + for(size_t i=0;iV(j)->C() = Color4b::Green; + + for(size_t i=0;iC() = Color4b::Black; + swap(newSeeds,seedVec); for(size_t i=0;iC() = Color4b::White; } - tri::Allocator::DeletePerVertexAttribute (m,"sources"); +// tri::Allocator::DeletePerVertexAttribute (m,"sources"); } diff --git a/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries index 1a6c8942..7134312c 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries +++ b/inst/include/vcglib/vcg/complex/algorithms/create/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms/create svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -mc_trivial_walker.h +ball_pivoting.h file 2013-06-21T07:05:05.218734Z -a865a54aca7a0771c851124bd356430d -2013-03-22T17:06:41.310674Z -4857 +af198f7ef0fa85ce571168010a2ff736 +2012-11-14T12:48:35.656236Z +4730 cignoni @@ -58,18 +58,18 @@ cignoni -11248 +12657 -mc_lookup_table.h +extended_marching_cubes.h file 2013-06-21T07:05:05.218734Z -61d3d5584b57fb73bd048a636e51e632 -2011-10-05T15:04:40.740408Z -4180 +c2a9457efb0d23244d82dbb5bf3026fb +2013-03-22T17:06:41.310674Z +4857 cignoni @@ -92,20 +92,19 @@ cignoni -173333 +18829 -extrude.h +marching_cubes.h file 2013-06-21T07:05:05.218734Z -b66b0fa6b72ca8358c1229d0bab657b6 -2013-01-23T08:35:23.484447Z -4805 +67c16819e693f9001c4c66a5ceb36458 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -126,18 +125,19 @@ has-props -2627 + +30538 -advancing_front.h +platonic.h file -2013-06-21T07:05:05.218734Z -66f3bb1a2b5a0b043839c8d551676e42 -2012-11-14T12:48:35.656236Z -4730 +2013-06-24T13:55:27.726353Z +abc9741172e7c3d5287d79771c868ac7 +2013-06-24T09:36:46.352528Z +4907 cignoni @@ -160,18 +160,18 @@ cignoni -16120 +32745 -emc_lookup_table.h +resampler.h file -2013-06-21T07:05:05.218734Z -cb99e47ac508530409c23910f23b41e3 -2013-03-22T17:06:41.310674Z -4857 +2013-07-25T06:52:24.538398Z +49d95eca07658db0e421b8b12b924492 +2013-07-16T15:44:52.091083Z +4918 cignoni @@ -194,18 +194,18 @@ cignoni -40594 +19624 -readme.txt +mc_trivial_walker.h file 2013-06-21T07:05:05.218734Z -75e96946e85dde41ce0b3a09d8a9e1a3 -2011-10-05T15:04:40.740408Z -4180 +a865a54aca7a0771c851124bd356430d +2013-03-22T17:06:41.310674Z +4857 cignoni @@ -228,19 +228,19 @@ cignoni -6725 +11248 -zonohedron.h +mc_lookup_table.h file 2013-06-21T07:05:05.218734Z -1547e5b37534a4fe5fe13e13c672356a -2012-07-24T01:48:21.496304Z -4488 -tarini +61d3d5584b57fb73bd048a636e51e632 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -262,19 +262,20 @@ tarini -9221 +173333 -ball_pivoting.h +extrude.h file 2013-06-21T07:05:05.218734Z -af198f7ef0fa85ce571168010a2ff736 -2012-11-14T12:48:35.656236Z -4730 +b66b0fa6b72ca8358c1229d0bab657b6 +2013-01-23T08:35:23.484447Z +4805 cignoni +has-props @@ -295,19 +296,18 @@ cignoni - -12657 +2627 -extended_marching_cubes.h +advancing_front.h file 2013-06-21T07:05:05.218734Z -c2a9457efb0d23244d82dbb5bf3026fb -2013-03-22T17:06:41.310674Z -4857 +66f3bb1a2b5a0b043839c8d551676e42 +2012-11-14T12:48:35.656236Z +4730 cignoni @@ -330,18 +330,18 @@ cignoni -18829 +16120 -marching_cubes.h +emc_lookup_table.h file 2013-06-21T07:05:05.218734Z -67c16819e693f9001c4c66a5ceb36458 -2011-10-05T15:04:40.740408Z -4180 +cb99e47ac508530409c23910f23b41e3 +2013-03-22T17:06:41.310674Z +4857 cignoni @@ -364,18 +364,18 @@ cignoni -30538 +40594 -platonic.h +readme.txt file -2013-06-24T13:55:27.726353Z -abc9741172e7c3d5287d79771c868ac7 -2013-06-24T09:36:46.352528Z -4907 +2013-06-21T07:05:05.218734Z +75e96946e85dde41ce0b3a09d8a9e1a3 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -398,19 +398,19 @@ cignoni -32745 +6725 -resampler.h +zonohedron.h file -2013-07-25T06:52:24.538398Z -49d95eca07658db0e421b8b12b924492 -2013-07-16T15:44:52.091083Z -4918 -cignoni +2013-06-21T07:05:05.218734Z +1547e5b37534a4fe5fe13e13c672356a +2012-07-24T01:48:21.496304Z +4488 +tarini @@ -432,5 +432,5 @@ cignoni -19624 +9221 diff --git a/inst/include/vcglib/vcg/complex/algorithms/geodesic.h b/inst/include/vcglib/vcg/complex/algorithms/geodesic.h index afa4e305..67bbf4e5 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/geodesic.h +++ b/inst/include/vcglib/vcg/complex/algorithms/geodesic.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. * @@ -46,13 +46,110 @@ struct EuclideanDistance{ {return vcg::Distance(Barycenter(*f0),Barycenter(*f1));} }; + +template +class IsotropicDistance{ +private: + // The only member of this class. The attribute handle used to + typename MeshType::template PerVertexAttributeHandle wH; +public: + typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::ScalarType ScalarType; + typedef typename MeshType::FacePointer FacePointer; + + /// The constructor reads per vertex quality and transfer it into a per vertex attribute mapping it into the specified range. + /// The variance parameter specify how the distance is biased by the quality + /// the distance is scaled by a factor that range from 1/variance to variance according to a linear mapping of quality range. + /// So for example if you have a quality distributed in the 0..1 range and you specify a variance of 2 it means + /// that the distance will be scaled from 0.5 to 2 their original values. + + IsotropicDistance(MeshType &m, float variance) + { + // the wH attribute store the scaling factor to be applied to the distance + wH = tri::Allocator:: template GetPerVertexAttribute (m,"distW"); + float qmin = 1.0f/variance; + float qmax = variance; + float qrange = qmax-qmin; + std::pair minmax = Stat::ComputePerVertexQualityMinMax(m); + float range = minmax.second-minmax.first; + for(int i=0;icP(),v1->cP()); + } +}; + + +template +struct BasicCrossFunctor +{ + BasicCrossFunctor(MeshType &m) { tri::RequirePerVertexCurvatureDir(m); } + typedef typename MeshType::VertexType VertexType; + + Point3f D1(VertexType &v) { return v.PD1(); } + Point3f D2(VertexType &v) { return v.PD1(); } +}; + +/** + * Anisotropic Distance Functor + * + * Given a couple of vertexes over the surface (usually an edge) + * it returns a distance value that is biased according to a tangential cross field. + * It is assumed that the cross field is smooth enough so that you can safely blend the two directions + * + */ +template +class AnisotropicDistance{ + typedef typename MeshType::VertexType VertexType; + typedef typename MeshType::ScalarType ScalarType; + typedef typename MeshType::VertexIterator VertexIterator; + + typename MeshType::template PerVertexAttributeHandle wxH,wyH; +public: + template AnisotropicDistance(MeshType &m, CrossFunctor &cf) + { + wxH = tri::Allocator:: template GetPerVertexAttribute (m,"distDirX"); + wyH = tri::Allocator:: template GetPerVertexAttribute (m,"distDirY"); + + for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) + { + wxH[vi]=cf.D1(*vi); + wyH[vi]=cf.D2(*vi); + } + } + + ScalarType operator()( VertexType * v0, VertexType * v1) + { + Point3f dd = v0->cP()-v1->cP(); + float x = dd * (wxH[v0]+wxH[v1])/2.0f; + float y = dd * (wyH[v0]+wyH[v1])/2.0f; + + return sqrt(x*x+y*y); + } +}; + + + + + + + + + + /*! \brief class for computing approximate geodesic distances on a mesh require VF Adjacency relation \sa trimesh_geodesic.cpp */ -template > +template class Geodesic{ public: @@ -129,7 +226,9 @@ class Geodesic{ //************** calcolo della distanza di pw in base alle distanze note di pw1 e curr //************** sapendo che (curr,pw,pw1) e'una faccia della mesh //************** (vedi figura in file distance.gif) - static ScalarType Distance(const VertexPointer &pw, + template + static ScalarType Distance(DistanceFunctor &distFunc, + const VertexPointer &pw, const VertexPointer &pw1, const VertexPointer &curr, const ScalarType &d_pw1, @@ -137,9 +236,9 @@ class Geodesic{ { ScalarType curr_d=0; - ScalarType ew_c = DistanceFunctor()(pw,curr); - ScalarType ew_w1 = DistanceFunctor()(pw,pw1); - ScalarType ec_w1 = DistanceFunctor()(pw1,curr); + ScalarType ew_c = distFunc(pw,curr); + ScalarType ew_w1 = distFunc(pw,pw1); + ScalarType ec_w1 = distFunc(pw1,curr); CoordType w_c = (pw->cP()-curr->cP()).Normalize() * ew_c; CoordType w_w1 = (pw->cP() - pw1->cP()).Normalize() * ew_w1; CoordType w1_c = (pw1->cP() - curr->cP()).Normalize() * ec_w1; @@ -179,10 +278,12 @@ approximated geodesic distance to the closest seeds. This is function is not meant to be called (although is not prevented). Instead, it is invoked by wrapping function. */ + template static VertexPointer Visit( MeshType & m, std::vector & seedVec, // the set of seed to start from - bool farthestOnBorder = false, + DistanceFunctor &distFunc, +// bool farthestOnBorder = false, ScalarType distance_threshold = std::numeric_limits::max(), // cut off distance (do no compute anything farther than this value) typename MeshType::template PerVertexAttributeHandle * vertSource = NULL, // if present we put in this attribute the closest source for each vertex typename MeshType::template PerVertexAttributeHandle * vertParent = NULL, // if present we put in this attribute the parent in the path that goes from the vertex to the closest source @@ -231,7 +332,7 @@ wrapping function. d_curr = TD[curr].d; - bool isLeaf = (!farthestOnBorder || curr->IsB()); +// bool isLeaf = (!farthestOnBorder || curr->IsB()); face::VFIterator x;int k; @@ -249,7 +350,7 @@ wrapping function. const ScalarType & d_pw1 = TD[pw1].d; { - const ScalarType inter = DistanceFunctor()(curr,pw1);//(curr->P() - pw1->P()).Norm(); + const ScalarType inter = distFunc(curr,pw1);//(curr->P() - pw1->P()).Norm(); const ScalarType tol = (inter + d_curr + d_pw1)*.0001f; if ( (TD[pw1].source != TD[curr].source)||// not the same source @@ -257,9 +358,9 @@ wrapping function. (inter + d_pw1 < d_curr +tol ) || (d_curr + d_pw1 < inter +tol ) // triangular inequality ) - curr_d = d_curr + DistanceFunctor()(pw,curr);//(pw->P()-curr->P()).Norm(); + curr_d = d_curr + distFunc(pw,curr);//(pw->P()-curr->P()).Norm(); else - curr_d = Distance(pw,pw1,curr,d_pw1,d_curr); + curr_d = Distance(distFunc,pw,pw1,curr,d_pw1,d_curr); } if(TD[pw].d > curr_d){ @@ -269,12 +370,12 @@ wrapping function. frontier.push_back(VertDist(pw,curr_d)); push_heap(frontier.begin(),frontier.end(),pred()); } - if(isLeaf){ +// if(isLeaf){ if(d_curr > max_distance){ max_distance = d_curr; farthest = curr; } - } +// } } }// end while @@ -326,8 +427,17 @@ It requires per vertex Quality (e.g. vertex::Quality component) \warning that this function has ALWAYS at least a linear cost (it use additional attributes that have a linear initialization) \todo make it O(output) by using incremental mark and persistent attributes. */ + static bool Compute( MeshType & m, + const std::vector & seedVec) + { + EuclideanDistance dd; + return Compute(m,seedVec,dd); + } + + template static bool Compute( MeshType & m, const std::vector & seedVec, + DistanceFunctor &distFunc, ScalarType maxDistanceThr = std::numeric_limits::max(), std::vector *withinDistanceVec=NULL, typename MeshType::template PerVertexAttributeHandle * sourceSeed = NULL, @@ -339,8 +449,7 @@ It requires per vertex Quality (e.g. vertex::Quality component) typename std::vector::const_iterator fi; for( fi = seedVec.begin(); fi != seedVec.end() ; ++fi) vdSeedVec.push_back(VertDist(*fi,0.0)); - - Visit(m, vdSeedVec, false, maxDistanceThr, sourceSeed, parentSeed, withinDistanceVec); + Visit(m, vdSeedVec, distFunc, maxDistanceThr, sourceSeed, parentSeed, withinDistanceVec); return true; } @@ -358,9 +467,9 @@ It is just a simple wrapper of the basic Compute() if( (*vi).IsB()) fro.push_back(&(*vi)); if(fro.empty()) return false; - + EuclideanDistance dd; tri::UpdateQuality::VertexConstant(m,0); - return Compute(m,fro,std::numeric_limits::max(),0,sources); + return Compute(m,fro,dd,std::numeric_limits::max(),0,sources); } @@ -384,8 +493,9 @@ It is just a simple wrapper of the basic Compute() return true; } - + template static void PerFaceDijsktraCompute(MeshType &m, const std::vector &seedVec, + DistanceFunctor &distFunc, ScalarType maxDistanceThr = std::numeric_limits::max(), std::vector *InInterval=NULL, FacePointer FaceTarget=NULL, @@ -426,7 +536,7 @@ It is just a simple wrapper of the basic Compute() if(!face::IsBorder(*curr,i) ) { FacePointer nextF = curr->FFp(i); - ScalarType nextDist = curr->Q() + DistanceFunctor()(curr,nextF); + ScalarType nextDist = curr->Q() + distFunc(curr,nextF); if( (nextDist < maxDistanceThr) && (!tri::IsMarked(m,nextF) || nextDist < nextF->Q()) ) { @@ -448,7 +558,9 @@ It is just a simple wrapper of the basic Compute() + template static void PerVertexDijsktraCompute(MeshType &m, const std::vector &seedVec, + DistanceFunctor &distFunc, ScalarType maxDistanceThr = std::numeric_limits::max(), std::vector *InInterval=NULL,bool avoid_selected=false, VertexPointer target=NULL) @@ -490,7 +602,7 @@ It is just a simple wrapper of the basic Compute() { VertexPointer nextV = vertVec[i]; if ((avoid_selected)&&(nextV->IsS()))continue; - ScalarType nextDist = curr->Q() + DistanceFunctor()(curr,nextV); + ScalarType nextDist = curr->Q() + distFunc(curr,nextV); if( (nextDist < maxDistanceThr) && (!tri::IsMarked(m,nextV) || nextDist < nextV->Q()) ) { 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 3a12e8bc..f97b5ea0 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms/local_optimization svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries index c96a5048..f1670011 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries +++ b/inst/include/vcglib/vcg/complex/algorithms/parametrization/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms/parametrization svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ pietroni e8973e21-934d-0410-ac44-de4585f5606d -uv_utils.h +tangent_field_operators.h file 2013-06-21T07:04:58.518700Z -5e82b4679676215d8704922248c01006 -2013-02-19T13:54:14.305513Z -4817 +534f628c16fdf03f8d12412e909ee4c6 +2013-01-22T09:58:20.090287Z +4799 pietroni @@ -58,19 +58,19 @@ pietroni -5526 +24853 -distortion.h +poisson_solver.h file -2013-06-21T07:04:58.518700Z -cca1d04130da7edaa71babe6135e3708 -2012-11-15T19:11:28.863456Z -4733 -cignoni +2013-07-25T06:52:24.418397Z +5e61c1715fc4703225a5bfeb48171584 +2013-07-23T11:22:06.031850Z +4924 +pietroni @@ -92,20 +92,19 @@ cignoni -9671 +24815 -voronoi_atlas.h +uv_utils.h file 2013-06-21T07:04:58.518700Z -b3050025ec71936e1ee0e647c824021c -2013-04-03T10:07:29.655724Z -4879 -cignoni -has-props +5e82b4679676215d8704922248c01006 +2013-02-19T13:54:14.305513Z +4817 +pietroni @@ -126,19 +125,20 @@ has-props -8181 + +5526 -tangent_field_operators.h +distortion.h file 2013-06-21T07:04:58.518700Z -534f628c16fdf03f8d12412e909ee4c6 -2013-01-22T09:58:20.090287Z -4799 -pietroni +cca1d04130da7edaa71babe6135e3708 +2012-11-15T19:11:28.863456Z +4733 +cignoni @@ -160,20 +160,20 @@ pietroni -24853 +9671 -poisson_solver.h +voronoi_atlas.h file -2013-07-25T06:52:24.418397Z -5e61c1715fc4703225a5bfeb48171584 -2013-07-23T11:22:06.031850Z -4924 -pietroni - +2013-06-21T07:04:58.518700Z +b3050025ec71936e1ee0e647c824021c +2013-04-03T10:07:29.655724Z +4879 +cignoni +has-props @@ -194,5 +194,5 @@ pietroni -24815 +8181 diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/entries b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/entries index 5bdf31b0..f8dfb9ac 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/entries +++ b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/complex/algorithms/update svn://svn.code.sf.net/p/vcg/code -2013-07-24T12:00:47.297259Z -4928 +2013-07-26T12:21:40.300260Z +4936 cignoni @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -halfedge_indexed.h +curvature.h file -2013-06-21T07:05:01.338714Z -c5d14429a1100bdbcbe0ac0fc8a3b9a6 -2012-10-26T07:08:18.415917Z -4673 +2013-08-01T07:24:02.610587Z +e510bc83b8f1b90d3ba4f80b6505ab49 +2013-07-26T12:21:40.300260Z +4936 cignoni @@ -58,18 +58,18 @@ cignoni -28728 +25505 -texture.h +selection.h file 2013-06-21T07:05:01.338714Z -522363f2ae317ecb07f7c829769036c0 -2011-10-05T15:04:40.740408Z -4180 +ddb66935449b516540527355fe0309db +2012-12-10T09:39:44.689543Z +4774 cignoni @@ -92,18 +92,18 @@ cignoni -5177 +14064 -fitmaps.h +component_ep.h file 2013-06-21T07:05:01.338714Z -eb2cd92a7d611da11c4c338dc4aa3947 -2012-10-11T11:09:30.641825Z -4577 +b4b4bae5f8d1e343be81166ed8d16155 +2012-10-25T13:47:31.884904Z +4660 cignoni @@ -126,19 +126,19 @@ cignoni -14721 +3888 -position.h +normal.h file 2013-06-21T07:05:01.338714Z -aaccde031ac9aaacc2b992587fad20c9 -2012-10-09T08:51:15.856009Z -4567 -cignoni +dfe945e70dc23d764993ccb763d6a597 +2013-03-30T15:31:57.829666Z +4877 +pietroni @@ -160,18 +160,18 @@ cignoni -3851 +13123 -curvature_fitting.h +quality.h file -2013-06-21T07:05:01.338714Z -389e2e9661d12d92b3debbb6cd178f4a -2012-11-12T11:15:21.768111Z -4717 +2013-07-25T06:52:24.490397Z +b288a15954e9150d986d9b14b841b528 +2013-07-24T12:00:47.297259Z +4928 cignoni @@ -194,18 +194,18 @@ cignoni -19397 +10929 -bounding.h +halfedge_topology.h file 2013-06-21T07:05:01.338714Z -c18ac0887107cc339eb4b59642e62c23 -2012-10-09T07:53:55.029671Z -4562 +f12f6a7679ff5f9b3be825f3e1ca84a5 +2012-10-26T07:08:18.415917Z +4673 cignoni @@ -228,19 +228,19 @@ cignoni -2559 +59630 -flag.h +halfedge_indexed.h file -2013-07-25T06:52:24.490397Z -6c9e314c2e9ed9e2126e2d65231707b4 -2013-07-23T11:20:44.873477Z -4923 -pietroni +2013-06-21T07:05:01.338714Z +c5d14429a1100bdbcbe0ac0fc8a3b9a6 +2012-10-26T07:08:18.415917Z +4673 +cignoni @@ -262,18 +262,18 @@ pietroni -14707 +28728 -topology.h +texture.h file -2013-06-24T13:55:27.674352Z -a4df685aa8843ca47d080dc293466432 -2013-06-24T07:31:11.072713Z -4901 +2013-06-21T07:05:01.338714Z +522363f2ae317ecb07f7c829769036c0 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -296,18 +296,18 @@ cignoni -17795 +5177 -color.h +fitmaps.h file 2013-06-21T07:05:01.338714Z -fac9f1db98fc07dd6bf8011a3ff9a1fd -2012-11-09T10:52:35.758572Z -4707 +eb2cd92a7d611da11c4c338dc4aa3947 +2012-10-11T11:09:30.641825Z +4577 cignoni @@ -330,18 +330,18 @@ cignoni -31330 +14721 -curvature.h +curvature_fitting.h file 2013-06-21T07:05:01.338714Z -062eb87d037def8a901437daf913e9c5 -2012-12-06T11:00:37.557169Z -4768 +389e2e9661d12d92b3debbb6cd178f4a +2012-11-12T11:15:21.768111Z +4717 cignoni @@ -364,18 +364,18 @@ cignoni -24231 +19397 -selection.h +position.h file 2013-06-21T07:05:01.338714Z -ddb66935449b516540527355fe0309db -2012-12-10T09:39:44.689543Z -4774 +aaccde031ac9aaacc2b992587fad20c9 +2012-10-09T08:51:15.856009Z +4567 cignoni @@ -398,18 +398,18 @@ cignoni -14064 +3851 -component_ep.h +bounding.h file 2013-06-21T07:05:01.338714Z -b4b4bae5f8d1e343be81166ed8d16155 -2012-10-25T13:47:31.884904Z -4660 +c18ac0887107cc339eb4b59642e62c23 +2012-10-09T07:53:55.029671Z +4562 cignoni @@ -432,19 +432,19 @@ cignoni -3888 +2559 -quality.h +flag.h file 2013-07-25T06:52:24.490397Z -b288a15954e9150d986d9b14b841b528 -2013-07-24T12:00:47.297259Z -4928 -cignoni +6c9e314c2e9ed9e2126e2d65231707b4 +2013-07-23T11:20:44.873477Z +4923 +pietroni @@ -466,19 +466,19 @@ cignoni -10929 +14707 -normal.h +topology.h file -2013-06-21T07:05:01.338714Z -dfe945e70dc23d764993ccb763d6a597 -2013-03-30T15:31:57.829666Z -4877 -pietroni +2013-08-01T07:24:02.606587Z +a61a80e7abe3db2b743c8b04e790ea31 +2013-07-26T07:35:02.868773Z +4930 +cignoni @@ -500,18 +500,18 @@ pietroni -13123 +17794 -halfedge_topology.h +color.h file 2013-06-21T07:05:01.338714Z -f12f6a7679ff5f9b3be825f3e1ca84a5 -2012-10-26T07:08:18.415917Z -4673 +fac9f1db98fc07dd6bf8011a3ff9a1fd +2012-11-09T10:52:35.758572Z +4707 cignoni @@ -534,5 +534,5 @@ cignoni -59630 +31330 diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/curvature.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/curvature.h.svn-base index 7ff7e523..d640783d 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/curvature.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/curvature.h.svn-base @@ -74,20 +74,20 @@ private: public: - /// \brief Compute principal direction and magniuto of curvature. + /// \brief Compute principal direction and magnitudo of curvature. /* Compute principal direction and magniuto of curvature as describe in the paper: @InProceedings{bb33922, author = "G. Taubin", title = "Estimating the Tensor of Curvature of a Surface from a - Polyhedral Approximation", + Polyhedral Approximation", booktitle = "International Conference on Computer Vision", year = "1995", pages = "902--907", URL = "http://dx.doi.org/10.1109/ICCV.1995.466840", bibsource = "http://www.visionbib.com/bibliography/describe440.html#TT32253", - */ + */ static void PrincipalDirections(MeshType &m) { tri::RequireVFAdjacency(m); @@ -566,7 +566,7 @@ static void MeanAndGaussian(MeshType & m) ang1 = math::Abs(Angle(f->N(), v1->N())); ang2 = math::Abs(Angle(f->N(), v2->N())); v->Kh() += ( (math::Sqrt(s01) / 2.0) * ang1 + - (math::Sqrt(s02) / 2.0) * ang2 ); + (math::Sqrt(s02) / 2.0) * ang2 ); } ++vfi; @@ -682,8 +682,40 @@ static void MeanAndGaussian(MeshType & m) (*vi).K2() = lambda[1]; } } + + static void PerVertexBasicRadialCrossField(MeshType &m, float anisotropyRatio = 1.0 ) + { + tri::RequirePerVertexCurvatureDir(m); + CoordType c=m.bbox.Center(); + float maxRad = m.bbox.Diag()/2.0f; + + for(int i=0;i + // eg |PD1|/|PD2| < ratio + // and |PD1|^2 + |PD2|^2 == 1 + + float q =Distance(m.vert[i].P(),c) / maxRad; // it is in the 0..1 range + const float minRatio = 1.0f/anisotropyRatio; + const float maxRatio = anisotropyRatio; + const float curRatio = minRatio + (maxRatio-minRatio)*q; + float pd1Len = sqrt(1.0/(1+curRatio*curRatio)); + float pd2Len = curRatio * pd1Len; + assert(fabs(curRatio - pd2Len/pd1Len)<0.0000001); + assert(fabs(pd1Len*pd1Len + pd2Len*pd2Len - 1.0f)<0.0001); + m.vert[i].PD1() *= pd1Len; + m.vert[i].PD2() *= pd2Len; + } + } + }; -} -} +} // end namespace tri +} // end namespace vcg #endif diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/topology.h.svn-base b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/topology.h.svn-base index 398fa00d..cf150879 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/topology.h.svn-base +++ b/inst/include/vcglib/vcg/complex/algorithms/update/.svn/text-base/topology.h.svn-base @@ -80,7 +80,7 @@ public: v[1] = pf->V(pf->Next(nz)); assert(v[0] != v[1]); // The face pointed by 'f' is Degenerate (two coincident vertexes) - if( v[0] > v[1] ) math::Swap(v[0],v[1]); + if( v[0] > v[1] ) std::swap(v[0],v[1]); f = pf; z = nz; } diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/curvature.h b/inst/include/vcglib/vcg/complex/algorithms/update/curvature.h index 7ff7e523..d640783d 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/curvature.h +++ b/inst/include/vcglib/vcg/complex/algorithms/update/curvature.h @@ -74,20 +74,20 @@ class UpdateCurvature public: - /// \brief Compute principal direction and magniuto of curvature. + /// \brief Compute principal direction and magnitudo of curvature. /* Compute principal direction and magniuto of curvature as describe in the paper: @InProceedings{bb33922, author = "G. Taubin", title = "Estimating the Tensor of Curvature of a Surface from a - Polyhedral Approximation", + Polyhedral Approximation", booktitle = "International Conference on Computer Vision", year = "1995", pages = "902--907", URL = "http://dx.doi.org/10.1109/ICCV.1995.466840", bibsource = "http://www.visionbib.com/bibliography/describe440.html#TT32253", - */ + */ static void PrincipalDirections(MeshType &m) { tri::RequireVFAdjacency(m); @@ -566,7 +566,7 @@ static void MeanAndGaussian(MeshType & m) ang1 = math::Abs(Angle(f->N(), v1->N())); ang2 = math::Abs(Angle(f->N(), v2->N())); v->Kh() += ( (math::Sqrt(s01) / 2.0) * ang1 + - (math::Sqrt(s02) / 2.0) * ang2 ); + (math::Sqrt(s02) / 2.0) * ang2 ); } ++vfi; @@ -682,8 +682,40 @@ static void MeanAndGaussian(MeshType & m) (*vi).K2() = lambda[1]; } } + + static void PerVertexBasicRadialCrossField(MeshType &m, float anisotropyRatio = 1.0 ) + { + tri::RequirePerVertexCurvatureDir(m); + CoordType c=m.bbox.Center(); + float maxRad = m.bbox.Diag()/2.0f; + + for(int i=0;i + // eg |PD1|/|PD2| < ratio + // and |PD1|^2 + |PD2|^2 == 1 + + float q =Distance(m.vert[i].P(),c) / maxRad; // it is in the 0..1 range + const float minRatio = 1.0f/anisotropyRatio; + const float maxRatio = anisotropyRatio; + const float curRatio = minRatio + (maxRatio-minRatio)*q; + float pd1Len = sqrt(1.0/(1+curRatio*curRatio)); + float pd2Len = curRatio * pd1Len; + assert(fabs(curRatio - pd2Len/pd1Len)<0.0000001); + assert(fabs(pd1Len*pd1Len + pd2Len*pd2Len - 1.0f)<0.0001); + m.vert[i].PD1() *= pd1Len; + m.vert[i].PD2() *= pd2Len; + } + } + }; -} -} +} // end namespace tri +} // end namespace vcg #endif diff --git a/inst/include/vcglib/vcg/complex/algorithms/update/topology.h b/inst/include/vcglib/vcg/complex/algorithms/update/topology.h index 398fa00d..cf150879 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/update/topology.h +++ b/inst/include/vcglib/vcg/complex/algorithms/update/topology.h @@ -80,7 +80,7 @@ class PEdge v[1] = pf->V(pf->Next(nz)); assert(v[0] != v[1]); // The face pointed by 'f' is Degenerate (two coincident vertexes) - if( v[0] > v[1] ) math::Swap(v[0],v[1]); + if( v[0] > v[1] ) std::swap(v[0],v[1]); f = pf; z = nz; } diff --git a/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h b/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h index cfe68769..9116fb44 100644 --- a/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h +++ b/inst/include/vcglib/vcg/complex/algorithms/voronoi_clustering.h @@ -51,20 +51,39 @@ class ClusteringSampler }; // end class ClusteringSampler +struct VoronoiProcessingParameter +{ + enum { + None=0, + DistanceFromSeed=1, + DistanceFromBorder=2, + RegionArea=3 + }; + + VoronoiProcessingParameter() + { + colorStrategy = DistanceFromSeed; + areaThresholdPerc=0; + deleteUnreachedRegionFlag=false; + } + int colorStrategy; + float areaThresholdPerc; + bool deleteUnreachedRegionFlag; +}; -template +template > class VoronoiProcessing { - typedef typename MeshType::CoordType CoordType; - typedef typename MeshType::ScalarType ScalarType; - 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: + typedef typename MeshType::CoordType CoordType; + typedef typename MeshType::ScalarType ScalarType; + 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: // Given a vector of point3f it finds the closest vertices on the mesh. @@ -94,7 +113,7 @@ static void SeedToVertexConversion(MeshType &m,std::vector &seedPVec, typedef typename MeshType::template PerVertexAttributeHandle PerVertexPointerHandle; typedef typename MeshType::template PerFaceAttributeHandle PerFacePointerHandle; -static void ComputePerVertexSources(MeshType &m, std::vector &seedVec) +static void ComputePerVertexSources(MeshType &m, std::vector &seedVec, DistanceFunctor &df) { tri::Allocator::DeletePerVertexAttribute(m,"sources"); // delete any conflicting handle regardless of the type... PerVertexPointerHandle vertexSources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); @@ -103,7 +122,8 @@ static void ComputePerVertexSources(MeshType &m, std::vector &seed PerFacePointerHandle faceSources = tri::Allocator:: template AddPerFaceAttribute (m,"sources"); assert(tri::Allocator::IsValidHandle(m,vertexSources)); - tri::Geodesic::Compute(m,seedVec,std::numeric_limits::max(),0,&vertexSources); + + tri::Geodesic::Compute(m,seedVec,df,std::numeric_limits::max(),0,&vertexSources); } static void VoronoiColoring(MeshType &m, std::vector &seedVec, bool frontierFlag=true) @@ -120,7 +140,9 @@ static void VoronoiColoring(MeshType &m, std::vector &seedVec, boo 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); + std::vector cornerVec; + std::vector borderCornerVec; + GetAreaAndFrontier(m, sources, regionArea, borderVec, cornerVec, borderCornerVec); tri::Geodesic::Compute(m,borderVec); } @@ -231,98 +253,264 @@ static int FaceSelectRegion(MeshType &m, VertexPointer vp) return selCnt; } -// find the vertexes of frontier faces -// and compute Area of all the regions +/// Given a mesh with geodesic sources for all vertexes +/// (e.g. for all vertexes we know what is the corresponding voronoi region) +/// we compute Area of all the regions +/// Area is computed only for triangles that fully belong to a given source. + static void GetAreaAndFrontier(MeshType &m, PerVertexPointerHandle &sources, - std::vector< std::pair > ®ionArea, - std::vector &borderVec) + std::vector< std::pair > ®ionArea, + std::vector &borderVec, + std::vector &cornerVec, + std::vector &borderCornerVec) { tri::UpdateFlags::VertexClearV(m); + cornerVec.clear(); + borderVec.clear(); 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)] ) + VertexPointer s0 = sources[(*fi).V(0)]; + VertexPointer s1 = sources[(*fi).V(1)]; + VertexPointer s2 = sources[(*fi).V(2)]; + if((s0 != s1) || (s0 != s2) ) { for(int i=0;i<3;++i) + borderVec.push_back(fi->V(i)); + + if(s1!=s2 && s0!=s1 && s0!=s2) { + cornerVec.push_back(&*fi); + } + else { - (*fi).V(i)->SetV(); - (*fi).V(i)->C() = Color4b::Black; + for(int i=0;i<3;++i) + { + if(sources[(*fi).V0(i)] != sources[(*fi).V1(i)] && fi->IsB(i)) + borderCornerVec.push_back(&*fi); + } } } else // the face belongs to a single region; accumulate area; { - if(sources[(*fi).V(0)] != 0) + if(s0 != 0) { - int seedIndex = sources[(*fi).V(0)] - &*m.vert.begin(); - regionArea[seedIndex].first+=DoubleArea(*fi); - regionArea[seedIndex].second=sources[(*fi).V(0)]; + int seedIndex = tri::Index(m,s0); + regionArea[seedIndex].first+=DoubleArea(*fi)*0.5f; + regionArea[seedIndex].second=s0; } } } +} - // 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 ConvertVoronoiDiagramToMesh(MeshType &m, MeshType &outM, MeshType &poly, std::vector &seedVec, DistanceFunctor &df, VoronoiProcessingParameter &vpp ) +{ + typename MeshType::template PerVertexAttributeHandle sources; + sources = tri::Allocator:: template GetPerVertexAttribute (m,"sources"); + + tri::Geodesic::Compute(m,seedVec, df,std::numeric_limits::max(),0,&sources); + + std::map seedMap; + for(size_t i=0;i zz(0.0f,VertexPointer(NULL)); + std::vector< std::pair > regionArea(m.vert.size(),zz); + std::vector borderVec; + std::vector cornerVec; + std::vector borderCornerVec; + GetAreaAndFrontier(m, sources, regionArea, borderVec, cornerVec, borderCornerVec); + outM.Clear(); + poly.Clear(); + + std::map cornerMap; + for(size_t i=0;i::AddVertices(outM,seedVec.size()+cornerVec.size()+borderCornerVec.size()); + + for(size_t i=0;iP(); + outM.vert[i].C()=Color4b::White; + } + + int cOff = seedVec.size(); + for(size_t i=0;i::MeshCopy(poly,outM); + + // There is a voronoi edge if there are two corner face that share two sources. + // In such a case we add a pair of triangles with an edge connecting these two corner faces + // and with the two involved sources + std::map, FacePointer > VoronoiEdge; + + for(size_t i=0;iV0(j)]; + VertexPointer v1 = sources[cornerVec[i]->V1(j)]; + if(v1::AddFace(outM,&(outM.vert[seedMap[v0]]), corner0, corner1); + fi->SetF(0); fi->SetF(2); + fi = tri::Allocator::AddFace(outM,&(outM.vert[seedMap[v1]]), corner0, corner1); + fi->SetF(0); fi->SetF(2); + + tri::Allocator::AddEdge(poly,&(poly.vert[tri::Index(outM,corner0)]),&(poly.vert[tri::Index(outM,corner1)]) ); + } + } + } + + // Now build the boundary facets, e.g. the triangles with an edge on the boundary that connects two bordercorner face. + for(size_t i=0;iV(0)]; + VertexPointer v1 = sources[borderCornerVec[i]->V(1)]; + if(v1==v0) v1 = sources[borderCornerVec[i]->V(2)]; + if(v1::AddFace(outM,&(outM.vert[seedMap[v0]]), corner0, corner1); + fi->SetF(0);fi->SetF(2); + } + if(VoronoiEdge[std::make_pair(VertexPointer(0),v1)] == 0) + VoronoiEdge[std::make_pair(VertexPointer(0),v1)] = borderCornerVec[i]; + else + { + int otherCorner = cornerMap[VoronoiEdge[std::make_pair(VertexPointer(0),v1)]]; + FaceIterator fi=tri::Allocator::AddFaces(outM,1); + VertexPointer corner0 = &(outM.vert[bcOff+i]); + VertexPointer corner1 = &(outM.vert[bcOff+otherCorner]); + fi->V(0) = &(outM.vert[seedMap[v1]]); + fi->V(1) = corner0; + fi->V(2) = corner1; + fi->SetF(0);fi->SetF(2); + } + if(VoronoiEdge[std::make_pair(v0,v1)] == 0) + assert(0); + else + { + int otherCorner = cornerMap[VoronoiEdge[std::make_pair(v0,v1)]]; + FaceIterator fi=tri::Allocator::AddFaces(outM,2); + VertexPointer corner0 = &(outM.vert[bcOff+i]); + VertexPointer corner1 = &(outM.vert[cOff+otherCorner]); + fi->V(0) = &(outM.vert[seedMap[v0]]); + fi->V(1) = corner0; + fi->V(2) = corner1; + fi->SetF(0);fi->SetF(2); + tri::Allocator::AddEdge(poly,&(poly.vert[tri::Index(outM,corner0)]),&(poly.vert[tri::Index(outM,corner1)]) ); + + ++fi; + fi->V(0) = &(outM.vert[seedMap[v1]]); + fi->V(1) = corner0; + fi->V(2) = corner1; + fi->SetF(0);fi->SetF(2); + tri::Allocator::AddEdge(poly,&(poly.vert[tri::Index(outM,corner0)]),&(poly.vert[tri::Index(outM,corner1)]) ); + + } + } +} +static void DeleteUnreachedRegions(MeshType &m, PerVertexPointerHandle &sources) +{ + tri::UpdateFlags::VertexClearV(m); + for(size_t 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::CompactEveryVector(m); } -static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int relaxIter, int /*percentileClamping*/, vcg::CallBackPos *cb=0) +static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int relaxIter, DistanceFunctor &df, VoronoiProcessingParameter &vpp, vcg::CallBackPos *cb=0) { tri::RequireVFAdjacency(m); - + tri::UpdateFlags::FaceBorderFromVF(m); typename MeshType::template PerVertexAttributeHandle sources; - sources = tri::Allocator:: template AddPerVertexAttribute (m,"sources"); + sources = tri::Allocator:: template GetPerVertexAttribute (m,"sources"); for(int iter=0;iter::Compute(m,seedVec,std::numeric_limits::max(),0,&sources); - + tri::Geodesic::Compute(m,seedVec, df,std::numeric_limits::max(),0,&sources); + if(vpp.colorStrategy == VoronoiProcessingParameter::DistanceFromSeed) + tri::UpdateColor::PerVertexQualityRamp(m); // 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); + if(vpp.deleteUnreachedRegionFlag) + DeleteUnreachedRegions(m,sources); //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; + std::vector cornerVec; + std::vector borderCornerVec; - GetAreaAndFrontier(m, sources, regionArea, borderVec); + GetAreaAndFrontier(m, sources, regionArea, borderVec, cornerVec,borderCornerVec); // Smaller area region are discarded Distribution H; for(size_t i=0;i::ComputeMeshArea(m); + float expectedArea = meshArea/float(seedVec.size()); + for(size_t i=0;i::Compute(m,borderVec); - tri::UpdateColor::PerVertexQualityRamp(m); + tri::Geodesic::Compute(m,borderVec,df); + + if(vpp.colorStrategy == VoronoiProcessingParameter::DistanceFromBorder) + 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) { + assert(sources[vi]!=0); int seedIndex = tri::Index(m,sources[vi]); if(seedMaxima[seedIndex].first < (*vi).Q()) { @@ -339,20 +527,24 @@ static void VoronoiRelaxing(MeshType &m, std::vector &seedVec, int newSeeds.push_back(seedMaxima[i].second); } - tri::UpdateColor::PerVertexQualityRamp(m); - for(size_t i=0;iC() = Color4b::Black; for(size_t i=0;iC() = Color4b::Gray; + for(size_t i=0;iV(j)->C() = Color4b::Green; + + for(size_t i=0;iC() = Color4b::Black; + swap(newSeeds,seedVec); for(size_t i=0;iC() = Color4b::White; } - tri::Allocator::DeletePerVertexAttribute (m,"sources"); +// tri::Allocator::DeletePerVertexAttribute (m,"sources"); } diff --git a/inst/include/vcglib/vcg/complex/allocate.h b/inst/include/vcglib/vcg/complex/allocate.h index dc554ea8..d8793f2d 100644 --- a/inst/include/vcglib/vcg/complex/allocate.h +++ b/inst/include/vcglib/vcg/complex/allocate.h @@ -243,58 +243,62 @@ namespace tri { */ static EdgeIterator AddEdges(MeshType &m,int n, PointerUpdater &pu) { - EdgeIterator last; - if(n == 0) return m.edge.end(); - pu.Clear(); - if(m.edge.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element - else { - pu.oldBase=&*m.edge.begin(); - pu.oldEnd=&m.edge.back()+1; - } - - m.edge.resize(m.edge.size()+n); - m.en+=n; - - typename std::set::iterator ai; - for(ai = m.edge_attr.begin(); ai != m.edge_attr.end(); ++ai) - ((typename MeshType::PointerToAttribute)(*ai)).Resize(m.edge.size()); - - pu.newBase = &*m.edge.begin(); - pu.newEnd = &m.edge.back()+1; - if(pu.NeedUpdate()) - { - FaceIterator fi; - for (fi=m.face.begin(); fi!=m.face.end(); ++fi){ - //if(HasFHEAdjacency(m)) - // pu.Update((*fi).FHEp()); - if(!(*fi).IsD()) - for(int i=0; i < (*fi).VN(); ++i) - if ((*fi).cFEp(i)!=0) pu.Update((*fi).FEp(i)); - } - - VertexIterator vi; - if(HasVEAdjacency(m)) - for (vi=m.vert.begin(); vi!=m.vert.end(); ++vi) - if(!(*vi).IsD()) - if ((*vi).cVEp()!=0) pu.Update((*vi).VEp()); - - HEdgeIterator hi; - if(HasHEAdjacency(m)) - for (hi=m.hedge.begin(); hi!=m.hedge.end(); ++hi) - if(!(*hi).IsD()) - if ((*hi).cHEp()!=0) pu.Update((*hi).HEp()); - - - - } - unsigned int siz=(unsigned int)m.edge.size()-n; - - last = m.edge.begin(); - advance(last,siz); + EdgeIterator last; + if(n == 0) return m.edge.end(); + pu.Clear(); + if(m.edge.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element + else { + pu.oldBase=&*m.edge.begin(); + pu.oldEnd=&m.edge.back()+1; + } + + m.edge.resize(m.edge.size()+n); + m.en+=n; + + typename std::set::iterator ai; + for(ai = m.edge_attr.begin(); ai != m.edge_attr.end(); ++ai) + ((typename MeshType::PointerToAttribute)(*ai)).Resize(m.edge.size()); + + pu.newBase = &*m.edge.begin(); + pu.newEnd = &m.edge.back()+1; + if(pu.NeedUpdate()) + { + if(HasFEAdjacency(m)) + for (FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi){ + if(!(*fi).IsD()) + for(int i=0; i < (*fi).VN(); ++i) + if ((*fi).cFEp(i)!=0) pu.Update((*fi).FEp(i)); + } + + if(HasVEAdjacency(m)) + for (VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi) + if(!(*vi).IsD()) + if ((*vi).cVEp()!=0) pu.Update((*vi).VEp()); + + if(HasHEAdjacency(m)) + for (HEdgeIterator hi=m.hedge.begin(); hi!=m.hedge.end(); ++hi) + if(!(*hi).IsD()) + if ((*hi).cHEp()!=0) pu.Update((*hi).HEp()); + } + unsigned int siz=(unsigned int)m.edge.size()-n; + + last = m.edge.begin(); + advance(last,siz); + + return last;// deve restituire l'iteratore alla prima faccia aggiunta; + } - return last;// deve restituire l'iteratore alla prima faccia aggiunta; + /** Function to add a single edge to the mesh. and initializing it with two VertexPointer + */ + static EdgeIterator AddEdge(MeshType &m, VertexPointer v0, VertexPointer v1) + { + EdgeIterator ei= AddEdges(m, 1); + ei->V(0)=v0; + ei->V(1)=v1; + return ei; } + /** Function to add n edges to the mesh. First wrapper, with no parameters */ @@ -423,6 +427,19 @@ namespace tri { } + /** Function to add a face to the mesh and initializing it with the three given VertexPointers + First wrapper, with no parameters + */ + static FaceIterator AddFace(MeshType &m, VertexPointer v0, VertexPointer v1, VertexPointer v2) + { + PointerUpdater pu; + FaceIterator fi = AddFaces(m,1,pu); + fi->V(0)=v0; + fi->V(1)=v1; + fi->V(2)=v2; + return fi; + } + /** Function to add n faces to the mesh. First wrapper, with no parameters */ diff --git a/inst/include/vcglib/vcg/connectors/.svn/entries b/inst/include/vcglib/vcg/connectors/.svn/entries index d0a52048..8e03f748 100644 --- a/inst/include/vcglib/vcg/connectors/.svn/entries +++ b/inst/include/vcglib/vcg/connectors/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 93536895..1fd348c5 100644 --- a/inst/include/vcglib/vcg/container/.svn/entries +++ b/inst/include/vcglib/vcg/container/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/container svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ ganovelli e8973e21-934d-0410-ac44-de4585f5606d -container_allocation_table.h +simple_temporary_data.h file 2013-06-21T07:04:55.518685Z -7fb8b4361f371a6602d5d859cc45b62f -2011-10-25T10:03:10.599181Z -4200 -ganovelli +52d0f705494a0ba60df78b20723914e1 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -58,16 +58,16 @@ ganovelli -10396 +6090 -simple_temporary_data.h +entries_allocation_table.h file 2013-06-21T07:04:55.518685Z -52d0f705494a0ba60df78b20723914e1 +fcafddc8fbdbd73cdef23b215cf0bd3c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -6090 +3345 -entries_allocation_table.h +derivation_chain.h file 2013-06-21T07:04:55.518685Z -fcafddc8fbdbd73cdef23b215cf0bd3c +144e86a7a988cf75afb96ab5f3f14b73 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,16 +126,16 @@ cignoni -3345 +6807 -derivation_chain.h +vector_occ.h file 2013-06-21T07:04:55.518685Z -144e86a7a988cf75afb96ab5f3f14b73 +1a4792e3ecd826bd3519d72e873992a9 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,19 +160,19 @@ cignoni -6807 +5791 -vector_occ.h +container_allocation_table.h file 2013-06-21T07:04:55.518685Z -1a4792e3ecd826bd3519d72e873992a9 -2011-10-05T15:04:40.740408Z -4180 -cignoni +7fb8b4361f371a6602d5d859cc45b62f +2011-10-25T10:03:10.599181Z +4200 +ganovelli @@ -194,5 +194,5 @@ cignoni -5791 +10396 diff --git a/inst/include/vcglib/vcg/math/.svn/entries b/inst/include/vcglib/vcg/math/.svn/entries index bbd6a50c..9d5f58bb 100644 --- a/inst/include/vcglib/vcg/math/.svn/entries +++ b/inst/include/vcglib/vcg/math/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/math svn://svn.code.sf.net/p/vcg/code -2013-06-24T08:34:53.914220Z -4905 +2013-07-26T07:01:21.950672Z +4929 cignoni @@ -26,17 +26,17 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -camera.h +eigen_matrix_addons.h file -2013-06-21T07:05:10.162758Z -a868c0b2ba8b7711c30054d88e6d5bba -2012-12-05T11:37:19.944597Z -4763 -ganovelli +2013-06-21T07:05:10.158758Z +869db7b70d66dfef27765221bf826d72 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -58,19 +58,19 @@ ganovelli -17605 +6233 -quadric.h +point_matching.h file -2013-06-21T07:05:10.162758Z -36fafede65aea8108942459675313ee0 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:05:10.158758Z +74fc6f952931df840c965ed084ff3742 +2012-01-12T00:52:04.199938Z +4284 +pietroni @@ -92,18 +92,18 @@ cignoni -11397 +14698 -old_lin_algebra.h +factorial.h file -2013-06-21T07:05:10.154758Z -b8c751f39847d09e2cb7339fb5759a12 -2013-03-19T17:05:56.433202Z -4841 +2013-06-21T07:05:10.158758Z +c5b04285954376b8b80c5f3f8fa65aae +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -126,19 +126,20 @@ cignoni -18314 +11968 -histogram.h +similarity2.h file -2013-06-21T07:05:10.154758Z -5e26b0b67d0ee9311d8116c324bb6bbe -2012-05-05T14:55:50.371418Z -4399 +2013-06-21T07:05:10.158758Z +bc75cb476bd474e425ae277c7e0de170 +2011-10-20T22:29:20.159536Z +4196 cignoni +has-props @@ -159,21 +160,19 @@ cignoni - -12916 +2505 -eigen_matrixbase_addons.h +old_matrix33.h file -2013-06-21T07:05:10.154758Z -f0aa7243461ffd3581b86f0c3eb9a8fa -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:10.158758Z +f8d85aa9fac646a20670980f0522ba50 +2013-03-19T21:51:13.509472Z +4846 cignoni -has-props @@ -194,18 +193,19 @@ has-props -11517 + +8725 -disjoint_set.h +polar_decomposition.h file -2013-06-21T07:05:10.154758Z -647b6198ad214b4146c8c2eb6e9a1766 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:10.158758Z +822f16409d541d2fa2f396a8d7bf611a +2011-11-21T09:09:58.603625Z +4230 cignoni @@ -228,18 +228,18 @@ cignoni -5440 +2824 -old_matrix.h +linear.h file 2013-06-21T07:05:10.158758Z -d3146333a8b88c11933db3ef40a2e0f8 -2013-03-19T17:05:56.433202Z -4841 +f0497e2b2b6c931be5c7b63831f65c3b +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -262,20 +262,20 @@ cignoni -5522 +3085 -point_matching.h +matrix33.h file -2013-06-21T07:05:10.158758Z -74fc6f952931df840c965ed084ff3742 -2012-01-12T00:52:04.199938Z -4284 -pietroni - +2013-08-01T07:24:02.710588Z +8943c3df0810d48d9a2434b8b6f0f9c5 +2013-07-26T07:01:21.950672Z +4929 +cignoni +has-props @@ -296,18 +296,18 @@ pietroni -14698 +16554 -eigen_matrix_addons.h +base.h file -2013-06-21T07:05:10.158758Z -869db7b70d66dfef27765221bf826d72 -2011-10-05T15:04:40.740408Z -4180 +2013-08-01T07:24:02.710588Z +0fc161b571f3a1e152b00f9f23af5428 +2013-07-26T07:01:21.950672Z +4929 cignoni @@ -330,18 +330,18 @@ cignoni -6233 +7345 -factorial.h +old_matrix44.h file 2013-06-21T07:05:10.158758Z -c5b04285954376b8b80c5f3f8fa65aae -2011-10-05T15:04:40.740408Z -4180 +f901bc09d6b86d8fccc9e78777f730b0 +2013-03-19T21:51:13.509472Z +4846 cignoni @@ -364,19 +364,20 @@ cignoni -11968 +16502 -old_matrix33.h +matrix44.h file -2013-06-21T07:05:10.158758Z -f8d85aa9fac646a20670980f0522ba50 -2013-03-19T21:51:13.509472Z -4846 +2013-08-01T07:24:02.710588Z +a735aa04c346d9789b2a8d7de9ea542e +2013-07-26T07:01:21.950672Z +4929 cignoni +has-props @@ -397,19 +398,18 @@ cignoni - -8725 +19873 -similarity2.h +quadric5.h file 2013-06-21T07:05:10.158758Z -bc75cb476bd474e425ae277c7e0de170 -2011-10-20T22:29:20.159536Z -4196 +6bd86374cd9f8dcdb4f12cb0dadc0cad +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -432,18 +432,18 @@ has-props -2505 +18070 -polar_decomposition.h +shot.h file 2013-06-21T07:05:10.158758Z -822f16409d541d2fa2f396a8d7bf611a -2011-11-21T09:09:58.603625Z -4230 +147ab01bd7ecb9f358e0e0fb809443fe +2012-10-08T09:07:50.965890Z +4552 cignoni @@ -466,20 +466,19 @@ cignoni -2824 +20685 -matrix33.h +spherical_harmonics.h file 2013-06-21T07:05:10.158758Z -b6f9a1049ba5dc90c4a44e4aac2aa796 -2013-03-19T22:04:35.242318Z -4849 +7e6b468d2a61f181405a2cb671e62d44 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -500,16 +499,17 @@ has-props -16557 + +6316 -linear.h +gen_normal.h file 2013-06-21T07:05:10.158758Z -f0497e2b2b6c931be5c7b63831f65c3b +2646c8d33b8901dd311631eb4710f9b8 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -534,19 +534,20 @@ cignoni -3085 +5953 -base.h +old_deprecated_matrix.h file 2013-06-21T07:05:10.158758Z -4717b0cfa4eb8a80d8a232a5baaef737 -2013-03-22T16:43:59.187666Z -4855 +17740f24ddc5a0f19aba228893b1939a +2013-03-19T21:53:52.238167Z +4848 cignoni +has-props @@ -567,19 +568,18 @@ cignoni - -7379 +20399 -old_matrix44.h +legendre.h file -2013-06-21T07:05:10.158758Z -f901bc09d6b86d8fccc9e78777f730b0 -2013-03-19T21:51:13.509472Z -4846 +2013-08-01T07:24:02.710588Z +1b0d4802a315afdc5656cac2afe1a85f +2013-07-26T07:01:21.950672Z +4929 cignoni @@ -602,20 +602,20 @@ cignoni -16502 +6708 -matrix44.h +quaternion.h file 2013-06-21T07:05:10.158758Z -d672a69cf6b22fdd1cda18a47f5555de -2013-06-05T11:08:55.186300Z -4897 -tarini -has-props +8584c12c6da6bc9426cbcacb07851cce +2011-10-05T15:04:40.740408Z +4180 +cignoni + @@ -636,20 +636,19 @@ has-props -19871 +13518 -quadric5.h +perlin_noise.h file 2013-06-21T07:05:10.158758Z -6bd86374cd9f8dcdb4f12cb0dadc0cad +68cbe424593ee5932085c0930ef8e225 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -670,18 +669,19 @@ has-props -18070 + +5999 -shot.h +random_generator.h file -2013-06-21T07:05:10.158758Z -147ab01bd7ecb9f358e0e0fb809443fe -2012-10-08T09:07:50.965890Z -4552 +2013-06-24T13:55:27.918354Z +a3bb4a70ac48b2212439cfb7c336c871 +2013-06-24T08:34:53.914220Z +4905 cignoni @@ -704,16 +704,16 @@ cignoni -20685 +14580 -spherical_harmonics.h +similarity.h file -2013-06-21T07:05:10.158758Z -7e6b468d2a61f181405a2cb671e62d44 +2013-06-21T07:05:10.162758Z +e0a966732851cb464691f8a37afce8e4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -738,16 +738,16 @@ cignoni -6316 +9338 -gen_normal.h +eigen.h file -2013-06-21T07:05:10.158758Z -2646c8d33b8901dd311631eb4710f9b8 +2013-06-21T07:05:10.162758Z +d039d2a81714573993176cda12ac060c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -772,20 +772,19 @@ cignoni -5953 +12003 -old_deprecated_matrix.h +quadric.h file -2013-06-21T07:05:10.158758Z -17740f24ddc5a0f19aba228893b1939a -2013-03-19T21:53:52.238167Z -4848 +2013-06-21T07:05:10.162758Z +36fafede65aea8108942459675313ee0 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -806,19 +805,20 @@ has-props -20399 + +11397 -legendre.h +camera.h file -2013-06-21T07:05:10.158758Z -a5001bf1a84994489151f339ce858e31 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:05:10.162758Z +a868c0b2ba8b7711c30054d88e6d5bba +2012-12-05T11:37:19.944597Z +4763 +ganovelli @@ -840,18 +840,18 @@ cignoni -6755 +17605 -quaternion.h +histogram.h file -2013-06-21T07:05:10.158758Z -8584c12c6da6bc9426cbcacb07851cce -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:10.154758Z +5e26b0b67d0ee9311d8116c324bb6bbe +2012-05-05T14:55:50.371418Z +4399 cignoni @@ -874,18 +874,18 @@ cignoni -13518 +12916 -perlin_noise.h +old_lin_algebra.h file -2013-06-21T07:05:10.158758Z -68cbe424593ee5932085c0930ef8e225 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:10.154758Z +b8c751f39847d09e2cb7339fb5759a12 +2013-03-19T17:05:56.433202Z +4841 cignoni @@ -908,18 +908,18 @@ cignoni -5999 +18314 -random_generator.h +disjoint_set.h file -2013-06-24T13:55:27.918354Z -a3bb4a70ac48b2212439cfb7c336c871 -2013-06-24T08:34:53.914220Z -4905 +2013-06-21T07:05:10.154758Z +647b6198ad214b4146c8c2eb6e9a1766 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -942,19 +942,20 @@ cignoni -14580 +5440 -similarity.h +eigen_matrixbase_addons.h file -2013-06-21T07:05:10.162758Z -e0a966732851cb464691f8a37afce8e4 +2013-06-21T07:05:10.154758Z +f0aa7243461ffd3581b86f0c3eb9a8fa 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -975,19 +976,18 @@ cignoni - -9338 +11517 -eigen.h +old_matrix.h file -2013-06-21T07:05:10.162758Z -d039d2a81714573993176cda12ac060c -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:10.158758Z +d3146333a8b88c11933db3ef40a2e0f8 +2013-03-19T17:05:56.433202Z +4841 cignoni @@ -1010,5 +1010,5 @@ cignoni -12003 +5522 diff --git a/inst/include/vcglib/vcg/math/.svn/text-base/base.h.svn-base b/inst/include/vcglib/vcg/math/.svn/text-base/base.h.svn-base index 714165e4..8b1dee3f 100644 --- a/inst/include/vcglib/vcg/math/.svn/text-base/base.h.svn-base +++ b/inst/include/vcglib/vcg/math/.svn/text-base/base.h.svn-base @@ -90,6 +90,7 @@ Edited Comments and GPL license #include #include #include +#include #ifdef __BORLANDC__ @@ -153,15 +154,12 @@ namespace math { } } - template inline void Swap(T &a, T &b){ - T tmp=a; a=b; b=tmp; - } template inline void Sort(T &a, T &b){ - if (a>b) Swap(a,b); + if (a>b) std::swap(a,b); } template inline void Sort(T &a, T &b, T &c){ - if (a>b) Swap(a,b); - if (b>c) {Swap(b,c); if (a>b) Swap(a,b);} + if (a>b) std::swap(a,b); + if (b>c) {std::swap(b,c); if (a>b) std::swap(a,b);} } /* Some files do not define M_PI... */ diff --git a/inst/include/vcglib/vcg/math/.svn/text-base/legendre.h.svn-base b/inst/include/vcglib/vcg/math/.svn/text-base/legendre.h.svn-base index 482732d1..7bb3c3c4 100644 --- a/inst/include/vcglib/vcg/math/.svn/text-base/legendre.h.svn-base +++ b/inst/include/vcglib/vcg/math/.svn/text-base/legendre.h.svn-base @@ -30,18 +30,18 @@ namespace vcg { namespace math { /* - * Contrary to their definition, the Associated Legendre Polynomials presented here are + * Contrary to their definition, the Associated Legendre Polynomials presented here are * only computed for positive m values. - * + * */ template class Legendre { protected : - + /** * Legendre Polynomial three term Recurrence Relation - */ + */ static inline ScalarType legendre_next(unsigned l, ScalarType P_lm1, ScalarType P_lm2, ScalarType x) { return ((2 * l + 1) * x * P_lm1 - l * P_lm2) / (l + 1); @@ -50,113 +50,113 @@ protected : /** * Associated Legendre Polynomial three term Recurrence Relation. * Raises the band index. - */ + */ static inline double legendre_next(unsigned l, unsigned m, ScalarType P_lm1, ScalarType P_lm2, ScalarType x) { return ((2 * l + 1) * x * P_lm1 - (l + m) * P_lm2) / (l + 1 - m); } - + /** * Recurrence relation to compute P_m_(m+1) given P_m_m at the same x - */ + */ static inline double legendre_P_m_mplusone(unsigned m, ScalarType p_m_m, ScalarType x) { return x * (2.0 * m + 1.0) * p_m_m; } - + /** * Starting relation to compute P_m_m according to the formula: - * + * * pow(-1, m) * double_factorial(2 * m - 1) * pow(1 - x*x, abs(m)/2) - * + * * which becomes, if x = cos(theta) : - * + * * pow(-1, m) * double_factorial(2 * m - 1) * pow(sin(theta), abs(m)/2) */ static inline double legendre_P_m_m(unsigned m, ScalarType sin_theta) { ScalarType p_m_m = 1.0; - + if (m > 0) { - ScalarType fact = 1.0; //Double factorial here + ScalarType fact = 1.0; //Double factorial here for (unsigned i = 1; i <= m; ++i) { p_m_m *= fact * sin_theta; //raising sin_theta to the power of m/2 fact += 2.0; } - + if (m&1) //odd m { // Condon-Shortley Phase term p_m_m *= -1; } } - + return p_m_m; } - + static inline double legendre_P_l(unsigned l, ScalarType x) { ScalarType p0 = 1; ScalarType p1 = x; - + if (l == 0) return p0; - + for (unsigned n = 1; n < l; ++n) { - Swap(p0, p1); + std::swap(p0, p1); p1 = legendre_next(n, p0, p1, x); } - + return p1; } - + /** * Computes the Associated Legendre Polynomial for any given * positive m and l, with m <= l and -1 <= x <= 1. */ static inline double legendre_P_l_m(unsigned l, unsigned m, ScalarType cos_theta, ScalarType sin_theta) - { + { if(m > l) return 0; if(m == 0) return legendre_P_l(l, cos_theta); //OK else { ScalarType p_m_m = legendre_P_m_m(m, sin_theta); //OK - + if (l == m) return p_m_m; - + ScalarType p_m_mplusone = legendre_P_m_mplusone(m, p_m_m, cos_theta); //OK - - if (l == m + 1) return p_m_mplusone; - + + if (l == m + 1) return p_m_mplusone; + unsigned n = m + 1; - + while(n < l) { - Swap(p_m_m, p_m_mplusone); - p_m_mplusone = legendre_next(n, m, p_m_m, p_m_mplusone, cos_theta); - ++n; + std::swap(p_m_m, p_m_mplusone); + p_m_mplusone = legendre_next(n, m, p_m_m, p_m_mplusone, cos_theta); + ++n; } - + return p_m_mplusone; - } + } } public : - + static double Polynomial(unsigned l, ScalarType x) { assert (x <= 1 && x >= -1); return legendre_P_l(l, x); } - + static double AssociatedPolynomial(unsigned l, unsigned m, ScalarType x) { assert (m <= l && x <= 1 && x >= -1); return legendre_P_l_m(l, m, x, Sqrt(1.0 - x * x) ); } - + static double AssociatedPolynomial(unsigned l, unsigned m, ScalarType cos_theta, ScalarType sin_theta) { assert (m <= l && cos_theta <= 1 && cos_theta >= -1 && sin_theta <= 1 && sin_theta >= -1); @@ -175,7 +175,7 @@ private: ScalarType _sin_theta; void generate(ScalarType cos_theta, ScalarType sin_theta) - { + { //generate all 'l's with m = 0 matrix[0][0] = 1; diff --git a/inst/include/vcglib/vcg/math/.svn/text-base/matrix33.h.svn-base b/inst/include/vcglib/vcg/math/.svn/text-base/matrix33.h.svn-base index 633ba39b..13a8797a 100644 --- a/inst/include/vcglib/vcg/math/.svn/text-base/matrix33.h.svn-base +++ b/inst/include/vcglib/vcg/math/.svn/text-base/matrix33.h.svn-base @@ -261,9 +261,9 @@ public: /// Funzione per eseguire la trasposta della matrice Matrix33 & Transpose() { - math::Swap(a[1],a[3]); - math::Swap(a[2],a[6]); - math::Swap(a[5],a[7]); + std::swap(a[1],a[3]); + std::swap(a[2],a[6]); + std::swap(a[5],a[7]); return *this; } diff --git a/inst/include/vcglib/vcg/math/.svn/text-base/matrix44.h.svn-base b/inst/include/vcglib/vcg/math/.svn/text-base/matrix44.h.svn-base index 956f96f8..b7276c06 100644 --- a/inst/include/vcglib/vcg/math/.svn/text-base/matrix44.h.svn-base +++ b/inst/include/vcglib/vcg/math/.svn/text-base/matrix44.h.svn-base @@ -516,7 +516,7 @@ This procedure decompose it in a sequence of - ScaleV and Tranv are obiviously scaling and translation. - ShearV contains three scalars with, respectively, - ShearXY, ShearXZ and ShearYZ + ShearXY, ShearXZ and ShearYZ - RotateV contains the rotations (in degree!) around the x,y,z axis The input matrix is modified leaving inside it a simple roto translation. @@ -661,7 +661,7 @@ template Point3 operator*(const Matrix44 &m, const Point3 &p) template Matrix44 &Transpose(Matrix44 &m) { for(int i = 1; i < 4; i++) for(int j = 0; j < i; j++) { - math::Swap(m.ElementAt(i, j), m.ElementAt(j, i)); + std::swap(m.ElementAt(i, j), m.ElementAt(j, i)); } return m; } diff --git a/inst/include/vcglib/vcg/math/base.h b/inst/include/vcglib/vcg/math/base.h index 714165e4..8b1dee3f 100644 --- a/inst/include/vcglib/vcg/math/base.h +++ b/inst/include/vcglib/vcg/math/base.h @@ -90,6 +90,7 @@ Edited Comments and GPL license #include #include #include +#include #ifdef __BORLANDC__ @@ -153,15 +154,12 @@ namespace math { } } - template inline void Swap(T &a, T &b){ - T tmp=a; a=b; b=tmp; - } template inline void Sort(T &a, T &b){ - if (a>b) Swap(a,b); + if (a>b) std::swap(a,b); } template inline void Sort(T &a, T &b, T &c){ - if (a>b) Swap(a,b); - if (b>c) {Swap(b,c); if (a>b) Swap(a,b);} + if (a>b) std::swap(a,b); + if (b>c) {std::swap(b,c); if (a>b) std::swap(a,b);} } /* Some files do not define M_PI... */ diff --git a/inst/include/vcglib/vcg/math/legendre.h b/inst/include/vcglib/vcg/math/legendre.h index 482732d1..7bb3c3c4 100644 --- a/inst/include/vcglib/vcg/math/legendre.h +++ b/inst/include/vcglib/vcg/math/legendre.h @@ -30,18 +30,18 @@ namespace vcg { namespace math { /* - * Contrary to their definition, the Associated Legendre Polynomials presented here are + * Contrary to their definition, the Associated Legendre Polynomials presented here are * only computed for positive m values. - * + * */ template class Legendre { protected : - + /** * Legendre Polynomial three term Recurrence Relation - */ + */ static inline ScalarType legendre_next(unsigned l, ScalarType P_lm1, ScalarType P_lm2, ScalarType x) { return ((2 * l + 1) * x * P_lm1 - l * P_lm2) / (l + 1); @@ -50,113 +50,113 @@ protected : /** * Associated Legendre Polynomial three term Recurrence Relation. * Raises the band index. - */ + */ static inline double legendre_next(unsigned l, unsigned m, ScalarType P_lm1, ScalarType P_lm2, ScalarType x) { return ((2 * l + 1) * x * P_lm1 - (l + m) * P_lm2) / (l + 1 - m); } - + /** * Recurrence relation to compute P_m_(m+1) given P_m_m at the same x - */ + */ static inline double legendre_P_m_mplusone(unsigned m, ScalarType p_m_m, ScalarType x) { return x * (2.0 * m + 1.0) * p_m_m; } - + /** * Starting relation to compute P_m_m according to the formula: - * + * * pow(-1, m) * double_factorial(2 * m - 1) * pow(1 - x*x, abs(m)/2) - * + * * which becomes, if x = cos(theta) : - * + * * pow(-1, m) * double_factorial(2 * m - 1) * pow(sin(theta), abs(m)/2) */ static inline double legendre_P_m_m(unsigned m, ScalarType sin_theta) { ScalarType p_m_m = 1.0; - + if (m > 0) { - ScalarType fact = 1.0; //Double factorial here + ScalarType fact = 1.0; //Double factorial here for (unsigned i = 1; i <= m; ++i) { p_m_m *= fact * sin_theta; //raising sin_theta to the power of m/2 fact += 2.0; } - + if (m&1) //odd m { // Condon-Shortley Phase term p_m_m *= -1; } } - + return p_m_m; } - + static inline double legendre_P_l(unsigned l, ScalarType x) { ScalarType p0 = 1; ScalarType p1 = x; - + if (l == 0) return p0; - + for (unsigned n = 1; n < l; ++n) { - Swap(p0, p1); + std::swap(p0, p1); p1 = legendre_next(n, p0, p1, x); } - + return p1; } - + /** * Computes the Associated Legendre Polynomial for any given * positive m and l, with m <= l and -1 <= x <= 1. */ static inline double legendre_P_l_m(unsigned l, unsigned m, ScalarType cos_theta, ScalarType sin_theta) - { + { if(m > l) return 0; if(m == 0) return legendre_P_l(l, cos_theta); //OK else { ScalarType p_m_m = legendre_P_m_m(m, sin_theta); //OK - + if (l == m) return p_m_m; - + ScalarType p_m_mplusone = legendre_P_m_mplusone(m, p_m_m, cos_theta); //OK - - if (l == m + 1) return p_m_mplusone; - + + if (l == m + 1) return p_m_mplusone; + unsigned n = m + 1; - + while(n < l) { - Swap(p_m_m, p_m_mplusone); - p_m_mplusone = legendre_next(n, m, p_m_m, p_m_mplusone, cos_theta); - ++n; + std::swap(p_m_m, p_m_mplusone); + p_m_mplusone = legendre_next(n, m, p_m_m, p_m_mplusone, cos_theta); + ++n; } - + return p_m_mplusone; - } + } } public : - + static double Polynomial(unsigned l, ScalarType x) { assert (x <= 1 && x >= -1); return legendre_P_l(l, x); } - + static double AssociatedPolynomial(unsigned l, unsigned m, ScalarType x) { assert (m <= l && x <= 1 && x >= -1); return legendre_P_l_m(l, m, x, Sqrt(1.0 - x * x) ); } - + static double AssociatedPolynomial(unsigned l, unsigned m, ScalarType cos_theta, ScalarType sin_theta) { assert (m <= l && cos_theta <= 1 && cos_theta >= -1 && sin_theta <= 1 && sin_theta >= -1); @@ -175,7 +175,7 @@ class DynamicLegendre : public Legendre ScalarType _sin_theta; void generate(ScalarType cos_theta, ScalarType sin_theta) - { + { //generate all 'l's with m = 0 matrix[0][0] = 1; diff --git a/inst/include/vcglib/vcg/math/matrix33.h b/inst/include/vcglib/vcg/math/matrix33.h index 633ba39b..13a8797a 100644 --- a/inst/include/vcglib/vcg/math/matrix33.h +++ b/inst/include/vcglib/vcg/math/matrix33.h @@ -261,9 +261,9 @@ class Matrix33 /// Funzione per eseguire la trasposta della matrice Matrix33 & Transpose() { - math::Swap(a[1],a[3]); - math::Swap(a[2],a[6]); - math::Swap(a[5],a[7]); + std::swap(a[1],a[3]); + std::swap(a[2],a[6]); + std::swap(a[5],a[7]); return *this; } diff --git a/inst/include/vcglib/vcg/math/matrix44.h b/inst/include/vcglib/vcg/math/matrix44.h index 956f96f8..b7276c06 100644 --- a/inst/include/vcglib/vcg/math/matrix44.h +++ b/inst/include/vcglib/vcg/math/matrix44.h @@ -516,7 +516,7 @@ This procedure decompose it in a sequence of - ScaleV and Tranv are obiviously scaling and translation. - ShearV contains three scalars with, respectively, - ShearXY, ShearXZ and ShearYZ + ShearXY, ShearXZ and ShearYZ - RotateV contains the rotations (in degree!) around the x,y,z axis The input matrix is modified leaving inside it a simple roto translation. @@ -661,7 +661,7 @@ template Point3 operator*(const Matrix44 &m, const Point3 &p) template Matrix44 &Transpose(Matrix44 &m) { for(int i = 1; i < 4; i++) for(int j = 0; j < i; j++) { - math::Swap(m.ElementAt(i, j), m.ElementAt(j, i)); + std::swap(m.ElementAt(i, j), m.ElementAt(j, i)); } return m; } diff --git a/inst/include/vcglib/vcg/simplex/.svn/entries b/inst/include/vcglib/vcg/simplex/.svn/entries index b6043902..8a8534d4 100644 --- a/inst/include/vcglib/vcg/simplex/.svn/entries +++ b/inst/include/vcglib/vcg/simplex/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/vcg/simplex/edge/.svn/entries b/inst/include/vcglib/vcg/simplex/edge/.svn/entries index 5d24c0c2..17e54d75 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex/edge svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -topology.h +base.h file 2013-06-21T07:04:54.734682Z -009b582da51add17755ca39573fc00c8 -2012-04-27T09:23:01.738505Z -4392 +b15561d1ae08dd21d0a6ac05b561a9ed +2012-11-07T01:24:45.064120Z +4687 cignoni has-props @@ -58,18 +58,18 @@ has-props -3196 +9564 -pos.h +distance.h file 2013-06-21T07:04:54.734682Z -088f52556e4dd38d0345284d35002d75 -2012-12-17T14:59:29.898891Z -4781 +4db3ac5cf829d854b4b4b5d4c4887e49 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -92,18 +92,18 @@ cignoni -8694 +3509 -component.h +topology.h file -2013-06-21T07:04:54.738682Z -457cd70d24bee968a947c6752c153a7b -2012-12-21T15:33:18.395499Z -4786 +2013-06-21T07:04:54.734682Z +009b582da51add17755ca39573fc00c8 +2012-04-27T09:23:01.738505Z +4392 cignoni has-props @@ -126,20 +126,19 @@ has-props -16575 +3196 -base.h +pos.h file 2013-06-21T07:04:54.734682Z -b15561d1ae08dd21d0a6ac05b561a9ed -2012-11-07T01:24:45.064120Z -4687 +088f52556e4dd38d0345284d35002d75 +2012-12-17T14:59:29.898891Z +4781 cignoni -has-props @@ -160,19 +159,21 @@ has-props -9564 + +8694 -distance.h +component.h file -2013-06-21T07:04:54.734682Z -4db3ac5cf829d854b4b4b5d4c4887e49 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:04:54.738682Z +457cd70d24bee968a947c6752c153a7b +2012-12-21T15:33:18.395499Z +4786 cignoni +has-props @@ -193,6 +194,5 @@ cignoni - -3509 +16575 diff --git a/inst/include/vcglib/vcg/simplex/face/.svn/entries b/inst/include/vcglib/vcg/simplex/face/.svn/entries index 2a0cf3f3..ff4e5811 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex/face svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -topology.h +base.h file -2013-06-24T13:55:27.502352Z -487d1129de5921cd2945ab238a01374a -2013-06-24T07:55:54.673865Z -4902 +2013-06-21T07:04:55.514685Z +a45538bd4c2824c18c86680b4c8d171a +2012-11-07T15:42:14.149252Z +4689 cignoni +has-props @@ -57,19 +58,18 @@ cignoni - -28581 +11646 -pos.h +distance.h file 2013-06-21T07:04:55.514685Z -90f9651f1c20dd2117681bcbd10e6527 -2012-11-09T11:11:50.079044Z -4708 +4e21b38fa3907d3f506a3bc0f16d21df +2012-11-15T19:11:28.863456Z +4733 cignoni @@ -92,20 +92,19 @@ cignoni -12690 +17712 -component.h +jumping_pos.h file 2013-06-21T07:04:55.514685Z -b8a36cf34f3e723c82cfe00d87eaf0a0 -2013-03-13T14:02:03.583247Z -4835 +7ee919bc9f8d3fcfe5024ce467438215 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -126,20 +125,20 @@ has-props -30834 + +4164 -component_ep.h +topology.h file -2013-06-21T07:04:55.514685Z -7a9843292c6b205a7bf3542c8e040d78 -2012-10-25T13:07:25.089246Z -4656 +2013-06-24T13:55:27.502352Z +487d1129de5921cd2945ab238a01374a +2013-06-24T07:55:54.673865Z +4902 cignoni -has-props @@ -160,20 +159,20 @@ has-props -4203 + +28581 -component_occ.h +pos.h file 2013-06-21T07:04:55.514685Z -1af1a1dd2461acccc3e14fff102786da -2012-10-25T21:29:10.244068Z -4666 +90f9651f1c20dd2117681bcbd10e6527 +2012-11-09T11:11:50.079044Z +4708 cignoni -has-props @@ -194,18 +193,19 @@ has-props -11792 + +12690 -component_ocf.h +component.h file 2013-06-21T07:04:55.514685Z -743f4ecb5e272c6f39d15967e0e66262 -2013-02-06T11:22:11.027627Z -4815 +b8a36cf34f3e723c82cfe00d87eaf0a0 +2013-03-13T14:02:03.583247Z +4835 cignoni has-props @@ -228,18 +228,18 @@ has-props -28267 +30834 -component_polygon.h +component_ep.h file 2013-06-21T07:04:55.514685Z -f473f40c32f9fbaa9b0b481b143b38a8 -2013-03-20T08:56:20.633995Z -4852 +7a9843292c6b205a7bf3542c8e040d78 +2012-10-25T13:07:25.089246Z +4656 cignoni has-props @@ -262,18 +262,18 @@ has-props -13952 +4203 -base.h +component_occ.h file 2013-06-21T07:04:55.514685Z -a45538bd4c2824c18c86680b4c8d171a -2012-11-07T15:42:14.149252Z -4689 +1af1a1dd2461acccc3e14fff102786da +2012-10-25T21:29:10.244068Z +4666 cignoni has-props @@ -296,19 +296,20 @@ has-props -11646 +11792 -distance.h +component_ocf.h file 2013-06-21T07:04:55.514685Z -4e21b38fa3907d3f506a3bc0f16d21df -2012-11-15T19:11:28.863456Z -4733 +743f4ecb5e272c6f39d15967e0e66262 +2013-02-06T11:22:11.027627Z +4815 cignoni +has-props @@ -329,20 +330,20 @@ cignoni - -17712 +28267 -jumping_pos.h +component_polygon.h file 2013-06-21T07:04:55.514685Z -7ee919bc9f8d3fcfe5024ce467438215 -2011-10-05T15:04:40.740408Z -4180 +f473f40c32f9fbaa9b0b481b143b38a8 +2013-03-20T08:56:20.633995Z +4852 cignoni +has-props @@ -363,6 +364,5 @@ cignoni - -4164 +13952 diff --git a/inst/include/vcglib/vcg/simplex/tetrahedron/.svn/entries b/inst/include/vcglib/vcg/simplex/tetrahedron/.svn/entries index c332ccaa..cd0c04c1 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/simplex/tetrahedron svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/vcg/simplex/vertex/.svn/entries b/inst/include/vcglib/vcg/simplex/vertex/.svn/entries index 96c91102..521c3ffa 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 -4928 +4937 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 -component_occ.h +component.h file 2013-06-21T07:04:54.890682Z -c2be92fae18ed8ffd71ee0881c08bcfc -2012-10-25T21:29:10.244068Z -4666 +03cc7cf5ae3985e2d3a0a79440303ec7 +2013-03-13T14:02:03.583247Z +4835 cignoni has-props @@ -58,18 +58,18 @@ has-props -11484 +25013 -component_ocf.h +component_occ.h file 2013-06-21T07:04:54.890682Z -4ee0ed2432886acff65c9b4b71125e1f -2013-02-06T11:22:11.027627Z -4815 +c2be92fae18ed8ffd71ee0881c08bcfc +2012-10-25T21:29:10.244068Z +4666 cignoni has-props @@ -92,18 +92,18 @@ has-props -23963 +11484 -base.h +component_ocf.h file 2013-06-21T07:04:54.890682Z -79a37d794be44163dbd4b6860027a71c -2012-11-15T19:07:34.785185Z -4732 +4ee0ed2432886acff65c9b4b71125e1f +2013-02-06T11:22:11.027627Z +4815 cignoni has-props @@ -126,19 +126,20 @@ has-props -8836 +23963 -distance.h +base.h file 2013-06-21T07:04:54.890682Z -d04a2a00d17d15086e2daf553c4a5ff7 -2012-11-15T19:11:28.863456Z -4733 +79a37d794be44163dbd4b6860027a71c +2012-11-15T19:07:34.785185Z +4732 cignoni +has-props @@ -159,21 +160,19 @@ cignoni - -6141 +8836 -component_sph.h +distance.h file 2013-06-21T07:04:54.890682Z -eb0c9ead560a74df3d0ca1210edf1889 -2011-10-05T15:04:40.740408Z -4180 +d04a2a00d17d15086e2daf553c4a5ff7 +2012-11-15T19:11:28.863456Z +4733 cignoni -has-props @@ -194,18 +193,19 @@ has-props -2618 + +6141 -component.h +component_sph.h file 2013-06-21T07:04:54.890682Z -03cc7cf5ae3985e2d3a0a79440303ec7 -2013-03-13T14:02:03.583247Z -4835 +eb0c9ead560a74df3d0ca1210edf1889 +2011-10-05T15:04:40.740408Z +4180 cignoni has-props @@ -228,5 +228,5 @@ has-props -25013 +2618 diff --git a/inst/include/vcglib/vcg/space/.svn/entries b/inst/include/vcglib/vcg/space/.svn/entries index e517b857..d0f4eaa0 100644 --- a/inst/include/vcglib/vcg/space/.svn/entries +++ b/inst/include/vcglib/vcg/space/.svn/entries @@ -1,14 +1,14 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space svn://svn.code.sf.net/p/vcg/code -2013-06-24T07:57:18.546668Z -4903 +2013-07-26T07:01:21.950672Z +4929 cignoni @@ -26,18 +26,18 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -color4.h +point_matching.h file -2013-06-21T07:05:19.030802Z -5afd2c538331c1dda1dc498a1aba2a98 -2013-01-30T17:18:55.488904Z -4811 -ganovelli - +2013-06-21T07:05:19.034802Z +d587853663bdd83d9c288f4ca777cfc8 +2012-11-27T22:49:21.711917Z +4753 +cignoni +has-props @@ -58,16 +58,16 @@ ganovelli -11339 +6217 -tetra3.h +texcoord2.h file 2013-06-21T07:05:19.034802Z -ef3ef72b89421e759f9a4dfdf09de071 +d8aa8259dda93f3bd9928ba824b88dbf 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,20 +92,19 @@ cignoni -13845 +7413 -deprecated_point.h +sphere3.h file 2013-06-21T07:05:19.034802Z -59e9b222b9e7ae8d185ed06e6e4f0ca2 -2012-07-03T09:29:48.654375Z -4457 -cignoni -has-props +a47baec2253f399adc0a0fefe322ef0c +2012-06-14T09:40:26.368718Z +4431 +ponchio @@ -126,19 +125,20 @@ has-props -27759 + +8188 -line2.h +distance2.h file 2013-06-21T07:05:19.034802Z -037ceee14c2e90b7638a9515f84b3e12 -2011-10-05T15:04:40.740408Z -4180 -cignoni +801945cd32314026009d573486246af1 +2012-06-22T14:25:35.235717Z +4438 +pietroni @@ -160,18 +160,18 @@ cignoni -7759 +3025 -box2.h +distance3.h file 2013-06-21T07:05:19.034802Z -897269b96beebe3adcea957f9cd78474 -2012-10-08T09:03:25.280307Z -4549 +4905fdaf208b2f8f94d6fb71c97c9499 +2012-07-02T16:45:49.420129Z +4454 cignoni @@ -194,19 +194,19 @@ cignoni -10440 +16510 -line3.h +ray2.h file 2013-06-21T07:05:19.034802Z -121c184b83496729d2a0ac35b5e007f0 -2011-10-05T15:04:40.740408Z -4180 -cignoni +d3a9c3f291990d0ee70d7fd8acfbd556 +2012-06-22T14:23:33.652600Z +4437 +pietroni @@ -228,18 +228,18 @@ cignoni -7866 +7239 -planar_polygon_tessellation.h +ray3.h file 2013-06-21T07:05:19.034802Z -254e2b48368fd1fc9942a713a46a74c9 -2012-12-02T15:07:17.950203Z -4760 +701f60dcf47d96cae84763beb09ac085 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -262,20 +262,23 @@ cignoni -5196 +7402 -box3.h +intersection +dir + +rasterized_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 +6b945db289c6162bffddbae772a4e20e +2013-03-26T23:02:23.538870Z +4875 +cignoni +has-props @@ -296,16 +299,16 @@ ponchio -12926 +32178 -point2.h +smallest_enclosing.h file -2013-06-21T07:05:19.034802Z -5f37808bba8992a43a292a356b87c0cc +2013-06-21T07:05:19.038802Z +647907fa832532de426ece2bd09e4403 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,18 +333,18 @@ cignoni -5070 +4884 -point3.h +fitting3.h file -2013-06-21T07:05:19.034802Z -8261392e72ab65c8e5aad716752282d2 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.038802Z +6365980c67418fc0652da966f48707ce +2012-11-22T23:32:35.421515Z +4744 cignoni @@ -364,18 +367,18 @@ cignoni -6286 +5343 -point4.h +intersection2.h file 2013-06-21T07:05:19.034802Z -d1d2e784c599e97d99c5caf4841f8b7f -2011-10-05T15:04:40.740408Z -4180 +29f8f9365d085ab4244cbe8139bc92cb +2012-10-08T09:05:11.519307Z +4550 cignoni @@ -398,21 +401,18 @@ cignoni -5665 - -index -dir +10713 -plane3.h +point.h file 2013-06-21T07:05:19.034802Z -c70294cb8275c887598a54e07f37d467 -2012-01-18T11:44:42.289793Z -4292 +52a1c58acb8cf0d61b0aa0f0782011ea +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -435,20 +435,19 @@ cignoni -5503 +4643 -rect_packer.h +intersection3.h file -2013-06-21T07:05:19.038802Z -6f6439f62d9f1fdbcd1952c533ecd051 -2013-04-15T20:56:40.165930Z -4886 -cignoni -has-props +2013-06-21T07:05:19.034802Z +ffed4612e483af0b2bd635eb630dd3d2 +2013-03-13T09:40:55.149160Z +4833 +ganovelli @@ -469,19 +468,20 @@ has-props -19207 + +25344 -segment2.h +colorspace.h file -2013-06-21T07:05:19.034802Z -8ff02a548c1acb174e97ee1a86e5c864 -2012-10-08T09:03:25.280307Z -4549 -cignoni +2013-06-21T07:05:19.030802Z +35f9de785a719ffb8d7f1c5e019cb518 +2011-11-18T10:42:19.939072Z +4219 +granzuglia @@ -503,19 +503,19 @@ cignoni -5710 +48608 -segment3.h +color4.h file -2013-06-21T07:05:19.034802Z -510798697acdb006898929d3f2cd51ed -2012-10-08T09:05:11.519307Z -4550 -cignoni +2013-06-21T07:05:19.030802Z +5afd2c538331c1dda1dc498a1aba2a98 +2013-01-30T17:18:55.488904Z +4811 +ganovelli @@ -537,20 +537,19 @@ cignoni -7968 +11339 -outline2_packer.h +tetra3.h file -2013-06-21T07:05:19.038802Z -ed41f21c73823ea35530b3464c9115b7 -2013-04-15T20:57:15.592226Z -4887 +2013-06-21T07:05:19.034802Z +ef3ef72b89421e759f9a4dfdf09de071 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -571,20 +570,21 @@ has-props -7250 + +13845 -triangle2.h +deprecated_point.h file -2013-06-21T07:05:19.038802Z -1808dfb7c9dd1c10afd22f41eea74869 -2012-10-03T16:39:29.913144Z -4522 -pietroni - +2013-08-01T07:24:02.770588Z +09e9726c663fa2f740cbec12a521e137 +2013-07-26T07:01:21.950672Z +4929 +cignoni +has-props @@ -605,18 +605,18 @@ pietroni -5451 +27902 -triangle3.h +line2.h file -2013-06-21T07:05:19.038802Z -5a03a0131af081c0febbca9a91cf6e62 -2012-11-15T19:14:29.014670Z -4734 +2013-06-21T07:05:19.034802Z +037ceee14c2e90b7638a9515f84b3e12 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -639,18 +639,18 @@ cignoni -11833 +7759 -box.h +box2.h file -2013-06-21T07:05:19.038802Z -6d0e9d983af93715154acc4518e4e70d -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.034802Z +897269b96beebe3adcea957f9cd78474 +2012-10-08T09:03:25.280307Z +4549 cignoni @@ -673,16 +673,16 @@ cignoni -11166 +10440 -obox3.h +line3.h file -2013-06-21T07:05:19.030802Z -09af389baf2ee42700e15fea73556b8b +2013-06-21T07:05:19.034802Z +121c184b83496729d2a0ac35b5e007f0 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -707,18 +707,18 @@ cignoni -3215 +7866 -space.h +planar_polygon_tessellation.h file -2013-06-21T07:05:19.030802Z -48ccedd0a4d8211f37bf9d933dd9a161 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.034802Z +254e2b48368fd1fc9942a713a46a74c9 +2012-12-02T15:07:17.950203Z +4760 cignoni @@ -741,20 +741,19 @@ cignoni -3170 +5196 -deprecated_point2.h +box3.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 +86523e598e31bb612c395babe78a7dc6 +2013-03-04T20:35:03.106156Z +4827 +ponchio @@ -775,20 +774,20 @@ has-props -10377 + +12926 -deprecated_point3.h +point2.h file -2013-06-21T07:05:19.030802Z -d1d97918a3aa2057c5f1198407d4062e -2012-10-22T18:43:24.627255Z -4649 +2013-06-21T07:05:19.034802Z +5f37808bba8992a43a292a356b87c0cc +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -809,20 +808,20 @@ has-props -16545 + +5070 -deprecated_point4.h +point3.h file -2013-06-21T07:05:19.030802Z -a833f725f0df1e167b1405f22629e61a -2012-10-11T10:48:55.487939Z -4573 +2013-06-21T07:05:19.034802Z +8261392e72ab65c8e5aad716752282d2 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -843,20 +842,20 @@ has-props -11145 + +6286 -point_matching.h +point4.h file -2013-06-21T07:05:19.034802Z -d587853663bdd83d9c288f4ca777cfc8 -2012-11-27T22:49:21.711917Z -4753 +2013-08-01T07:24:02.770588Z +36d070c3bf10470a94f92ab45dbc1c83 +2013-07-26T07:01:21.950672Z +4929 cignoni -has-props @@ -877,19 +876,23 @@ has-props -6217 + +5629 -sphere3.h +index +dir + +plane3.h file 2013-06-21T07:05:19.034802Z -a47baec2253f399adc0a0fefe322ef0c -2012-06-14T09:40:26.368718Z -4431 -ponchio +c70294cb8275c887598a54e07f37d467 +2012-01-18T11:44:42.289793Z +4292 +cignoni @@ -911,19 +914,20 @@ ponchio -8188 +5503 -texcoord2.h +rect_packer.h file -2013-06-21T07:05:19.034802Z -d8aa8259dda93f3bd9928ba824b88dbf -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:05:19.038802Z +6f6439f62d9f1fdbcd1952c533ecd051 +2013-04-15T20:56:40.165930Z +4886 cignoni +has-props @@ -944,20 +948,19 @@ cignoni - -7413 +19207 -distance2.h +segment2.h file 2013-06-21T07:05:19.034802Z -801945cd32314026009d573486246af1 -2012-06-22T14:25:35.235717Z -4438 -pietroni +8ff02a548c1acb174e97ee1a86e5c864 +2012-10-08T09:03:25.280307Z +4549 +cignoni @@ -979,19 +982,19 @@ pietroni -3025 +5710 -ray2.h +segment3.h file 2013-06-21T07:05:19.034802Z -d3a9c3f291990d0ee70d7fd8acfbd556 -2012-06-22T14:23:33.652600Z -4437 -pietroni +510798697acdb006898929d3f2cd51ed +2012-10-08T09:05:11.519307Z +4550 +cignoni @@ -1013,19 +1016,20 @@ pietroni -7239 +7968 -distance3.h +outline2_packer.h file -2013-06-21T07:05:19.034802Z -4905fdaf208b2f8f94d6fb71c97c9499 -2012-07-02T16:45:49.420129Z -4454 +2013-06-21T07:05:19.038802Z +ed41f21c73823ea35530b3464c9115b7 +2013-04-15T20:57:15.592226Z +4887 cignoni +has-props @@ -1046,20 +1050,19 @@ cignoni - -16510 +7250 -ray3.h +triangle2.h file -2013-06-21T07:05:19.034802Z -701f60dcf47d96cae84763beb09ac085 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:05:19.038802Z +1808dfb7c9dd1c10afd22f41eea74869 +2012-10-03T16:39:29.913144Z +4522 +pietroni @@ -1081,23 +1084,19 @@ cignoni -7402 - -intersection -dir +5451 -rasterized_outline2_packer.h +box.h file 2013-06-21T07:05:19.038802Z -6b945db289c6162bffddbae772a4e20e -2013-03-26T23:02:23.538870Z -4875 +6d0e9d983af93715154acc4518e4e70d +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -1118,18 +1117,19 @@ has-props -32178 + +11166 -smallest_enclosing.h +triangle3.h file 2013-06-21T07:05:19.038802Z -647907fa832532de426ece2bd09e4403 -2011-10-05T15:04:40.740408Z -4180 +5a03a0131af081c0febbca9a91cf6e62 +2012-11-15T19:14:29.014670Z +4734 cignoni @@ -1152,18 +1152,18 @@ cignoni -4884 +11833 -fitting3.h +obox3.h file -2013-06-21T07:05:19.038802Z -6365980c67418fc0652da966f48707ce -2012-11-22T23:32:35.421515Z -4744 +2013-06-21T07:05:19.030802Z +09af389baf2ee42700e15fea73556b8b +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -1186,19 +1186,20 @@ cignoni -5343 +3215 -intersection2.h +deprecated_point2.h file -2013-06-21T07:05:19.034802Z -29f8f9365d085ab4244cbe8139bc92cb -2012-10-08T09:05:11.519307Z -4550 +2013-06-21T07:05:19.030802Z +6de492d52f538e805bade7cab9b53341 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -1219,17 +1220,16 @@ cignoni - -10713 +10377 -point.h +space.h file -2013-06-21T07:05:19.034802Z -52a1c58acb8cf0d61b0aa0f0782011ea +2013-06-21T07:05:19.030802Z +48ccedd0a4d8211f37bf9d933dd9a161 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -1254,20 +1254,20 @@ cignoni -4643 +3170 -intersection3.h +deprecated_point3.h file -2013-06-21T07:05:19.034802Z -ffed4612e483af0b2bd635eb630dd3d2 -2013-03-13T09:40:55.149160Z -4833 -ganovelli - +2013-06-21T07:05:19.030802Z +d1d97918a3aa2057c5f1198407d4062e +2012-10-22T18:43:24.627255Z +4649 +cignoni +has-props @@ -1288,20 +1288,20 @@ ganovelli -25344 +16545 -colorspace.h +deprecated_point4.h file -2013-06-21T07:05:19.030802Z -35f9de785a719ffb8d7f1c5e019cb518 -2011-11-18T10:42:19.939072Z -4219 -granzuglia - +2013-08-01T07:24:02.770588Z +1f4662e4c795c23d042083857dcb06b0 +2013-07-26T07:01:21.950672Z +4929 +cignoni +has-props @@ -1322,5 +1322,5 @@ granzuglia -48608 +11790 diff --git a/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point.h.svn-base b/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point.h.svn-base index 1fd6b31f..ed202318 100644 --- a/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point.h.svn-base +++ b/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point.h.svn-base @@ -61,7 +61,7 @@ Revision 1.1 2004/03/16 03:07:38 tarini namespace vcg { - namespace ndim{ + namespace ndim{ //template @@ -72,8 +72,8 @@ namespace vcg { /** The templated class for representing a point in R^N space. The class is templated over the ScalarType class that is used to represent coordinates. - PointBase provides the interface and the common operators for points - of any dimensionality. + PointBase provides the interface and the common operators for points + of any dimensionality. */ template @@ -88,7 +88,7 @@ public: protected: /// The only data member. Hidden to user. - S _v[N]; + S _v[N]; public: @@ -103,11 +103,11 @@ public: /// Padding function: give a default 0 value to all the elements that are not in the [0..2] range. /// Useful for managing in a consistent way object that could have point2 / point3 / point4 - inline S Ext( const int i ) const - { - if(i>=0 && i<=N) return _v[i]; - else return 0; - } + inline S Ext( const int i ) const + { + if(i>=0 && i<=N) return _v[i]; + else return 0; + } /// importer for points with different scalar type and-or dimensionality template @@ -123,7 +123,7 @@ public: template static inline PointType Construct( const Point & b ) { - PointType p; p.Import(b); + PointType p; p.Import(b); return p; } @@ -141,7 +141,7 @@ public: template static inline PointType Construct( const Point & b ) { - PointType p; p.ImportHomo(b); + PointType p; p.ImportHomo(b); return p; } @@ -163,30 +163,30 @@ public: return _v[i]; } inline const S &X() const { return _v[0]; } - inline const S &Y() const { return _v[1]; } - inline const S &Z() const { static_assert(N>2); return _v[2]; } - /// W is in any case the last coordinate. - /// (in a 2D point, W() == Y(). In a 3D point, W()==Z() - /// in a 4D point, W() is a separate component) - inline const S &W() const { return _v[N-1]; } - inline S &X() { return _v[0]; } - inline S &Y() { return _v[1]; } - inline S &Z() { static_assert(N>2); return _v[2]; } - inline S &W() { return _v[N-1]; } - inline const S * V() const - { - return _v; - } - inline S & V( const int i ) - { - assert(i>=0 && i=0 && i2); return _v[2]; } + /// W is in any case the last coordinate. + /// (in a 2D point, W() == Y(). In a 3D point, W()==Z() + /// in a 4D point, W() is a separate component) + inline const S &W() const { return _v[N-1]; } + inline S &X() { return _v[0]; } + inline S &Y() { return _v[1]; } + inline S &Z() { static_assert(N>2); return _v[2]; } + inline S &W() { return _v[N-1]; } + inline const S * V() const + { + return _v; + } + inline S & V( const int i ) + { + assert(i>=0 && i=0 && i::V; using Point<2,S>::W; - //@{ + //@{ /** @name Special members for 2D points. **/ /// default @@ -426,7 +426,7 @@ public: //@} - //@{ + //@{ /** @name Implementation of standard functions for 3D points **/ inline void Zero(){ @@ -475,7 +475,7 @@ public: template static S SquaredNorm(const PT &p ) { return ( p.V(0)*p.V(0) + p.V(1)*p.V(1) );} - inline S operator * ( Point2 const & p ) const { + inline S operator * ( Point2 const & p ) const { return ( _v[0]*p._v[0] + _v[1]*p._v[1]) ; } inline bool operator == ( Point2 const & p ) const { @@ -545,7 +545,7 @@ public: using Point<3,S>::W; - //@{ + //@{ /** @name Special members for 3D points. **/ /// default @@ -563,7 +563,7 @@ public: } //@} - //@{ + //@{ /** @name Implementation of standard functions for 3D points **/ inline void Zero(){ @@ -612,7 +612,7 @@ public: template static S SquaredNorm(const PT &p ) { return ( p.V(0)*p.V(0) + p.V(1)*p.V(1) + p.V(2)*p.V(2) );} - inline S operator * ( PointType const & p ) const { + inline S operator * ( PointType const & p ) const { return ( _v[0]*p._v[0] + _v[1]*p._v[1] + _v[2]*p._v[2]) ; } inline bool operator == ( PointType const & p ) const { @@ -623,19 +623,19 @@ public: inline bool operator < ( PointType const & p ) const{ return (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0] ( PointType const & p ) const { return (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } inline bool operator <= ( PointType const & p ) { return (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } inline bool operator >= ( PointType const & p ) const { return (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } inline PointType & Normalize() { S n = Norm(); @@ -650,7 +650,7 @@ public: inline S NormInfinity() const { return math::Max( math::Max( math::Abs(_v[0]), math::Abs(_v[1]) ), - math::Abs(_v[3]) ); } + math::Abs(_v[3]) ); } inline S NormOne() const { return math::Abs(_v[0])+ math::Abs(_v[1])+math::Max(math::Abs(_v[2]));} @@ -701,10 +701,10 @@ public: using Point<3,S>::V; using Point<3,S>::W; - //@{ + //@{ /** @name Special members for 4D points. **/ - /// default - inline Point4 (){} + /// default + inline Point4 (){} /// xyzw constructor //@} @@ -764,7 +764,7 @@ public: template static S SquaredNorm(const PT &p ) { return ( p.V(0)*p.V(0) + p.V(1)*p.V(1) + p.V(2)*p.V(2) + p.V(3)*p.V(3) );} - inline S operator * ( PointType const & p ) const { + inline S operator * ( PointType const & p ) const { return ( _v[0]*p._v[0] + _v[1]*p._v[1] + _v[2]*p._v[2] + _v[3]*p._v[3] ); } inline bool operator == ( PointType const & p ) const { @@ -775,19 +775,19 @@ public: inline bool operator < ( PointType const & p ) const{ return (_v[3]!=p._v[3])?(_v[3]< p._v[3]) : (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0] ( PointType const & p ) const { return (_v[3]!=p._v[3])?(_v[3]> p._v[3]) : (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } inline bool operator <= ( PointType const & p ) { return (_v[3]!=p._v[3])?(_v[3]< p._v[3]) : (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } inline bool operator >= ( PointType const & p ) const { return (_v[3]!=p._v[3])?(_v[3]> p._v[3]) : (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } inline PointType & Normalize() { PointType n = Norm(); if(n!=0.0) { n=1.0/n; _v[0]*=n; _v[1]*=n; _v[2]*=n; _v[3]*=n; } @@ -803,7 +803,7 @@ public: inline S NormInfinity() const { return math::Max( math::Max( math::Abs(_v[0]), math::Abs(_v[1]) ), - math::Max( math::Abs(_v[2]), math::Abs(_v[3]) ) ); } + math::Max( math::Abs(_v[2]), math::Abs(_v[3]) ) ); } inline S NormOne() const { return math::Abs(_v[0])+ math::Abs(_v[1])+math::Max(math::Abs(_v[2]),math::Abs(_v[3]));} @@ -837,11 +837,11 @@ public: int exp0,exp1,exp2,exp3; frexp( double(k0), &exp0 );frexp( double(k1), &exp1 ); frexp( double(k2), &exp2 );frexp( double(k3), &exp3 ); - if (exp0>exp1) { math::Swap(k0,k1); math::Swap(exp0,exp1); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } - if (exp0>exp2) { math::Swap(k0,k2); math::Swap(exp0,exp2); } - if (exp1>exp3) { math::Swap(k1,k3); math::Swap(exp1,exp3); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } + if (exp0>exp1) { std::swap(k0,k1); std::swap(exp0,exp1); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } + if (exp0>exp2) { std::swap(k0,k2); std::swap(exp0,exp2); } + if (exp1>exp3) { std::swap(k1,k3); std::swap(exp1,exp3); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } return ( (k0 + k1) + k2 ) +k3; } //@} @@ -856,7 +856,7 @@ inline S Angle( Point3 const & p1, Point3 const & p2 ) S t = (p1*p2)/w; if(t>1) t = 1; else if(t<-1) t = -1; - return (S) acos(t); + return (S) acos(t); } // versione uguale alla precedente ma che assume che i due vettori siano unitari @@ -875,7 +875,7 @@ inline S AngleN( Point3 const & p1, Point3 const & p2 ) template inline S Norm( Point const & p ) { - return p.Norm(); + return p.Norm(); } template diff --git a/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point4.h.svn-base b/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point4.h.svn-base index 134f408a..7ef89663 100644 --- a/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point4.h.svn-base +++ b/inst/include/vcglib/vcg/space/.svn/text-base/deprecated_point4.h.svn-base @@ -69,14 +69,14 @@ namespace vcg { /** The templated class for representing a point in 4D space. The class is templated over the ScalarType class that is used to represent coordinates. - All the usual operator (* + - ...) are defined. + All the usual operator (* + - ...) are defined. */ template class Point4 { public: /// The only data member. Hidden to user. - T _v[4]; + T _v[4]; public: typedef T ScalarType; @@ -134,104 +134,104 @@ public: /** @name Data Access. access to data is done by overloading of [] or explicit naming of coords (x,y,z,w) - **/ - inline const T & operator [] ( const int i ) const - { - assert(i>=0 && i<4); - return _v[i]; - } - inline T & operator [] ( const int i ) - { - assert(i>=0 && i<4); - return _v[i]; - } - inline T &X() {return _v[0];} - inline T &Y() {return _v[1];} - inline T &Z() {return _v[2];} - inline T &W() {return _v[3];} - inline T const * V() const - { - return _v; - } - inline T * V() - { - return _v; - } - inline const T & V ( const int i ) const - { - assert(i>=0 && i<4); - return _v[i]; - } - inline T & V ( const int i ) - { - assert(i>=0 && i<4); - return _v[i]; - } - /// Padding function: give a default 0 value to all the elements that are not in the [0..2] range. - /// Useful for managing in a consistent way object that could have point2 / point3 / point4 - inline T Ext( const int i ) const - { - if(i>=0 && i<=3) return _v[i]; - else return 0; - } + **/ + inline const T & operator [] ( const int i ) const + { + assert(i>=0 && i<4); + return _v[i]; + } + inline T & operator [] ( const int i ) + { + assert(i>=0 && i<4); + return _v[i]; + } + inline T &X() {return _v[0];} + inline T &Y() {return _v[1];} + inline T &Z() {return _v[2];} + inline T &W() {return _v[3];} + inline T const * V() const + { + return _v; + } + inline T * V() + { + return _v; + } + inline const T & V ( const int i ) const + { + assert(i>=0 && i<4); + return _v[i]; + } + inline T & V ( const int i ) + { + assert(i>=0 && i<4); + return _v[i]; + } + /// Padding function: give a default 0 value to all the elements that are not in the [0..2] range. + /// Useful for managing in a consistent way object that could have point2 / point3 / point4 + inline T Ext( const int i ) const + { + if(i>=0 && i<=3) return _v[i]; + else return 0; + } //@} //@{ /** @name Linear operators and the likes **/ - inline Point4 operator + ( const Point4 & p) const - { - return Point4( _v[0]+p._v[0], _v[1]+p._v[1], _v[2]+p._v[2], _v[3]+p._v[3] ); - } - inline Point4 operator - ( const Point4 & p) const - { - return Point4( _v[0]-p._v[0], _v[1]-p._v[1], _v[2]-p._v[2], _v[3]-p._v[3] ); - } - inline Point4 operator * ( const T s ) const - { - return Point4( _v[0]*s, _v[1]*s, _v[2]*s, _v[3]*s ); - } - inline Point4 operator / ( const T s ) const - { - return Point4( _v[0]/s, _v[1]/s, _v[2]/s, _v[3]/s ); - } - inline Point4 & operator += ( const Point4 & p) - { - _v[0] += p._v[0]; _v[1] += p._v[1]; _v[2] += p._v[2]; _v[3] += p._v[3]; - return *this; - } - inline Point4 & operator -= ( const Point4 & p ) - { - _v[0] -= p._v[0]; _v[1] -= p._v[1]; _v[2] -= p._v[2]; _v[3] -= p._v[3]; - return *this; - } - inline Point4 & operator *= ( const T s ) - { - _v[0] *= s; _v[1] *= s; _v[2] *= s; _v[3] *= s; - return *this; - } - inline Point4 & operator /= ( const T s ) - { - _v[0] /= s; _v[1] /= s; _v[2] /= s; _v[3] /= s; - return *this; - } - inline Point4 operator - () const - { - return Point4( -_v[0], -_v[1], -_v[2], -_v[3] ); - } - inline Point4 VectProd ( const Point4 &x, const Point4 &z ) const - { - Point4 res; - const Point4 &y = *this; + inline Point4 operator + ( const Point4 & p) const + { + return Point4( _v[0]+p._v[0], _v[1]+p._v[1], _v[2]+p._v[2], _v[3]+p._v[3] ); + } + inline Point4 operator - ( const Point4 & p) const + { + return Point4( _v[0]-p._v[0], _v[1]-p._v[1], _v[2]-p._v[2], _v[3]-p._v[3] ); + } + inline Point4 operator * ( const T s ) const + { + return Point4( _v[0]*s, _v[1]*s, _v[2]*s, _v[3]*s ); + } + inline Point4 operator / ( const T s ) const + { + return Point4( _v[0]/s, _v[1]/s, _v[2]/s, _v[3]/s ); + } + inline Point4 & operator += ( const Point4 & p) + { + _v[0] += p._v[0]; _v[1] += p._v[1]; _v[2] += p._v[2]; _v[3] += p._v[3]; + return *this; + } + inline Point4 & operator -= ( const Point4 & p ) + { + _v[0] -= p._v[0]; _v[1] -= p._v[1]; _v[2] -= p._v[2]; _v[3] -= p._v[3]; + return *this; + } + inline Point4 & operator *= ( const T s ) + { + _v[0] *= s; _v[1] *= s; _v[2] *= s; _v[3] *= s; + return *this; + } + inline Point4 & operator /= ( const T s ) + { + _v[0] /= s; _v[1] /= s; _v[2] /= s; _v[3] /= s; + return *this; + } + inline Point4 operator - () const + { + return Point4( -_v[0], -_v[1], -_v[2], -_v[3] ); + } + inline Point4 VectProd ( const Point4 &x, const Point4 &z ) const + { + Point4 res; + const Point4 &y = *this; res[0] = y[1]*x[2]*z[3]-y[1]*x[3]*z[2]-x[1]*y[2]*z[3]+ - x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; + x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; res[1] = y[0]*x[3]*z[2]-z[0]*y[2]*x[3]-y[0]*x[2]* - z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; + z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; res[2] = -y[0]*z[1]*x[3]+x[0]*z[1]*y[3]+y[0]*x[1]* - z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; + z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; res[3] = -z[0]*y[1]*x[2]-y[0]*x[1]*z[2]+x[0]*y[1]* - z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; + z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; return res; } //@} @@ -239,70 +239,70 @@ public: //@{ /** @name Norms and normalizations **/ - /// Euclidian normal - inline T Norm() const - { - return math::Sqrt( _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); - } - /// Squared euclidian normal - inline T SquaredNorm() const - { - return _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3]; - } - /// Euclidian normalization + /// Euclidian normal + inline T Norm() const + { + return math::Sqrt( _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); + } + /// Squared euclidian normal + inline T SquaredNorm() const + { + return _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3]; + } + /// Euclidian normalization inline Point4 & Normalize() - { - T n = sqrt(_v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); - if(n>0.0) { _v[0] /= n; _v[1] /= n; _v[2] /= n; _v[3] /= n; } - return *this; - } - /// Homogeneous normalization (division by W) - inline Point4 & HomoNormalize(){ - if (_v[3]!=0.0) { _v[0] /= _v[3]; _v[1] /= _v[3]; _v[2] /= _v[3]; _v[3]=1.0; } - return *this; - }; + { + T n = sqrt(_v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); + if(n>0.0) { _v[0] /= n; _v[1] /= n; _v[2] /= n; _v[3] /= n; } + return *this; + } + /// Homogeneous normalization (division by W) + inline Point4 & HomoNormalize(){ + if (_v[3]!=0.0) { _v[0] /= _v[3]; _v[1] /= _v[3]; _v[2] /= _v[3]; _v[3]=1.0; } + return *this; + }; //@} //@{ /** @name Comparison operators (lexicographical order) **/ - inline bool operator == ( const Point4& p ) const - { - return _v[0]==p._v[0] && _v[1]==p._v[1] && _v[2]==p._v[2] && _v[3]==p._v[3]; - } - inline bool operator != ( const Point4 & p ) const - { - return _v[0]!=p._v[0] || _v[1]!=p._v[1] || _v[2]!=p._v[2] || _v[3]!=p._v[3]; - } - inline bool operator < ( Point4 const & p ) const - { - return (_v[3]!=p._v[3])?(_v[3] ( const Point4 & p ) const - { - return (_v[3]!=p._v[3])?(_v[3]>p._v[3]): - (_v[2]!=p._v[2])?(_v[2]>p._v[2]): - (_v[1]!=p._v[1])?(_v[1]>p._v[1]): - (_v[0]>p._v[0]); - } - inline bool operator <= ( const Point4 & p ) const - { - return (_v[3]!=p._v[3])?(_v[3]< p._v[3]): - (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]): - (_v[0]<=p._v[0]); - } - inline bool operator >= ( const Point4 & p ) const - { - return (_v[3]!=p._v[3])?(_v[3]> p._v[3]): - (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]): - (_v[0]>=p._v[0]); - } + inline bool operator == ( const Point4& p ) const + { + return _v[0]==p._v[0] && _v[1]==p._v[1] && _v[2]==p._v[2] && _v[3]==p._v[3]; + } + inline bool operator != ( const Point4 & p ) const + { + return _v[0]!=p._v[0] || _v[1]!=p._v[1] || _v[2]!=p._v[2] || _v[3]!=p._v[3]; + } + inline bool operator < ( Point4 const & p ) const + { + return (_v[3]!=p._v[3])?(_v[3] ( const Point4 & p ) const + { + return (_v[3]!=p._v[3])?(_v[3]>p._v[3]): + (_v[2]!=p._v[2])?(_v[2]>p._v[2]): + (_v[1]!=p._v[1])?(_v[1]>p._v[1]): + (_v[0]>p._v[0]); + } + inline bool operator <= ( const Point4 & p ) const + { + return (_v[3]!=p._v[3])?(_v[3]< p._v[3]): + (_v[2]!=p._v[2])?(_v[2]< p._v[2]): + (_v[1]!=p._v[1])?(_v[1]< p._v[1]): + (_v[0]<=p._v[0]); + } + inline bool operator >= ( const Point4 & p ) const + { + return (_v[3]!=p._v[3])?(_v[3]> p._v[3]): + (_v[2]!=p._v[2])?(_v[2]> p._v[2]): + (_v[1]!=p._v[1])?(_v[1]> p._v[1]): + (_v[0]>=p._v[0]); + } //@} //@{ @@ -316,10 +316,10 @@ public: } inline T dot( const Point4 & p ) const { return (*this) * p; } inline Point4 operator ^ ( const Point4& /*p*/ ) const - { - assert(0);// not defined by two vectors (only put for metaprogramming) - return Point4(); - } + { + assert(0);// not defined by two vectors (only put for metaprogramming) + return Point4(); + } /// slower version, more stable (double precision only) T StableDot ( const Point4 & p ) const @@ -331,11 +331,11 @@ public: frexp( double(k0), &exp0 );frexp( double(k1), &exp1 ); frexp( double(k2), &exp2 );frexp( double(k3), &exp3 ); - if (exp0>exp1) { math::Swap(k0,k1); math::Swap(exp0,exp1); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } - if (exp0>exp2) { math::Swap(k0,k2); math::Swap(exp0,exp2); } - if (exp1>exp3) { math::Swap(k1,k3); math::Swap(exp1,exp3); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } + if (exp0>exp1) { std::swap(k0,k1); std::swap(exp0,exp1); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } + if (exp0>exp2) { std::swap(k0,k2); std::swap(exp0,exp2); } + if (exp1>exp3) { std::swap(k1,k3); std::swap(exp1,exp3); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } return ( (k0 + k1) + k2 ) +k3; } @@ -363,19 +363,19 @@ inline T Norm( const Point4 & p ) template inline T SquaredNorm( const Point4 & p ) { - return p.SquaredNorm(); + return p.SquaredNorm(); } template inline T Distance( const Point4 & p1, const Point4 & p2 ) { - return Norm(p1-p2); + return Norm(p1-p2); } template inline T SquaredDistance( const Point4 & p1, const Point4 & p2 ) { - return SquaredNorm(p1-p2); + return SquaredNorm(p1-p2); } /// slower version of dot product, more stable (double precision only) diff --git a/inst/include/vcglib/vcg/space/.svn/text-base/point4.h.svn-base b/inst/include/vcglib/vcg/space/.svn/text-base/point4.h.svn-base index 66660325..6acdfb63 100644 --- a/inst/include/vcglib/vcg/space/.svn/text-base/point4.h.svn-base +++ b/inst/include/vcglib/vcg/space/.svn/text-base/point4.h.svn-base @@ -88,13 +88,13 @@ public: const Point4 &y = *this; res[0] = y[1]*x[2]*z[3]-y[1]*x[3]*z[2]-x[1]*y[2]*z[3]+ - x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; + x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; res[1] = y[0]*x[3]*z[2]-z[0]*y[2]*x[3]-y[0]*x[2]* - z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; + z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; res[2] = -y[0]*z[1]*x[3]+x[0]*z[1]*y[3]+y[0]*x[1]* - z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; + z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; res[3] = -z[0]*y[1]*x[2]-y[0]*x[1]*z[2]+x[0]*y[1]* - z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; + z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; return res; } @@ -117,11 +117,11 @@ public: frexp( double(k0), &exp0 );frexp( double(k1), &exp1 ); frexp( double(k2), &exp2 );frexp( double(k3), &exp3 ); - if (exp0>exp1) { math::Swap(k0,k1); math::Swap(exp0,exp1); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } - if (exp0>exp2) { math::Swap(k0,k2); math::Swap(exp0,exp2); } - if (exp1>exp3) { math::Swap(k1,k3); math::Swap(exp1,exp3); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } + if (exp0>exp1) { std::swap(k0,k1); std::swap(exp0,exp1); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } + if (exp0>exp2) { std::swap(k0,k2); std::swap(exp0,exp2); } + if (exp1>exp3) { std::swap(k1,k3); std::swap(exp1,exp3); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } return ( (k0 + k1) + k2 ) +k3; } diff --git a/inst/include/vcglib/vcg/space/deprecated_point.h b/inst/include/vcglib/vcg/space/deprecated_point.h index 1fd6b31f..ed202318 100644 --- a/inst/include/vcglib/vcg/space/deprecated_point.h +++ b/inst/include/vcglib/vcg/space/deprecated_point.h @@ -61,7 +61,7 @@ Revision 1.1 2004/03/16 03:07:38 tarini namespace vcg { - namespace ndim{ + namespace ndim{ //template @@ -72,8 +72,8 @@ namespace vcg { /** The templated class for representing a point in R^N space. The class is templated over the ScalarType class that is used to represent coordinates. - PointBase provides the interface and the common operators for points - of any dimensionality. + PointBase provides the interface and the common operators for points + of any dimensionality. */ template @@ -88,7 +88,7 @@ class Point protected: /// The only data member. Hidden to user. - S _v[N]; + S _v[N]; public: @@ -103,11 +103,11 @@ class Point /// Padding function: give a default 0 value to all the elements that are not in the [0..2] range. /// Useful for managing in a consistent way object that could have point2 / point3 / point4 - inline S Ext( const int i ) const - { - if(i>=0 && i<=N) return _v[i]; - else return 0; - } + inline S Ext( const int i ) const + { + if(i>=0 && i<=N) return _v[i]; + else return 0; + } /// importer for points with different scalar type and-or dimensionality template @@ -123,7 +123,7 @@ class Point template static inline PointType Construct( const Point & b ) { - PointType p; p.Import(b); + PointType p; p.Import(b); return p; } @@ -141,7 +141,7 @@ class Point template static inline PointType Construct( const Point & b ) { - PointType p; p.ImportHomo(b); + PointType p; p.ImportHomo(b); return p; } @@ -163,30 +163,30 @@ class Point return _v[i]; } inline const S &X() const { return _v[0]; } - inline const S &Y() const { return _v[1]; } - inline const S &Z() const { static_assert(N>2); return _v[2]; } - /// W is in any case the last coordinate. - /// (in a 2D point, W() == Y(). In a 3D point, W()==Z() - /// in a 4D point, W() is a separate component) - inline const S &W() const { return _v[N-1]; } - inline S &X() { return _v[0]; } - inline S &Y() { return _v[1]; } - inline S &Z() { static_assert(N>2); return _v[2]; } - inline S &W() { return _v[N-1]; } - inline const S * V() const - { - return _v; - } - inline S & V( const int i ) - { - assert(i>=0 && i=0 && i2); return _v[2]; } + /// W is in any case the last coordinate. + /// (in a 2D point, W() == Y(). In a 3D point, W()==Z() + /// in a 4D point, W() is a separate component) + inline const S &W() const { return _v[N-1]; } + inline S &X() { return _v[0]; } + inline S &Y() { return _v[1]; } + inline S &Z() { static_assert(N>2); return _v[2]; } + inline S &W() { return _v[N-1]; } + inline const S * V() const + { + return _v; + } + inline S & V( const int i ) + { + assert(i>=0 && i=0 && i { using Point<2,S>::V; using Point<2,S>::W; - //@{ + //@{ /** @name Special members for 2D points. **/ /// default @@ -426,7 +426,7 @@ class Point2 : public Point<2,S> { //@} - //@{ + //@{ /** @name Implementation of standard functions for 3D points **/ inline void Zero(){ @@ -475,7 +475,7 @@ class Point2 : public Point<2,S> { template static S SquaredNorm(const PT &p ) { return ( p.V(0)*p.V(0) + p.V(1)*p.V(1) );} - inline S operator * ( Point2 const & p ) const { + inline S operator * ( Point2 const & p ) const { return ( _v[0]*p._v[0] + _v[1]*p._v[1]) ; } inline bool operator == ( Point2 const & p ) const { @@ -545,7 +545,7 @@ class Point3 : public Point<3,S> { using Point<3,S>::W; - //@{ + //@{ /** @name Special members for 3D points. **/ /// default @@ -563,7 +563,7 @@ class Point3 : public Point<3,S> { } //@} - //@{ + //@{ /** @name Implementation of standard functions for 3D points **/ inline void Zero(){ @@ -612,7 +612,7 @@ class Point3 : public Point<3,S> { template static S SquaredNorm(const PT &p ) { return ( p.V(0)*p.V(0) + p.V(1)*p.V(1) + p.V(2)*p.V(2) );} - inline S operator * ( PointType const & p ) const { + inline S operator * ( PointType const & p ) const { return ( _v[0]*p._v[0] + _v[1]*p._v[1] + _v[2]*p._v[2]) ; } inline bool operator == ( PointType const & p ) const { @@ -623,19 +623,19 @@ class Point3 : public Point<3,S> { inline bool operator < ( PointType const & p ) const{ return (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0] ( PointType const & p ) const { return (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } inline bool operator <= ( PointType const & p ) { return (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } inline bool operator >= ( PointType const & p ) const { return (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } inline PointType & Normalize() { S n = Norm(); @@ -650,7 +650,7 @@ class Point3 : public Point<3,S> { inline S NormInfinity() const { return math::Max( math::Max( math::Abs(_v[0]), math::Abs(_v[1]) ), - math::Abs(_v[3]) ); } + math::Abs(_v[3]) ); } inline S NormOne() const { return math::Abs(_v[0])+ math::Abs(_v[1])+math::Max(math::Abs(_v[2]));} @@ -701,10 +701,10 @@ class Point4 : public Point<4,S> { using Point<3,S>::V; using Point<3,S>::W; - //@{ + //@{ /** @name Special members for 4D points. **/ - /// default - inline Point4 (){} + /// default + inline Point4 (){} /// xyzw constructor //@} @@ -764,7 +764,7 @@ class Point4 : public Point<4,S> { template static S SquaredNorm(const PT &p ) { return ( p.V(0)*p.V(0) + p.V(1)*p.V(1) + p.V(2)*p.V(2) + p.V(3)*p.V(3) );} - inline S operator * ( PointType const & p ) const { + inline S operator * ( PointType const & p ) const { return ( _v[0]*p._v[0] + _v[1]*p._v[1] + _v[2]*p._v[2] + _v[3]*p._v[3] ); } inline bool operator == ( PointType const & p ) const { @@ -775,19 +775,19 @@ class Point4 : public Point<4,S> { inline bool operator < ( PointType const & p ) const{ return (_v[3]!=p._v[3])?(_v[3]< p._v[3]) : (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0] ( PointType const & p ) const { return (_v[3]!=p._v[3])?(_v[3]> p._v[3]) : (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>p._v[0]); } inline bool operator <= ( PointType const & p ) { return (_v[3]!=p._v[3])?(_v[3]< p._v[3]) : (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]< p._v[1]) : (_v[0]<=p._v[0]); } inline bool operator >= ( PointType const & p ) const { return (_v[3]!=p._v[3])?(_v[3]> p._v[3]) : (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } + (_v[1]!=p._v[1])?(_v[1]> p._v[1]) : (_v[0]>=p._v[0]); } inline PointType & Normalize() { PointType n = Norm(); if(n!=0.0) { n=1.0/n; _v[0]*=n; _v[1]*=n; _v[2]*=n; _v[3]*=n; } @@ -803,7 +803,7 @@ class Point4 : public Point<4,S> { inline S NormInfinity() const { return math::Max( math::Max( math::Abs(_v[0]), math::Abs(_v[1]) ), - math::Max( math::Abs(_v[2]), math::Abs(_v[3]) ) ); } + math::Max( math::Abs(_v[2]), math::Abs(_v[3]) ) ); } inline S NormOne() const { return math::Abs(_v[0])+ math::Abs(_v[1])+math::Max(math::Abs(_v[2]),math::Abs(_v[3]));} @@ -837,11 +837,11 @@ class Point4 : public Point<4,S> { int exp0,exp1,exp2,exp3; frexp( double(k0), &exp0 );frexp( double(k1), &exp1 ); frexp( double(k2), &exp2 );frexp( double(k3), &exp3 ); - if (exp0>exp1) { math::Swap(k0,k1); math::Swap(exp0,exp1); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } - if (exp0>exp2) { math::Swap(k0,k2); math::Swap(exp0,exp2); } - if (exp1>exp3) { math::Swap(k1,k3); math::Swap(exp1,exp3); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } + if (exp0>exp1) { std::swap(k0,k1); std::swap(exp0,exp1); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } + if (exp0>exp2) { std::swap(k0,k2); std::swap(exp0,exp2); } + if (exp1>exp3) { std::swap(k1,k3); std::swap(exp1,exp3); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } return ( (k0 + k1) + k2 ) +k3; } //@} @@ -856,7 +856,7 @@ inline S Angle( Point3 const & p1, Point3 const & p2 ) S t = (p1*p2)/w; if(t>1) t = 1; else if(t<-1) t = -1; - return (S) acos(t); + return (S) acos(t); } // versione uguale alla precedente ma che assume che i due vettori siano unitari @@ -875,7 +875,7 @@ inline S AngleN( Point3 const & p1, Point3 const & p2 ) template inline S Norm( Point const & p ) { - return p.Norm(); + return p.Norm(); } template diff --git a/inst/include/vcglib/vcg/space/deprecated_point4.h b/inst/include/vcglib/vcg/space/deprecated_point4.h index 134f408a..7ef89663 100644 --- a/inst/include/vcglib/vcg/space/deprecated_point4.h +++ b/inst/include/vcglib/vcg/space/deprecated_point4.h @@ -69,14 +69,14 @@ namespace vcg { /** The templated class for representing a point in 4D space. The class is templated over the ScalarType class that is used to represent coordinates. - All the usual operator (* + - ...) are defined. + All the usual operator (* + - ...) are defined. */ template class Point4 { public: /// The only data member. Hidden to user. - T _v[4]; + T _v[4]; public: typedef T ScalarType; @@ -134,104 +134,104 @@ template class Point4 /** @name Data Access. access to data is done by overloading of [] or explicit naming of coords (x,y,z,w) - **/ - inline const T & operator [] ( const int i ) const - { - assert(i>=0 && i<4); - return _v[i]; - } - inline T & operator [] ( const int i ) - { - assert(i>=0 && i<4); - return _v[i]; - } - inline T &X() {return _v[0];} - inline T &Y() {return _v[1];} - inline T &Z() {return _v[2];} - inline T &W() {return _v[3];} - inline T const * V() const - { - return _v; - } - inline T * V() - { - return _v; - } - inline const T & V ( const int i ) const - { - assert(i>=0 && i<4); - return _v[i]; - } - inline T & V ( const int i ) - { - assert(i>=0 && i<4); - return _v[i]; - } - /// Padding function: give a default 0 value to all the elements that are not in the [0..2] range. - /// Useful for managing in a consistent way object that could have point2 / point3 / point4 - inline T Ext( const int i ) const - { - if(i>=0 && i<=3) return _v[i]; - else return 0; - } + **/ + inline const T & operator [] ( const int i ) const + { + assert(i>=0 && i<4); + return _v[i]; + } + inline T & operator [] ( const int i ) + { + assert(i>=0 && i<4); + return _v[i]; + } + inline T &X() {return _v[0];} + inline T &Y() {return _v[1];} + inline T &Z() {return _v[2];} + inline T &W() {return _v[3];} + inline T const * V() const + { + return _v; + } + inline T * V() + { + return _v; + } + inline const T & V ( const int i ) const + { + assert(i>=0 && i<4); + return _v[i]; + } + inline T & V ( const int i ) + { + assert(i>=0 && i<4); + return _v[i]; + } + /// Padding function: give a default 0 value to all the elements that are not in the [0..2] range. + /// Useful for managing in a consistent way object that could have point2 / point3 / point4 + inline T Ext( const int i ) const + { + if(i>=0 && i<=3) return _v[i]; + else return 0; + } //@} //@{ /** @name Linear operators and the likes **/ - inline Point4 operator + ( const Point4 & p) const - { - return Point4( _v[0]+p._v[0], _v[1]+p._v[1], _v[2]+p._v[2], _v[3]+p._v[3] ); - } - inline Point4 operator - ( const Point4 & p) const - { - return Point4( _v[0]-p._v[0], _v[1]-p._v[1], _v[2]-p._v[2], _v[3]-p._v[3] ); - } - inline Point4 operator * ( const T s ) const - { - return Point4( _v[0]*s, _v[1]*s, _v[2]*s, _v[3]*s ); - } - inline Point4 operator / ( const T s ) const - { - return Point4( _v[0]/s, _v[1]/s, _v[2]/s, _v[3]/s ); - } - inline Point4 & operator += ( const Point4 & p) - { - _v[0] += p._v[0]; _v[1] += p._v[1]; _v[2] += p._v[2]; _v[3] += p._v[3]; - return *this; - } - inline Point4 & operator -= ( const Point4 & p ) - { - _v[0] -= p._v[0]; _v[1] -= p._v[1]; _v[2] -= p._v[2]; _v[3] -= p._v[3]; - return *this; - } - inline Point4 & operator *= ( const T s ) - { - _v[0] *= s; _v[1] *= s; _v[2] *= s; _v[3] *= s; - return *this; - } - inline Point4 & operator /= ( const T s ) - { - _v[0] /= s; _v[1] /= s; _v[2] /= s; _v[3] /= s; - return *this; - } - inline Point4 operator - () const - { - return Point4( -_v[0], -_v[1], -_v[2], -_v[3] ); - } - inline Point4 VectProd ( const Point4 &x, const Point4 &z ) const - { - Point4 res; - const Point4 &y = *this; + inline Point4 operator + ( const Point4 & p) const + { + return Point4( _v[0]+p._v[0], _v[1]+p._v[1], _v[2]+p._v[2], _v[3]+p._v[3] ); + } + inline Point4 operator - ( const Point4 & p) const + { + return Point4( _v[0]-p._v[0], _v[1]-p._v[1], _v[2]-p._v[2], _v[3]-p._v[3] ); + } + inline Point4 operator * ( const T s ) const + { + return Point4( _v[0]*s, _v[1]*s, _v[2]*s, _v[3]*s ); + } + inline Point4 operator / ( const T s ) const + { + return Point4( _v[0]/s, _v[1]/s, _v[2]/s, _v[3]/s ); + } + inline Point4 & operator += ( const Point4 & p) + { + _v[0] += p._v[0]; _v[1] += p._v[1]; _v[2] += p._v[2]; _v[3] += p._v[3]; + return *this; + } + inline Point4 & operator -= ( const Point4 & p ) + { + _v[0] -= p._v[0]; _v[1] -= p._v[1]; _v[2] -= p._v[2]; _v[3] -= p._v[3]; + return *this; + } + inline Point4 & operator *= ( const T s ) + { + _v[0] *= s; _v[1] *= s; _v[2] *= s; _v[3] *= s; + return *this; + } + inline Point4 & operator /= ( const T s ) + { + _v[0] /= s; _v[1] /= s; _v[2] /= s; _v[3] /= s; + return *this; + } + inline Point4 operator - () const + { + return Point4( -_v[0], -_v[1], -_v[2], -_v[3] ); + } + inline Point4 VectProd ( const Point4 &x, const Point4 &z ) const + { + Point4 res; + const Point4 &y = *this; res[0] = y[1]*x[2]*z[3]-y[1]*x[3]*z[2]-x[1]*y[2]*z[3]+ - x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; + x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; res[1] = y[0]*x[3]*z[2]-z[0]*y[2]*x[3]-y[0]*x[2]* - z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; + z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; res[2] = -y[0]*z[1]*x[3]+x[0]*z[1]*y[3]+y[0]*x[1]* - z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; + z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; res[3] = -z[0]*y[1]*x[2]-y[0]*x[1]*z[2]+x[0]*y[1]* - z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; + z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; return res; } //@} @@ -239,70 +239,70 @@ template class Point4 //@{ /** @name Norms and normalizations **/ - /// Euclidian normal - inline T Norm() const - { - return math::Sqrt( _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); - } - /// Squared euclidian normal - inline T SquaredNorm() const - { - return _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3]; - } - /// Euclidian normalization + /// Euclidian normal + inline T Norm() const + { + return math::Sqrt( _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); + } + /// Squared euclidian normal + inline T SquaredNorm() const + { + return _v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3]; + } + /// Euclidian normalization inline Point4 & Normalize() - { - T n = sqrt(_v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); - if(n>0.0) { _v[0] /= n; _v[1] /= n; _v[2] /= n; _v[3] /= n; } - return *this; - } - /// Homogeneous normalization (division by W) - inline Point4 & HomoNormalize(){ - if (_v[3]!=0.0) { _v[0] /= _v[3]; _v[1] /= _v[3]; _v[2] /= _v[3]; _v[3]=1.0; } - return *this; - }; + { + T n = sqrt(_v[0]*_v[0] + _v[1]*_v[1] + _v[2]*_v[2] + _v[3]*_v[3] ); + if(n>0.0) { _v[0] /= n; _v[1] /= n; _v[2] /= n; _v[3] /= n; } + return *this; + } + /// Homogeneous normalization (division by W) + inline Point4 & HomoNormalize(){ + if (_v[3]!=0.0) { _v[0] /= _v[3]; _v[1] /= _v[3]; _v[2] /= _v[3]; _v[3]=1.0; } + return *this; + }; //@} //@{ /** @name Comparison operators (lexicographical order) **/ - inline bool operator == ( const Point4& p ) const - { - return _v[0]==p._v[0] && _v[1]==p._v[1] && _v[2]==p._v[2] && _v[3]==p._v[3]; - } - inline bool operator != ( const Point4 & p ) const - { - return _v[0]!=p._v[0] || _v[1]!=p._v[1] || _v[2]!=p._v[2] || _v[3]!=p._v[3]; - } - inline bool operator < ( Point4 const & p ) const - { - return (_v[3]!=p._v[3])?(_v[3] ( const Point4 & p ) const - { - return (_v[3]!=p._v[3])?(_v[3]>p._v[3]): - (_v[2]!=p._v[2])?(_v[2]>p._v[2]): - (_v[1]!=p._v[1])?(_v[1]>p._v[1]): - (_v[0]>p._v[0]); - } - inline bool operator <= ( const Point4 & p ) const - { - return (_v[3]!=p._v[3])?(_v[3]< p._v[3]): - (_v[2]!=p._v[2])?(_v[2]< p._v[2]): - (_v[1]!=p._v[1])?(_v[1]< p._v[1]): - (_v[0]<=p._v[0]); - } - inline bool operator >= ( const Point4 & p ) const - { - return (_v[3]!=p._v[3])?(_v[3]> p._v[3]): - (_v[2]!=p._v[2])?(_v[2]> p._v[2]): - (_v[1]!=p._v[1])?(_v[1]> p._v[1]): - (_v[0]>=p._v[0]); - } + inline bool operator == ( const Point4& p ) const + { + return _v[0]==p._v[0] && _v[1]==p._v[1] && _v[2]==p._v[2] && _v[3]==p._v[3]; + } + inline bool operator != ( const Point4 & p ) const + { + return _v[0]!=p._v[0] || _v[1]!=p._v[1] || _v[2]!=p._v[2] || _v[3]!=p._v[3]; + } + inline bool operator < ( Point4 const & p ) const + { + return (_v[3]!=p._v[3])?(_v[3] ( const Point4 & p ) const + { + return (_v[3]!=p._v[3])?(_v[3]>p._v[3]): + (_v[2]!=p._v[2])?(_v[2]>p._v[2]): + (_v[1]!=p._v[1])?(_v[1]>p._v[1]): + (_v[0]>p._v[0]); + } + inline bool operator <= ( const Point4 & p ) const + { + return (_v[3]!=p._v[3])?(_v[3]< p._v[3]): + (_v[2]!=p._v[2])?(_v[2]< p._v[2]): + (_v[1]!=p._v[1])?(_v[1]< p._v[1]): + (_v[0]<=p._v[0]); + } + inline bool operator >= ( const Point4 & p ) const + { + return (_v[3]!=p._v[3])?(_v[3]> p._v[3]): + (_v[2]!=p._v[2])?(_v[2]> p._v[2]): + (_v[1]!=p._v[1])?(_v[1]> p._v[1]): + (_v[0]>=p._v[0]); + } //@} //@{ @@ -316,10 +316,10 @@ template class Point4 } inline T dot( const Point4 & p ) const { return (*this) * p; } inline Point4 operator ^ ( const Point4& /*p*/ ) const - { - assert(0);// not defined by two vectors (only put for metaprogramming) - return Point4(); - } + { + assert(0);// not defined by two vectors (only put for metaprogramming) + return Point4(); + } /// slower version, more stable (double precision only) T StableDot ( const Point4 & p ) const @@ -331,11 +331,11 @@ template class Point4 frexp( double(k0), &exp0 );frexp( double(k1), &exp1 ); frexp( double(k2), &exp2 );frexp( double(k3), &exp3 ); - if (exp0>exp1) { math::Swap(k0,k1); math::Swap(exp0,exp1); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } - if (exp0>exp2) { math::Swap(k0,k2); math::Swap(exp0,exp2); } - if (exp1>exp3) { math::Swap(k1,k3); math::Swap(exp1,exp3); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } + if (exp0>exp1) { std::swap(k0,k1); std::swap(exp0,exp1); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } + if (exp0>exp2) { std::swap(k0,k2); std::swap(exp0,exp2); } + if (exp1>exp3) { std::swap(k1,k3); std::swap(exp1,exp3); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } return ( (k0 + k1) + k2 ) +k3; } @@ -363,19 +363,19 @@ inline T Norm( const Point4 & p ) template inline T SquaredNorm( const Point4 & p ) { - return p.SquaredNorm(); + return p.SquaredNorm(); } template inline T Distance( const Point4 & p1, const Point4 & p2 ) { - return Norm(p1-p2); + return Norm(p1-p2); } template inline T SquaredDistance( const Point4 & p1, const Point4 & p2 ) { - return SquaredNorm(p1-p2); + return SquaredNorm(p1-p2); } /// slower version of dot product, more stable (double precision only) diff --git a/inst/include/vcglib/vcg/space/index/.svn/entries b/inst/include/vcglib/vcg/space/index/.svn/entries index 800e5acb..ff0a4fb6 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/vcg/space/index svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,19 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -spatial_hashing.h +kdtree +dir + +base.h file -2013-06-24T13:55:27.938354Z -7373d02031cce29f6e69d2c6beee6a8a -2013-06-24T07:57:18.546668Z -4903 +2013-06-21T07:05:18.326798Z +12ab5a5a3d0b63355ec44bd47e088a78 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -58,18 +61,18 @@ cignoni -15850 +13535 -grid_closest.h +octree_template.h file 2013-06-21T07:05:18.326798Z -6baac47bc92d67c887388ab64507f268 -2012-10-18T08:44:11.950287Z -4625 +51e308755cf0321d17ece75970a42c8d +2012-11-07T17:56:07.089933Z +4693 cignoni @@ -92,18 +95,18 @@ cignoni -11029 +22647 -grid_static_ptr.h +spatial_hashing.h file -2013-06-21T07:05:18.326798Z -dc3db3fd7cb1ad4d3f076098872a7cba -2012-07-06T09:40:09.291611Z -4473 +2013-06-24T13:55:27.938354Z +7373d02031cce29f6e69d2c6beee6a8a +2013-06-24T07:57:18.546668Z +4903 cignoni @@ -126,19 +129,19 @@ cignoni -16810 +15850 -octree.h +grid_closest.h file 2013-06-21T07:05:18.326798Z -18d62e3b99885ab199e0a1b64d6ae1cd -2012-07-23T12:16:17.067296Z -4487 -granzuglia +6baac47bc92d67c887388ab64507f268 +2012-10-18T08:44:11.950287Z +4625 +cignoni @@ -160,21 +163,18 @@ granzuglia -25192 - -aabb_binary_tree -dir +11029 -grid_util.h +grid_static_ptr.h file 2013-06-21T07:05:18.326798Z -2917c9420b91bbaca062c26498cfb5a1 -2011-10-05T15:04:40.740408Z -4180 +dc3db3fd7cb1ad4d3f076098872a7cba +2012-07-06T09:40:09.291611Z +4473 cignoni @@ -197,19 +197,19 @@ cignoni -9494 +16810 -grid_static_obj.h +octree.h file 2013-06-21T07:05:18.326798Z -41e9b09264ddcd8098143dae4d3df9d1 -2011-10-05T15:04:40.740408Z -4180 -cignoni +18d62e3b99885ab199e0a1b64d6ae1cd +2012-07-23T12:16:17.067296Z +4487 +granzuglia @@ -231,16 +231,19 @@ cignoni -4648 +25192 -perfect_spatial_hashing.h +aabb_binary_tree +dir + +grid_util.h file 2013-06-21T07:05:18.326798Z -3cd2fda22348c5648ac20b8abd68fc19 +2917c9420b91bbaca062c26498cfb5a1 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -265,21 +268,18 @@ cignoni -60505 - -index2D -dir +9494 -space_iterators.h +grid_static_obj.h file 2013-06-21T07:05:18.326798Z -d8002e2f7c6825e6ac833e5716795f23 -2012-10-18T09:01:51.587393Z -4626 +41e9b09264ddcd8098143dae4d3df9d1 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -302,19 +302,16 @@ cignoni -14628 - -kdtree -dir +4648 -base.h +perfect_spatial_hashing.h file 2013-06-21T07:05:18.326798Z -12ab5a5a3d0b63355ec44bd47e088a78 +3cd2fda22348c5648ac20b8abd68fc19 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -339,18 +336,21 @@ cignoni -13535 +60505 -octree_template.h +index2D +dir + +space_iterators.h file 2013-06-21T07:05:18.326798Z -51e308755cf0321d17ece75970a42c8d -2012-11-07T17:56:07.089933Z -4693 +d8002e2f7c6825e6ac833e5716795f23 +2012-10-18T09:01:51.587393Z +4626 cignoni @@ -373,5 +373,5 @@ cignoni -22647 +14628 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 7e503ce3..a5932216 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 -4928 +4937 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 -base.h +frustum_cull.h file 2013-06-21T07:05:17.046792Z -2c350a0a0022be010f369e5bed8c3d36 +494457d2acdba023c3e9a8ee9d3ee64e 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,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 @@ -92,16 +92,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 @@ -126,16 +126,16 @@ cignoni -5308 +6313 -frustum_cull.h +base.h file 2013-06-21T07:05:17.046792Z -494457d2acdba023c3e9a8ee9d3ee64e +2c350a0a0022be010f369e5bed8c3d36 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -160,16 +160,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 @@ -194,16 +194,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 @@ -228,5 +228,5 @@ cignoni -6313 +5308 diff --git a/inst/include/vcglib/vcg/space/index/index2D/.svn/entries b/inst/include/vcglib/vcg/space/index/index2D/.svn/entries index cc099076..2dbbd53d 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 -4928 +4937 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 -spatial_hashing_2D.h +base_2d.h file 2013-06-21T07:05:17.926797Z -65eff96795cf0d1ba18677659dec1474 -2012-09-19T09:05:40.634269Z -4515 -corsini +7dae8fb1e5eaa2b58a1cdd5a79756447 +2012-06-22T14:27:33.221037Z +4439 +pietroni @@ -58,19 +58,19 @@ corsini -17945 +13508 -grid_closest_2D.h +spatial_hashing_2D.h file 2013-06-21T07:05:17.926797Z -d83571668bd6e06cc1ac56468e1adc8d -2012-08-27T12:47:12.424377Z -4499 -pietroni +65eff96795cf0d1ba18677659dec1474 +2012-09-19T09:05:40.634269Z +4515 +corsini @@ -92,18 +92,18 @@ pietroni -5691 +17945 -grid_util_2D.h +grid_closest_2D.h file 2013-06-21T07:05:17.926797Z -8f79a27d1de5c56d8c65314a15df8c56 -2012-06-22T14:27:33.221037Z -4439 +d83571668bd6e06cc1ac56468e1adc8d +2012-08-27T12:47:12.424377Z +4499 pietroni @@ -126,16 +126,16 @@ pietroni -7405 +5691 -base_2d.h +grid_util_2D.h file 2013-06-21T07:05:17.926797Z -7dae8fb1e5eaa2b58a1cdd5a79756447 +8f79a27d1de5c56d8c65314a15df8c56 2012-06-22T14:27:33.221037Z 4439 pietroni @@ -160,5 +160,5 @@ pietroni -13508 +7405 diff --git a/inst/include/vcglib/vcg/space/index/kdtree/.svn/entries b/inst/include/vcglib/vcg/space/index/kdtree/.svn/entries index 2565667c..6c55311c 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 -4928 +4937 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 -mlsutils.h +priorityqueue.h file 2013-06-21T07:05:18.322798Z -99f6b0adc42604eeed342c905caf9927 -2012-07-04T15:27:17.564256Z -4463 +2f02f547dbc35ff6b19b2f23d14dd2e8 +2012-02-22T16:57:44.619581Z +4334 cignoni has-props @@ -58,18 +58,18 @@ has-props -3373 +3618 -kdtree.h +mlsutils.h file 2013-06-21T07:05:18.322798Z -fc64d5b7ce0a6ca7a198485299ec0efb -2013-01-31T10:44:44.180922Z -4812 +99f6b0adc42604eeed342c905caf9927 +2012-07-04T15:27:17.564256Z +4463 cignoni has-props @@ -92,18 +92,18 @@ has-props -13285 +3373 -priorityqueue.h +kdtree.h file 2013-06-21T07:05:18.322798Z -2f02f547dbc35ff6b19b2f23d14dd2e8 -2012-02-22T16:57:44.619581Z -4334 +fc64d5b7ce0a6ca7a198485299ec0efb +2013-01-31T10:44:44.180922Z +4812 cignoni has-props @@ -126,5 +126,5 @@ has-props -3618 +13285 diff --git a/inst/include/vcglib/vcg/space/intersection/.svn/entries b/inst/include/vcglib/vcg/space/intersection/.svn/entries index 7d86e65b..e1a1875d 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 -4928 +4937 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/vcg/space/point4.h b/inst/include/vcglib/vcg/space/point4.h index 66660325..6acdfb63 100644 --- a/inst/include/vcglib/vcg/space/point4.h +++ b/inst/include/vcglib/vcg/space/point4.h @@ -88,13 +88,13 @@ template class Point4 : public Eigen::Matrix const Point4 &y = *this; res[0] = y[1]*x[2]*z[3]-y[1]*x[3]*z[2]-x[1]*y[2]*z[3]+ - x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; + x[1]*y[3]*z[2]+z[1]*y[2]*x[3]-z[1]*y[3]*x[2]; res[1] = y[0]*x[3]*z[2]-z[0]*y[2]*x[3]-y[0]*x[2]* - z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; + z[3]+z[0]*y[3]*x[2]+x[0]*y[2]*z[3]-x[0]*y[3]*z[2]; res[2] = -y[0]*z[1]*x[3]+x[0]*z[1]*y[3]+y[0]*x[1]* - z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; + z[3]-x[0]*y[1]*z[3]-z[0]*x[1]*y[3]+z[0]*y[1]*x[3]; res[3] = -z[0]*y[1]*x[2]-y[0]*x[1]*z[2]+x[0]*y[1]* - z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; + z[2]+y[0]*z[1]*x[2]-x[0]*z[1]*y[2]+z[0]*x[1]*y[2]; return res; } @@ -117,11 +117,11 @@ template class Point4 : public Eigen::Matrix frexp( double(k0), &exp0 );frexp( double(k1), &exp1 ); frexp( double(k2), &exp2 );frexp( double(k3), &exp3 ); - if (exp0>exp1) { math::Swap(k0,k1); math::Swap(exp0,exp1); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } - if (exp0>exp2) { math::Swap(k0,k2); math::Swap(exp0,exp2); } - if (exp1>exp3) { math::Swap(k1,k3); math::Swap(exp1,exp3); } - if (exp2>exp3) { math::Swap(k2,k3); math::Swap(exp2,exp3); } + if (exp0>exp1) { std::swap(k0,k1); std::swap(exp0,exp1); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } + if (exp0>exp2) { std::swap(k0,k2); std::swap(exp0,exp2); } + if (exp1>exp3) { std::swap(k1,k3); std::swap(exp1,exp3); } + if (exp2>exp3) { std::swap(k2,k3); std::swap(exp2,exp3); } return ( (k0 + k1) + k2 ) +k3; } diff --git a/inst/include/vcglib/wrap/.svn/entries b/inst/include/vcglib/wrap/.svn/entries index bec0495d..2a9ecc8a 100644 --- a/inst/include/vcglib/wrap/.svn/entries +++ b/inst/include/vcglib/wrap/.svn/entries @@ -1,15 +1,15 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap svn://svn.code.sf.net/p/vcg/code -2013-07-23T11:24:38.954326Z -4927 -pietroni +2013-07-26T14:01:17.531085Z +4937 +cignoni @@ -29,10 +29,10 @@ e8973e21-934d-0410-ac44-de4585f5606d tsai dir -io_trimesh +gl dir -gl +io_trimesh dir ply @@ -47,12 +47,6 @@ dir mt dir -minpack -dir - -bmt -dir - callback.h file @@ -87,16 +81,22 @@ cignoni 2760 +bmt +dir + +minpack +dir + io_tetramesh dir -gui +system dir qt dir -system +gui dir miq diff --git a/inst/include/vcglib/wrap/bmt/.svn/entries b/inst/include/vcglib/wrap/bmt/.svn/entries index 5b46c3f4..1c581e6d 100644 --- a/inst/include/vcglib/wrap/bmt/.svn/entries +++ b/inst/include/vcglib/wrap/bmt/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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.h +bmt.cpp file 2013-06-21T07:08:07.531638Z -37b71b585b4d43d268ef20cf291b923a +625d0805cc87a919ba2ef36583ed83a6 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -3609 +6952 -bmt.cpp +strip_mesh.h file 2013-06-21T07:08:07.531638Z -625d0805cc87a919ba2ef36583ed83a6 +98f127b06a6d1fa7ec023d630a114084 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -6952 +2688 -strip_mesh.h +bmt.h file 2013-06-21T07:08:07.531638Z -98f127b06a6d1fa7ec023d630a114084 +37b71b585b4d43d268ef20cf291b923a 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,5 +126,5 @@ cignoni -2688 +3609 diff --git a/inst/include/vcglib/wrap/dae/.svn/entries b/inst/include/vcglib/wrap/dae/.svn/entries index 944571e0..36a0d33c 100644 --- a/inst/include/vcglib/wrap/dae/.svn/entries +++ b/inst/include/vcglib/wrap/dae/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/dae svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/gcache/.svn/entries b/inst/include/vcglib/wrap/gcache/.svn/entries index 9e363d8f..4856bcec 100644 --- a/inst/include/vcglib/wrap/gcache/.svn/entries +++ b/inst/include/vcglib/wrap/gcache/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache svn://svn.code.sf.net/p/vcg/code @@ -26,17 +26,17 @@ ponchio e8973e21-934d-0410-ac44-de4585f5606d -dheap.h +provider.h file 2013-06-21T07:08:21.863709Z -b2c49281396f20bc4388851fe2efdad8 -2011-12-17T11:50:40.350085Z -4268 -jmnoguerar +84667629b7ed10c5ae18e65961a64845 +2012-05-29T12:14:27.024790Z +4423 +ponchio @@ -58,19 +58,16 @@ jmnoguerar -7854 - -docs -dir +2286 -cache.h +token.h file 2013-06-21T07:08:21.863709Z -5db8ce591eef8eb9448b6def7d4f1855 +582013e42ef3cb389a4def477851b609 2013-03-19T19:46:24.889400Z 4845 ponchio @@ -95,19 +92,19 @@ ponchio -10242 +3461 -controller.h +dheap.h file 2013-06-21T07:08:21.863709Z -df87f0c438798a60fbf68b923598d42f -2013-03-19T19:46:24.889400Z -4845 -ponchio +b2c49281396f20bc4388851fe2efdad8 +2011-12-17T11:50:40.350085Z +4268 +jmnoguerar @@ -129,18 +126,21 @@ ponchio -4918 +7854 -door.h +docs +dir + +cache.h file 2013-06-21T07:08:21.863709Z -4aad2e46b295c2c6dc37d7db7b053a2c -2012-01-05T17:52:34.350736Z -4281 +5db8ce591eef8eb9448b6def7d4f1855 +2013-03-19T19:46:24.889400Z +4845 ponchio @@ -163,24 +163,18 @@ ponchio -5324 - -example -dir - -test -dir +10242 -provider.h +controller.h file 2013-06-21T07:08:21.863709Z -84667629b7ed10c5ae18e65961a64845 -2012-05-29T12:14:27.024790Z -4423 +df87f0c438798a60fbf68b923598d42f +2013-03-19T19:46:24.889400Z +4845 ponchio @@ -203,18 +197,18 @@ ponchio -2286 +4918 -token.h +door.h file 2013-06-21T07:08:21.863709Z -582013e42ef3cb389a4def477851b609 -2013-03-19T19:46:24.889400Z -4845 +4aad2e46b295c2c6dc37d7db7b053a2c +2012-01-05T17:52:34.350736Z +4281 ponchio @@ -237,5 +231,11 @@ ponchio -3461 +5324 + +example +dir + +test +dir diff --git a/inst/include/vcglib/wrap/gcache/docs/.svn/entries b/inst/include/vcglib/wrap/gcache/docs/.svn/entries index 9120c39d..550a1656 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gcache/docs svn://svn.code.sf.net/p/vcg/code @@ -26,23 +26,14 @@ cignoni e8973e21-934d-0410-ac44-de4585f5606d -css -dir - -img -dir - -js -dir - -readme.html +Doxyfile file 2013-06-21T07:08:21.687708Z -f4ddd8b2e49b36ed0b9917e42a3fb315 +b3b820210cfcdde3f4e212628e87f370 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -67,16 +58,28 @@ cignoni -6969 +67460 -Doxyfile +html +dir + +css +dir + +img +dir + +js +dir + +readme.html file 2013-06-21T07:08:21.687708Z -b3b820210cfcdde3f4e212628e87f370 +f4ddd8b2e49b36ed0b9917e42a3fb315 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -101,8 +104,5 @@ cignoni -67460 - -html -dir +6969 diff --git a/inst/include/vcglib/wrap/gcache/docs/css/.svn/entries b/inst/include/vcglib/wrap/gcache/docs/css/.svn/entries index a4edb3a7..88f73d2c 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 -4928 +4937 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 fe4b4b40..ee0da19b 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 -4928 +4937 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 70799447..a7976544 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 -4928 +4937 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 27978460..5418b65b 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 -4928 +4937 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.css +prettify.js file 2013-06-21T07:08:21.687708Z -65a9f734e81153feb6f7a48145dc3fe4 +872e112ccd26dc15e635b977d5235d8c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -391 +15549 -prettify.js +prettify.css file 2013-06-21T07:08:21.687708Z -872e112ccd26dc15e635b977d5235d8c +65a9f734e81153feb6f7a48145dc3fe4 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,5 +92,5 @@ cignoni -15549 +391 diff --git a/inst/include/vcglib/wrap/gcache/example/.svn/entries b/inst/include/vcglib/wrap/gcache/example/.svn/entries index 465073e1..9471f8d9 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 -4928 +4937 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 dbdea308..2244bcf7 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 -4928 +4937 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 f6aa8a46..6630358d 100644 --- a/inst/include/vcglib/wrap/gl/.svn/entries +++ b/inst/include/vcglib/wrap/gl/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gl svn://svn.code.sf.net/p/vcg/code @@ -60,14 +60,14 @@ cignoni 12975 -gl_object.h +camera.h file 2013-06-21T07:08:18.515692Z -b09309ab9910a1b170ccc8aca05f7af0 +789277da9a30a3f93ee1e90e00ca5729 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -2490 +32921 -camera.h +gl_object.h file 2013-06-21T07:08:18.515692Z -789277da9a30a3f93ee1e90e00ca5729 +b09309ab9910a1b170ccc8aca05f7af0 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,19 +126,19 @@ cignoni -32921 +2490 -math.h +shaders.h file 2013-06-21T07:08:18.515692Z -25ff776fd76c9938b1536514ae6e95b2 -2011-10-05T15:04:40.740408Z -4180 -cignoni +93a8cf5bb11526bfc27342ee1a732062 +2011-12-09T16:06:08.628319Z +4246 +ponchio @@ -160,19 +160,19 @@ cignoni -5870 +12478 -shaders.h +math.h file 2013-06-21T07:08:18.515692Z -93a8cf5bb11526bfc27342ee1a732062 -2011-12-09T16:06:08.628319Z -4246 -ponchio +25ff776fd76c9938b1536514ae6e95b2 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -194,20 +194,19 @@ ponchio -12478 +5870 -glu_tessellator_cap.h +space.h file 2013-06-21T07:08:18.515692Z -9399f318ecaaeaeae68ed7ba501b9059 -2012-01-18T16:48:06.042804Z -4296 +7da71ef8551e40e249f824d56867f995 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -228,19 +227,21 @@ has-props -2276 + +13275 -space.h +glu_tessellator_cap.h file 2013-06-21T07:08:18.515692Z -7da71ef8551e40e249f824d56867f995 -2011-10-05T15:04:40.740408Z -4180 +9399f318ecaaeaeae68ed7ba501b9059 +2012-01-18T16:48:06.042804Z +4296 cignoni +has-props @@ -261,19 +262,18 @@ cignoni - -13275 +2276 -glu_tesselator.h +tetramesh.h file 2013-06-21T07:08:18.515692Z -480cea7fe7b7329cdd6a7c099fe18781 -2012-05-23T08:50:03.107360Z -4414 +96de94bf320449bb4b9c506a3bf44e73 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -296,18 +296,18 @@ cignoni -7351 +10655 -tetramesh.h +glu_tesselator.h file 2013-06-21T07:08:18.515692Z -96de94bf320449bb4b9c506a3bf44e73 -2011-10-05T15:04:40.740408Z -4180 +480cea7fe7b7329cdd6a7c099fe18781 +2012-05-23T08:50:03.107360Z +4414 cignoni @@ -330,7 +330,7 @@ cignoni -10655 +7351 pos.h file @@ -366,9 +366,6 @@ cignoni 3419 -splatting_apss -dir - gl_field.h file @@ -403,6 +400,9 @@ pietroni 6538 +splatting_apss +dir + fbo.h file diff --git a/inst/include/vcglib/wrap/gl/splatting_apss/.svn/entries b/inst/include/vcglib/wrap/gl/splatting_apss/.svn/entries index 72862644..31b0fb4d 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gl/splatting_apss svn://svn.code.sf.net/p/vcg/code 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 391d99de..1c4ed54d 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/gl/splatting_apss/shaders svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/glw/.svn/entries b/inst/include/vcglib/wrap/glw/.svn/entries index e0632d9d..30bad94e 100644 --- a/inst/include/vcglib/wrap/glw/.svn/entries +++ b/inst/include/vcglib/wrap/glw/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 -type.h +texture2d.h file 2013-06-21T07:08:13.003665Z -633f5a482c088d413246695d7eb1bf58 -2012-08-22T12:38:09.043025Z -4494 +c379454b35d23afc4a9c60116cce8d2a +2012-08-29T23:25:28.287404Z +4502 dibenedetto @@ -58,16 +58,16 @@ dibenedetto -321 +7845 -geometryshader.h +common.h file 2013-06-21T07:08:13.003665Z -ddf2efdf95a0c40c7a18ca7d89eb3bd8 +d30a208790046f71d30d9ae44b84408c 2012-05-07T13:18:05.629767Z 4407 dibenedetto @@ -92,18 +92,18 @@ dibenedetto -3743 +831 -context.h +glw.h file -2013-06-21T07:08:13.003665Z -a31b0bc5d7678847034456800a9779c2 -2013-02-05T18:43:59.934417Z -4814 +2013-06-21T07:08:12.999665Z +c7f0beb83214272f04b49af0b6048446 +2012-04-30T18:23:53.926492Z +4393 dibenedetto @@ -126,18 +126,18 @@ dibenedetto -23112 +111 -framebuffer.h +fragmentshader.h file -2013-06-21T07:08:13.003665Z -eb53ca2bac75d7d68e89be63b2fd731c -2012-08-22T12:38:09.043025Z -4494 +2013-06-21T07:08:12.999665Z +966abfbc41b8b94503719043bd798e61 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -160,18 +160,18 @@ dibenedetto -21046 +3743 -texture2d.h +bookkeeping.h file 2013-06-21T07:08:13.003665Z -c379454b35d23afc4a9c60116cce8d2a -2012-08-29T23:25:28.287404Z -4502 +63c8c17de4ebeb7a7e6b8fae5c4f773e +2012-05-07T19:21:47.050983Z +4409 dibenedetto @@ -194,18 +194,18 @@ dibenedetto -7845 +8803 -common.h +glheaders.h file 2013-06-21T07:08:13.003665Z -d30a208790046f71d30d9ae44b84408c -2012-05-07T13:18:05.629767Z -4407 +a7818439ef0798f3438d138c45a0574c +2012-04-30T18:23:53.926492Z +4393 dibenedetto @@ -228,18 +228,18 @@ dibenedetto -831 +103 -glw.h +texturecube.h file -2013-06-21T07:08:12.999665Z -c7f0beb83214272f04b49af0b6048446 -2012-04-30T18:23:53.926492Z -4393 +2013-06-21T07:08:13.003665Z +4abec5478c3c76188520b579d07693c3 +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -262,18 +262,18 @@ dibenedetto -111 +7874 -fragmentshader.h +texture.h file -2013-06-21T07:08:12.999665Z -966abfbc41b8b94503719043bd798e61 -2012-05-07T13:18:05.629767Z -4407 +2013-06-21T07:08:13.003665Z +ecc5efa79af0ab929afb8e97315e9117 +2012-05-23T18:02:22.047197Z +4415 dibenedetto @@ -296,18 +296,18 @@ dibenedetto -3743 +5033 -bookkeeping.h +renderable.h file 2013-06-21T07:08:13.003665Z -63c8c17de4ebeb7a7e6b8fae5c4f773e -2012-05-07T19:21:47.050983Z -4409 +c2ea3af781b1896708c02823f10ad111 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -330,18 +330,18 @@ dibenedetto -8803 +4137 -glheaders.h +utility.h file 2013-06-21T07:08:13.003665Z -a7818439ef0798f3438d138c45a0574c -2012-04-30T18:23:53.926492Z -4393 +45c8e5efbea5a1450ba7baad4fce89ce +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -364,18 +364,18 @@ dibenedetto -103 +9606 -texturecube.h +vertexshader.h file 2013-06-21T07:08:13.003665Z -4abec5478c3c76188520b579d07693c3 -2012-08-22T12:38:09.043025Z -4494 +5a50bbdcef70e77779c0e12191f35191 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -398,18 +398,18 @@ dibenedetto -7874 +3631 -texture.h +config.h file 2013-06-21T07:08:13.003665Z -ecc5efa79af0ab929afb8e97315e9117 -2012-05-23T18:02:22.047197Z -4415 +1fb26369d111ad673dd30faa30e124d6 +2012-05-19T17:59:50.630000Z +4412 dibenedetto @@ -432,18 +432,18 @@ dibenedetto -5033 +383 -utility.h +shader.h file 2013-06-21T07:08:13.003665Z -45c8e5efbea5a1450ba7baad4fce89ce -2012-08-22T12:38:09.043025Z -4494 +cb9c4ffb901f6ceb1afa813952322db8 +2012-05-07T16:12:40.729865Z +4408 dibenedetto @@ -466,18 +466,18 @@ dibenedetto -9606 +6055 -renderable.h +object.h file 2013-06-21T07:08:13.003665Z -c2ea3af781b1896708c02823f10ad111 -2012-05-07T13:18:05.629767Z -4407 +2bdb0781f1868004aa819a95d08ae925 +2012-05-07T19:21:47.050983Z +4409 dibenedetto @@ -500,18 +500,18 @@ dibenedetto -4137 +6020 -vertexshader.h +program.h file 2013-06-21T07:08:13.003665Z -5a50bbdcef70e77779c0e12191f35191 -2012-05-07T13:18:05.629767Z -4407 +4701baa400535ea381716b34b255b0c2 +2012-06-02T00:35:04.072474Z +4429 dibenedetto @@ -534,18 +534,18 @@ dibenedetto -3631 +20908 -config.h +renderbuffer.h file 2013-06-21T07:08:13.003665Z -1fb26369d111ad673dd30faa30e124d6 -2012-05-19T17:59:50.630000Z -4412 +b80c38d5bd5df6491480227ac61e1d66 +2012-05-08T10:46:00.837775Z +4410 dibenedetto @@ -568,18 +568,18 @@ dibenedetto -383 +5938 -shader.h +buffer.h file 2013-06-21T07:08:13.003665Z -cb9c4ffb901f6ceb1afa813952322db8 -2012-05-07T16:12:40.729865Z -4408 +fe9edbd618d2a1de8a8bc35935241792 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -602,18 +602,18 @@ dibenedetto -6055 +16754 -object.h +noncopyable.h file 2013-06-21T07:08:13.003665Z -2bdb0781f1868004aa819a95d08ae925 -2012-05-07T19:21:47.050983Z -4409 +daa0a22ee1378fd0bafd0dd881b4295a +2012-04-30T18:23:53.926492Z +4393 dibenedetto @@ -636,18 +636,18 @@ dibenedetto -6020 +486 -program.h +objectdeleter.h file 2013-06-21T07:08:13.003665Z -4701baa400535ea381716b34b255b0c2 -2012-06-02T00:35:04.072474Z -4429 +38a9b9e89291d009f13bea2d48cd8b28 +2012-05-07T13:18:05.629767Z +4407 dibenedetto @@ -670,18 +670,18 @@ dibenedetto -20908 +354 -renderbuffer.h +type.h file 2013-06-21T07:08:13.003665Z -b80c38d5bd5df6491480227ac61e1d66 -2012-05-08T10:46:00.837775Z -4410 +633f5a482c088d413246695d7eb1bf58 +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -704,16 +704,16 @@ dibenedetto -5938 +321 -buffer.h +geometryshader.h file 2013-06-21T07:08:13.003665Z -fe9edbd618d2a1de8a8bc35935241792 +ddf2efdf95a0c40c7a18ca7d89eb3bd8 2012-05-07T13:18:05.629767Z 4407 dibenedetto @@ -738,18 +738,18 @@ dibenedetto -16754 +3743 -noncopyable.h +framebuffer.h file 2013-06-21T07:08:13.003665Z -daa0a22ee1378fd0bafd0dd881b4295a -2012-04-30T18:23:53.926492Z -4393 +eb53ca2bac75d7d68e89be63b2fd731c +2012-08-22T12:38:09.043025Z +4494 dibenedetto @@ -772,18 +772,18 @@ dibenedetto -486 +21046 -objectdeleter.h +context.h file 2013-06-21T07:08:13.003665Z -38a9b9e89291d009f13bea2d48cd8b28 -2012-05-07T13:18:05.629767Z -4407 +a31b0bc5d7678847034456800a9779c2 +2013-02-05T18:43:59.934417Z +4814 dibenedetto @@ -806,5 +806,5 @@ dibenedetto -354 +23112 diff --git a/inst/include/vcglib/wrap/gui/.svn/entries b/inst/include/vcglib/wrap/gui/.svn/entries index 390f5d3a..b1152644 100644 --- a/inst/include/vcglib/wrap/gui/.svn/entries +++ b/inst/include/vcglib/wrap/gui/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 -frustum.h +trackball.cpp file 2013-06-21T07:08:10.531652Z -ede0ae4bc332aa3e30845f174cb58b3e -2012-07-02T14:38:10.168389Z -4451 -ganovelli +4293a38a8710094303bf6f6af9aa286d +2013-01-28T15:15:14.079360Z +4807 +cignoni @@ -58,18 +58,18 @@ ganovelli -6671 +12372 -trackutils.h +trackrecorder.h file 2013-06-21T07:08:10.531652Z -9d083b474d7941386c468ac5c713ca38 -2012-03-06T11:52:00.209520Z -4341 +402ee54496fbab82c0940985ec9b6cb1 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -92,18 +92,18 @@ cignoni -36969 +3088 -rubberband.h +view.h file 2013-06-21T07:08:10.531652Z -991d12f12eb2b8178e0d2ac4ed497825 -2011-10-05T15:04:40.740408Z -4180 +84eb9b6274e66b5b00c0b8d3c2abed83 +2013-03-19T16:59:45.458763Z +4839 cignoni @@ -126,18 +126,18 @@ cignoni -4509 +7834 -activecoordinateframe.cpp +coordinateframe.cpp file 2013-06-21T07:08:10.531652Z -217a733adec6833e1fbb89ae9953ea4e -2013-01-28T15:15:14.079360Z -4807 +167072b45b9d4ebf3bc00c9cc60a94a1 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -160,16 +160,16 @@ cignoni -9307 +12284 -trackmode.h +activecoordinateframe.h file 2013-06-21T07:08:10.531652Z -666eedfe949a321037b438161184c302 +13496db648681f2f16cf7eaa951e0944 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -194,16 +194,16 @@ cignoni -31973 +6522 -trackball.cpp +trackball.h file 2013-06-21T07:08:10.531652Z -4293a38a8710094303bf6f6af9aa286d +d042f42bcb6e676a9a064f4855f4efe8 2013-01-28T15:15:14.079360Z 4807 cignoni @@ -228,16 +228,16 @@ cignoni -12372 +17237 -trackrecorder.h +rubberband.cpp file 2013-06-21T07:08:10.531652Z -402ee54496fbab82c0940985ec9b6cb1 +566b4a5045292e3721d5e2361460a614 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -262,18 +262,18 @@ cignoni -3088 +7231 -view.h +coordinateframe.h file 2013-06-21T07:08:10.531652Z -84eb9b6274e66b5b00c0b8d3c2abed83 -2013-03-19T16:59:45.458763Z -4839 +35c6b9bd0432192b26e5e4f35137c88e +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -296,18 +296,18 @@ cignoni -7834 +7557 -coordinateframe.cpp +trackmode.cpp file 2013-06-21T07:08:10.531652Z -167072b45b9d4ebf3bc00c9cc60a94a1 -2011-10-05T15:04:40.740408Z -4180 +a0d0924119fe2f608774e06a6950f237 +2012-03-06T11:52:00.209520Z +4341 cignoni @@ -330,19 +330,19 @@ cignoni -12284 +24818 -activecoordinateframe.h +frustum.h file 2013-06-21T07:08:10.531652Z -13496db648681f2f16cf7eaa951e0944 -2011-10-05T15:04:40.740408Z -4180 -cignoni +ede0ae4bc332aa3e30845f174cb58b3e +2012-07-02T14:38:10.168389Z +4451 +ganovelli @@ -364,18 +364,18 @@ cignoni -6522 +6671 -trackball.h +trackutils.h file 2013-06-21T07:08:10.531652Z -d042f42bcb6e676a9a064f4855f4efe8 -2013-01-28T15:15:14.079360Z -4807 +9d083b474d7941386c468ac5c713ca38 +2012-03-06T11:52:00.209520Z +4341 cignoni @@ -398,16 +398,16 @@ cignoni -17237 +36969 -rubberband.cpp +rubberband.h file 2013-06-21T07:08:10.531652Z -566b4a5045292e3721d5e2361460a614 +991d12f12eb2b8178e0d2ac4ed497825 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -432,18 +432,18 @@ cignoni -7231 +4509 -coordinateframe.h +activecoordinateframe.cpp file 2013-06-21T07:08:10.531652Z -35c6b9bd0432192b26e5e4f35137c88e -2011-10-05T15:04:40.740408Z -4180 +217a733adec6833e1fbb89ae9953ea4e +2013-01-28T15:15:14.079360Z +4807 cignoni @@ -466,18 +466,18 @@ cignoni -7557 +9307 -trackmode.cpp +trackmode.h file 2013-06-21T07:08:10.531652Z -a0d0924119fe2f608774e06a6950f237 -2012-03-06T11:52:00.209520Z -4341 +666eedfe949a321037b438161184c302 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -500,5 +500,5 @@ cignoni -24818 +31973 diff --git a/inst/include/vcglib/wrap/io_edgemesh/.svn/entries b/inst/include/vcglib/wrap/io_edgemesh/.svn/entries index 86619f4c..bd97bf74 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 -4928 +4937 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 030fe021..35071542 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 -4928 +4937 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 -export_ts.h +io_ply.h file 2013-06-21T07:08:07.883639Z -3de894d4df6bf0ccfb64fa88345fbaed +e1cbee1b2a751006a01cf244c46982bf 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,18 +58,18 @@ cignoni -3714 +4081 -io_ply.h +import_ply.h file 2013-06-21T07:08:07.883639Z -e1cbee1b2a751006a01cf244c46982bf -2011-10-05T15:04:40.740408Z -4180 +f7fd992c0b8b35d2c564d1234ac8c3dd +2012-10-25T13:17:47.287786Z +4658 cignoni @@ -92,16 +92,16 @@ cignoni -4081 +23404 -import_ply.h +import_ts.h file 2013-06-21T07:08:07.883639Z -f7fd992c0b8b35d2c564d1234ac8c3dd +fc46e6d26f17e052e1984763c9682748 2012-10-25T13:17:47.287786Z 4658 cignoni @@ -126,16 +126,16 @@ cignoni -23404 +3881 -import_ts.h +export_ply.h file 2013-06-21T07:08:07.883639Z -fc46e6d26f17e052e1984763c9682748 +c4f5afa10f32cdd4329f723cbdd77485 2012-10-25T13:17:47.287786Z 4658 cignoni @@ -160,18 +160,18 @@ cignoni -3881 +17990 -export_ply.h +export_ts.h file 2013-06-21T07:08:07.883639Z -c4f5afa10f32cdd4329f723cbdd77485 -2012-10-25T13:17:47.287786Z -4658 +3de894d4df6bf0ccfb64fa88345fbaed +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -194,5 +194,5 @@ cignoni -17990 +3714 diff --git a/inst/include/vcglib/wrap/io_trimesh/.svn/entries b/inst/include/vcglib/wrap/io_trimesh/.svn/entries index f2c09a34..9599bb80 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/io_trimesh svn://svn.code.sf.net/p/vcg/code -2013-07-07T22:26:45.051813Z -4917 -granzuglia +2013-07-26T14:01:17.531085Z +4937 +cignoni @@ -26,18 +26,17 @@ granzuglia e8973e21-934d-0410-ac44-de4585f5606d -import_ctm.h +import_ply.h file -2013-06-21T07:08:16.811684Z -62b3fcd1d8979a7208396fec962ac771 -2011-10-06T14:00:54.207830Z -4183 -cignoni -has-props +2013-06-21T07:08:16.815684Z +839dc5cb21f8da87c68cec351f9c6583 +2013-06-04T11:55:33.377527Z +4896 +tarini @@ -58,19 +57,21 @@ has-props -5479 + +40202 -export_iv.h +export_gts.h file 2013-06-21T07:08:16.815684Z -bdfdd627e01a83d6162ba5da4eaf024e -2011-10-05T15:04:40.740408Z -4180 +10928d7f7ca81c56619f5ba2e8b9c4f7 +2012-10-25T13:17:47.287786Z +4658 cignoni +has-props @@ -91,21 +92,19 @@ cignoni - -3158 +6344 -export_fbx.h +import_asc.h file -2013-06-21T07:08:16.811684Z -241aec436da087a7d7177e142c205231 +2013-06-21T07:08:16.815684Z +c2d9a6b17a2f81d9f74026b4f2df3252 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -126,18 +125,19 @@ has-props -11169 + +5057 -export.h +export_stl.h file -2013-06-21T07:08:16.811684Z -2f151766a7e494f22be8505a02e2ea3b -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:16.815684Z +b1d7fcc6fca8a57fed7bbda16de3eff2 +2012-11-27T07:05:38.064450Z +4746 cignoni @@ -160,18 +160,18 @@ cignoni -5244 +6307 -export_dxf.h +export_ply.h file -2013-06-21T07:08:16.811684Z -21f41d4ebfc787ffe892a575ee9dc579 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:16.815684Z +587f287a6bdb94dea9472d027f21d6bd +2012-11-08T18:48:07.067992Z +4706 cignoni @@ -194,18 +194,18 @@ cignoni -4172 +26842 -import_dae.h +import_ptx.h file -2013-06-21T07:08:16.811684Z -fb723590f2ef15ea4b7a7c0c6e6f8f50 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:16.815684Z +b0792b8b93aec745dbe26a8bdf880146 +2012-10-11T11:20:55.820886Z +4580 cignoni @@ -228,20 +228,19 @@ cignoni -41259 +14800 -export_ctm.h +how_to_write_an_io_filter.txt file 2013-06-21T07:08:16.815684Z -6da45d8b006c0ab478098f1e4817cd45 -2011-10-06T14:00:54.207830Z -4183 +06ff7e7f6533e155afd18462e1453202 +2011-10-05T15:04:40.740408Z +4180 cignoni -has-props @@ -262,20 +261,21 @@ has-props -6566 + +1945 -additionalinfo.h +import_field.h file 2013-06-21T07:08:16.815684Z -d77ea3ef72311f41e4c81d3a00a2d983 -2011-10-05T15:04:40.740408Z -4180 -cignoni - +98df142bd291faae5c16a1fd739f554b +2013-01-30T17:18:55.488904Z +4811 +ganovelli +has-props @@ -296,16 +296,16 @@ cignoni -1973 +9550 -io_material.h +import_smf.h file -2013-06-21T07:08:16.819684Z -ca5761162e3908bd1c2325cf7bc9e0db +2013-06-21T07:08:16.815684Z +e15080b83d5e36827ff95dc0fb01e204 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,20 +330,19 @@ cignoni -5166 +4399 -import_gts.h +export_iv.h file 2013-06-21T07:08:16.815684Z -0f46db10354d3047addae8505574163e +bdfdd627e01a83d6162ba5da4eaf024e 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -364,19 +363,20 @@ has-props -8847 + +3158 -export_idtf.h +import_raw.h file -2013-07-25T06:52:24.830399Z -c083ab1284193ae3e0c3d09525cf13f6 -2013-07-01T08:32:58.213815Z -4911 -granzuglia +2013-06-21T07:08:16.815684Z +de453b16118f7e40b322d5107c4b3b8e +2012-01-20T07:44:55.724259Z +4299 +cignoni @@ -398,20 +398,20 @@ granzuglia -21039 +12587 -export_dae.h +export_field.h file 2013-06-21T07:08:16.815684Z -16ce5c00cf35d329d677eb90d91b1f63 -2011-10-05T15:04:40.740408Z -4180 -cignoni - +d46e9f7d57ad23ae4a1141d26c8b7772 +2013-01-22T10:04:28.267703Z +4802 +pietroni +has-props @@ -432,19 +432,19 @@ cignoni -2831 +3591 -export_3ds.h +import_vmi.h file -2013-06-21T07:08:16.815684Z -47adec58ebc9d5b556338bbb2b1e6aa3 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:08:16.819684Z +55359ab1da2ffff6f0a1b647583d1d8a +2013-01-03T09:33:41.553814Z +4797 +granzuglia @@ -466,19 +466,19 @@ cignoni -16467 +35703 -import_nvm.h +io_material.h file -2013-06-21T07:08:16.815684Z -2d495400f4fae4dad33c90ae5b9947ea -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-06-21T07:08:16.819684Z +ca5761162e3908bd1c2325cf7bc9e0db +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -500,18 +500,18 @@ ganovelli -8105 +5166 -io_ply.h +export_smf.h file -2013-06-21T07:08:16.815684Z -f532e60a9e62ce375770e896193a3e8f -2011-12-12T23:25:39.996917Z -4248 +2013-06-21T07:08:16.819684Z +9d256b9288d5c716e2de4fb25efc047a +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -534,18 +534,18 @@ cignoni -4373 +3908 -import_stl.h +export_idtf.h file -2013-07-25T06:52:24.826399Z -8d5bda2921b2d66d596743c216aa2d0d -2013-07-07T22:26:45.051813Z -4917 +2013-07-25T06:52:24.830399Z +c083ab1284193ae3e0c3d09525cf13f6 +2013-07-01T08:32:58.213815Z +4911 granzuglia @@ -568,20 +568,19 @@ granzuglia -8991 +21039 -export_gts.h +export_vmi.h file -2013-06-21T07:08:16.815684Z -10928d7f7ca81c56619f5ba2e8b9c4f7 -2012-10-25T13:17:47.287786Z -4658 -cignoni -has-props +2013-06-21T07:08:16.811684Z +42c382fb2385c7b346bcc9f234cb092d +2012-07-02T14:38:10.168389Z +4451 +ganovelli @@ -602,19 +601,20 @@ has-props -6344 + +19104 -import_ply.h +export_u3d.h file -2013-06-21T07:08:16.815684Z -839dc5cb21f8da87c68cec351f9c6583 -2013-06-04T11:55:33.377527Z -4896 -tarini +2013-06-21T07:08:16.811684Z +29b4f69a7de16a0c6433fc63bdcb6fec +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -636,19 +636,19 @@ tarini -40202 +9984 -import_asc.h +import_out.h file -2013-06-21T07:08:16.815684Z -c2d9a6b17a2f81d9f74026b4f2df3252 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2013-06-21T07:08:16.811684Z +15d87b7d458b69a232879cb1f484d19e +2013-01-30T17:18:55.488904Z +4811 +ganovelli @@ -670,18 +670,18 @@ cignoni -5057 +8190 -export_stl.h +import_off.h file -2013-06-21T07:08:16.815684Z -b1d7fcc6fca8a57fed7bbda16de3eff2 -2012-11-27T07:05:38.064450Z -4746 +2013-06-24T13:55:27.978354Z +a350a51928f05cb1c5977b2ac9ec0550 +2013-06-24T08:34:01.960887Z +4904 cignoni @@ -704,18 +704,18 @@ cignoni -6307 +27610 -import_ptx.h +import_obj.h file -2013-06-21T07:08:16.815684Z -b0792b8b93aec745dbe26a8bdf880146 -2012-10-11T11:20:55.820886Z -4580 +2013-06-21T07:08:16.811684Z +73e16fce5090359c126e09d7e18c8644 +2013-04-12T09:49:51.257901Z +4882 cignoni @@ -738,19 +738,20 @@ cignoni -14800 +38948 -export_ply.h +import_fbx.h file -2013-06-21T07:08:16.815684Z -587f287a6bdb94dea9472d027f21d6bd -2012-11-08T18:48:07.067992Z -4706 +2013-06-21T07:08:16.811684Z +3d966d3234f9296aac4592864ce2ebe0 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -771,21 +772,19 @@ cignoni - -26842 +21364 -import_field.h +import.h file -2013-06-21T07:08:16.815684Z -98df142bd291faae5c16a1fd739f554b -2013-01-30T17:18:55.488904Z -4811 -ganovelli -has-props +2013-06-21T07:08:16.811684Z +0fe86e5506f544ffae5833418e6c5485 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -806,18 +805,19 @@ has-props -9550 + +6529 -import_smf.h +export_off.h file -2013-06-21T07:08:16.815684Z -e15080b83d5e36827ff95dc0fb01e204 -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:16.811684Z +3cccdab271934b38cb88fa2c06888b80 +2012-10-25T13:17:47.287786Z +4658 cignoni @@ -840,18 +840,18 @@ cignoni -4399 +6784 -export_vrml.h +export_obj.h file -2013-06-21T07:08:16.811684Z -fcc58e4693b42c3acc97db992c01d0b6 -2011-10-05T15:04:40.740408Z -4180 +2013-08-01T07:24:02.822588Z +6e91af7d399d3ef5d1af6ac8b87c49ea +2013-07-26T09:35:44.656128Z +4932 cignoni @@ -874,19 +874,20 @@ cignoni -9824 +13498 -io_mask.h +import_ctm.h file 2013-06-21T07:08:16.811684Z -27e26a5315ed15d68f60fdb72fef87c8 -2012-01-20T07:44:55.724259Z -4299 +62b3fcd1d8979a7208396fec962ac771 +2011-10-06T14:00:54.207830Z +4183 cignoni +has-props @@ -907,20 +908,20 @@ cignoni - -4802 +5479 -import_raw.h +export_fbx.h file -2013-06-21T07:08:16.815684Z -de453b16118f7e40b322d5107c4b3b8e -2012-01-20T07:44:55.724259Z -4299 +2013-06-21T07:08:16.811684Z +241aec436da087a7d7177e142c205231 +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -941,21 +942,19 @@ cignoni - -12587 +11169 -export_field.h +export_vrml.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 +fcc58e4693b42c3acc97db992c01d0b6 +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -976,19 +975,20 @@ has-props -3591 + +9824 -import_vmi.h +export.h file -2013-06-21T07:08:16.819684Z -55359ab1da2ffff6f0a1b647583d1d8a -2013-01-03T09:33:41.553814Z -4797 -granzuglia +2013-06-21T07:08:16.811684Z +2f151766a7e494f22be8505a02e2ea3b +2011-10-05T15:04:40.740408Z +4180 +cignoni @@ -1010,18 +1010,18 @@ granzuglia -35703 +5244 -export_smf.h +io_mask.h file -2013-06-21T07:08:16.819684Z -9d256b9288d5c716e2de4fb25efc047a -2011-10-05T15:04:40.740408Z -4180 +2013-06-21T07:08:16.811684Z +27e26a5315ed15d68f60fdb72fef87c8 +2012-01-20T07:44:55.724259Z +4299 cignoni @@ -1044,19 +1044,19 @@ cignoni -3908 +4802 -export_vmi.h +export_dxf.h file -2013-06-21T07:08:16.811684Z -42c382fb2385c7b346bcc9f234cb092d -2012-07-02T14:38:10.168389Z -4451 -ganovelli +2013-08-01T07:24:02.830588Z +d74e2a47d13dce80239cf6dc204a2098 +2013-07-26T14:01:17.531085Z +4937 +cignoni @@ -1078,16 +1078,16 @@ ganovelli -19104 +5293 -export_u3d.h +import_dae.h file 2013-06-21T07:08:16.811684Z -29b4f69a7de16a0c6433fc63bdcb6fec +fb723590f2ef15ea4b7a7c0c6e6f8f50 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -1112,20 +1112,20 @@ cignoni -9984 +41259 -import_out.h +export_ctm.h file -2013-06-21T07:08:16.811684Z -15d87b7d458b69a232879cb1f484d19e -2013-01-30T17:18:55.488904Z -4811 -ganovelli - +2013-06-21T07:08:16.815684Z +6da45d8b006c0ab478098f1e4817cd45 +2011-10-06T14:00:54.207830Z +4183 +cignoni +has-props @@ -1146,18 +1146,18 @@ ganovelli -8190 +6566 -import_off.h +additionalinfo.h file -2013-06-24T13:55:27.978354Z -a350a51928f05cb1c5977b2ac9ec0550 -2013-06-24T08:34:01.960887Z -4904 +2013-06-21T07:08:16.815684Z +d77ea3ef72311f41e4c81d3a00a2d983 +2011-10-05T15:04:40.740408Z +4180 cignoni @@ -1180,19 +1180,20 @@ cignoni -27610 +1973 -import_obj.h +import_gts.h file -2013-06-21T07:08:16.811684Z -73e16fce5090359c126e09d7e18c8644 -2013-04-12T09:49:51.257901Z -4882 +2013-06-21T07:08:16.815684Z +0f46db10354d3047addae8505574163e +2011-10-05T15:04:40.740408Z +4180 cignoni +has-props @@ -1213,21 +1214,19 @@ cignoni - -38948 +8847 -import_fbx.h +export_dae.h file -2013-06-21T07:08:16.811684Z -3d966d3234f9296aac4592864ce2ebe0 +2013-06-21T07:08:16.815684Z +16ce5c00cf35d329d677eb90d91b1f63 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -1248,16 +1247,17 @@ has-props -21364 + +2831 -import.h +export_3ds.h file -2013-06-21T07:08:16.811684Z -0fe86e5506f544ffae5833418e6c5485 +2013-06-21T07:08:16.815684Z +47adec58ebc9d5b556338bbb2b1e6aa3 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -1282,19 +1282,19 @@ cignoni -6529 +16467 -how_to_write_an_io_filter.txt +import_nvm.h file 2013-06-21T07:08:16.815684Z -06ff7e7f6533e155afd18462e1453202 -2011-10-05T15:04:40.740408Z -4180 -cignoni +2d495400f4fae4dad33c90ae5b9947ea +2013-01-30T17:18:55.488904Z +4811 +ganovelli @@ -1316,18 +1316,18 @@ cignoni -1945 +8105 -export_off.h +io_ply.h file -2013-06-21T07:08:16.811684Z -3cccdab271934b38cb88fa2c06888b80 -2012-10-25T13:17:47.287786Z -4658 +2013-06-21T07:08:16.815684Z +f532e60a9e62ce375770e896193a3e8f +2011-12-12T23:25:39.996917Z +4248 cignoni @@ -1350,19 +1350,19 @@ cignoni -6784 +4373 -export_obj.h +import_stl.h file -2013-06-21T07:08:16.811684Z -9475db627c89e7cf09509cd8a1111cfa -2013-04-15T12:29:54.226667Z -4883 -corsini +2013-07-25T06:52:24.826399Z +8d5bda2921b2d66d596743c216aa2d0d +2013-07-07T22:26:45.051813Z +4917 +granzuglia @@ -1384,5 +1384,5 @@ corsini -13039 +8991 diff --git a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_dxf.h.svn-base b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_dxf.h.svn-base index 0c0c2a18..d87748ed 100644 --- a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_dxf.h.svn-base +++ b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_dxf.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,77 +33,122 @@ namespace tri { namespace io { template -/** +/** This class encapsulate a filter for save dxf meshes. */ class ExporterDXF { public: - ///Standard call for saving a mesh - static int Save(SaveMeshType &m, const char * filename) - { - - FILE * o = fopen(filename,"w"); - if(o==NULL) return 1; - fprintf(o,"0\n"); - fprintf(o,"SECTION\n"); - fprintf(o,"2\n"); - fprintf(o,"ENTITIES\n"); - - typename SaveMeshType::FaceIterator fi; - for(fi=m.face.begin(); fi!=m.face.end(); ++fi) - { - if (!fi->IsD()) - { - typename SaveMeshType::CoordType v0 = (*fi).V(0)->P(); - typename SaveMeshType::CoordType v1 = (*fi).V(1)->P(); - typename SaveMeshType::CoordType v2 = (*fi).V(2)->P(); - fprintf(o,"0\n"); fprintf(o,"3DFACE\n"); fprintf(o,"8\n"); fprintf(o,"0\n"); - fprintf(o,"10\n"); fprintf(o,"%f\n", v0[0]); //X - fprintf(o,"20\n"); fprintf(o,"%f\n", v0[1]); //Y - fprintf(o,"30\n"); fprintf(o,"%f\n", v0[2]); //Z - - fprintf(o,"11\n"); fprintf(o,"%f\n", v1[0]); //X - fprintf(o,"21\n"); fprintf(o,"%f\n", v1[1]); //Y - fprintf(o,"31\n"); fprintf(o,"%f\n", v1[2]); //Z - - fprintf(o,"12\n"); fprintf(o,"%f\n", v2[0]); //X - fprintf(o,"22\n"); fprintf(o,"%f\n", v2[1]); //Y - fprintf(o,"32\n"); fprintf(o,"%f\n", v2[2]); //Z - - fprintf(o,"13\n"); fprintf(o,"%f\n", v2[0]); //X - fprintf(o,"23\n"); fprintf(o,"%f\n", v2[1]); //Y - fprintf(o,"33\n"); fprintf(o,"%f\n", v2[2]); //Z - } - } - - fprintf(o,"0\n"); - fprintf(o,"ENDSEC\n"); - fprintf(o,"0\n"); - fprintf(o,"EOF\n"); - fclose(o); - return 0; - } - /// Standard call for knowing the meaning of an error code - static const char *ErrorMsg(int error) - { - static std::vector dxf_error_msg; - if(dxf_error_msg.empty()) - { - dxf_error_msg.resize(2 ); - dxf_error_msg[0]="No errors"; - dxf_error_msg[1]="Can't open file"; - } - - if(error>1 || error<0) return "Unknown error"; - else return dxf_error_msg[error].c_str(); - } + ///Standard call for saving a mesh + static int Save(SaveMeshType &m, const char * filename) + { + if(m.fn==0 && m.en != 0) return SaveEdge(m,filename); + + FILE * o = fopen(filename,"w"); + if(o==NULL) return 1; + fprintf(o,"0\n"); + fprintf(o,"SECTION\n"); + fprintf(o,"2\n"); + fprintf(o,"ENTITIES\n"); + + typename SaveMeshType::FaceIterator fi; + for(fi=m.face.begin(); fi!=m.face.end(); ++fi) + { + if (!fi->IsD()) + { + typename SaveMeshType::CoordType v0 = (*fi).V(0)->P(); + typename SaveMeshType::CoordType v1 = (*fi).V(1)->P(); + typename SaveMeshType::CoordType v2 = (*fi).V(2)->P(); + fprintf(o,"0\n"); fprintf(o,"3DFACE\n"); fprintf(o,"8\n"); fprintf(o,"0\n"); + fprintf(o,"10\n"); fprintf(o,"%f\n", v0[0]); //X + fprintf(o,"20\n"); fprintf(o,"%f\n", v0[1]); //Y + fprintf(o,"30\n"); fprintf(o,"%f\n", v0[2]); //Z + + fprintf(o,"11\n"); fprintf(o,"%f\n", v1[0]); //X + fprintf(o,"21\n"); fprintf(o,"%f\n", v1[1]); //Y + fprintf(o,"31\n"); fprintf(o,"%f\n", v1[2]); //Z + + fprintf(o,"12\n"); fprintf(o,"%f\n", v2[0]); //X + fprintf(o,"22\n"); fprintf(o,"%f\n", v2[1]); //Y + fprintf(o,"32\n"); fprintf(o,"%f\n", v2[2]); //Z + + fprintf(o,"13\n"); fprintf(o,"%f\n", v2[0]); //X + fprintf(o,"23\n"); fprintf(o,"%f\n", v2[1]); //Y + fprintf(o,"33\n"); fprintf(o,"%f\n", v2[2]); //Z + } + } + + fprintf(o,"0\n"); + fprintf(o,"ENDSEC\n"); + fprintf(o,"0\n"); + fprintf(o,"EOF\n"); + fclose(o); + return 0; + } + /// Standard call for knowing the meaning of an error code + static const char *ErrorMsg(int error) + { + static std::vector dxf_error_msg; + if(dxf_error_msg.empty()) + { + dxf_error_msg.resize(2 ); + dxf_error_msg[0]="No errors"; + dxf_error_msg[1]="Can't open file"; + } + + if(error>1 || error<0) return "Unknown error"; + else return dxf_error_msg[error].c_str(); + } + + + static bool SaveEdge(SaveMeshType &mp, const char * filename) + { + FILE * o = fopen(filename,"w"); + if(o==NULL) return 1; + fprintf(o,"0\n"); + fprintf(o,"SECTION\n"); + fprintf(o,"2\n"); + fprintf(o,"ENTITIES\n"); + + typename SaveMeshType::EdgeIterator ei; + for(ei=mp.edge.begin(); ei!=mp.edge.end();++ei) + { + Point3f p1 = (*ei).V(0)->P(); + Point3f p2 = (*ei).V(1)->P(); + + fprintf(o,"0\n"); + fprintf(o,"LINE\n"); + fprintf(o,"8\n"); + fprintf(o,"0\n"); + fprintf(o,"10\n"); + + fprintf(o,"%f\n", p1[0]); //X + fprintf(o,"20\n"); + fprintf(o,"%f\n", p1[1]); //Y + fprintf(o,"30\n"); + fprintf(o,"%f\n", p1[2]); //Z + + fprintf(o,"11\n"); + fprintf(o,"%f\n", p2[0]); //X + fprintf(o,"21\n"); + fprintf(o,"%f\n", p2[1]); //Y + fprintf(o,"31\n"); + fprintf(o,"%f\n", p2[2]); //Z + } + + fprintf(o,"0\n"); + fprintf(o,"ENDSEC\n"); + fprintf(o,"0\n"); + fprintf(o,"EOF\n"); + fclose(o); + return true; + } }; // end class -} // end Namespace tri } // end Namespace io +} // end Namespace tri } // end Namespace vcg #endif diff --git a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_obj.h.svn-base b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_obj.h.svn-base index bb012548..6ddb8ff7 100644 --- a/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_obj.h.svn-base +++ b/inst/include/vcglib/wrap/io_trimesh/.svn/text-base/export_obj.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. * @@ -37,369 +37,366 @@ namespace vcg { namespace tri { namespace io { - template - class ExporterOBJ - { - public: - typedef typename SaveMeshType::FaceIterator FaceIterator; - typedef typename SaveMeshType::VertexIterator VertexIterator; - typedef typename SaveMeshType::VertexType VertexType; - typedef typename SaveMeshType::ScalarType ScalarType; - typedef typename SaveMeshType::CoordType CoordType; - /* - enum of all the types of error - */ - enum SaveError - { - E_NOERROR, // 0 - E_CANTOPENFILE, // 1 - E_CANTCLOSEFILE, // 2 - E_UNESPECTEDEOF, // 3 - E_ABORTED, // 4 - E_NOTDEFINITION, // 5 - E_NOTVEXTEXVALID, // 6 - E_NOTFACESVALID // 7 - }; - - /* - this function takes an index and the relative error message gets back - */ - static const char* ErrorMsg(int error) - { - static const char* obj_error_msg[] = - { - "No errors", // 0 - "Can't open file", // 1 - "can't close file", // 2 - "Premature End of file", // 3 - "File saving aborted", // 4 - "Function not defined", // 5 - "Vertices not valid", // 6 - "Faces not valid" // 7 - }; - - if(error>7 || error<0) return "Unknown error"; - else return obj_error_msg[error]; - }; - - /* - returns mask of capability one define with what are the saveable information of the format. - */ - static int GetExportMaskCapability() - { - int capability = 0; - - //vert - capability |= vcg::tri::io::Mask::IOM_VERTNORMAL; - capability |= vcg::tri::io::Mask::IOM_VERTTEXCOORD; - capability |= vcg::tri::io::Mask::IOM_VERTCOLOR; - - //face - capability |= vcg::tri::io::Mask::IOM_FACECOLOR; - - //wedg - capability |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD; - capability |= vcg::tri::io::Mask::IOM_WEDGNORMAL; - - return capability; - } - - /* - function which saves in OBJ file format - */ - static int Save(SaveMeshType &m, const char * filename, int mask, CallBackPos *cb=0) - { - // texture coord and normal: cannot be saved BOTH per vertex and per wedge - if (mask & vcg::tri::io::Mask::IOM_WEDGTEXCOORD && - mask & vcg::tri::io::Mask::IOM_VERTTEXCOORD ) { - mask &= ~vcg::tri::io::Mask::IOM_VERTTEXCOORD; +template +class ExporterOBJ +{ +public: + typedef typename SaveMeshType::FaceIterator FaceIterator; + typedef typename SaveMeshType::EdgeIterator EdgeIterator; + typedef typename SaveMeshType::VertexIterator VertexIterator; + typedef typename SaveMeshType::VertexType VertexType; + typedef typename SaveMeshType::ScalarType ScalarType; + typedef typename SaveMeshType::CoordType CoordType; + /* + enum of all the types of error + */ + enum SaveError + { + E_NOERROR, // 0 + E_CANTOPENFILE, // 1 + E_CANTCLOSEFILE, // 2 + E_UNESPECTEDEOF, // 3 + E_ABORTED, // 4 + E_NOTDEFINITION, // 5 + E_NOTVEXTEXVALID, // 6 + E_NOTFACESVALID // 7 + }; + + /* + this function takes an index and the relative error message gets back + */ + static const char* ErrorMsg(int error) + { + static const char* obj_error_msg[] = + { + "No errors", // 0 + "Can't open file", // 1 + "can't close file", // 2 + "Premature End of file", // 3 + "File saving aborted", // 4 + "Function not defined", // 5 + "Vertices not valid", // 6 + "Faces not valid" // 7 + }; + + if(error>7 || error<0) return "Unknown error"; + else return obj_error_msg[error]; + }; + + /* + returns mask of capability one define with what are the saveable information of the format. + */ + static int GetExportMaskCapability() + { + int capability = 0; + + //vert + capability |= vcg::tri::io::Mask::IOM_VERTNORMAL; + capability |= vcg::tri::io::Mask::IOM_VERTTEXCOORD; + capability |= vcg::tri::io::Mask::IOM_VERTCOLOR; + + //face + capability |= vcg::tri::io::Mask::IOM_FACECOLOR; + + capability |= vcg::tri::io::Mask::IOM_EDGEINDEX; + //wedg + capability |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD; + capability |= vcg::tri::io::Mask::IOM_WEDGNORMAL; + + return capability; + } + + /* + function which saves in OBJ file format + */ + static int Save(SaveMeshType &m, const char * filename, int mask, CallBackPos *cb=0) + { + // texture coord and normal: cannot be saved BOTH per vertex and per wedge + if (mask & vcg::tri::io::Mask::IOM_WEDGTEXCOORD && + mask & vcg::tri::io::Mask::IOM_VERTTEXCOORD ) { + mask &= ~vcg::tri::io::Mask::IOM_VERTTEXCOORD; + } + if (mask & vcg::tri::io::Mask::IOM_WEDGCOLOR && + mask & vcg::tri::io::Mask::IOM_VERTCOLOR ) { + mask &= ~vcg::tri::io::Mask::IOM_VERTCOLOR; + } + if(m.vn == 0) return E_NOTVEXTEXVALID; + // Commented out this control. You should be allowed to save a point cloud. + // if(m.fn == 0) return E_NOTFACESVALID; + + int current = 0; + int totalPrimitives = m.vn+m.fn; + + std::vector materialVec; + + std::string fn(filename); + int LastSlash=fn.size()-1; + while(LastSlash>=0 && fn[LastSlash]!='/') + --LastSlash; + + FILE *fp; + fp = fopen(filename,"w"); + if(fp == NULL) return E_CANTOPENFILE; + + fprintf(fp,"####\n#\n# OBJ File Generated by Meshlab\n#\n####\n"); + fprintf(fp,"# Object %s\n#\n# Vertices: %d\n# Faces: %d\n#\n####\n",fn.substr(LastSlash+1).c_str(),m.vn,m.fn); + + //library materialVec + if( (mask & vcg::tri::io::Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) + fprintf(fp,"mtllib ./%s.mtl\n\n",fn.substr(LastSlash+1).c_str()); + + //vertexs + normal + VertexIterator vi; + std::map NormalVertex; + std::vector VertexId(m.vert.size()); + int numvert = 0; + int curNormalIndex = 1; + for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi) if( !(*vi).IsD() ) + { + VertexId[vi-m.vert.begin()]=numvert; + //saves normal per vertex + if (mask & Mask::IOM_WEDGNORMAL ) + { + if(AddNewNormalVertex(NormalVertex,(*vi).N(),curNormalIndex)) + { + fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); + curNormalIndex++; + } } - if (mask & vcg::tri::io::Mask::IOM_WEDGCOLOR && - mask & vcg::tri::io::Mask::IOM_VERTCOLOR ) { - mask &= ~vcg::tri::io::Mask::IOM_VERTCOLOR; + if (mask & Mask::IOM_VERTNORMAL ) { + fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); } - if(m.vn == 0) return E_NOTVEXTEXVALID; - // Commented out this control. You should be allowed to save a point cloud. - // if(m.fn == 0) return E_NOTFACESVALID; - - int current = 0; - int totalPrimitives = m.vn+m.fn; - - std::vector materialVec; - - std::string fn(filename); - int LastSlash=fn.size()-1; - while(LastSlash>=0 && fn[LastSlash]!='/') - --LastSlash; - - FILE *fp; - fp = fopen(filename,"w"); - if(fp == NULL) return E_CANTOPENFILE; - - fprintf(fp,"####\n#\n# OBJ File Generated by Meshlab\n#\n####\n"); - fprintf(fp,"# Object %s\n#\n# Vertices: %d\n# Faces: %d\n#\n####\n",fn.substr(LastSlash+1).c_str(),m.vn,m.fn); - - //library materialVec - if( (mask & vcg::tri::io::Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) - fprintf(fp,"mtllib ./%s.mtl\n\n",fn.substr(LastSlash+1).c_str()); - - //vertexs + normal - VertexIterator vi; - std::map NormalVertex; - std::vector VertexId(m.vert.size()); - int numvert = 0; - int curNormalIndex = 1; - for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi) if( !(*vi).IsD() ) - { - VertexId[vi-m.vert.begin()]=numvert; - //saves normal per vertex - if (mask & Mask::IOM_WEDGNORMAL ) - { - if(AddNewNormalVertex(NormalVertex,(*vi).N(),curNormalIndex)) - { - fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); - curNormalIndex++; - } - } - if (mask & Mask::IOM_VERTNORMAL ) { - fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); + if (mask & Mask::IOM_VERTTEXCOORD ) { + fprintf(fp,"vt %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); + } + //if (mask & Mask::IOM_VERTCOLOR ) { + // fprintf(fp,"vc %f %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); + //} + + //saves vertex + + fprintf(fp,"v %f %f %f",(*vi).P()[0],(*vi).P()[1],(*vi).P()[2]); + if(mask & Mask::IOM_VERTCOLOR) + fprintf(fp," %f %f %f",double((*vi).C()[0])/255.,double((*vi).C()[1])/255.,double((*vi).C()[2])/255.); + fprintf(fp,"\n"); + + if (cb !=NULL) + { + if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) + { + fclose(fp); + return E_ABORTED; } - if (mask & Mask::IOM_VERTTEXCOORD ) { - fprintf(fp,"vt %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); + } + numvert++; + } + assert(numvert == m.vn); + + fprintf(fp,"# %d vertices, %d vertices normals\n\n",m.vn,int(NormalVertex.size())); + + //faces + texture coords + std::map,int> CoordIndexTexture; + unsigned int material_num = 0; + int mem_index = 0; //var temporany + int curTexCoordIndex = 1; + for(FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi) if( !(*fi).IsD() ) + { + if((mask & Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) + { + int index = Materials::CreateNewMaterial(m,materialVec,material_num,fi); + + if(index == (int)materialVec.size())//inserts a new element material + { + material_num++; + fprintf(fp,"\nusemtl material_%d\n",materialVec[index-1].index); + mem_index = index-1; } - //if (mask & Mask::IOM_VERTCOLOR ) { - // fprintf(fp,"vc %f %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); - //} - - //saves vertex - - fprintf(fp,"v %f %f %f",(*vi).P()[0],(*vi).P()[1],(*vi).P()[2]); - if(mask & Mask::IOM_VERTCOLOR) - fprintf(fp," %f %f %f",double((*vi).C()[0])/255.,double((*vi).C()[1])/255.,double((*vi).C()[2])/255.); - fprintf(fp,"\n"); - - if (cb !=NULL) - { - if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) - { - fclose(fp); - return E_ABORTED; - } - } - numvert++; - } - assert(numvert == m.vn); - - fprintf(fp,"# %d vertices, %d vertices normals\n\n",m.vn,int(NormalVertex.size())); - - //faces + texture coords - FaceIterator fi; - std::map,int> CoordIndexTexture; - unsigned int material_num = 0; - int mem_index = 0; //var temporany - int curTexCoordIndex = 1; - for(fi=m.face.begin(); fi!=m.face.end(); ++fi) if( !(*fi).IsD() ) - { - if((mask & Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) - { - int index = Materials::CreateNewMaterial(m,materialVec,material_num,fi); - - if(index == (int)materialVec.size())//inserts a new element material - { - material_num++; - fprintf(fp,"\nusemtl material_%d\n",materialVec[index-1].index); - mem_index = index-1; - } - else - { - if(index != mem_index)//inserts old name elemente material - { - fprintf(fp,"\nusemtl material_%d\n",materialVec[index].index); - mem_index=index; - } - } - } - - //saves texture coord x wedge - if(HasPerWedgeTexCoord(m) && (mask & Mask::IOM_WEDGTEXCOORD)) - for(int k=0;k<(*fi).VN();k++) - { - { - if(AddNewTextureCoord(CoordIndexTexture,(*fi).WT(k),curTexCoordIndex)) - { - fprintf(fp,"vt %f %f\n",(*fi).WT(k).u(),(*fi).WT(k).v()); - curTexCoordIndex++; //ncreases the value number to be associated to the Texture - } - } - } - - - fprintf(fp,"f "); + else + { + if(index != mem_index)//inserts old name elemente material + { + fprintf(fp,"\nusemtl material_%d\n",materialVec[index].index); + mem_index=index; + } + } + } + + //saves texture coord x wedge + if(HasPerWedgeTexCoord(m) && (mask & Mask::IOM_WEDGTEXCOORD)) for(int k=0;k<(*fi).VN();k++) - { - if(k!=0) fprintf(fp," "); - int vInd = -1; - // +1 because Obj file format begins from index = 1 but not from index = 0. - vInd = VertexId[GetIndexVertex(m, (*fi).V(k))] + 1;//index of vertex per face - - int vt = -1; - if(mask & Mask::IOM_WEDGTEXCOORD) - vt = GetIndexVertexTexture(CoordIndexTexture,(*fi).WT(k));//index of vertex texture per face - if (mask & Mask::IOM_VERTTEXCOORD) - vt = vInd; - - int vn = -1; - if(mask & Mask::IOM_WEDGNORMAL ) - vn = GetIndexVertexNormal(m, NormalVertex, (*fi).V(k)->cN());//index of vertex normal per face. - if (mask & Mask::IOM_VERTNORMAL) - vn = vInd; - - //writes elements on file obj - WriteFacesElement(fp,vInd,vt,vn); - } - fprintf(fp,"\n"); - if (cb !=NULL) { - if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) - { fclose(fp); return E_ABORTED;} + { + if(AddNewTextureCoord(CoordIndexTexture,(*fi).WT(k),curTexCoordIndex)) + { + fprintf(fp,"vt %f %f\n",(*fi).WT(k).u(),(*fi).WT(k).v()); + curTexCoordIndex++; //ncreases the value number to be associated to the Texture + } } - }//for - fprintf(fp,"# %d faces, %d coords texture\n\n",m.fn,int(CoordIndexTexture.size())); - - fprintf(fp,"# End of File\n"); - fclose(fp); - - int r = 0; - if((mask & Mask::IOM_WEDGTEXCOORD) || (mask & Mask::IOM_FACECOLOR) ) - r = WriteMaterials(materialVec, filename,cb);//write material - - if(r!= E_NOERROR) - return r; - return E_NOERROR; - } - - /* - returns index of the vertex - */ - inline static int GetIndexVertex(SaveMeshType &m, VertexType *p) - { - return p-&*(m.vert.begin()); - } - - /* - returns index of the texture coord - */ - inline static int GetIndexVertexTexture(typename std::map,int> &mapTexToInt, const vcg::TexCoord2 &wt) - { - typename std::map,int>::iterator iter= mapTexToInt.find(wt); - if(iter != mapTexToInt.end()) return (*iter).second; - else return -1; - // Old wrong version. - // int index = mapTexToInt[wt]; - // if(index!=0){return index;} - } - - /* - returns index of the vertex normal - */ - inline static int GetIndexVertexNormal(SaveMeshType &/*m*/, std::map &mapNormToInt, const CoordType &norm ) - { - typename std::map::iterator iter= mapNormToInt.find(norm); - if(iter != mapNormToInt.end()) return (*iter).second; - else return -1; - // Old wrong version. - // int index = mapNormToInt[m.vert[iv].N()]; - // if(index!=0){return index;} - } - - /* - write elements on file - - f v/tc/vn v/tc/vn v/tc/vn ... - f v/tc v/tc v/tc ... - f v//vn v//vn v//vn ... - f v v v ... - - */ - inline static void WriteFacesElement(FILE *fp,int v,int vt, int vn) - { - fprintf(fp,"%d",v); - if(vt!=-1) - { - fprintf(fp,"/%d",vt); - if(vn!=-1) - fprintf(fp,"/%d",vn); - } - else if(vn!=-1) - fprintf(fp,"//%d",vn); - } - - /* - adds a new index to the coordinate of Texture if it is the first time - which is otherwise met not execute anything - */ - inline static bool AddNewTextureCoord(std::map,int> &m, - const typename vcg::TexCoord2 &wt,int value) - { - int index = m[wt]; - if(index==0){m[wt]=value;return true;} - return false; - } - - /* - adds a new index to the normal per vertex if it is the first time - which is otherwise met does not execute anything - */ - inline static bool AddNewNormalVertex(typename std::map &m, CoordType &n ,int value) - { - int index = m[n]; - if(index==0){m[n]=value;return true;} - return false; - } - - /* - writes material into file - */ - inline static int WriteMaterials(std::vector &materialVec, const char * filename, CallBackPos *cb=0) - { - std::string fileName = std::string(filename); - fileName+=".mtl"; - - if(materialVec.size() > 0) - { - FILE *fp; - fp = fopen(fileName.c_str(),"w"); - if(fp==NULL)return E_ABORTED; - - fprintf(fp,"#\n# Wavefront material file\n# Converted by Meshlab Group\n#\n\n"); - - int current = 0; - - for(unsigned int i=0;i0) - fprintf(fp,"map_Kd %s\n",materialVec[i].map_Kd.c_str()); - fprintf(fp,"\n"); - } - fclose(fp); - } - return E_NOERROR; - } - - }; // end class + + fprintf(fp,"f "); + for(int k=0;k<(*fi).VN();k++) + { + if(k!=0) fprintf(fp," "); + int vInd = -1; + // +1 because Obj file format begins from index = 1 but not from index = 0. + vInd = VertexId[tri::Index(m, (*fi).V(k))] + 1;//index of vertex per face + + int vt = -1; + if(mask & Mask::IOM_WEDGTEXCOORD) + vt = GetIndexVertexTexture(CoordIndexTexture,(*fi).WT(k));//index of vertex texture per face + if (mask & Mask::IOM_VERTTEXCOORD) + vt = vInd; + + int vn = -1; + if(mask & Mask::IOM_WEDGNORMAL ) + vn = GetIndexVertexNormal(m, NormalVertex, (*fi).V(k)->cN());//index of vertex normal per face. + if (mask & Mask::IOM_VERTNORMAL) + vn = vInd; + + //writes elements on file obj + WriteFacesElement(fp,vInd,vt,vn); + } + fprintf(fp,"\n"); + + if (cb !=NULL) { + if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) + { fclose(fp); return E_ABORTED;} + } + + }//for faces + + for(EdgeIterator ei=m.edge.begin(); ei!=m.edge.end(); ++ei) if( !(*ei).IsD() ) + { + fprintf(fp,"l %i %i\n", + VertexId[tri::Index(m, (*ei).V(0))] + 1, + VertexId[tri::Index(m, (*ei).V(1))] + 1); + } + + fprintf(fp,"# %d faces, %d coords texture\n\n",m.fn,int(CoordIndexTexture.size())); + + fprintf(fp,"# End of File\n"); + fclose(fp); + + int errCode = E_NOERROR; + if((mask & Mask::IOM_WEDGTEXCOORD) || (mask & Mask::IOM_FACECOLOR) ) + errCode = WriteMaterials(materialVec, filename,cb);//write material + + if(errCode!= E_NOERROR) + return errCode; + return E_NOERROR; + } + + /* + returns index of the texture coord + */ + inline static int GetIndexVertexTexture(typename std::map,int> &mapTexToInt, const vcg::TexCoord2 &wt) + { + typename std::map,int>::iterator iter= mapTexToInt.find(wt); + if(iter != mapTexToInt.end()) return (*iter).second; + else return -1; + // Old wrong version. + // int index = mapTexToInt[wt]; + // if(index!=0){return index;} + } + + /* + returns index of the vertex normal + */ + inline static int GetIndexVertexNormal(SaveMeshType &/*m*/, std::map &mapNormToInt, const CoordType &norm ) + { + typename std::map::iterator iter= mapNormToInt.find(norm); + if(iter != mapNormToInt.end()) return (*iter).second; + else return -1; + } + + /* + write elements on file + + f v/tc/vn v/tc/vn v/tc/vn ... + f v/tc v/tc v/tc ... + f v//vn v//vn v//vn ... + f v v v ... + + */ + inline static void WriteFacesElement(FILE *fp,int v,int vt, int vn) + { + fprintf(fp,"%d",v); + if(vt!=-1) + { + fprintf(fp,"/%d",vt); + if(vn!=-1) + fprintf(fp,"/%d",vn); + } + else if(vn!=-1) + fprintf(fp,"//%d",vn); + } + + /* + adds a new index to the coordinate of Texture if it is the first time + which is otherwise met not execute anything + */ + inline static bool AddNewTextureCoord(std::map,int> &m, + const typename vcg::TexCoord2 &wt,int value) + { + int index = m[wt]; + if(index==0){m[wt]=value;return true;} + return false; + } + + /* + adds a new index to the normal per vertex if it is the first time + which is otherwise met does not execute anything + */ + inline static bool AddNewNormalVertex(typename std::map &m, CoordType &n ,int value) + { + int index = m[n]; + if(index==0){m[n]=value;return true;} + return false; + } + + /* + writes material into file + */ + inline static int WriteMaterials(std::vector &materialVec, const char * filename, CallBackPos *cb=0) + { + std::string fileName = std::string(filename); + fileName+=".mtl"; + + if(materialVec.size() > 0) + { + FILE *fp; + fp = fopen(fileName.c_str(),"w"); + if(fp==NULL)return E_ABORTED; + + fprintf(fp,"#\n# Wavefront material file\n# Converted by Meshlab Group\n#\n\n"); + + int current = 0; + + for(unsigned int i=0;i0) + fprintf(fp,"map_Kd %s\n",materialVec[i].map_Kd.c_str()); + fprintf(fp,"\n"); + } + fclose(fp); + } + return E_NOERROR; + } + +}; // end class } // end Namespace tri } // end Namespace io } // end Namespace vcg diff --git a/inst/include/vcglib/wrap/io_trimesh/export_dxf.h b/inst/include/vcglib/wrap/io_trimesh/export_dxf.h index 0c0c2a18..d87748ed 100644 --- a/inst/include/vcglib/wrap/io_trimesh/export_dxf.h +++ b/inst/include/vcglib/wrap/io_trimesh/export_dxf.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,77 +33,122 @@ namespace tri { namespace io { template -/** +/** This class encapsulate a filter for save dxf meshes. */ class ExporterDXF { public: - ///Standard call for saving a mesh - static int Save(SaveMeshType &m, const char * filename) - { - - FILE * o = fopen(filename,"w"); - if(o==NULL) return 1; - fprintf(o,"0\n"); - fprintf(o,"SECTION\n"); - fprintf(o,"2\n"); - fprintf(o,"ENTITIES\n"); - - typename SaveMeshType::FaceIterator fi; - for(fi=m.face.begin(); fi!=m.face.end(); ++fi) - { - if (!fi->IsD()) - { - typename SaveMeshType::CoordType v0 = (*fi).V(0)->P(); - typename SaveMeshType::CoordType v1 = (*fi).V(1)->P(); - typename SaveMeshType::CoordType v2 = (*fi).V(2)->P(); - fprintf(o,"0\n"); fprintf(o,"3DFACE\n"); fprintf(o,"8\n"); fprintf(o,"0\n"); - fprintf(o,"10\n"); fprintf(o,"%f\n", v0[0]); //X - fprintf(o,"20\n"); fprintf(o,"%f\n", v0[1]); //Y - fprintf(o,"30\n"); fprintf(o,"%f\n", v0[2]); //Z - - fprintf(o,"11\n"); fprintf(o,"%f\n", v1[0]); //X - fprintf(o,"21\n"); fprintf(o,"%f\n", v1[1]); //Y - fprintf(o,"31\n"); fprintf(o,"%f\n", v1[2]); //Z - - fprintf(o,"12\n"); fprintf(o,"%f\n", v2[0]); //X - fprintf(o,"22\n"); fprintf(o,"%f\n", v2[1]); //Y - fprintf(o,"32\n"); fprintf(o,"%f\n", v2[2]); //Z - - fprintf(o,"13\n"); fprintf(o,"%f\n", v2[0]); //X - fprintf(o,"23\n"); fprintf(o,"%f\n", v2[1]); //Y - fprintf(o,"33\n"); fprintf(o,"%f\n", v2[2]); //Z - } - } - - fprintf(o,"0\n"); - fprintf(o,"ENDSEC\n"); - fprintf(o,"0\n"); - fprintf(o,"EOF\n"); - fclose(o); - return 0; - } - /// Standard call for knowing the meaning of an error code - static const char *ErrorMsg(int error) - { - static std::vector dxf_error_msg; - if(dxf_error_msg.empty()) - { - dxf_error_msg.resize(2 ); - dxf_error_msg[0]="No errors"; - dxf_error_msg[1]="Can't open file"; - } - - if(error>1 || error<0) return "Unknown error"; - else return dxf_error_msg[error].c_str(); - } + ///Standard call for saving a mesh + static int Save(SaveMeshType &m, const char * filename) + { + if(m.fn==0 && m.en != 0) return SaveEdge(m,filename); + + FILE * o = fopen(filename,"w"); + if(o==NULL) return 1; + fprintf(o,"0\n"); + fprintf(o,"SECTION\n"); + fprintf(o,"2\n"); + fprintf(o,"ENTITIES\n"); + + typename SaveMeshType::FaceIterator fi; + for(fi=m.face.begin(); fi!=m.face.end(); ++fi) + { + if (!fi->IsD()) + { + typename SaveMeshType::CoordType v0 = (*fi).V(0)->P(); + typename SaveMeshType::CoordType v1 = (*fi).V(1)->P(); + typename SaveMeshType::CoordType v2 = (*fi).V(2)->P(); + fprintf(o,"0\n"); fprintf(o,"3DFACE\n"); fprintf(o,"8\n"); fprintf(o,"0\n"); + fprintf(o,"10\n"); fprintf(o,"%f\n", v0[0]); //X + fprintf(o,"20\n"); fprintf(o,"%f\n", v0[1]); //Y + fprintf(o,"30\n"); fprintf(o,"%f\n", v0[2]); //Z + + fprintf(o,"11\n"); fprintf(o,"%f\n", v1[0]); //X + fprintf(o,"21\n"); fprintf(o,"%f\n", v1[1]); //Y + fprintf(o,"31\n"); fprintf(o,"%f\n", v1[2]); //Z + + fprintf(o,"12\n"); fprintf(o,"%f\n", v2[0]); //X + fprintf(o,"22\n"); fprintf(o,"%f\n", v2[1]); //Y + fprintf(o,"32\n"); fprintf(o,"%f\n", v2[2]); //Z + + fprintf(o,"13\n"); fprintf(o,"%f\n", v2[0]); //X + fprintf(o,"23\n"); fprintf(o,"%f\n", v2[1]); //Y + fprintf(o,"33\n"); fprintf(o,"%f\n", v2[2]); //Z + } + } + + fprintf(o,"0\n"); + fprintf(o,"ENDSEC\n"); + fprintf(o,"0\n"); + fprintf(o,"EOF\n"); + fclose(o); + return 0; + } + /// Standard call for knowing the meaning of an error code + static const char *ErrorMsg(int error) + { + static std::vector dxf_error_msg; + if(dxf_error_msg.empty()) + { + dxf_error_msg.resize(2 ); + dxf_error_msg[0]="No errors"; + dxf_error_msg[1]="Can't open file"; + } + + if(error>1 || error<0) return "Unknown error"; + else return dxf_error_msg[error].c_str(); + } + + + static bool SaveEdge(SaveMeshType &mp, const char * filename) + { + FILE * o = fopen(filename,"w"); + if(o==NULL) return 1; + fprintf(o,"0\n"); + fprintf(o,"SECTION\n"); + fprintf(o,"2\n"); + fprintf(o,"ENTITIES\n"); + + typename SaveMeshType::EdgeIterator ei; + for(ei=mp.edge.begin(); ei!=mp.edge.end();++ei) + { + Point3f p1 = (*ei).V(0)->P(); + Point3f p2 = (*ei).V(1)->P(); + + fprintf(o,"0\n"); + fprintf(o,"LINE\n"); + fprintf(o,"8\n"); + fprintf(o,"0\n"); + fprintf(o,"10\n"); + + fprintf(o,"%f\n", p1[0]); //X + fprintf(o,"20\n"); + fprintf(o,"%f\n", p1[1]); //Y + fprintf(o,"30\n"); + fprintf(o,"%f\n", p1[2]); //Z + + fprintf(o,"11\n"); + fprintf(o,"%f\n", p2[0]); //X + fprintf(o,"21\n"); + fprintf(o,"%f\n", p2[1]); //Y + fprintf(o,"31\n"); + fprintf(o,"%f\n", p2[2]); //Z + } + + fprintf(o,"0\n"); + fprintf(o,"ENDSEC\n"); + fprintf(o,"0\n"); + fprintf(o,"EOF\n"); + fclose(o); + return true; + } }; // end class -} // end Namespace tri } // end Namespace io +} // end Namespace tri } // end Namespace vcg #endif diff --git a/inst/include/vcglib/wrap/io_trimesh/export_obj.h b/inst/include/vcglib/wrap/io_trimesh/export_obj.h index bb012548..6ddb8ff7 100644 --- a/inst/include/vcglib/wrap/io_trimesh/export_obj.h +++ b/inst/include/vcglib/wrap/io_trimesh/export_obj.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. * @@ -37,369 +37,366 @@ namespace vcg { namespace tri { namespace io { - template - class ExporterOBJ - { - public: - typedef typename SaveMeshType::FaceIterator FaceIterator; - typedef typename SaveMeshType::VertexIterator VertexIterator; - typedef typename SaveMeshType::VertexType VertexType; - typedef typename SaveMeshType::ScalarType ScalarType; - typedef typename SaveMeshType::CoordType CoordType; - /* - enum of all the types of error - */ - enum SaveError - { - E_NOERROR, // 0 - E_CANTOPENFILE, // 1 - E_CANTCLOSEFILE, // 2 - E_UNESPECTEDEOF, // 3 - E_ABORTED, // 4 - E_NOTDEFINITION, // 5 - E_NOTVEXTEXVALID, // 6 - E_NOTFACESVALID // 7 - }; - - /* - this function takes an index and the relative error message gets back - */ - static const char* ErrorMsg(int error) - { - static const char* obj_error_msg[] = - { - "No errors", // 0 - "Can't open file", // 1 - "can't close file", // 2 - "Premature End of file", // 3 - "File saving aborted", // 4 - "Function not defined", // 5 - "Vertices not valid", // 6 - "Faces not valid" // 7 - }; - - if(error>7 || error<0) return "Unknown error"; - else return obj_error_msg[error]; - }; - - /* - returns mask of capability one define with what are the saveable information of the format. - */ - static int GetExportMaskCapability() - { - int capability = 0; - - //vert - capability |= vcg::tri::io::Mask::IOM_VERTNORMAL; - capability |= vcg::tri::io::Mask::IOM_VERTTEXCOORD; - capability |= vcg::tri::io::Mask::IOM_VERTCOLOR; - - //face - capability |= vcg::tri::io::Mask::IOM_FACECOLOR; - - //wedg - capability |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD; - capability |= vcg::tri::io::Mask::IOM_WEDGNORMAL; - - return capability; - } - - /* - function which saves in OBJ file format - */ - static int Save(SaveMeshType &m, const char * filename, int mask, CallBackPos *cb=0) - { - // texture coord and normal: cannot be saved BOTH per vertex and per wedge - if (mask & vcg::tri::io::Mask::IOM_WEDGTEXCOORD && - mask & vcg::tri::io::Mask::IOM_VERTTEXCOORD ) { - mask &= ~vcg::tri::io::Mask::IOM_VERTTEXCOORD; +template +class ExporterOBJ +{ +public: + typedef typename SaveMeshType::FaceIterator FaceIterator; + typedef typename SaveMeshType::EdgeIterator EdgeIterator; + typedef typename SaveMeshType::VertexIterator VertexIterator; + typedef typename SaveMeshType::VertexType VertexType; + typedef typename SaveMeshType::ScalarType ScalarType; + typedef typename SaveMeshType::CoordType CoordType; + /* + enum of all the types of error + */ + enum SaveError + { + E_NOERROR, // 0 + E_CANTOPENFILE, // 1 + E_CANTCLOSEFILE, // 2 + E_UNESPECTEDEOF, // 3 + E_ABORTED, // 4 + E_NOTDEFINITION, // 5 + E_NOTVEXTEXVALID, // 6 + E_NOTFACESVALID // 7 + }; + + /* + this function takes an index and the relative error message gets back + */ + static const char* ErrorMsg(int error) + { + static const char* obj_error_msg[] = + { + "No errors", // 0 + "Can't open file", // 1 + "can't close file", // 2 + "Premature End of file", // 3 + "File saving aborted", // 4 + "Function not defined", // 5 + "Vertices not valid", // 6 + "Faces not valid" // 7 + }; + + if(error>7 || error<0) return "Unknown error"; + else return obj_error_msg[error]; + }; + + /* + returns mask of capability one define with what are the saveable information of the format. + */ + static int GetExportMaskCapability() + { + int capability = 0; + + //vert + capability |= vcg::tri::io::Mask::IOM_VERTNORMAL; + capability |= vcg::tri::io::Mask::IOM_VERTTEXCOORD; + capability |= vcg::tri::io::Mask::IOM_VERTCOLOR; + + //face + capability |= vcg::tri::io::Mask::IOM_FACECOLOR; + + capability |= vcg::tri::io::Mask::IOM_EDGEINDEX; + //wedg + capability |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD; + capability |= vcg::tri::io::Mask::IOM_WEDGNORMAL; + + return capability; + } + + /* + function which saves in OBJ file format + */ + static int Save(SaveMeshType &m, const char * filename, int mask, CallBackPos *cb=0) + { + // texture coord and normal: cannot be saved BOTH per vertex and per wedge + if (mask & vcg::tri::io::Mask::IOM_WEDGTEXCOORD && + mask & vcg::tri::io::Mask::IOM_VERTTEXCOORD ) { + mask &= ~vcg::tri::io::Mask::IOM_VERTTEXCOORD; + } + if (mask & vcg::tri::io::Mask::IOM_WEDGCOLOR && + mask & vcg::tri::io::Mask::IOM_VERTCOLOR ) { + mask &= ~vcg::tri::io::Mask::IOM_VERTCOLOR; + } + if(m.vn == 0) return E_NOTVEXTEXVALID; + // Commented out this control. You should be allowed to save a point cloud. + // if(m.fn == 0) return E_NOTFACESVALID; + + int current = 0; + int totalPrimitives = m.vn+m.fn; + + std::vector materialVec; + + std::string fn(filename); + int LastSlash=fn.size()-1; + while(LastSlash>=0 && fn[LastSlash]!='/') + --LastSlash; + + FILE *fp; + fp = fopen(filename,"w"); + if(fp == NULL) return E_CANTOPENFILE; + + fprintf(fp,"####\n#\n# OBJ File Generated by Meshlab\n#\n####\n"); + fprintf(fp,"# Object %s\n#\n# Vertices: %d\n# Faces: %d\n#\n####\n",fn.substr(LastSlash+1).c_str(),m.vn,m.fn); + + //library materialVec + if( (mask & vcg::tri::io::Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) + fprintf(fp,"mtllib ./%s.mtl\n\n",fn.substr(LastSlash+1).c_str()); + + //vertexs + normal + VertexIterator vi; + std::map NormalVertex; + std::vector VertexId(m.vert.size()); + int numvert = 0; + int curNormalIndex = 1; + for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi) if( !(*vi).IsD() ) + { + VertexId[vi-m.vert.begin()]=numvert; + //saves normal per vertex + if (mask & Mask::IOM_WEDGNORMAL ) + { + if(AddNewNormalVertex(NormalVertex,(*vi).N(),curNormalIndex)) + { + fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); + curNormalIndex++; + } } - if (mask & vcg::tri::io::Mask::IOM_WEDGCOLOR && - mask & vcg::tri::io::Mask::IOM_VERTCOLOR ) { - mask &= ~vcg::tri::io::Mask::IOM_VERTCOLOR; + if (mask & Mask::IOM_VERTNORMAL ) { + fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); } - if(m.vn == 0) return E_NOTVEXTEXVALID; - // Commented out this control. You should be allowed to save a point cloud. - // if(m.fn == 0) return E_NOTFACESVALID; - - int current = 0; - int totalPrimitives = m.vn+m.fn; - - std::vector materialVec; - - std::string fn(filename); - int LastSlash=fn.size()-1; - while(LastSlash>=0 && fn[LastSlash]!='/') - --LastSlash; - - FILE *fp; - fp = fopen(filename,"w"); - if(fp == NULL) return E_CANTOPENFILE; - - fprintf(fp,"####\n#\n# OBJ File Generated by Meshlab\n#\n####\n"); - fprintf(fp,"# Object %s\n#\n# Vertices: %d\n# Faces: %d\n#\n####\n",fn.substr(LastSlash+1).c_str(),m.vn,m.fn); - - //library materialVec - if( (mask & vcg::tri::io::Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) - fprintf(fp,"mtllib ./%s.mtl\n\n",fn.substr(LastSlash+1).c_str()); - - //vertexs + normal - VertexIterator vi; - std::map NormalVertex; - std::vector VertexId(m.vert.size()); - int numvert = 0; - int curNormalIndex = 1; - for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi) if( !(*vi).IsD() ) - { - VertexId[vi-m.vert.begin()]=numvert; - //saves normal per vertex - if (mask & Mask::IOM_WEDGNORMAL ) - { - if(AddNewNormalVertex(NormalVertex,(*vi).N(),curNormalIndex)) - { - fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); - curNormalIndex++; - } - } - if (mask & Mask::IOM_VERTNORMAL ) { - fprintf(fp,"vn %f %f %f\n",(*vi).N()[0],(*vi).N()[1],(*vi).N()[2]); + if (mask & Mask::IOM_VERTTEXCOORD ) { + fprintf(fp,"vt %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); + } + //if (mask & Mask::IOM_VERTCOLOR ) { + // fprintf(fp,"vc %f %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); + //} + + //saves vertex + + fprintf(fp,"v %f %f %f",(*vi).P()[0],(*vi).P()[1],(*vi).P()[2]); + if(mask & Mask::IOM_VERTCOLOR) + fprintf(fp," %f %f %f",double((*vi).C()[0])/255.,double((*vi).C()[1])/255.,double((*vi).C()[2])/255.); + fprintf(fp,"\n"); + + if (cb !=NULL) + { + if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) + { + fclose(fp); + return E_ABORTED; } - if (mask & Mask::IOM_VERTTEXCOORD ) { - fprintf(fp,"vt %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); + } + numvert++; + } + assert(numvert == m.vn); + + fprintf(fp,"# %d vertices, %d vertices normals\n\n",m.vn,int(NormalVertex.size())); + + //faces + texture coords + std::map,int> CoordIndexTexture; + unsigned int material_num = 0; + int mem_index = 0; //var temporany + int curTexCoordIndex = 1; + for(FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi) if( !(*fi).IsD() ) + { + if((mask & Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) + { + int index = Materials::CreateNewMaterial(m,materialVec,material_num,fi); + + if(index == (int)materialVec.size())//inserts a new element material + { + material_num++; + fprintf(fp,"\nusemtl material_%d\n",materialVec[index-1].index); + mem_index = index-1; } - //if (mask & Mask::IOM_VERTCOLOR ) { - // fprintf(fp,"vc %f %f %f\n",(*vi).T().P()[0],(*vi).T().P()[1]); - //} - - //saves vertex - - fprintf(fp,"v %f %f %f",(*vi).P()[0],(*vi).P()[1],(*vi).P()[2]); - if(mask & Mask::IOM_VERTCOLOR) - fprintf(fp," %f %f %f",double((*vi).C()[0])/255.,double((*vi).C()[1])/255.,double((*vi).C()[2])/255.); - fprintf(fp,"\n"); - - if (cb !=NULL) - { - if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) - { - fclose(fp); - return E_ABORTED; - } - } - numvert++; - } - assert(numvert == m.vn); - - fprintf(fp,"# %d vertices, %d vertices normals\n\n",m.vn,int(NormalVertex.size())); - - //faces + texture coords - FaceIterator fi; - std::map,int> CoordIndexTexture; - unsigned int material_num = 0; - int mem_index = 0; //var temporany - int curTexCoordIndex = 1; - for(fi=m.face.begin(); fi!=m.face.end(); ++fi) if( !(*fi).IsD() ) - { - if((mask & Mask::IOM_FACECOLOR) || (mask & Mask::IOM_WEDGTEXCOORD) ) - { - int index = Materials::CreateNewMaterial(m,materialVec,material_num,fi); - - if(index == (int)materialVec.size())//inserts a new element material - { - material_num++; - fprintf(fp,"\nusemtl material_%d\n",materialVec[index-1].index); - mem_index = index-1; - } - else - { - if(index != mem_index)//inserts old name elemente material - { - fprintf(fp,"\nusemtl material_%d\n",materialVec[index].index); - mem_index=index; - } - } - } - - //saves texture coord x wedge - if(HasPerWedgeTexCoord(m) && (mask & Mask::IOM_WEDGTEXCOORD)) - for(int k=0;k<(*fi).VN();k++) - { - { - if(AddNewTextureCoord(CoordIndexTexture,(*fi).WT(k),curTexCoordIndex)) - { - fprintf(fp,"vt %f %f\n",(*fi).WT(k).u(),(*fi).WT(k).v()); - curTexCoordIndex++; //ncreases the value number to be associated to the Texture - } - } - } - - - fprintf(fp,"f "); + else + { + if(index != mem_index)//inserts old name elemente material + { + fprintf(fp,"\nusemtl material_%d\n",materialVec[index].index); + mem_index=index; + } + } + } + + //saves texture coord x wedge + if(HasPerWedgeTexCoord(m) && (mask & Mask::IOM_WEDGTEXCOORD)) for(int k=0;k<(*fi).VN();k++) - { - if(k!=0) fprintf(fp," "); - int vInd = -1; - // +1 because Obj file format begins from index = 1 but not from index = 0. - vInd = VertexId[GetIndexVertex(m, (*fi).V(k))] + 1;//index of vertex per face - - int vt = -1; - if(mask & Mask::IOM_WEDGTEXCOORD) - vt = GetIndexVertexTexture(CoordIndexTexture,(*fi).WT(k));//index of vertex texture per face - if (mask & Mask::IOM_VERTTEXCOORD) - vt = vInd; - - int vn = -1; - if(mask & Mask::IOM_WEDGNORMAL ) - vn = GetIndexVertexNormal(m, NormalVertex, (*fi).V(k)->cN());//index of vertex normal per face. - if (mask & Mask::IOM_VERTNORMAL) - vn = vInd; - - //writes elements on file obj - WriteFacesElement(fp,vInd,vt,vn); - } - fprintf(fp,"\n"); - if (cb !=NULL) { - if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) - { fclose(fp); return E_ABORTED;} + { + if(AddNewTextureCoord(CoordIndexTexture,(*fi).WT(k),curTexCoordIndex)) + { + fprintf(fp,"vt %f %f\n",(*fi).WT(k).u(),(*fi).WT(k).v()); + curTexCoordIndex++; //ncreases the value number to be associated to the Texture + } } - }//for - fprintf(fp,"# %d faces, %d coords texture\n\n",m.fn,int(CoordIndexTexture.size())); - - fprintf(fp,"# End of File\n"); - fclose(fp); - - int r = 0; - if((mask & Mask::IOM_WEDGTEXCOORD) || (mask & Mask::IOM_FACECOLOR) ) - r = WriteMaterials(materialVec, filename,cb);//write material - - if(r!= E_NOERROR) - return r; - return E_NOERROR; - } - - /* - returns index of the vertex - */ - inline static int GetIndexVertex(SaveMeshType &m, VertexType *p) - { - return p-&*(m.vert.begin()); - } - - /* - returns index of the texture coord - */ - inline static int GetIndexVertexTexture(typename std::map,int> &mapTexToInt, const vcg::TexCoord2 &wt) - { - typename std::map,int>::iterator iter= mapTexToInt.find(wt); - if(iter != mapTexToInt.end()) return (*iter).second; - else return -1; - // Old wrong version. - // int index = mapTexToInt[wt]; - // if(index!=0){return index;} - } - - /* - returns index of the vertex normal - */ - inline static int GetIndexVertexNormal(SaveMeshType &/*m*/, std::map &mapNormToInt, const CoordType &norm ) - { - typename std::map::iterator iter= mapNormToInt.find(norm); - if(iter != mapNormToInt.end()) return (*iter).second; - else return -1; - // Old wrong version. - // int index = mapNormToInt[m.vert[iv].N()]; - // if(index!=0){return index;} - } - - /* - write elements on file - - f v/tc/vn v/tc/vn v/tc/vn ... - f v/tc v/tc v/tc ... - f v//vn v//vn v//vn ... - f v v v ... - - */ - inline static void WriteFacesElement(FILE *fp,int v,int vt, int vn) - { - fprintf(fp,"%d",v); - if(vt!=-1) - { - fprintf(fp,"/%d",vt); - if(vn!=-1) - fprintf(fp,"/%d",vn); - } - else if(vn!=-1) - fprintf(fp,"//%d",vn); - } - - /* - adds a new index to the coordinate of Texture if it is the first time - which is otherwise met not execute anything - */ - inline static bool AddNewTextureCoord(std::map,int> &m, - const typename vcg::TexCoord2 &wt,int value) - { - int index = m[wt]; - if(index==0){m[wt]=value;return true;} - return false; - } - - /* - adds a new index to the normal per vertex if it is the first time - which is otherwise met does not execute anything - */ - inline static bool AddNewNormalVertex(typename std::map &m, CoordType &n ,int value) - { - int index = m[n]; - if(index==0){m[n]=value;return true;} - return false; - } - - /* - writes material into file - */ - inline static int WriteMaterials(std::vector &materialVec, const char * filename, CallBackPos *cb=0) - { - std::string fileName = std::string(filename); - fileName+=".mtl"; - - if(materialVec.size() > 0) - { - FILE *fp; - fp = fopen(fileName.c_str(),"w"); - if(fp==NULL)return E_ABORTED; - - fprintf(fp,"#\n# Wavefront material file\n# Converted by Meshlab Group\n#\n\n"); - - int current = 0; - - for(unsigned int i=0;i0) - fprintf(fp,"map_Kd %s\n",materialVec[i].map_Kd.c_str()); - fprintf(fp,"\n"); - } - fclose(fp); - } - return E_NOERROR; - } - - }; // end class + + fprintf(fp,"f "); + for(int k=0;k<(*fi).VN();k++) + { + if(k!=0) fprintf(fp," "); + int vInd = -1; + // +1 because Obj file format begins from index = 1 but not from index = 0. + vInd = VertexId[tri::Index(m, (*fi).V(k))] + 1;//index of vertex per face + + int vt = -1; + if(mask & Mask::IOM_WEDGTEXCOORD) + vt = GetIndexVertexTexture(CoordIndexTexture,(*fi).WT(k));//index of vertex texture per face + if (mask & Mask::IOM_VERTTEXCOORD) + vt = vInd; + + int vn = -1; + if(mask & Mask::IOM_WEDGNORMAL ) + vn = GetIndexVertexNormal(m, NormalVertex, (*fi).V(k)->cN());//index of vertex normal per face. + if (mask & Mask::IOM_VERTNORMAL) + vn = vInd; + + //writes elements on file obj + WriteFacesElement(fp,vInd,vt,vn); + } + fprintf(fp,"\n"); + + if (cb !=NULL) { + if(!(*cb)((100*++current)/totalPrimitives, "writing vertices ")) + { fclose(fp); return E_ABORTED;} + } + + }//for faces + + for(EdgeIterator ei=m.edge.begin(); ei!=m.edge.end(); ++ei) if( !(*ei).IsD() ) + { + fprintf(fp,"l %i %i\n", + VertexId[tri::Index(m, (*ei).V(0))] + 1, + VertexId[tri::Index(m, (*ei).V(1))] + 1); + } + + fprintf(fp,"# %d faces, %d coords texture\n\n",m.fn,int(CoordIndexTexture.size())); + + fprintf(fp,"# End of File\n"); + fclose(fp); + + int errCode = E_NOERROR; + if((mask & Mask::IOM_WEDGTEXCOORD) || (mask & Mask::IOM_FACECOLOR) ) + errCode = WriteMaterials(materialVec, filename,cb);//write material + + if(errCode!= E_NOERROR) + return errCode; + return E_NOERROR; + } + + /* + returns index of the texture coord + */ + inline static int GetIndexVertexTexture(typename std::map,int> &mapTexToInt, const vcg::TexCoord2 &wt) + { + typename std::map,int>::iterator iter= mapTexToInt.find(wt); + if(iter != mapTexToInt.end()) return (*iter).second; + else return -1; + // Old wrong version. + // int index = mapTexToInt[wt]; + // if(index!=0){return index;} + } + + /* + returns index of the vertex normal + */ + inline static int GetIndexVertexNormal(SaveMeshType &/*m*/, std::map &mapNormToInt, const CoordType &norm ) + { + typename std::map::iterator iter= mapNormToInt.find(norm); + if(iter != mapNormToInt.end()) return (*iter).second; + else return -1; + } + + /* + write elements on file + + f v/tc/vn v/tc/vn v/tc/vn ... + f v/tc v/tc v/tc ... + f v//vn v//vn v//vn ... + f v v v ... + + */ + inline static void WriteFacesElement(FILE *fp,int v,int vt, int vn) + { + fprintf(fp,"%d",v); + if(vt!=-1) + { + fprintf(fp,"/%d",vt); + if(vn!=-1) + fprintf(fp,"/%d",vn); + } + else if(vn!=-1) + fprintf(fp,"//%d",vn); + } + + /* + adds a new index to the coordinate of Texture if it is the first time + which is otherwise met not execute anything + */ + inline static bool AddNewTextureCoord(std::map,int> &m, + const typename vcg::TexCoord2 &wt,int value) + { + int index = m[wt]; + if(index==0){m[wt]=value;return true;} + return false; + } + + /* + adds a new index to the normal per vertex if it is the first time + which is otherwise met does not execute anything + */ + inline static bool AddNewNormalVertex(typename std::map &m, CoordType &n ,int value) + { + int index = m[n]; + if(index==0){m[n]=value;return true;} + return false; + } + + /* + writes material into file + */ + inline static int WriteMaterials(std::vector &materialVec, const char * filename, CallBackPos *cb=0) + { + std::string fileName = std::string(filename); + fileName+=".mtl"; + + if(materialVec.size() > 0) + { + FILE *fp; + fp = fopen(fileName.c_str(),"w"); + if(fp==NULL)return E_ABORTED; + + fprintf(fp,"#\n# Wavefront material file\n# Converted by Meshlab Group\n#\n\n"); + + int current = 0; + + for(unsigned int i=0;i0) + fprintf(fp,"map_Kd %s\n",materialVec[i].map_Kd.c_str()); + fprintf(fp,"\n"); + } + fclose(fp); + } + return E_NOERROR; + } + +}; // end class } // end Namespace tri } // end Namespace io } // end Namespace vcg diff --git a/inst/include/vcglib/wrap/math/.svn/entries b/inst/include/vcglib/wrap/math/.svn/entries index 55e1d72e..65c8e5cf 100644 --- a/inst/include/vcglib/wrap/math/.svn/entries +++ b/inst/include/vcglib/wrap/math/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/math svn://svn.code.sf.net/p/vcg/code diff --git a/inst/include/vcglib/wrap/minpack/.svn/entries b/inst/include/vcglib/wrap/minpack/.svn/entries index 9d847b3c..c9585a8f 100644 --- a/inst/include/vcglib/wrap/minpack/.svn/entries +++ b/inst/include/vcglib/wrap/minpack/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 242e072f..dde1a846 100644 --- a/inst/include/vcglib/wrap/miq/.svn/entries +++ b/inst/include/vcglib/wrap/miq/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/miq svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,9 @@ pietroni e8973e21-934d-0410-ac44-de4585f5606d +core +dir + MIQ.h file @@ -94,6 +97,3 @@ has-props 18233 -core -dir - diff --git a/inst/include/vcglib/wrap/miq/core/.svn/entries b/inst/include/vcglib/wrap/miq/core/.svn/entries index 118273aa..27eab4e3 100644 --- a/inst/include/vcglib/wrap/miq/core/.svn/entries +++ b/inst/include/vcglib/wrap/miq/core/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/miq/core svn://svn.code.sf.net/p/vcg/code @@ -26,16 +26,16 @@ pietroni e8973e21-934d-0410-ac44-de4585f5606d -glUtils.h +sparsesystemdata.h file -2013-07-25T06:52:24.794399Z -8a995c21525f5103c79ab7d5bbebbcd7 -2013-07-23T11:24:38.954326Z -4927 +2013-06-21T07:08:11.591658Z +841bc605464a44754ae145cd5862278b +2012-10-17T12:27:02.302460Z +4620 pietroni has-props @@ -58,19 +58,19 @@ has-props -8703 +8465 -poisson_solver.h +stiffening.h file -2013-06-21T07:08:11.595658Z -f9f333fe6c5c4d2b98507248d51daa25 -2012-11-12T11:17:33.619286Z -4719 -pietroni +2013-06-21T07:08:11.591658Z +c476d42c4fcb28a23b8aedbf9ad5992c +2013-01-30T17:18:55.488904Z +4811 +ganovelli has-props @@ -92,19 +92,19 @@ has-props -25718 +6364 -auxmath.h +param_stats.h file -2013-06-21T07:08:11.595658Z -db38d9059f3c4f87c4ca22725ae00c8d -2012-10-17T12:27:02.302460Z -4620 -pietroni +2013-06-21T07:08:11.591658Z +f7c0d6ee9cba8445af0c7facad5c0efc +2013-01-30T17:18:55.488904Z +4811 +ganovelli has-props @@ -126,19 +126,19 @@ has-props -873 +7224 -seams_initializer.h +vertex_indexing.h file -2013-07-25T06:52:24.794399Z -5e09fca1481b5bac024c7350cc08d699 -2013-07-23T11:23:21.585077Z -4925 -pietroni +2013-06-21T07:08:11.591658Z +a2a3cfcd8b99b21b0042f9ad0abdd23d +2013-01-30T17:18:55.488904Z +4811 +ganovelli has-props @@ -160,18 +160,18 @@ has-props -12138 +14249 -sparsesystemdata.h +glUtils.h file -2013-06-21T07:08:11.591658Z -841bc605464a44754ae145cd5862278b -2012-10-17T12:27:02.302460Z -4620 +2013-07-25T06:52:24.794399Z +8a995c21525f5103c79ab7d5bbebbcd7 +2013-07-23T11:24:38.954326Z +4927 pietroni has-props @@ -194,19 +194,19 @@ has-props -8465 +8703 -stiffening.h +poisson_solver.h file -2013-06-21T07:08:11.591658Z -c476d42c4fcb28a23b8aedbf9ad5992c -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 @@ -228,19 +228,19 @@ has-props -6364 +25718 -param_stats.h +auxmath.h file -2013-06-21T07:08:11.591658Z -f7c0d6ee9cba8445af0c7facad5c0efc -2013-01-30T17:18:55.488904Z -4811 -ganovelli +2013-06-21T07:08:11.595658Z +db38d9059f3c4f87c4ca22725ae00c8d +2012-10-17T12:27:02.302460Z +4620 +pietroni has-props @@ -262,19 +262,19 @@ has-props -7224 +873 -vertex_indexing.h +seams_initializer.h file -2013-06-21T07:08:11.591658Z -a2a3cfcd8b99b21b0042f9ad0abdd23d -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 @@ -296,5 +296,5 @@ has-props -14249 +12138 diff --git a/inst/include/vcglib/wrap/mt/.svn/entries b/inst/include/vcglib/wrap/mt/.svn/entries index 846940f4..f8df9a13 100644 --- a/inst/include/vcglib/wrap/mt/.svn/entries +++ b/inst/include/vcglib/wrap/mt/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 83055eb1..33640f64 100644 --- a/inst/include/vcglib/wrap/opensg/.svn/entries +++ b/inst/include/vcglib/wrap/opensg/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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 7a81a2cb..f50e85f0 100644 --- a/inst/include/vcglib/wrap/ply/.svn/entries +++ b/inst/include/vcglib/wrap/ply/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 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.cpp +plylib.h file 2013-06-21T07:08:18.867694Z -4898296162fa9cc9282affbd74e4d19c +42f906d8b81428f23ba29652b56fac26 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,16 +58,16 @@ cignoni -82266 +8887 -plylib.h +plystuff.h file 2013-06-21T07:08:18.867694Z -42f906d8b81428f23ba29652b56fac26 +50360ba5a653f235ad1260d87b17553f 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -92,16 +92,16 @@ cignoni -8887 +10445 -plystuff.h +plylib.cpp file 2013-06-21T07:08:18.867694Z -50360ba5a653f235ad1260d87b17553f +4898296162fa9cc9282affbd74e4d19c 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -126,5 +126,5 @@ cignoni -10445 +82266 diff --git a/inst/include/vcglib/wrap/qt/.svn/entries b/inst/include/vcglib/wrap/qt/.svn/entries index 0c020bfd..c52d959c 100644 --- a/inst/include/vcglib/wrap/qt/.svn/entries +++ b/inst/include/vcglib/wrap/qt/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/qt svn://svn.code.sf.net/p/vcg/code @@ -26,6 +26,40 @@ granzuglia e8973e21-934d-0410-ac44-de4585f5606d +trackball.h +file + + + + +2013-06-21T07:08:08.987645Z +f2dfa4f4a8ba5e0ec9b70483fb07affd +2011-10-05T15:04:40.740408Z +4180 +cignoni + + + + + + + + + + + + + + + + + + + + + +4195 + gl_label.h file @@ -162,17 +196,17 @@ has-props 9196 -to_string.h +anttweakbarMapper.h file 2013-06-21T07:08:08.991645Z -014ba50cb2a7f46671b157ff2ae00686 -2011-10-05T15:04:40.740408Z -4180 -cignoni +5a6df9f04a3049c41a3d5251907e3391 +2012-02-14T11:39:27.403341Z +4330 +malomo has-props @@ -194,19 +228,19 @@ has-props -744 +419 -anttweakbarMapper.h +to_string.h file 2013-06-21T07:08:08.991645Z -5a6df9f04a3049c41a3d5251907e3391 -2012-02-14T11:39:27.403341Z -4330 -malomo +014ba50cb2a7f46671b157ff2ae00686 +2011-10-05T15:04:40.740408Z +4180 +cignoni has-props @@ -228,7 +262,7 @@ has-props -419 +744 checkGLError.h file @@ -298,14 +332,14 @@ has-props 713 -img_qt_convert.h +img_qt.h file 2013-06-21T07:08:08.987645Z -62eac7a5457e18e8e5122801994fb6a1 +10781583b22685222c6c415b0118f33b 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -330,16 +364,16 @@ has-props -5200 +221 -img_qt.h +img_qt_convert.h file 2013-06-21T07:08:08.987645Z -10781583b22685222c6c415b0118f33b +62eac7a5457e18e8e5122801994fb6a1 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -364,20 +398,19 @@ has-props -221 +5200 -shot_qt.h +col_qt_convert.h file 2013-06-21T07:08:08.987645Z -77bfd209c52a449f61147a2c31d58c6b +8c042a9aac22615df1c0efadc2d9d6c8 2011-10-05T15:04:40.740408Z 4180 cignoni -has-props @@ -398,19 +431,21 @@ has-props -5837 + +421 -col_qt_convert.h +shot_qt.h file 2013-06-21T07:08:08.987645Z -8c042a9aac22615df1c0efadc2d9d6c8 +77bfd209c52a449f61147a2c31d58c6b 2011-10-05T15:04:40.740408Z 4180 cignoni +has-props @@ -431,8 +466,7 @@ cignoni - -421 +5837 Outline2ToQImage.cpp file @@ -502,37 +536,3 @@ has-props 5577 -trackball.h -file - - - - -2013-06-21T07:08:08.987645Z -f2dfa4f4a8ba5e0ec9b70483fb07affd -2011-10-05T15:04:40.740408Z -4180 -cignoni - - - - - - - - - - - - - - - - - - - - - -4195 - diff --git a/inst/include/vcglib/wrap/system/.svn/entries b/inst/include/vcglib/wrap/system/.svn/entries index 26d05bb5..b02b3346 100644 --- a/inst/include/vcglib/wrap/system/.svn/entries +++ b/inst/include/vcglib/wrap/system/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/system svn://svn.code.sf.net/p/vcg/code @@ -26,14 +26,17 @@ ponchio e8973e21-934d-0410-ac44-de4585f5606d -getopt.h +multithreading +dir + +getopt.cpp file 2013-06-21T07:08:08.455642Z -4fa0be0d909a37f303717ddab672c3cd +cc0fd9f2a9d754a540d678eb9cc7f256 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -58,18 +61,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 @@ -92,22 +95,16 @@ ponchio -5078 - -time -dir - -multithreading -dir +11162 -getopt.cpp +getopt.h file 2013-06-21T07:08:08.455642Z -cc0fd9f2a9d754a540d678eb9cc7f256 +4fa0be0d909a37f303717ddab672c3cd 2011-10-05T15:04:40.740408Z 4180 cignoni @@ -132,18 +129,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 @@ -166,5 +163,8 @@ ponchio -11162 +5078 + +time +dir diff --git a/inst/include/vcglib/wrap/system/multithreading/.svn/entries b/inst/include/vcglib/wrap/system/multithreading/.svn/entries index 3b3e379c..0191e9a6 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 -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/system/multithreading svn://svn.code.sf.net/p/vcg/code @@ -26,40 +26,6 @@ jmnoguerar e8973e21-934d-0410-ac44-de4585f5606d -base.h -file - - - - -2013-06-21T07:08:08.235641Z -c207af9750d0a969db47a54fd7587d6a -2011-12-09T16:06:08.628319Z -4246 -ponchio -has-props - - - - - - - - - - - - - - - - - - - - -278 - util.h file @@ -502,3 +468,37 @@ has-props 2841 +base.h +file + + + + +2013-06-21T07:08:08.235641Z +c207af9750d0a969db47a54fd7587d6a +2011-12-09T16:06:08.628319Z +4246 +ponchio +has-props + + + + + + + + + + + + + + + + + + + + +278 + diff --git a/inst/include/vcglib/wrap/system/time/.svn/entries b/inst/include/vcglib/wrap/system/time/.svn/entries index 5ea0d257..a7d37ae7 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 -4928 +4937 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 5d86f7f8..4aefa009 100644 --- a/inst/include/vcglib/wrap/tsai/.svn/entries +++ b/inst/include/vcglib/wrap/tsai/.svn/entries @@ -1,7 +1,7 @@ 10 dir -4928 +4937 svn://svn.code.sf.net/p/vcg/code/trunk/vcglib/wrap/tsai svn://svn.code.sf.net/p/vcg/code