WebSVN – gelsvn – Diff – /trunk/apps/OBJViewer/objview.cpp

 #include <IL/ilu.h>
 #include <CGLA/Vec3f.h>
 #include <CGLA/Mat4x4f.h>
 #include "GLGraphics/gel_glut.h"
-#include "GLGraphics/SimpleTrackBall.h"
+#include "GLGraphics/QuatTrackBall.h"
 #include "GLGraphics/draw.h"
 #include "Geometry/TriMesh.h"
 #include "Geometry/obj_load.h"
 using namespace std;
 namespace
+{
 int win_size_x = 800;
 int win_size_y = 800;
-SimpleTrackBall* ball;
+QuatTrackBall* ball;
+int spin_timer = 20;
+void spin(int x);
 int main_window;
 bool load_image_into_texture(const std::string& name, GLuint& id)
+{
     // The lines below copy the viewing transformation from OpenGL
     // to local variables. The call to gluLookAt must have exactly
     // the same parameters as when the scene is drawn.
     glLoadIdentity();
-    ball->gl_view();
+    ball->set_gl_modelview();
     double mvmat[16];
     glGetDoublev(GL_MODELVIEW_MATRIX, mvmat);
     // Copy the projection matrix. We assume it is unchanged.
     double prjmat[16];
 TriMesh mesh;
 void mouse_motion(int x, int y)
+{
-    ball->roll(x,y);
+    ball->roll_ball(Vec2i(x,y));
+}
-void mouse(int button, int state, int x, int y)
+void mouse(int btn, int state, int x, int y)
+{
-    if(button==GLUT_RIGHT_BUTTON && state==GLUT_DOWN)
+  if(state == GLUT_DOWN)
-    {
+  {
-        Vec3f p;
+	if(btn == GLUT_LEFT_BUTTON)
+	   ball->grab_ball(ROTATE_ACTION, Vec2i(x,y));
-        if(depth_pick(x, y, p))
+    else if(btn == GLUT_MIDDLE_BUTTON)
-            ball->set_center(p);
+	  ball->grab_ball(ZOOM_ACTION, Vec2i(x, y));
-    }
-    else if(button==3)
+    else if(btn == GLUT_RIGHT_BUTTON)
-        ball->farther();
+	  ball->grab_ball(PAN_ACTION, Vec2i(x, y));
+  }
-    else if(button==4)
+  else if(state == GLUT_UP)
-        ball->closer();
+    ball->release_ball();
+}
+void spin(int x)
+{
+  ball->do_spin();
+  glutTimerFunc(spin_timer, spin, 0);
+  glutPostRedisplay();
+}
+/*
 void idle()
+{
     if ( glutGetWindow() != main_window )
         glutSetWindow(main_window);
     glutPostRedisplay();
+}
+*/
 void display()
+{
     static bool washere = false;
     static unsigned int l;
     if(!washere)
         l = glGenLists(1);
         glNewList(l, GL_COMPILE);
         draw(mesh);
         glEndList();
         washere = true;
+      glutTimerFunc(spin_timer, spin, 0);
-    }
+	}
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
-    ball->gl_view();
+    ball->set_gl_modelview();
     glCallList(l);
     glutSwapBuffers();
+}
 void keyboard(unsigned char key, int x, int y)
+{
     switch(key)
+    {
     case '\033': exit(0); break;
-    case '+': ball->closer(); break;
+    //case '+': ball->closer(); break;
-    case '-': ball->farther(); break;
+    //case '-': ball->farther(); break;
-    default:
+    //default:
-        ball->up_axis(key);
+    //    ball->up_axis(key);
+    }
+}
+}
 int main(int argc, char** argv)
     main_window = glutCreateWindow("OBJ Viewer");
     glutDisplayFunc(display);
     glutKeyboardFunc(keyboard);
     glutMotionFunc(mouse_motion);
     glutMouseFunc(mouse);
-    glutIdleFunc(idle);
+    //glutIdleFunc(idle);
     // GL INIT
     glClearColor(.8f, 0.9f, 1.0f, 0.f);
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_LIGHTING);
     // Initialize Trackball
     Vec3f c;
     float r;
     mesh.get_bsphere(c,r);
     r *= 1.5;
-    ball = new SimpleTrackBall(c,r);
+    ball = new QuatTrackBall(c,r,800,800);
     // Setup projection
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    gluPerspective(53,1.0f,r/100,r*3);
+    gluPerspective(53,1.0f,r/100.0,r*3.0);
     glMatrixMode(GL_MODELVIEW);
     // Pass control to GLUT
     glutMainLoop();

Subversion Repositories gelsvn

(root)/trunk/apps/OBJViewer/objview.cpp @ 198 – Rev 198 → 299