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

*** empty log message ***

This commit is contained in:
Federico Ponchio 2004-11-28 04:16:19 +00:00
parent 290aac34d3
commit 11b96df32c
7 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/nexus/decimate.h
View File

@ -3,6 +3,7 @@
#include <vector> #include <vector>
#include "border.h" #include "border.h"
#include "fragment.h"
#include <vcg/space/point3.h> #include <vcg/space/point3.h>
namespace nxs { namespace nxs {

2
apps/nexus/fragment.cpp
View File

@ -432,7 +432,7 @@ void nxs::Split(Fragment &out,
} }
unsigned int Fragment::Locate(const Point3f &p) { unsigned int Fragment::Locate(const Point3f &p) {
float max_dist = 1e20; float max_dist = 1e20f;
unsigned int id = 0xffffffff; unsigned int id = 0xffffffff;
for(unsigned int i = 0; i < seeds.size(); i++) { for(unsigned int i = 0; i < seeds.size(); i++) {
float dist = Distance(seeds[i], p); float dist = Distance(seeds[i], p);

2
apps/nexus/nexusmt.cpp
View File

@ -51,7 +51,7 @@ float FrustumMetric::GetError(unsigned int cell) {
Nexus::PatchInfo &entry = (*index)[cell]; Nexus::PatchInfo &entry = (*index)[cell];
Sphere3f &sphere = entry.sphere; Sphere3f &sphere = entry.sphere;
float dist = Distance(sphere, frustum.ViewPoint()); float dist = Distance(sphere, frustum.ViewPoint());
if(dist < 0) return 1e40; if(dist < 0) return 1e20f;
float error = entry.error/frustum.Resolution(dist); float error = entry.error/frustum.Resolution(dist);
if(frustum.IsOutside(sphere.Center(), sphere.Radius())) if(frustum.IsOutside(sphere.Center(), sphere.Radius()))
error /= 4; error /= 4;

5
apps/nexus/nexusview.cpp
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.21 2004/11/28 01:23:26 ponchio
Fixing borders... let's hope.
Revision 1.20 2004/11/18 18:30:14 ponchio Revision 1.20 2004/11/18 18:30:14 ponchio
Using baricenters... lotsa changes. Using baricenters... lotsa changes.
@ -399,7 +402,7 @@ int main(int argc, char *argv[]) {
glPointSize(4); glPointSize(4);
glColor3f(1.0f, 1.0f, 1.0f); glColor3f(1.0f, 1.0f, 1.0f);
glBegin(GL_POINTS); glBegin(GL_POINTS);
for(int b = 0; b < border.Size(); b++) { for(unsigned int b = 0; b < border.Size(); b++) {
Link &link = border[b]; Link &link = border[b];
Point3f &p = patch.Vert(link.start_vert); Point3f &p = patch.Vert(link.start_vert);
glVertex3f(p[0], p[1], p[2]); glVertex3f(p[0], p[1], p[2]);

2
apps/nexus/nxsdispatcher.cpp
View File

@ -27,7 +27,7 @@ void Opener::execute() {
break; break;
} catch(...) { } catch(...) {
} }
sleep(4); psleep(4000);
} }
server->reading.unlock(); server->reading.unlock();
server->writing.unlock(); server->writing.unlock();

5
apps/nexus/nxsdispatcher.h
View File

@ -1,3 +1,6 @@
#ifndef NXS_DISPATCHER_H
#define NXS_DISPATCHER_H
#include <ptypes/pinet.h> #include <ptypes/pinet.h>
#include <ptypes/pasync.h> #include <ptypes/pasync.h>
#include <vector> #include <vector>
@ -80,3 +83,5 @@ namespace nxs {
} }
#endif

5
apps/nexus/voronoichain.cpp
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.21 2004/11/28 01:23:26 ponchio
Fixing borders... let's hope.
Revision 1.20 2004/11/18 18:30:14 ponchio Revision 1.20 2004/11/18 18:30:14 ponchio
Using baricenters... lotsa changes. Using baricenters... lotsa changes.
@ -123,7 +126,7 @@ float getClosest(const Point3f &seed, VoronoiPartition &part) {
} }
count++; count++;
} }
return sqrt(dist); return (float)sqrt(dist);
} }
int getBest(const Point3f &seed, VoronoiPartition &part, int getBest(const Point3f &seed, VoronoiPartition &part,