From 899c1db43f879a4cc88b206d7ec34b2338b765d0 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Fri, 9 Sep 2016 16:04:28 +0200
Subject: [PATCH] Draw the surface manager in application states

Instead of the SurfaceManagerGui class.
---
 src/Application/PresentationState.cpp      | 1 +
 src/Application/ProjectionMappingState.cpp | 1 +
 src/Application/SourceSelectionState.cpp   | 1 +
 src/Application/TextureMappingState.cpp    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/Application/PresentationState.cpp b/src/Application/PresentationState.cpp
index e4f60db..b846c06 100644
--- a/src/Application/PresentationState.cpp
+++ b/src/Application/PresentationState.cpp
@@ -13,6 +13,7 @@ PresentationState * PresentationState::instance(){
 }
 
 void PresentationState::draw(Application * app){
+	app->getSurfaceManager()->draw();
 	app->getGui()->draw();
 }
 
diff --git a/src/Application/ProjectionMappingState.cpp b/src/Application/ProjectionMappingState.cpp
index 0091e16..073a4bf 100644
--- a/src/Application/ProjectionMappingState.cpp
+++ b/src/Application/ProjectionMappingState.cpp
@@ -17,6 +17,7 @@ ProjectionMappingState * ProjectionMappingState::instance(){
 }
 
 void ProjectionMappingState::draw(Application * app){
+	app->getSurfaceManager()->draw();
 	app->getGui()->draw();
 	
 	/*
diff --git a/src/Application/SourceSelectionState.cpp b/src/Application/SourceSelectionState.cpp
index 7684dfb..077bb57 100644
--- a/src/Application/SourceSelectionState.cpp
+++ b/src/Application/SourceSelectionState.cpp
@@ -13,6 +13,7 @@ SourceSelectionState * SourceSelectionState::instance(){
 }
 
 void SourceSelectionState::draw(Application * app){
+	app->getSurfaceManager()->draw();
 	app->getGui()->draw();
 	
 	Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager());
diff --git a/src/Application/TextureMappingState.cpp b/src/Application/TextureMappingState.cpp
index 9065346..14f4fbd 100644
--- a/src/Application/TextureMappingState.cpp
+++ b/src/Application/TextureMappingState.cpp
@@ -14,6 +14,7 @@ TextureMappingState * TextureMappingState::instance(){
 
 void TextureMappingState::draw(Application * app){
 	app->getGui()->draw();
+	app->getSurfaceManager()->draw();
 	
 	Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager());
 	Gui::instance()->getSurfaceHighlightWidget().draw();