chore: fix: style: too many changes long ago (linux)

popojan · Dec 3, 2021 · 95cf5fe · 95cf5fe
1 parent d7af42b
commit 95cf5fe
Show file tree

Hide file tree

Showing 19 changed files with 567 additions and 1,049 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/cmake/FileList.cmake b/cmake/FileList.cmake
diff --git a/cmake/FindGnuGo.cmake b/cmake/FindGnuGo.cmake
diff --git a/cmake/FindLibGlyphy.cmake b/cmake/FindLibGlyphy.cmake
@@ -1,25 +1,20 @@
-# - Try to find libGlyphy
-# Once done this will define
-#  LIBGLYPHY_FOUND - System has libglyphy
-#  LIBGLYPHY_INCLUDE_DIRS - The GLyphy include directories
-#  LIBGLYPHY_LIBRARIES - The libraries needed to use libglyphy
-#  LIBGLYPHY_DEFINITIONS - Compiler switches required for using libglyphy
-
 find_path(LIBGLYPHY_INCLUDE_DIR NAMES glyphy.h HINTS  ${PROJECT_SOURCE_DIR}/deps/glyphy/src)
 
-find_library(LIBGLYPHY_LIBRARY NAMES goban_glyphy.lib libglyphy.a HINTS ${PROJECT_SOURCE_DIR}/deps/glyphy/win32/x64/${CMAKE_BUILD_TYPE})
+find_library(LIBGLYPHY_LIBRARY NAMES goban_glyphy.lib libglyphy.a
+    HINTS ${PROJECT_SOURCE_DIR}/deps/glyphy/win32/x64/${CMAKE_BUILD_TYPE}
+    HINTS ${PROJECT_BINARY_DIR}/deps/glyphy/build/src/.libs
+)
+
+add_library(libglyphy STATIC IMPORTED)
 
-message(${PROJECT_SOURCE_DIR}/deps/glyphy/win32/x64/${CMAKE_BUILD_TYPE})
-set(LIBGLYPHY_LIBRARIES
-    ${LIBGLYPHY_LIBRARY}
+set_target_properties(libglyphy PROPERTIES
+    IMPORTED_LOCATION ${LIBGLYPHY_LIBRARY}
 )
-set(LIBGLYPHY_INCLUDE_DIRS ${LIBGLYPHY_INCLUDE_DIR})
 
 include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBGLYPHY_FOUND to TRUE
-# if all listed variables are TRUE
+
 find_package_handle_standard_args(LibGlyphy DEFAULT_MSG
-                                  LIBGLYPHY_LIBRARY LIBGLYPHY_INCLUDE_DIR)
+    LIBGLYPHY_LIBRARY LIBGLYPHY_INCLUDE_DIR)
 
-mark_as_advanced(LIBGLYPHY_INCLUDE_DIR LIBGLYPHY_LIBRARY )
+mark_as_advanced(LIBGLYPHY_INCLUDE_DIR LIBGLYPHY_LIBRARY)
 
diff --git a/cmake/FindLibRocket.cmake b/cmake/FindLibRocket.cmake
@@ -16,6 +16,14 @@ find_library(LIBROCKET_CONTROLS_LIBRARY NAMES RocketControls
 find_library(LIBROCKET_DEBUGGER_LIBRARY NAMES RocketDebugger
 	HINTS ${PROJECT_BINARY_DIR}/deps/libRocket/build ${PROJECT_BINARY_DIR}/deps/libRocket/build/${CMAKE_BUILD_TYPE})
 
+add_library(LibRocket_Core STATIC IMPORTED)
+add_library(LibRocket_Controls STATIC IMPORTED)
+add_library(LibRocket_Debugger STATIC IMPORTED)
+
+set_target_properties(LibRocket_Core PROPERTIES IMPORTED_LOCATION ${LIBROCKET_CORE_LIBRARY})
+set_target_properties(LibRocket_Controls PROPERTIES IMPORTED_LOCATION ${LIBROCKET_CONTROLS_LIBRARY})
+set_target_properties(LibRocket_Debugger PROPERTIES IMPORTED_LOCATION ${LIBROCKET_DEBUGGER_LIBRARY})
+
 set(LIBROCKET_LIBRARIES
     ${LIBROCKET_CORE_LIBRARY}
     ${LIBROCKET_CONTROLS_LIBRARY}
@@ -24,10 +32,8 @@ set(LIBROCKET_LIBRARIES
 set(LIBROCKET_INCLUDE_DIRS ${LIBROCKET_INCLUDE_DIR} )
 
 include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBROCKET_FOUND to TRUE
-# if all listed variables are TRUE
+
 find_package_handle_standard_args(LibRocket DEFAULT_MSG
                                   LIBROCKET_LIBRARIES LIBROCKET_INCLUDE_DIR)
 
 mark_as_advanced(LIBROCKET_INCLUDE_DIR LIBROCKET_LIBRARIES)
-
diff --git a/cmake/FindPortaudio.cmake b/cmake/FindPortaudio.cmake
@@ -19,7 +19,7 @@ if (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
   set(PORTAUDIO_FOUND TRUE)
 else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
   if (NOT WIN32)
-   include(FindPkgConfig)
+   #include(FindPkgConfig)
    pkg_check_modules(PORTAUDIO2 portaudio-2.0)
   endif (NOT WIN32)
 

diff --git a/src/ElementGame.cpp b/src/ElementGame.cpp
@@ -8,7 +8,7 @@
 
 ElementGame::ElementGame(const Rocket::Core::String& tag)
         : Rocket::Core::Element(tag), model(this), view(model), engine(model),
-          control(this, model, view, engine), hasResults(false), calculatingScore(false)
+          control(this, model, view, engine)
 {
     engine.loadEngines(config);
     engine.addGameObserver(&model);

diff --git a/src/ElementGame.h b/src/ElementGame.h
@@ -17,9 +17,6 @@ class ElementGame : public Rocket::Core::Element,
 
     void OnChildAdd(Rocket::Core::Element* element);
 
-    bool needsRepaint() {
-        return view.needsRepaint();
-    }
     void requestRepaint() {
         view.requestRepaint();
     }
@@ -43,7 +40,6 @@ class ElementGame : public Rocket::Core::Element,
     GameThread engine;
     GobanControl control;
     std::mutex mutex;
-    bool hasResults, calculatingScore;
 };
 
 #endif
diff --git a/src/EventManager.cpp b/src/EventManager.cpp
@@ -28,11 +28,9 @@
 #include "EventManager.h"
 #include <Rocket/Core/Context.h>
 #include <Rocket/Core/ElementDocument.h>
-#include <Rocket/Core/ElementUtilities.h>
 #include <Shell.h>
 #include "EventHandler.h"
 #include <map>
-#include <iostream>
 
 // The game's element context (declared in main.cpp).
 extern Rocket::Core::Context* context;

diff --git a/src/GameRecord.h b/src/GameRecord.h
@@ -6,7 +6,7 @@
 #include <memory>
 #include "Board.h"
 
-#include "OpenGL.h"
+#include "SGF.h"
 
 class GameRecord {
 public:

diff --git a/src/GameThread.cpp b/src/GameThread.cpp
@@ -194,9 +194,11 @@ bool GameThread::setFixedHandicap(int handicap) {
 	return success;
 }
 void GameThread::run() {
+    std::unique_lock<std::mutex> lock(playerMutex);
     model.start();
+    spdlog::warn("construct thread {}", (bool)model);
     thread = new std::thread(&GameThread::gameLoop, this);
-    while(!hasThreadRunning || !playerToMove);
+    engineStarted.wait(lock);
 }
 
 bool GameThread::isRunning() { return hasThreadRunning;}
@@ -226,12 +228,15 @@ bool GameThread::undo(Player * engine, bool doubleUndo) {
 }
 
 void GameThread::gameLoop() {
-    hasThreadRunning = true;
     interruptRequested = false;
     while (model && !interruptRequested) {
         Engine* coach = currentCoach();
         Engine* kibitz = currentKibitz();
         Player* player = currentPlayer();
+        if(!hasThreadRunning) {
+            hasThreadRunning = true;
+            engineStarted.notify_all();
+        }
         std::unique_lock<std::mutex> lock(playerMutex, std::defer_lock);
         bool locked = false;
         if(coach && player && !interruptRequested) {
@@ -325,9 +330,9 @@ void GameThread::gameLoop() {
                 );
             }
 
-            if(model.over)
+            if(model.over) {
                 break;
-
+            }
 
             if(success && move != Move::INTERRUPT)
                 std::this_thread::sleep_for(std::chrono::milliseconds(500));

diff --git a/src/GameThread.h b/src/GameThread.h
@@ -55,15 +55,14 @@ class GameThread
     void playLocalMove(const Move& move);
     void playKibitzMove();
 
-    void loadEngines(const std::shared_ptr<Configuration> config);
+    void loadEngines(std::shared_ptr<Configuration> config);
 
 	int activatePlayer(int which, int delta = 1);
 
 	int getActivePlayer(int which);
 
 	Move getLocalMove(const Position& coord);
 
-	void init();
 	void reset();
 
     void addGameObserver(GameObserver* pobserver) {
@@ -72,8 +71,8 @@ class GameThread
 
     bool undo(Player * engine, bool doubleUndo);
 
-    const std::vector<Engine*> getEngines() { return engines;}
-    const std::vector<Player*> getPlayers() { return players;}
+    std::vector<Engine*> getEngines() { return engines;}
+    std::vector<Player*> getPlayers() { return players;}
 
 private:
     std::vector<GameObserver*> gameObservers;
@@ -82,13 +81,13 @@ class GameThread
     std::vector<Player*> players; //all players including engines, humans, spectators
     std::thread* thread;
     std::mutex mutex2;
-    volatile bool interruptRequested, hasThreadRunning;
+    bool interruptRequested, hasThreadRunning;
     Player* playerToMove;
 	std::size_t human, sgf, coach, kibitz;
 	std::size_t numPlayers;
 	std::array<std::size_t, 2> activePlayer;
     std::mutex playerMutex;
-
+    std::condition_variable engineStarted;
     int komi;
     int boardSize;
     int handicap;

diff --git a/src/GobanControl.cpp b/src/GobanControl.cpp
@@ -7,7 +7,7 @@
 #include "GobanControl.h"
 
 bool GobanControl::newGame(int boardSize) {
-	engine.interrupt();
+    engine.interrupt();
     engine.reset();
 	if(engine.clearGame(boardSize, model.state.komi, model.state.handicap)) {
         view.animateIntro();
@@ -34,6 +34,7 @@ void GobanControl::mouseClick(int button, int state, int x, int y) {
             else if(!engine.isRunning() && !model.over) {
                engine.run();
             }
+            spdlog::debug("engine.isRunning() = {}", engine.isRunning());
             if(playNow) {
                 bool humanMove = engine.humanToMove();
                 if(model.state.holdsStone || !humanMove) {
@@ -116,10 +117,10 @@ bool GobanControl::command(const std::string& cmd) {
             newGame(model.getBoardSize());
             playNow = false;
         }
-        else if(view.board.isEmpty()) {
+        /*else if(view.board.isEmpty()) {
             if(!engine.isRunning())
                 engine.run();
-        }
+        }*/
         if(playNow) {
             auto move = model.getPassMove();
             engine.playLocalMove(move);

diff --git a/src/GobanModel.h b/src/GobanModel.h
@@ -71,8 +71,8 @@ class GobanModel: public GameObserver {
     Board board;
 
     bool prevPass;
-    volatile bool over;
-    volatile bool started;
+    bool over;
+    bool started;
     GameState state;
 
     GameRecord game; //TODO find usage and create API including SGF generation

diff --git a/src/GobanView.h b/src/GobanView.h
@@ -115,8 +115,8 @@ class GobanView: public GameObserver {
     glm::vec3 translate, newTranslate;
     glm::vec2 resolution;
     float lastTime, startTime;
-    volatile bool animationRunning;
-    volatile bool calculatingScore = false;
+    bool animationRunning;
+    bool calculatingScore = false;
     bool isPanning, isZooming, isRotating;
     int needsUpdate;
     DDG::Camera cam;

diff --git a/src/OpenGL.h b/src/OpenGL.h
@@ -2,24 +2,6 @@
 #define GOBAN_OPENGL_H
 
 #include <Rocket/Core/Platform.h>
-
-#define SGFCPLUSPLUS_STATIC_DEFINE 1
-#include <ISgfcTreeBuilder.h>
-#include <SgfcPlusPlusFactory.h>
-#include <ISgfcPropertyFactory.h>
-#include <ISgfcPropertyValueFactory.h>
-#include <ISgfcPropertyValue.h>
-#include <SgfcPropertyType.h>
-#include <SgfcPlusPlusExport.h>
-//#include <SgfcPropertyValueType.h>
-#include <ISgfcGoMovePropertyValue.h>
-#include <SgfcGameType.h>
-#include <ISgfcGame.h>
-#include <ISgfcNode.h>
-#include <ISgfcDocument.h>
-#include <ISgfcDocumentWriter.h>
-#include <SgfcConstants.h>
-
 #if defined(ROCKET_PLATFORM_MACOSX)
 #elif defined(ROCKET_PLATFORM_LINUX)
     #include <glad/glad.h>

diff --git a/src/SGF.h b/src/SGF.h
@@ -0,0 +1,25 @@
+//
+// Created by jan on 4/18/21.
+//
+
+#ifndef GOBAN_SGF_H
+#define GOBAN_SGF_H
+
+#undef None
+
+#include <ISgfcTreeBuilder.h>
+#include <SgfcPlusPlusFactory.h>
+#include <ISgfcPropertyFactory.h>
+#include <ISgfcPropertyValueFactory.h>
+#include <ISgfcPropertyValue.h>
+#include <SgfcPropertyType.h>
+#include <SgfcPlusPlusExport.h>
+#include <ISgfcGoMovePropertyValue.h>
+#include <SgfcGameType.h>
+#include <ISgfcGame.h>
+#include <ISgfcNode.h>
+#include <ISgfcDocument.h>
+#include <ISgfcDocumentWriter.h>
+#include <SgfcConstants.h>
+
+#endif //GOBAN_SGF_H