Merge pull request #1574 from OutpostUniverse/updateNas2d

Update NAS2D submodule

Author: DanRStevens

appOPHD/UI/FileIo.cpp

@@ -8,7 +8,6 @@
 
 #include <NAS2D/Utility.h>
 #include <NAS2D/Filesystem.h>
-#include <NAS2D/Math/MathUtils.h>
 
 #include <string>
 #include <vector>

appOPHD/UI/IconGrid.cpp

@@ -5,7 +5,6 @@
 
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
-#include <NAS2D/Math/MathUtils.h>
 
 #include <algorithm>
 #include <stdexcept>

appOPHD/UI/ProgressBar.cpp

@@ -3,6 +3,9 @@
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 #include <NAS2D/Renderer/Color.h>
+#include <NAS2D/Math/Rectangle.h>
+
+#include <algorithm>
 
 
 void drawProgressBar(int value, int max, NAS2D::Rectangle<int> rect, int padding)

appOPHD/UI/ProgressBar.h

@@ -1,6 +1,11 @@
 #pragma once
 
-#include <NAS2D/Math/Rectangle.h>
+
+namespace NAS2D
+{
+	template <typename BaseType>
+	struct Rectangle;
+}
 
 
 void drawProgressBar(int value, int max, NAS2D::Rectangle<int> rect, int padding = 4);

appOPHD/UI/StringTable.cpp

@@ -4,6 +4,7 @@
 #include "../Constants/UiConstants.h"
 
 #include <NAS2D/Utility.h>
+#include <NAS2D/Renderer/Renderer.h>
 
 #include <stdexcept>
 #include <algorithm>

appOPHD/UI/StringTable.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <NAS2D/Renderer/Renderer.h>
 #include <NAS2D/Renderer/Color.h>
 #include <NAS2D/Math/Point.h>
 #include <NAS2D/Math/Rectangle.h>
@@ -12,6 +11,13 @@
 #include <cstddef>
 
 
+namespace NAS2D
+{
+	class Font;
+	class Renderer;
+}
+
+
 // Draw a 2 dimensional table of text. Determine cell size based on inserted text, font, and padding. Only allows one line of text per cell.
 class StringTable
 {

libControls/Button.cpp

@@ -2,7 +2,6 @@
 
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
-#include <NAS2D/Math/MathUtils.h>
 
 
 Button::Button(std::string newText) :

libControls/CheckBox.cpp

@@ -17,7 +17,6 @@
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 #include <NAS2D/Resource/Font.h>
-#include <NAS2D/Math/MathUtils.h>
 
 #include <algorithm>
 

libControls/ComboBox.cpp

@@ -1,7 +1,6 @@
 #include "ComboBox.h"
 
 #include <NAS2D/Utility.h>
-#include <NAS2D/Math/MathUtils.h>
 #include <NAS2D/StringUtils.h>
 
 #include <utility>

libControls/ListBoxBase.cpp

@@ -4,7 +4,6 @@
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 #include <NAS2D/Math/Point.h>
-#include <NAS2D/Math/MathUtils.h>
 
 #include <algorithm>
 

libControls/RadioButtonGroup.cpp

@@ -2,7 +2,6 @@
 
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
-#include <NAS2D/Math/MathUtils.h>
 
 #include <algorithm>
 

libControls/RadioButtonGroup.h

@@ -8,7 +8,6 @@
 #include <NAS2D/Resource/Image.h>
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
-#include <NAS2D/Math/MathUtils.h>
 #include <NAS2D/Math/Point.h>
 
 #include <algorithm>

libControls/TextField.cpp

@@ -10,7 +10,6 @@
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 #include <NAS2D/Resource/Font.h>
-#include <NAS2D/Math/MathUtils.h>
 
 #include <locale>