Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase

2017-12-20 23:03:49 +01:00
parent 37eed7ef88 60e57b9ae0
commit 9720613543
9 changed files with 15 additions and 8 deletions
--- a/Source/header/input.h
+++ b/Source/header/input.h
@@ -1,7 +1,7 @@
 #include <stdint.h>

-class AbstractionLayer_1_Properties;
-class DestructionPower_Properties;
+#include "../functions/AbstractionLayers/Layer1/AbstractionLayer_1_Properties.h"
+#include "../functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h"
 class Part
 {
 public:
--- a/Source/header/solve.h
+++ b/Source/header/solve.h
@@ -6,6 +6,8 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

+class Part;
+
 using namespace std;

 class coor