From ddf55f4232002ee06d7ae4af670ce80f1ec37eb3 Mon Sep 17 00:00:00 2001 From: Alexander Schmidt Date: Fri, 15 Jul 2016 23:59:53 +0200 Subject: [PATCH] Cleaning up --- seamulator.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/seamulator.cpp b/seamulator.cpp index d3ac1c4..565b99a 100644 --- a/seamulator.cpp +++ b/seamulator.cpp @@ -8,8 +8,16 @@ #include "seaview.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; @@ -26,14 +34,14 @@ int main(int argc, char** argv) surface = std::make_shared(LATTICE_SIZE, LATTICE_UNIT); sea = std::make_shared(surface); - seaView = std::make_unique(LATTICE_SIZE * LATTICE_UNIT * 1.5, - 0, M_PI/4); + seaView = std::make_unique(INIT_VIEW_DISTANCE, INIT_VIEW_AZIMUTH, + INIT_VIEW_ALTITUDE); 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); glutDisplayFunc(glDisplayFunc); -- 2.39.2