X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=judge%2Fmanager%2Fgame.cpp;h=c1238f0660104b9b09326f970382badd105130cf;hp=92dc71ab349c96d0bad905ee9ae82926a1f8c176;hb=f37d392713a0b6fec7a2c543edcd8402156f3744;hpb=48216daa641008e0de21c5522d6e958a38b02093 diff --git a/judge/manager/game.cpp b/judge/manager/game.cpp index 92dc71a..c1238f0 100644 --- a/judge/manager/game.cpp +++ b/judge/manager/game.cpp @@ -7,7 +7,7 @@ using namespace std; Game* Game::theGame = NULL; bool Game::gameCreated = false; -Game::Game(const char * redPath, const char * bluePath, const bool enableGraphics, double newStallTime, const bool allowIllegal, FILE * newLog, const Piece::Colour & newReveal, int newMaxTurns, bool newPrintBoard, double newTimeoutTime, bool server, bool client) : red(NULL), blue(NULL), turn(Piece::RED), theBoard(10,10), graphicsEnabled(enableGraphics), stallTime(newStallTime), allowIllegalMoves(allowIllegal), log(newLog), reveal(newReveal), turnCount(0), input(NULL), maxTurns(newMaxTurns), printBoard(newPrintBoard), timeoutTime(newTimeoutTime) +Game::Game(const char * redPath, const char * bluePath, const bool enableGraphics, double newStallTime, const bool allowIllegal, FILE * newLog, const Piece::Colour & newReveal, int newMaxTurns, bool newPrintBoard, double newTimeoutTime, const char * newImageOutput) : red(NULL), blue(NULL), turn(Piece::RED), theBoard(10,10), graphicsEnabled(enableGraphics), stallTime(newStallTime), allowIllegalMoves(allowIllegal), log(newLog), reveal(newReveal), turnCount(0), input(NULL), maxTurns(newMaxTurns), printBoard(newPrintBoard), timeoutTime(newTimeoutTime), imageOutput(newImageOutput) { gameCreated = false; if (gameCreated) @@ -26,37 +26,27 @@ Game::Game(const char * redPath, const char * bluePath, const bool enableGraphic #endif //BUILD_GRAPHICS - if (client) - { - red = new Client(Piece::RED, "server", redPath); //TODO: Retrieve server address - } - else - { - assert(redPath != NULL); - if (strcmp(redPath, "human") == 0) - red = new Human_Controller(Piece::RED, graphicsEnabled); - else - red = new AI_Controller(Piece::RED, redPath, timeoutTime); - } - - - if (server) - { - blue = new Server(Piece::BLUE, "client"); - } - else + + MakeControllers(redPath, bluePath); + + if (red == NULL || blue == NULL) { - assert(bluePath != NULL); - if (strcmp(bluePath, "human") == 0) - blue = new Human_Controller(Piece::BLUE, graphicsEnabled); + fprintf(stderr, "Game::Game - Error creating controller: "); + if (red == NULL) + { + if (blue == NULL) + fprintf(stderr, " BOTH! (red: \"%s\", blue: \"%s\"\n", redPath, bluePath); + else + fprintf(stderr, " RED! (red: \"%s\")\n", redPath); + } else - blue = new AI_Controller(Piece::BLUE, bluePath, timeoutTime); + fprintf(stderr, "BLUE! (blue: \"%s\")\n", bluePath); + exit(EXIT_FAILURE); } - - +// logMessage("Game initialised.\n"); } -Game::Game(const char * fromFile, const bool enableGraphics, double newStallTime, const bool allowIllegal, FILE * newLog, const Piece::Colour & newReveal, int newMaxTurns, bool newPrintBoard, double newTimeoutTime) : red(NULL), blue(NULL), turn(Piece::RED), theBoard(10,10), graphicsEnabled(enableGraphics), stallTime(newStallTime), allowIllegalMoves(allowIllegal), log(newLog), reveal(newReveal), turnCount(0), input(NULL), maxTurns(newMaxTurns), printBoard(newPrintBoard), timeoutTime(newTimeoutTime) +Game::Game(const char * fromFile, const bool enableGraphics, double newStallTime, const bool allowIllegal, FILE * newLog, const Piece::Colour & newReveal, int newMaxTurns, bool newPrintBoard, double newTimeoutTime,const char * newImageOutput) : red(NULL), blue(NULL), turn(Piece::RED), theBoard(10,10), graphicsEnabled(enableGraphics), stallTime(newStallTime), allowIllegalMoves(allowIllegal), log(newLog), reveal(newReveal), turnCount(0), input(NULL), maxTurns(newMaxTurns), printBoard(newPrintBoard), timeoutTime(newTimeoutTime), imageOutput(newImageOutput) { gameCreated = false; if (gameCreated) @@ -218,21 +208,23 @@ void Game::Wait(double wait) if (wait <= 0) return; - TimerThread timer(wait*1000000); //Wait in seconds - timer.Start(); + + #ifdef BUILD_GRAPHICS + + if (!graphicsEnabled) { - while (!timer.Finished()); - timer.Stop(); + usleep(1000000*wait); //Wait in seconds return; } - #endif //BUILD_GRAPHICS + TimerThread timer(wait*1000000); //Wait in seconds + timer.Start(); while (!timer.Finished()) { - #ifdef BUILD_GRAPHICS + SDL_Event event; while (SDL_PollEvent(&event)) { @@ -244,9 +236,12 @@ void Game::Wait(double wait) break; } } - #endif //BUILD_GRAPHICS } timer.Stop(); + + #else + usleep(wait*1000000); //Wait in seconds + #endif //BUILD_GRAPHICS } @@ -489,10 +484,10 @@ MovementResult Game::Play() - +// logMessage("Messaging red with \"START\"\n"); red->Message("START"); - + int moveCount = 0; while (!Board::HaltResult(result) && (turnCount < maxTurns || maxTurns < 0)) { @@ -511,7 +506,15 @@ MovementResult Game::Play() #ifdef BUILD_GRAPHICS if (graphicsEnabled) + { theBoard.Draw(toReveal); + if (imageOutput != "") + { + string imageFile = "" + imageOutput + "/"+ itostr(moveCount) + ".bmp"; + Graphics::ScreenShot(imageFile.c_str()); + } + + } #endif //BUILD_GRAPHICS turn = Piece::RED; @@ -551,10 +554,19 @@ MovementResult Game::Play() theBoard.PrintPretty(stdout, toReveal); fprintf(stdout, "\n\n"); } + + ++moveCount; #ifdef BUILD_GRAPHICS if (graphicsEnabled) + { theBoard.Draw(toReveal); + if (imageOutput != "") + { + string imageFile = "" + imageOutput + "/" + itostr(moveCount) + ".bmp"; + Graphics::ScreenShot(imageFile.c_str()); + } + } #endif //BUILD_GRAPHICS @@ -599,7 +611,7 @@ MovementResult Game::Play() else ReadUserCommand(); - + ++moveCount; ++turnCount; } @@ -770,4 +782,113 @@ int Game::Tokenise(std::vector & buffer, std::string & str, char split) return buffer.size(); } +/** + * Creates Controller baseds off strings. Takes into account controllers other than AI_Controller. + * @param redPath - Either the path to an AI_Controller compatable executable, or one of %human or %network or %network:[IP_ADDRESS] + * @param bluePath - Ditto + * Sets this->red to a controller using redPath, and this->blue to a controller using bluePath + * TODO: Make nicer (this function should be ~half the length) + */ +void Game::MakeControllers(const char * redPath, const char * bluePath) +{ + Network * redNetwork = NULL; + Network * blueNetwork = NULL; + //To allow for running two network controllers (I don't know why you would, but beside the point...) use two ports + static const int port1 = 4560; + static const int port2 = 4561; + + if (redPath[0] == '@') + { + if (strcmp(redPath, "@human") == 0) + red = new Human_Controller(Piece::RED, graphicsEnabled); + else + { + const char * network = strstr(redPath, "@network"); + if (network == NULL) + { + red = NULL; + return; + } + network = strstr(network, ":"); + + if (network == NULL) + { + logMessage("Creating server for red AI... "); + redNetwork = new Server(port1); + logMessage("Successful!\n"); + + } + else + { + network = (const char*)(network+1); + logMessage("Creating client for red AI... "); + redNetwork = new Client(network, port2); + logMessage("Connected to address %s\n", network); + } + + logMessage(" (Red's responses will be received over the connection)\n"); + red = new NetworkReceiver(Piece::RED, redNetwork); + } + } + else + red = new AI_Controller(Piece::RED, redPath, timeoutTime); + + if (bluePath[0] == '@') + { + if (strcmp(bluePath, "@human") == 0) + blue = new Human_Controller(Piece::BLUE, graphicsEnabled); + else + { + const char * network = strstr(bluePath, "@network"); + if (network == NULL) + { + blue = NULL; + return; + } + network = strstr(network, ":"); + + if (network == NULL) + { + logMessage("Creating server for blue AI... "); + blueNetwork = new Server(port2); + logMessage("Successful!\n"); + + } + else + { + network = (const char*)(network+1); + logMessage("Creating client for blue AI... "); + blueNetwork = new Client(network, port1); + logMessage("Connected to address %s\n", network); + } + logMessage(" (Blue's responses will be received over the connection)\n"); + blue = new NetworkReceiver(Piece::BLUE, blueNetwork); + } + } + else + blue = new AI_Controller(Piece::BLUE, bluePath, timeoutTime); + + if (redNetwork != NULL) + { + + blue = new NetworkSender(Piece::BLUE,blue, redNetwork); + logMessage(" (Blue's responses will be copied over the connection)\n"); + } + if (blueNetwork != NULL) + { + + red = new NetworkSender(Piece::RED, red, blueNetwork); + logMessage(" (Red's responses will be copied over the connection)\n"); + } + + red->FixName(); blue->FixName(); + +} + +string itostr(int i) +{ + stringstream s; + s << i; + return s.str(); +}