Cleaning up

[seamulator.git] / seamulator.cpp

diff --git a/seamulator.cpp b/seamulator.cpp
index 15b731bcaf68b211411d5e58b3c8c9ca299d99e7..565b99a69671149df2bea8d1e2e855fdfb84fe5a 100644 (file)
--- a/seamulator.cpp
+++ b/seamulator.cpp
@@ -1,28 +1,68 @@
 #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 glDisplayFunc()
+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)

 {
 {

-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
+  std::srand(std::time(0));

 
 

+  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);
+  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);
+
+  glutDisplayFunc(glDisplayFunc);
+  glutReshapeFunc(glReshapeFunc);
+  glutMouseFunc(glMouseFunc);
+  glutMotionFunc(glMotionFunc);
+
+  glutMainLoop();
+
+  return 0;
+}
+
+void glDisplayFunc()
+{

   glClear(GL_COLOR_BUFFER_BIT);
 
   glClear(GL_COLOR_BUFFER_BIT);
 

+  seaView->setupView();

   sea->update();
   surface->draw();
 
   glutSwapBuffers();
   sea->update();
   surface->draw();
 
   glutSwapBuffers();

-

   glutPostRedisplay();
 }
 
   glutPostRedisplay();
 }
 


@@ -32,28 +72,14 @@ void glReshapeFunc(int width, int height)
   glLoadIdentity();
   gluPerspective(50.0, ((float)width/(float)height), 0, 1000.0);
   glViewport(0, 0, width, height);
   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);

 }
 
 }
 

-int main(int argc, char** argv)
+void glMouseFunc(int button, int state, int x, int y)

 {
 {

-  std::srand(std::time(0));
-
-  surface = std::make_shared<WaterSurface>(LATTICE_SIZE, LATTICE_UNIT);
-  sea = std::make_shared<Sea>(surface);
-
-  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);
-
-  glutMainLoop();
+  seaView->onMouseEvent(button, state, x, y);
+}

 
 

-  return 0;
+void glMotionFunc(int x, int y)
+{
+  seaView->onMouseMove(x, y);

 }
 }