Moved view code to separate class

[seamulator.git] / seamulator.cpp

diff --git a/seamulator.cpp b/seamulator.cpp
index 15b731bcaf68b211411d5e58b3c8c9ca299d99e7..d3ac1c48172ed34cd6d27c9a8fee73e76f53879c 100644 (file)
--- a/seamulator.cpp
+++ b/seamulator.cpp
@@ -1,8 +1,11 @@
 #include <ctime>
+#include <cmath>
+#include <memory>
 
 #include <GL/glut.h>
 
 #include "sea.h"
+#include "seaview.h"
 #include "watersurface.h"
 
 const int LATTICE_SIZE = 10;
@@ -10,30 +13,12 @@ const double LATTICE_UNIT = 1;
 
 SeaPtr sea;
 WaterSurfacePtr surface;
+std::unique_ptr<SeaView> seaView;
 
-void glDisplayFunc()
-{
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-
-  glClear(GL_COLOR_BUFFER_BIT);
-
-  sea->update();
-  surface->draw();
-
-  glutSwapBuffers();
-
-  glutPostRedisplay();
-}
-
-void glReshapeFunc(int width, int height)
-{
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  gluPerspective(50.0, ((float)width/(float)height), 0, 1000.0);
-  glViewport(0, 0, width, height);
-  gluLookAt(0,-10,10, 0,0,0, 0,1,0);
-}
+void glDisplayFunc();
+void glReshapeFunc(int width, int height);
+void glMouseFunc(int button, int state, int x, int y);
+void glMotionFunc(int x, int y);
 
 int main(int argc, char** argv)
 {
@@ -41,19 +26,52 @@ int main(int argc, char** argv)
 
   surface = std::make_shared<WaterSurface>(LATTICE_SIZE, LATTICE_UNIT);
   sea = std::make_shared<Sea>(surface);
+  seaView = std::make_unique<SeaView>(LATTICE_SIZE * LATTICE_UNIT * 1.5,
+                                     0, M_PI/4);
 
   glutInit(&argc, argv);
   glutInitDisplayMode(GLUT_DOUBLE);
   glutInitWindowSize(300, 300);
   glutInitWindowPosition(100, 100);
   glutCreateWindow("seamulator");
-
   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
   glutDisplayFunc(glDisplayFunc);
   glutReshapeFunc(glReshapeFunc);
+  glutMouseFunc(glMouseFunc);
+  glutMotionFunc(glMotionFunc);
 
   glutMainLoop();
 
   return 0;
 }
+
+void glDisplayFunc()
+{
+  glClear(GL_COLOR_BUFFER_BIT);
+
+  seaView->setupView();
+  sea->update();
+  surface->draw();
+
+  glutSwapBuffers();
+  glutPostRedisplay();
+}
+
+void glReshapeFunc(int width, int height)
+{
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  gluPerspective(50.0, ((float)width/(float)height), 0, 1000.0);
+  glViewport(0, 0, width, height);
+}
+
+void glMouseFunc(int button, int state, int x, int y)
+{
+  seaView->onMouseEvent(button, state, x, y);
+}
+
+void glMotionFunc(int x, int y)
+{
+  seaView->onMouseMove(x, y);
+}