Changeset 3470


Ignore:
Timestamp:
Mar 8, 2013, 4:26:24 AM (7 years ago)
Author:
ldelgass
Message:

Cleanups for nanovis utility libs

Location:
trunk/packages/vizservers/nanovis
Files:
4 deleted
27 edited

Legend:

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

    r3463 r3470  
    250250void Grid::setFont(Fonts *font)
    251251{
    252 //    if (font == _font) return;
    253 //    if (font) font->addRef();
    254 //    if (_font) _font->unrefDelete();
    255 
    256252    _font = font;
    257253}
  • trunk/packages/vizservers/nanovis/graphics/Makefile.in

    r3465 r3470  
    4848all: $(NVGRAPHICSLIB)
    4949
    50 install:
     50install: all
    5151
    5252$(NVGRAPHICSLIB): $(OBJS)
     
    6363distclean: clean
    6464        $(RM) Makefile *~
     65
     66Geometry.o: Geometry.h IndexBuffer.h VertexBuffer.h
     67IndexBuffer.o: IndexBuffer.h
     68RenderContext.o: RenderContext.h
     69VertexBuffer.o: VertexBuffer.h
  • trunk/packages/vizservers/nanovis/imgLoaders/ImageLoader.h

    r2831 r3470  
    88
    99class ImageLoaderImpl;
    10 class Image;
    1110
    1211class ImageLoader
  • trunk/packages/vizservers/nanovis/imgLoaders/Makefile.in

    r2896 r3470  
    4848all: $(IMGLIB)
    4949
    50 install:
     50install: all
    5151
    5252$(IMGLIB): $(OBJS)
     
    6464        $(RM) Makefile *~
    6565
     66BMPImageLoaderImpl.o: BMPImageLoaderImpl.h Image.h $(srcdir)/../Trace.h
     67Image.o: Image.h
     68ImageLoader.o: ImageLoader.h ImageLoaderImpl.h Image.h
     69ImageLoaderFactory.o: ImageLoaderFactory.h ImageLoader.h ImageLoaderImpl.h Image.h $(srcdir)/../Trace.h
     70ImageLoaderImpl.o: ImageLoaderImpl.h Image.h
  • trunk/packages/vizservers/nanovis/nanovis.cpp

    r3465 r3470  
    271271    }
    272272#endif
     273    if (fonts != NULL) {
     274        TRACE("Deleting fonts");
     275        delete fonts;
     276    }
    273277    TRACE("Leave");
    274278}
  • trunk/packages/vizservers/nanovis/newmat11/Makefile.in

    r951 r3470  
    6262all: $(MATLIB)
    6363
    64 install:
     64install: all
    6565
    6666$(MATLIB): $(OBJS)
  • trunk/packages/vizservers/nanovis/util/Fonts.h

    r3465 r3470  
    99#include <string>
    1010
    11 #include <util/Object.h>
    12 
    1311namespace nv {
    1412namespace util {
    1513
    16 class Fonts : public Object
     14class Fonts
    1715{
     16public:
    1817    struct FontAttributes {
    1918        std::string _fontName;
     
    3534    };
    3635
    37     typedef std::vector<FontAttributes>  FontVector;
    38 
    39 public:
    4036    Fonts();
     37    ~Fonts();
    4138
    4239    /// set projection to orthographic
     
    6663
    6764private:
    68     ~Fonts();
     65    typedef std::vector<FontAttributes> FontVector;
    6966
    7067    FontVector _fonts;
  • trunk/packages/vizservers/nanovis/util/Makefile.in

    r3465 r3470  
    4242OBJS            = \
    4343                FilePath.o \
    44                 Fonts.o \
    45                 Object.o
     44                Fonts.o
    4645
    4746all: $(NVUTILLIB)
    4847
    49 install:
     48install: all
    5049
    5150$(NVUTILLIB): $(OBJS)
     
    6261distclean: clean
    6362        $(RM) Makefile *~
     63
     64FilePath.o: FilePath.h $(srcdir)/../Trace.h
     65Fonts.o: Fonts.h
  • trunk/packages/vizservers/nanovis/vrmath/BPlane.cpp

    r3467 r3470  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22#include <vrmath/BPlane.h>
     3#include <vrmath/Vector3f.h>
     4#include <vrmath/LineSegment.h>
    35
    46void vrBPlane::makePts(const vrVector3f& p1, const vrVector3f& p2, const vrVector3f& p3)
  • trunk/packages/vizservers/nanovis/vrmath/Makefile.in

    r3467 r3470  
    4040VRMATHLIB       = vrmath.a
    4141
     42#               Projection.o \
     43
    4244OBJS            = \
    4345                BBox.o \
     
    4547                Color4f.o \
    4648                LineSegment.o \
    47                 Linmath.o \
    4849                Matrix4x4f.o \
    4950                Plane.o \
    5051                Plane2.o \
    51                 Projection.o \
    5252                Quaternion.o \
    5353                Rotation.o \
     
    5656                Vector4f.o \
    5757
     58.PHONY: all install clean distclean
     59
    5860all: $(VRMATHLIB)
    5961
    60 install:
     62install: all
    6163
    6264$(VRMATHLIB): $(OBJS)
     
    7476        $(RM) Makefile *~
    7577
     78BBox.o: $(srcdir)/include/vrmath/BBox.h $(srcdir)/include/vrmath/Vector3f.h
     79BPlane.o: $(srcdir)/include/vrmath/BPlane.h $(srcdir)/include/vrmath/Vector3f.h $(srcdir)/include/vrmath/LineSegment.h
     80Color4f.o: $(srcdir)/include/vrmath/Color4f.h
     81LineSegment.o: $(srcdir)/include/vrmath/LineSegment.h
     82Matrix4x4f.o: $(srcdir)/include/vrmath/Matrix4x4f.h $(srcdir)/include/vrmath/Vector3f.h $(srcdir)/include/vrmath/Rotation.h
     83Plane.o: $(srcdir)/include/vrmath/Plane.h $(srcdir)/include/vrmath/Matrix4x4f.h
     84Plane2.o: $(srcdir)/include/vrmath/Plane2.h $(srcdir)/include/vrmath/LineSegment.h
     85Quaternion.o: $(srcdir)/include/vrmath/Quaternion.h $(srcdir)/include/vrmath/Rotation.h $(srcdir)/include/vrmath/Vector3f.h
     86Rotation.o: $(srcdir)/include/vrmath/Quaternion.h $(srcdir)/include/vrmath/Rotation.h $(srcdir)/include/vrmath/Vector3f.h
     87Vector2f.o: $(srcdir)/include/vrmath/Vector2f.h
     88Vector3f.o: $(srcdir)/include/vrmath/Vector3f.h $(srcdir)/include/vrmath/Matrix4x4f.h
     89Vector4f.o: $(srcdir)/include/vrmath/Vector4f.h $(srcdir)/include/vrmath/Matrix4x4f.h
  • trunk/packages/vizservers/nanovis/vrmath/Plane.cpp

    r3467 r3470  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22#include <vrmath/Plane.h>
     3#include <vrmath/Matrix4x4f.h>
    34
    45void vrPlane::transform(vrMatrix4x4f& mat)
  • trunk/packages/vizservers/nanovis/vrmath/Plane2.cpp

    r3467 r3470  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22#include <vrmath/Plane2.h>
     3#include <vrmath/LineSegment.h>
    34
    45void vrPlane2::makePts(const vrVector3f& p1, const vrVector3f& p2, const vrVector3f& p3)
  • trunk/packages/vizservers/nanovis/vrmath/Projection.cpp

    r3467 r3470  
    33#include <math.h>
    44#include <memory.h>
     5
     6#if 0
     7vrVector3f vrCalcNormal(const vrVector3f& v1, const vrVector3f& v2, const vrVector3f& v3)
     8{
     9    vrVector3f temp;
     10
     11    float a[3], b[3];
     12
     13    a[0] = v2.x - v1.x;
     14    a[1] = v2.y - v1.y;
     15    a[2] = v2.z - v1.z;
     16    b[0] = v3.x - v1.x;
     17    b[1] = v3.y - v1.y;
     18    b[2] = v3.z - v1.z;
     19
     20    temp.x = a[1] * b[2] - a[2] * b[1];
     21    temp.y = a[2] * b[0] - a[0] * b[2];
     22    temp.z = a[0] * b[1] - a[1] * b[0];
     23
     24    float leng = (float)sqrt(temp.x * temp.x + temp.y * temp.y + temp.z * temp.z);
     25
     26    if (leng != 0.0f) {
     27        temp.x /= leng;
     28        temp.y /= leng;
     29        temp.z /= leng;
     30    }
     31    else temp.set(-1.0f, 0.0f, 0.0f);
     32
     33    return temp;
     34}
     35#endif
    536
    637static void __gluMakeIdentityd(float m[16])
     
    1142    m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1;
    1243}
    13 
    1444
    1545static int __gluInvertMatrixd(const float m[16], float invOut[16])
     
    5383    det = m[0]*inv[0] + m[1]*inv[4] + m[2]*inv[8] + m[3]*inv[12];
    5484
    55             if (det == 0)
     85    if (det == 0)
    5686        return 0;
    5787
     
    6494}
    6595
    66 
    6796static void __gluMultMatrixVecd(const float matrix[16], const float in[4],
    68                       float out[4])
     97                                float out[4])
    6998{
    7099    int i;
     
    80109
    81110static void __gluMultMatricesd(const float a[16], const float b[16],
    82                                 float r[16])
     111                               float r[16])
    83112{
    84113    int i, j;
     
    96125
    97126int unproject(float winx, float winy, float winz,
    98                 const float modelMatrix[16],
    99                 const float projMatrix[16],
    100                 const int viewport[4],
    101                 float *objx, float *objy, float *objz)
     127              const float modelMatrix[16],
     128              const float projMatrix[16],
     129              const int viewport[4],
     130              float *objx, float *objy, float *objz)
    102131{
    103132    float finalMatrix[16];
     
    158187    memcpy(matrix, &m[0][0], sizeof(float) * 16);
    159188}
    160 
  • trunk/packages/vizservers/nanovis/vrmath/Quaternion.cpp

    r3467 r3470  
    1212#include <vrmath/Quaternion.h>
    1313#include <vrmath/Rotation.h>
    14 #include <vrmath/Linmath.h>
    1514#include <vrmath/Vector3f.h>
    1615
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/BBox.h

    r3467 r3470  
    33#define VRBBOX_H
    44
    5 #include <vrmath/Linmath.h>
    65#include <vrmath/Vector3f.h>
    7 #include <vrmath/Matrix4x4f.h>
     6
     7class vrMatrix4x4f;
    88
    99class vrBBox
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/BPlane.h

    r3467 r3470  
    99#define VRBPLANE_H
    1010
    11 #include <vrmath/Linmath.h>
    1211#include <vrmath/Vector3f.h>
    13 #include <vrmath/LineSegment.h>
     12
     13class vrLineSegment;
    1414
    1515class vrBPlane
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Color4f.h

    r3467 r3470  
    22#ifndef VRCOLOR4F_H
    33#define VRCOLOR4F_H
    4 
    5 #include <vrmath/Linmath.h>
    64
    75class vrColor4f
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/LineSegment.h

    r3467 r3470  
    99#define VRLINESEGMENT_H
    1010
    11 #include <vrmath/Linmath.h>
    1211#include <vrmath/Vector3f.h>
    13 #include <vrmath/Matrix4x4f.h>
     12
     13class vrMatrix4x4f;
    1414
    1515class vrLineSegment
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Matrix4x4f.h

    r3467 r3470  
    55#include <memory.h>
    66
    7 #include <vrmath/Linmath.h>
    87#include <vrmath/Vector3f.h>
    9 #include <vrmath/Rotation.h>
     8
     9class vrRotation;
    1010
    1111class vrMatrix4x4f
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Plane.h

    r3467 r3470  
    99#define VRPLANE_H
    1010
    11 #include <vrmath/Linmath.h>
    12 #include <vrmath/Matrix4x4f.h>
    1311#include <vrmath/Vector4f.h>
    1412#include <vrmath/Vector3f.h>
     13
     14class vrMatrix4x4f;
    1515
    1616class vrPlane
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Plane2.h

    r3467 r3470  
    88#define VRPLANE2_H
    99
    10 #include <vrmath/Linmath.h>
    1110#include <vrmath/Vector3f.h>
    12 #include <vrmath/LineSegment.h>
     11
     12class vrLineSegment;
    1313
    1414class vrPlane2
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Projection.h

    r3467 r3470  
    33#define VRPROJECTION_H
    44
    5 #ifdef __cplusplus
    6 extern "C" {
    7 #endif
    8 
    9 int
     5extern int
    106unproject(float winx, float winy, float winz,
    117          const float modelMatrix[16],
     
    1410          float *objx, float *objy, float *objz);
    1511
    16 void
     12extern void
    1713perspective(float fovy, float aspect, float zNear, float zFar, float *matrix);
    18 
    19 #ifdef __cplusplus
    20 };
    21 #endif
    2214
    2315#endif
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Quaternion.h

    r3467 r3470  
    88#ifndef VRQUATERNION_H
    99#define VRQUATERNION_H
    10 
    11 #include <vrmath/Linmath.h>
    1210
    1311class vrRotation;
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Rotation.h

    r3467 r3470  
    22#ifndef VRROTATION_H
    33#define VRROTATION_H
    4 
    5 #include <vrmath/Linmath.h>
    64
    75class vrVector3f;
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector2f.h

    r3467 r3470  
    55#include <cstdlib>
    66#include <cmath>
    7 
    8 #include <vrmath/Linmath.h>
    97
    108class vrVector2f
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector3f.h

    r3467 r3470  
    55#include <cstdlib>
    66#include <cmath>
    7 
    8 #include <vrmath/Linmath.h>
    97
    108class vrMatrix4x4f;
  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector4f.h

    r3467 r3470  
    33#define VRVECTOR4F_H
    44
    5 #include <vrmath/Linmath.h>
    65#include <vrmath/Vector3f.h>
    76#include <vrmath/Vector4f.h>
Note: See TracChangeset for help on using the changeset viewer.