Ignore:
Timestamp:
Apr 3, 2013 2:02:16 AM (9 years ago)
Author:
ldelgass
Message:

Compile fixes for USE_POINTSET_RENDERER (not tested).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/PointSetRenderer.cpp

    r3612 r3617  
    1616using namespace nv;
    1717using namespace nv::util;
     18using namespace vrmath;
     19using namespace PCA;
    1820
    1921#define USE_TEXTURE
     
    5153    delete loader;
    5254    delete image;
    53     _bucketSort = new PCA::BucketSort(1024);
     55    _bucketSort = new BucketSort(1024);
    5456}
    5557
     
    5860}
    5961
    60 void PointSetRenderer::renderPoints(PCA::Point *points, int length)
     62void PointSetRenderer::renderPoints(Point *points, int length)
    6163{
    62     PCA::Point *p = points;
     64    Point *p = points;
    6365    for (int i = 0; i < length; ++i, ++p) {
    6466        glColor4f(p->color.x, p->color.y, p->color.z, p->color.w);
     
    6769}
    6870
    69 void PointSetRenderer::renderCluster(PCA::ClusterList** bucket, int size, int level)
     71void PointSetRenderer::renderCluster(ClusterList** bucket, int size, int level)
    7072{
    7173    float quadratic[] = { 1.0f, 0.0f, 0.01f };
     
    8385    glBegin(GL_POINTS);
    8486
    85     PCA::ClusterList *p;
     87    ClusterList *p;
    8688    for (int i = size - 1; i >= 0; --i) {
    8789        p = bucket[i];
     
    108110}
    109111
    110 void PointSetRenderer::render(PCA::ClusterAccel *cluster, const Matrix4x4d& mat,
     112void PointSetRenderer::render(ClusterAccel *cluster, const Matrix4x4d& mat,
    111113                              int sortLevel, const Vector3f& scale, const Vector3f& origin)
    112114{
     
    131133    glPushMatrix();
    132134    float s = 1.0f / scale.x;
    133     Vector3 shift(origin.x + scale.x * 0.5, origin.x + scale.x * 0.5, origin.x + scale.x * 0.5);
     135    Vector3f shift(origin.x + scale.x * 0.5, origin.x + scale.x * 0.5, origin.x + scale.x * 0.5);
    134136    glScalef(s, scale.y / scale.x * s, scale.z / scale.x * s);
    135137
Note: See TracChangeset for help on using the changeset viewer.