Changeset 453 for trunk

Timestamp:

Jun 2, 2006, 2:05:50 AM (18 years ago)

Author:

qiaow

Message:

Fixed initial camera view so Z points upward.

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (2 diffs)
• nanovis.cpp (modified) (4 diffs)
• nanovis.h (modified) (1 diff)

trunk/gui/vizservers/nanovis/Makefile

@@ -15 +15 @@
 NANOSCALESRC = ./nanoscale
 
-LIB_NANOVIS = -ltcl8.3 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
+LIB_NANOVIS = -ltcl8.4 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
 LIB_CLIENT = -L/opt/render/lib -lGL -lglut -pthread -lstdc++
-INCLUDES = -I../../src2/core -I/opt/render/include -I/autohome/u76/qiaow/Cg/usr/include
+INCLUDES = -I../core -I/opt/render/include -I/autohome/u76/qiaow/Cg/usr/include
 CFLAG = -g -c $(INCLUDES)
 
@@ -26 +26 @@
 
 nanovis: $(OBJ_NANOVIS)
-        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../src2/core/*.o
+        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../core/*.o
 
 ColorGradient.o: Color.o $(TFSRC)/ColorGradient.cpp

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -2088 +2088 @@
    vol_render = new VolumeRenderer(g_context);
 
+   
    /*
    //I added this to debug : Wei
    float tmp_data[4*124];
+   memset(tmp_data, 0, 4*4*124);
    TransferFunction* tmp_tf = new TransferFunction(124, tmp_data);
    vol_render->add_volume(volume[0], tmp_tf);
-   volume[1]->move(Vector3(0.5, 0.6, 0.7));
-   vol_render->add_volume(volume[1], tmp_tf);
+   volume[0]->get_cutplane(0)->enabled = false;
+   volume[0]->get_cutplane(1)->enabled = false;
+   volume[0]->get_cutplane(2)->enabled = false;
+
+   //volume[1]->move(Vector3(0.5, 0.6, 0.7));
+   //vol_render->add_volume(volume[1], tmp_tf);
    */
+
 
    //create an 2D plane renderer
@@ -2639 +2646 @@
         glPushMatrix();
         glTranslatef(0.4, 0., 0.);
+        glRotatef(90, 1, 0, 0);
+        glRotatef(180, 0, 1, 0);
         glScalef(0.0005, 0.0005, 0.0005);
         glutStrokeCharacter(GLUT_STROKE_ROMAN, 'x');
@@ -2645 +2654 @@
         glPushMatrix();
         glTranslatef(0., 0.4, 0.);
+        glRotatef(90, 1, 0, 0);
+        glRotatef(180, 0, 1, 0);
         glScalef(0.0005, 0.0005, 0.0005);
         glutStrokeCharacter(GLUT_STROKE_ROMAN, 'y');
@@ -2651 +2662 @@
         glPushMatrix();
         glTranslatef(0., 0., 0.4);
+        glRotatef(90, 1, 0, 0);
+        glRotatef(180, 0, 1, 0);
         glScalef(0.0005, 0.0005, 0.0005);
         glutStrokeCharacter(GLUT_STROKE_ROMAN, 'z');

trunk/gui/vizservers/nanovis/nanovis.h

@@ -89 +89 @@
 
 //variables for mouse events
-float live_rot_x = 0.;          //object rotation angles
-float live_rot_y = 0.;
-float live_rot_z = 0.;
+float live_rot_x = 90.;         //object rotation angles
+float live_rot_y = 180.;
+float live_rot_z = -135;
 
 float live_obj_x = -0.0;        //object translation location from the origin