- Timestamp:
- Feb 13, 2008, 6:53:34 AM (17 years ago)
- Location:
- trunk/vizservers/nanovis
- Files:
-
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/vizservers/nanovis/Command.cpp
r877 r881 63 63 #include "HeightMap.h" 64 64 #include "Grid.h" 65 #include " Camera.h"65 #include "NvCamera.h" 66 66 #include <RenderContext.h> 67 67 #include <NvLIC.h> -
trunk/vizservers/nanovis/Makefile.in
r851 r881 30 30 MATINC = ./newmat11 31 31 32 LIB_DX = -lDXcallm -lm 32 33 LIB_NANOVIS = -L@RP_DIR@/lib -ltcl8.4 -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lrappture2 -lb64 -lz 33 34 INCLUDES = -I@RP_DIR@/include -I@RP2_INCL_DIR@ -I/usr/include/GL -I$(R2INC) -I. -I$(MATINC) … … 41 42 BMPImageLoaderImpl.o \ 42 43 BucketSort.o \ 43 Camera.o \44 NvCamera.o \ 44 45 Color.o \ 45 46 ColorGradient.o \ … … 153 154 154 155 nanovis: $(OBJS) 155 $(CC) $(CC_SWITCHES) -o $@ $^ $(LIB_NANOVIS) 156 $(CC) $(CC_SWITCHES) -o $@ $^ $(LIB_NANOVIS) $(LIB_DX) 156 157 157 158 client: Socket.o ClientSocket.o RenderClient.o Event.o 158 $(CC) $(CC_SWITCHES) -o $ (LIB_NANOVIS) $@ $^159 $(CC) $(CC_SWITCHES) -o $@ $^ $(LIB_NANOVIS) $(LIB_DX) 159 160 160 161 .cpp.o: … … 222 223 Texture3D.o: Texture3D.cpp Texture3D.h $(AUXSRC) 223 224 Renderable.o: Renderable.cpp Renderable.h 224 Camera.o: Camera.cppCamera.h225 NvCamera.o: NvCamera.cpp NvCamera.h 225 226 ScreenSnapper.o: ScreenSnapper.cpp ScreenSnapper.h define.h 226 227 Volume.o: Volume.cpp Volume.h $(AUXSRC) -
trunk/vizservers/nanovis/NvCamera.cpp
r876 r881 1 1 /* 2 2 * ---------------------------------------------------------------------- 3 * Camera.cpp :Camera class3 * NvCamera.cpp : NvCamera class 4 4 * 5 5 * ====================================================================== … … 15 15 16 16 #include <stdio.h> 17 #include " Camera.h"17 #include "NvCamera.h" 18 18 19 Camera::Camera(int startx, int starty, int w, int h,19 NvCamera::NvCamera(int startx, int starty, int w, int h, 20 20 double loc_x, double loc_y, double loc_z, 21 21 double target_x, double target_y, double target_z, … … 29 29 angle(Vector3(angle_x, angle_y, angle_z)) { } 30 30 31 Camera::~Camera(){}31 NvCamera::~NvCamera(){} 32 32 33 void Camera::move(double loc_x, double loc_y, double loc_z)33 void NvCamera::move(double loc_x, double loc_y, double loc_z) 34 34 { 35 35 location = Vector3(loc_x, loc_y, loc_z); 36 36 } 37 37 38 void Camera::aim(double target_x, double target_y, double target_z)38 void NvCamera::aim(double target_x, double target_y, double target_z) 39 39 { 40 40 target = Vector3(target_x, target_y, target_z); 41 41 } 42 42 43 void Camera::rotate(double angle_x, double angle_y, double angle_z)43 void NvCamera::rotate(double angle_x, double angle_y, double angle_z) 44 44 { 45 45 angle = Vector3(angle_x, angle_y, angle_z); 46 46 } 47 47 48 void Camera::activate(){48 void NvCamera::activate(){ 49 49 //fprintf(stderr, "camera: %d, %d\n", width, height); 50 50 glViewport(startX, startY, width, height); … … 65 65 } 66 66 67 void Camera::set_screen_size(int sx, int sy, int w, int h){67 void NvCamera::set_screen_size(int sx, int sy, int w, int h){ 68 68 width = w; height = h; 69 69 startX = sx; startY = sy; -
trunk/vizservers/nanovis/NvCamera.h
r876 r881 1 1 /* 2 2 * ---------------------------------------------------------------------- 3 * Camera.h :Camera class3 * NvCamera.h : NvCamera class 4 4 * 5 5 * ====================================================================== … … 21 21 #include "Vector3.h" 22 22 23 class Camera{23 class NvCamera{ 24 24 25 25 public: … … 33 33 int startY; 34 34 35 ~ Camera();36 Camera(int startx, int starty, int w, int h,35 ~NvCamera(); 36 NvCamera(int startx, int starty, int w, int h, 37 37 double loc_x, double loc_y, double loc_z, 38 38 double target_x, double target_y, double target_z, -
trunk/vizservers/nanovis/nanovis.cpp
r862 r881 76 76 // STATIC MEMBER DATA 77 77 int NanoVis::updir = Y_POS; 78 Camera* NanoVis::cam = NULL;78 NvCamera* NanoVis::cam = NULL; 79 79 bool NanoVis::axis_on = true; 80 80 //bool NanoVis::axis_on = false; … … 658 658 659 659 //create the camera with default setting 660 cam = new Camera(0, 0, win_width, win_height,660 cam = new NvCamera(0, 0, win_width, win_height, 661 661 live_obj_x, live_obj_y, live_obj_z, 662 662 0., 0., 100., -
trunk/vizservers/nanovis/nanovis.h
r861 r881 43 43 #include "global.h" 44 44 #include "socket/Socket.h" 45 #include " Camera.h"45 #include "NvCamera.h" 46 46 #include "ConvexPolygon.h" 47 47 #include "Texture3D.h" … … 122 122 static int n_volumes; 123 123 static int updir; 124 static Camera *cam;124 static NvCamera *cam; 125 125 126 126 static float lic_slice_x;
Note: See TracChangeset
for help on using the changeset viewer.