fixed small bug on updating open book for each new move

spchuang · Jul 6, 2013 · 461cc9a · 461cc9a
1 parent eef498c
commit 461cc9a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/AugmentedRealityGo/ARGraphicController.cpp b/AugmentedRealityGo/ARGraphicController.cpp
@@ -353,6 +353,25 @@ void ARGraphicController::gl_idle_func()
 
 		//release frame data
 		frameImg = cv::Mat();
+
+
+		if(board->newMoveIsMade)
+		{
+			switch(assistant_mode){
+				case A_MODE_NONE:
+					break;
+				case A_MODE_FUEGO_BOOK:
+
+					fuego->getBookPositions();
+					break;
+				case A_MODE_TERRITORY:
+					fuego->estimateTerritory(board->getMoveTurnColor());
+					break;
+			}
+			board->newMoveIsMade = false;
+		}
+
+
 		glutPostRedisplay();
 	}else
        Sleep(1);  // don't be a CPU hog 

diff --git a/AugmentedRealityGo/GamePlayUtils/FuegoAssistant.cpp b/AugmentedRealityGo/GamePlayUtils/FuegoAssistant.cpp
@@ -36,6 +36,7 @@ FuegoAssistant::FuegoAssistant()
 
 	setTerritoryParam = false;
 	prevMove = "none";
+
 	for(int i=0; i<19*19; i++)
 	{
 		estimateScore.push_back(0);
@@ -124,11 +125,13 @@ bool FuegoAssistant::estimateTerritory(int color)
 		getline(readFromFuego, readLine);
 
 		cout<<"return: "<<endl<<readLine<<endl<<"END"<<endl;
+		cout <<"is this okay?"<<endl;
 		split(readLine, l, ' ');
+
 		cout <<"size: "<< l.size()<<endl;
-		for(int j=0; j<l.size(); j++)
+		for(int z=0; z<l.size(); z++)
 		{
-			cout <<j << " : " << l[j] <<endl;
+			cout <<z << " : " << l[z] <<endl;
 
 		}
 
@@ -163,7 +166,8 @@ void FuegoAssistant::addMove(std::string move, int color){
 		getline(readFromFuego, readLine);
 	}while(readLine[0]!='=');
 
-	getBookPositions();
+
+	//getBookPositions();
 }
 
 bool FuegoAssistant::getBookPositions()

diff --git a/AugmentedRealityGo/GamePlayUtils/FuegoAssistant.h b/AugmentedRealityGo/GamePlayUtils/FuegoAssistant.h
@@ -33,6 +33,7 @@ class FuegoAssistant
 	//public variables
 	static std::vector<int> bookMoves;
 	static std::vector<float> estimateScore;
+
 private:
 
 	static boost::process::child c;

diff --git a/AugmentedRealityGo/GamePlayUtils/GoBoard.cpp b/AugmentedRealityGo/GamePlayUtils/GoBoard.cpp
@@ -1,6 +1,7 @@
 #include "GoBoard.h"
 
 FuegoAssistant* GoBoard::fuego;
+bool GoBoard::newMoveIsMade;
 GoBoard::GoBoard(FuegoAssistant* f)
 {
 	fuego = f;
@@ -10,6 +11,7 @@ GoBoard::GoBoard(FuegoAssistant* f)
 		wrongRealStones[i] = 2;
 	}
 	currentMoveColor = COLOR_WHITE;
+	newMoveIsMade = false;
 }
 
 void GoBoard::clear_board()
@@ -35,7 +37,7 @@ void GoBoard::changeTurn()
 		currentMoveColor = COLOR_BLACK;
 	else if(currentMoveColor == COLOR_BLACK)
 		currentMoveColor = COLOR_WHITE;
-
+	newMoveIsMade = true;
 }
 
 void GoBoard::addVirtualStone(std::string move, std::string color)

diff --git a/AugmentedRealityGo/GamePlayUtils/GoBoard.h b/AugmentedRealityGo/GamePlayUtils/GoBoard.h
@@ -28,7 +28,7 @@ class GoBoard
 	volatile char virtualStones[361];
 	volatile char wrongRealStones[361];
 	volatile int newMoveIndex;
-
+	static bool newMoveIsMade;
 	static FuegoAssistant* fuego;
 private:
 	int currentMoveColor;

diff --git a/AugmentedRealityGo/GamePlayUtils/Helper.h b/AugmentedRealityGo/GamePlayUtils/Helper.h
@@ -57,6 +57,7 @@ static unsigned int split(const std::string &txt, std::vector<std::string> &strs
 
     // Decompose statement
     while( pos != std::string::npos ) {
+		std::cout<<"substr: "<< txt.substr( initialPos, pos - initialPos + 1 ) <<std::endl;
         strs.push_back( txt.substr( initialPos, pos - initialPos + 1 ) );
         initialPos = pos + 1;