Changeset 881 for trunk

Timestamp:

Feb 13, 2008, 6:53:34 AM (17 years ago)

Author:

dkearney

Message:

moving nanovis' camera object to nvcamera in preparation for a new dx file reader, the dx libraries also include an object called camera.

Location:

trunk/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• NvCamera.cpp (moved) (moved from trunk/vizservers/nanovis/Camera.cpp) (4 diffs)
• NvCamera.h (moved) (moved from trunk/vizservers/nanovis/Camera.h) (3 diffs)
• nanovis.cpp (modified) (2 diffs)
• nanovis.h (modified) (2 diffs)

trunk/vizservers/nanovis/Command.cpp

@@ -63 +63 @@
 #include "HeightMap.h"
 #include "Grid.h"
-#include "Camera.h"
+#include "NvCamera.h"
 #include <RenderContext.h>
 #include <NvLIC.h>

trunk/vizservers/nanovis/Makefile.in

@@ -30 +30 @@
 MATINC = ./newmat11
 
+LIB_DX = -lDXcallm -lm
 LIB_NANOVIS = -L@RP_DIR@/lib -ltcl8.4 -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lrappture2 -lb64 -lz
 INCLUDES = -I@RP_DIR@/include -I@RP2_INCL_DIR@ -I/usr/include/GL -I$(R2INC) -I. -I$(MATINC)
@@ -41 +42 @@
         BMPImageLoaderImpl.o \
         BucketSort.o \
-        Camera.o \
+        NvCamera.o \
         Color.o \
         ColorGradient.o \
@@ -153 +154 @@
 
 nanovis: $(OBJS)
-        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIB_NANOVIS)
+        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIB_NANOVIS) $(LIB_DX)
 
 client: Socket.o ClientSocket.o RenderClient.o Event.o
-        $(CC) $(CC_SWITCHES) -o $(LIB_NANOVIS) $@ $^
+        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIB_NANOVIS) $(LIB_DX)
 
 .cpp.o:
@@ -222 +223 @@
 Texture3D.o: Texture3D.cpp Texture3D.h $(AUXSRC)
 Renderable.o: Renderable.cpp Renderable.h
-Camera.o: Camera.cpp Camera.h
+NvCamera.o: NvCamera.cpp NvCamera.h
 ScreenSnapper.o: ScreenSnapper.cpp ScreenSnapper.h define.h
 Volume.o: Volume.cpp Volume.h $(AUXSRC)

trunk/vizservers/nanovis/NvCamera.cpp

@@ -1 +1 @@
 /*
  * ----------------------------------------------------------------------
- * Camera.cpp : Camera class
+ * NvCamera.cpp : NvCamera class
  *
  * ======================================================================
@@ -15 +15 @@
 
 #include <stdio.h>
-#include "Camera.h"
+#include "NvCamera.h"
 
-Camera::Camera(int startx, int starty, int w, int h,
+NvCamera::NvCamera(int startx, int starty, int w, int h,
                 double loc_x, double loc_y, double loc_z, 
                 double target_x, double target_y, double target_z,
@@ -29 +29 @@
          angle(Vector3(angle_x, angle_y, angle_z)) { }
 
-Camera::~Camera(){}      
+NvCamera::~NvCamera(){}  
 
-void Camera::move(double loc_x, double loc_y, double loc_z)
+void NvCamera::move(double loc_x, double loc_y, double loc_z)
 { 
   location = Vector3(loc_x, loc_y, loc_z); 
 }
 
-void Camera::aim(double target_x, double target_y, double target_z)
+void NvCamera::aim(double target_x, double target_y, double target_z)
 { 
   target = Vector3(target_x, target_y, target_z);
 }
 
-void Camera::rotate(double angle_x, double angle_y, double angle_z)
+void NvCamera::rotate(double angle_x, double angle_y, double angle_z)
 { 
   angle = Vector3(angle_x, angle_y, angle_z);
 }
 
-void Camera::activate(){
+void NvCamera::activate(){
   //fprintf(stderr, "camera: %d, %d\n", width, height);
   glViewport(startX, startY, width, height);
@@ -65 +65 @@
 }
 
-void Camera::set_screen_size(int sx, int sy, int w, int h){
+void NvCamera::set_screen_size(int sx, int sy, int w, int h){
   width = w; height = h;
   startX = sx; startY = sy;

trunk/vizservers/nanovis/NvCamera.h

@@ -1 +1 @@
 /*
  * ----------------------------------------------------------------------
- * Camera.h : Camera class
+ * NvCamera.h : NvCamera class
  *
  * ======================================================================
@@ -21 +21 @@
 #include "Vector3.h"
 
-class Camera{
+class NvCamera{
 
 public:
@@ -33 +33 @@
     int startY;
 
-        ~Camera();
-        Camera(int startx, int starty, int w, int h,
+        ~NvCamera();
+        NvCamera(int startx, int starty, int w, int h,
                 double loc_x, double loc_y, double loc_z, 
                 double target_x, double target_y, double target_z,

trunk/vizservers/nanovis/nanovis.cpp

@@ -76 +76 @@
 // STATIC MEMBER DATA
 int NanoVis::updir = Y_POS;
-Camera* NanoVis::cam = NULL;
+NvCamera* NanoVis::cam = NULL;
 bool NanoVis::axis_on = true;
 //bool NanoVis::axis_on = false;
@@ -658 +658 @@
 
    //create the camera with default setting
-   cam = new Camera(0, 0, win_width, win_height, 
+   cam = new NvCamera(0, 0, win_width, win_height, 
                    live_obj_x, live_obj_y, live_obj_z,
                    0., 0., 100.,

trunk/vizservers/nanovis/nanovis.h

@@ -43 +43 @@
 #include "global.h"
 #include "socket/Socket.h"
-#include "Camera.h"
+#include "NvCamera.h"
 #include "ConvexPolygon.h"
 #include "Texture3D.h"
@@ -122 +122 @@
     static int n_volumes;
     static int updir;
-    static Camera *cam;
+    static NvCamera *cam;
 
     static float lic_slice_x;