manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

int -> Key

This commit is contained in:
Federico Ponchio 2004-07-01 21:35:34 +00:00
parent fbe6bc4d8f
commit 8a4da23fe9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/nexus/pvoronoi.cpp
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.1 2004/06/24 14:32:45 ponchio
Moved from wrap/nexus
Revision 1.2 2004/06/24 14:19:20 ponchio Revision 1.2 2004/06/24 14:19:20 ponchio
Debugged Debugged
@ -53,7 +56,8 @@ bool Seed::Dist(const Point3f &point, float &mindist,
return false; return false;
} }
int VoronoiPartition::Add(vcg::Point3f p, float weight) { VoronoiPartition::Key VoronoiPartition::Add(const vcg::Point3f &p,
float weight) {
Seed ns(p,weight); Seed ns(p,weight);
all_seeds.push_back(ns); all_seeds.push_back(ns);
seedBuf.push_back(p); seedBuf.push_back(p);
@ -64,10 +68,11 @@ int VoronoiPartition::Add(vcg::Point3f p, float weight) {
seedBuf.clear(); seedBuf.clear();
ug.Set(ug_seeds); ug.Set(ug_seeds);
} }
return size(); return (Key)(size());
} }
float VoronoiPartition::Closest(const vcg::Point3f &p, int &target, float radius) { float VoronoiPartition::Closest(const vcg::Point3f &p,
VoronoiPartition::Key &target, float radius) {
Point3f res; Point3f res;
float mindist = 1e20; float mindist = 1e20;
target = -1; target = -1;
@ -129,7 +134,7 @@ unsigned int VoronoiPartition::count(Key key) {
} }
Seed &VoronoiPartition::operator[](Key key) { Seed &VoronoiPartition::operator[](Key key) {
assert(key < all_seeds.size()); assert((unsigned int)key < all_seeds.size());
return all_seeds[key]; return all_seeds[key];
} }

5
apps/nexus/pvoronoi.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2004/06/25 16:47:13 ponchio
Various debug
Revision 1.1 2004/06/24 14:32:45 ponchio Revision 1.1 2004/06/24 14:32:45 ponchio
Moved from wrap/nexus Moved from wrap/nexus
@ -81,7 +84,7 @@ namespace nxs {
VoronoiPartition() {} VoronoiPartition() {}
void Init(vcg::Box3f &bb) { bbox=bb; ug.SetBBox(bb); } void Init(vcg::Box3f &bb) { bbox=bb; ug.SetBBox(bb); }
int Add(vcg::Point3f p, float weight = 1); Key Add(const vcg::Point3f &p, float weight = 1);
float Closest(const vcg::Point3f &p, Key &target, float radius = 0); float Closest(const vcg::Point3f &p, Key &target, float radius = 0);
class iterator { class iterator {