Cleaning up

[seamulator.git] / seamulator.cpp

diff --git a/seamulator.cpp b/seamulator.cpp
index 572c154f256dcb4004a45abb5220f19b480a07e5..565b99a69671149df2bea8d1e2e855fdfb84fe5a 100644 (file)
--- a/seamulator.cpp
+++ b/seamulator.cpp
@@ -1,40 +1,32 @@
 #include <ctime>
 #include <ctime>

+#include <cmath>
+#include <memory>

 
 #include <GL/glut.h>
 
 #include "sea.h"
 
 #include <GL/glut.h>
 
 #include "sea.h"

+#include "seaview.h"

 #include "watersurface.h"
 
 #include "watersurface.h"
 

-const int LATTICE_SIZE = 10;
-const double LATTICE_UNIT = 1;
+const int LATTICE_SIZE{10};
+const double LATTICE_UNIT{1};
+const int INIT_WINDOW_POS_X{100};
+const int INIT_WINDOW_POS_Y{100};
+const int INIT_WINDOW_WIDTH{300};
+const int INIT_WINDOW_HEIGHT{300};
+const double INIT_VIEW_DISTANCE{LATTICE_SIZE * LATTICE_UNIT * 1.5};
+const double INIT_VIEW_AZIMUTH{0};
+const double INIT_VIEW_ALTITUDE{M_PI / 4};
+const char WINDOW_TITLE[]{"seamulator"};

 
 SeaPtr sea;
 WaterSurfacePtr surface;
 
 SeaPtr sea;
 WaterSurfacePtr surface;

+std::unique_ptr<SeaView> seaView;

 
 

-void setupView()
-{
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  gluPerspective(50, (GLfloat)300 / (GLfloat)300, 0, 1000);
-  gluLookAt(0,-10,10, 0,0,0, 0,1,0);
-}
-
-void displayMe(void)
-{
-  setupView();
-
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-
-  glClear(GL_COLOR_BUFFER_BIT);
-
-  sea->update();
-  surface->draw();
-
-  glutSwapBuffers();
-
-  glutPostRedisplay();
-}
+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)
 {
 
 int main(int argc, char** argv)
 {


@@ -42,18 +34,52 @@ int main(int argc, char** argv)
 
   surface = std::make_shared<WaterSurface>(LATTICE_SIZE, LATTICE_UNIT);
   sea = std::make_shared<Sea>(surface);
 
   surface = std::make_shared<WaterSurface>(LATTICE_SIZE, LATTICE_UNIT);
   sea = std::make_shared<Sea>(surface);

+  seaView = std::make_unique<SeaView>(INIT_VIEW_DISTANCE, INIT_VIEW_AZIMUTH,
+                                     INIT_VIEW_ALTITUDE);

 
   glutInit(&argc, argv);
   glutInitDisplayMode(GLUT_DOUBLE);
 
   glutInit(&argc, argv);
   glutInitDisplayMode(GLUT_DOUBLE);

-  glutInitWindowSize(300, 300);
-  glutInitWindowPosition(100, 100);
-  glutCreateWindow("seamulator");
-
+  glutInitWindowSize(INIT_WINDOW_WIDTH, INIT_WINDOW_HEIGHT);
+  glutInitWindowPosition(INIT_WINDOW_POS_X, INIT_WINDOW_POS_Y);
+  glutCreateWindow(WINDOW_TITLE);

   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 

-  glutDisplayFunc(displayMe);
+  glutDisplayFunc(glDisplayFunc);
+  glutReshapeFunc(glReshapeFunc);
+  glutMouseFunc(glMouseFunc);
+  glutMotionFunc(glMotionFunc);

 
   glutMainLoop();
 
   return 0;
 }
 
   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);
+}