From 3a3ad62faa958b07f2a91b4b21e6cfa92309ba80 Mon Sep 17 00:00:00 2001
From: Alexander Schmidt <alex@treefish.org>
Date: Fri, 15 Jul 2016 13:17:23 +0200
Subject: [PATCH 1/1] Moved surface drawing routines to surface class

---
 seamulator.cpp   | 38 ++++++++++++--------------------------
 watersurface.cpp | 38 +++++++++++++++++++++++++++++++++++++-
 watersurface.h   |  6 +++++-
 3 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/seamulator.cpp b/seamulator.cpp
index b6739b5..8f6b5d8 100644
--- a/seamulator.cpp
+++ b/seamulator.cpp
@@ -6,46 +6,30 @@
 #include "watersurface.h"
 
 const int LATTICE_SIZE = 10;
-const int LATTICE_UNIT = 1;
+const double LATTICE_UNIT = 1;
 
 SeaPtr sea;
 WaterSurfacePtr surface;
 
-void drawSingleTile(int x, int y)
-{
-  glBegin(GL_TRIANGLES);
-
-  glVertex3f(x, y, surface->at(x, y).getHeight());
-  glVertex3f(x+1, y, surface->at(x+1, y).getHeight());
-  glVertex3f(x+1, y+1, surface->at(x+1, y+1).getHeight());
-
-  glVertex3f(x, y, surface->at(x, y).getHeight());
-  glVertex3f(x, y+1, surface->at(x, y+1).getHeight());
-  glVertex3f(x+1, y+1, surface->at(x+1, y+1).getHeight());
-
-  glEnd();
-}
-
-void displayMe(void)
+void setupView()
 {
   glMatrixMode(GL_PROJECTION); // Switch to the projection matrix so that we can manipulate how our scene is viewed  
   glLoadIdentity(); // Reset the projection matrix to the identity matrix so that we don't get any artifacts (cleaning up)
   gluPerspective(50, (GLfloat)300 / (GLfloat)300, 0, 1000); // Set the Field of view angle (in degrees), the aspect ratio of our window, and the new and far planes
   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();
-
-  glScalef(LATTICE_UNIT, LATTICE_UNIT, 1.0f);
-  glTranslatef(-(float)(LATTICE_SIZE-1)/2, -(float)(LATTICE_SIZE-1)/2, 0);
-  for (int y = 0; y < LATTICE_SIZE-1; ++y) {
-    for (int x = 0; x < LATTICE_SIZE-1; ++x) {
-      drawSingleTile(x, y);
-    }
-  }
+  surface->draw();
 
   glFlush();
 
@@ -56,7 +40,7 @@ int main(int argc, char** argv)
 {
   std::srand(std::time(0));
 
-  surface = std::make_shared<WaterSurface>(LATTICE_SIZE);
+  surface = std::make_shared<WaterSurface>(LATTICE_SIZE, LATTICE_UNIT);
   sea = std::make_shared<Sea>(surface);
 
   glutInit(&argc, argv);
@@ -69,6 +53,8 @@ int main(int argc, char** argv)
   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
   glutDisplayFunc(displayMe);
+
   glutMainLoop();
+
   return 0;
 }
diff --git a/watersurface.cpp b/watersurface.cpp
index f9e7803..930cf7f 100644
--- a/watersurface.cpp
+++ b/watersurface.cpp
@@ -1,6 +1,10 @@
 #include "watersurface.h"
 
-WaterSurface::WaterSurface(int size) : m_size{size}
+#include <GL/glut.h>
+
+WaterSurface::WaterSurface(int size, double unitLength) :
+  m_size{size},
+  m_unitLength{unitLength}
 {
   m_points.resize(size*size);
 }
@@ -10,7 +14,39 @@ SurfacePoint& WaterSurface::at(int x, int y)
   return m_points.at(x + m_size*y);
 }
 
+const SurfacePoint& WaterSurface::at(int x, int y) const
+{
+  return m_points.at(x + m_size*y);
+}
+
 int WaterSurface::size() const
 {
   return m_size;
 }
+
+void WaterSurface::draw() const
+{
+  glScalef(m_unitLength, m_unitLength, 1.0f);
+  glTranslatef(-(float)(m_size - 1) / 2, -(float)(m_size - 1) / 2, 0);
+
+  for (int y = 0; y < m_size - 1; ++y) {
+    for (int x = 0; x < m_size - 1; ++x) {
+      drawSingleTile(x, y);
+    }
+  }
+}
+
+void WaterSurface::drawSingleTile(int x, int y) const
+{
+  glBegin(GL_TRIANGLES);
+
+  glVertex3f(x, y, at(x, y).getHeight());
+  glVertex3f(x+1, y, at(x+1, y).getHeight());
+  glVertex3f(x+1, y+1, at(x+1, y+1).getHeight());
+
+  glVertex3f(x, y, at(x, y).getHeight());
+  glVertex3f(x, y+1, at(x, y+1).getHeight());
+  glVertex3f(x+1, y+1, at(x+1, y+1).getHeight());
+
+  glEnd();
+}
diff --git a/watersurface.h b/watersurface.h
index cf5829e..7882197 100644
--- a/watersurface.h
+++ b/watersurface.h
@@ -9,11 +9,15 @@
 class WaterSurface
 {
  public:
-  WaterSurface(int size);
+  WaterSurface(int size, double unitLength);
   SurfacePoint& at(int x, int y);
+  const SurfacePoint& at(int x, int y) const;
   int size() const;
+  void draw() const;
+  void drawSingleTile(int x, int y) const;
 
  private:
   std::vector<SurfacePoint> m_points;
   int m_size;
+  double m_unitLength;
 };
-- 
2.39.2