From f68859b80a6682f8363ae5acd9ee0684b18670a5 Mon Sep 17 00:00:00 2001 From: pgovyadi Date: Thu, 4 Aug 2016 15:38:18 -0500 Subject: [PATCH] changed the code to facilitate the new vec3 implementation --- main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index 7c7526d..be4b7b6 100644 --- a/main.cpp +++ b/main.cpp @@ -79,9 +79,9 @@ void glut_render_modelview(){ glMatrixMode(GL_MODELVIEW); //load the modelview matrix for editing glLoadIdentity(); //start with the identity matrix - stim::vec eye = cam.getPosition(); //get the camera position (eye point) - stim::vec focus = cam.getLookAt(); //get the camera focal point - stim::vec up = cam.getUp(); //get the camera "up" orientation + stim::vec3 eye = cam.getPosition(); //get the camera position (eye point) + stim::vec3 focus = cam.getLookAt(); //get the camera focal point + stim::vec3 up = cam.getUp(); //get the camera "up" orientation gluLookAt(eye[0], eye[1], eye[2], focus[0], focus[1], focus[2], up[0], up[1], up[2]); //set up the OpenGL camera } @@ -187,7 +187,7 @@ void glut_initialize(){ texture_initialize(); //set up texture mapping (create texture maps, enable features) - stim::vec c = bb.center(); //get the center of the network bounding box + stim::vec3 c = bb.center(); //get the center of the network bounding box //place the camera along the z-axis at a distance determined by the network size along x and y cam.setPosition(c + stim::vec(0, 0, camera_factor * std::max(bb.size()[0], bb.size()[1]))); @@ -303,4 +303,4 @@ int main(int argc, char* argv[]) glut_initialize(); //create the GLUT window and set callback functions glutMainLoop(); // enter GLUT event processing cycle } -} \ No newline at end of file +} -- libgit2 0.21.4