GAIGResearch
diff --git a/‎CMakeLists.txt
+33-15 b/‎CMakeLists.txt
+33-15
diff --git a/‎CMakeSettings.json
+15 b/‎CMakeSettings.json
+15
diff --git a/‎cmake/settings/Conan.cmake
-1 b/‎cmake/settings/Conan.cmake
-1
diff --git a/‎cmake/targets/GUI.cmake
+1-3 b/‎cmake/targets/GUI.cmake
+1-3
diff --git a/‎cmake/targets/Stratega.cmake
+51-16 b/‎cmake/targets/Stratega.cmake
+51-16
diff --git a/‎docs/extraInformation/faq/index.rst
-26 b/‎docs/extraInformation/faq/index.rst
-26
@@ -49,6 +49,8 @@ option(ENABLE_STRATEGA_BINDINGS "Enable to build the bindings to other languages
 option(ENABLE_TESTING "Enable Test Builds" ON)
 option(WARNINGS_AS_ERRORS "Treat compiler warnings as errors (If ENABLE_STRATEGA_BINDINGS is enabled, this option will be disabled automatically)" ON)
 
+option(SGA_BUILD_HEADLESS "Compile Stratega in headless mode" OFF)
+
 #If CMAKE_NO_SYSTEM_FROM_IMPORTED is OFF, pybind11 should be treated as SYSTEM and it should not throw warnings
 #but it does for some reason that we dont know.
 #The temporal solution for this problem is to disable the warnings when we want to build the pyhton bindings
@@ -57,7 +59,7 @@ message("\nDeactivated warnings as errors.\n")
     set(WARNINGS_AS_ERRORS OFF)   
 endif()
 
-# print out a short summary of the compiler information
+# print out a short summary of the compiler inforMoved Arena and GUI filesmation
 message("C++ Compiler: ${CMAKE_CXX_COMPILER}")
 message("C++ Compiler Info: ${CMAKE_CXX_COMPILER_ID}, version ${CMAKE_CXX_COMPILER_VERSION}")
 message("Build type: ${CMAKE_BUILD_TYPE}")
@@ -114,35 +116,51 @@ enable_doxygen()
 include(${CMAKE_CONFIG_FOLDER}/settings/StaticAnalyzers.cmake)
 
 # configure conan and fetch all dependencies
-if (CMAKE_SYSTEM_NAME MATCHES Linux)
+if(NOT SGA_BUILD_HEADLESS)   
+   if (CMAKE_SYSTEM_NAME MATCHES Linux)
     # on linux SFML is not (yet) available from conan due to a missing lib dependency in their recipe.
     # We will have to fetch it manually in this case and add it to our project.
     include(${CMAKE_CONFIG_FOLDER}/modules/FetchSFML.cmake)
-endif ()
-include(${CMAKE_CONFIG_FOLDER}/modules/FetchIMGUI-SFML.cmake)
+    endif ()
+    include(${CMAKE_CONFIG_FOLDER}/modules/FetchIMGUI-SFML.cmake)
+else()
+    add_compile_definitions(BUILD_HEADLESS)
+    set(ENABLE_STRATEGA_BINDINGS OFF)
+endif()
+
 include(${CMAKE_CONFIG_FOLDER}/settings/Conan.cmake)
 run_conan()
 include(${PROJECT_BINARY_DIR}/conanbuildinfo.cmake)
 include(${PROJECT_BINARY_DIR}/conan_paths.cmake)
 
 
 # find the downloaded/installed packages
-
-find_package(Threads)
-find_package(imgui REQUIRED)
-find_package(OpenGL REQUIRED)
 if (CMAKE_SYSTEM_NAME MATCHES Linux)
-    add_subdirectory(${sfml_SOURCE_DIR} ${sfml_BINARY_DIR} EXCLUDE_FROM_ALL)
-else ()
-    find_package(SFML COMPONENTS system window graphics REQUIRED)
-endif ()
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ endif ()
+find_package(Threads)
+
+if(NOT SGA_BUILD_HEADLESS)
+   find_package(imgui REQUIRED)
+   find_package(OpenGL REQUIRED)
+   if (CMAKE_SYSTEM_NAME MATCHES Linux)
+       add_subdirectory(${sfml_SOURCE_DIR} ${sfml_BINARY_DIR} EXCLUDE_FROM_ALL)
+   else ()
+       find_package(SFML COMPONENTS system window graphics REQUIRED)
+   endif ()
+endif()
+
 find_package(yaml-cpp REQUIRED)
 find_package(recastnavigation REQUIRED)
 
 
 # define the targets of the project
-include(${CMAKE_CONFIG_FOLDER}/targets/IMGUI.cmake)
-include(${CMAKE_CONFIG_FOLDER}/targets/GUI.cmake)
+if(NOT SGA_BUILD_HEADLESS)
+   include(${CMAKE_CONFIG_FOLDER}/targets/IMGUI.cmake)
+    include(${CMAKE_CONFIG_FOLDER}/targets/GUI.cmake)
+endif()
+
 include(${CMAKE_CONFIG_FOLDER}/targets/Arena.cmake)
 include(${CMAKE_CONFIG_FOLDER}/targets/Stratega.cmake)
 if (ENABLE_STRATEGA_BINDINGS)
@@ -157,4 +175,4 @@ if (ENABLE_TESTING)
     enable_testing()
     message("\nTests enabled, configuring.\n")
     include(${CMAKE_CONFIG_FOLDER}/targets/Tests.cmake)
-endif ()
+endif ()
@@ -0,0 +1,15 @@
+{
+    "configurations": [
+        {
+            "name": "x64-Debug",
+            "generator": "Ninja",
+            "configurationType": "Debug",
+            "inheritEnvironments": [ "msvc_x64_x64" ],
+            "buildRoot": "${projectDir}\\out\\build\\${name}",
+            "installRoot": "${projectDir}\\out\\install\\${name}",
+            "cmakeCommandArgs": "",
+            "buildCommandArgs": "",
+            "ctestCommandArgs": ""
+        }
+    ]
+}
@@ -12,7 +12,6 @@ macro(run_conan)
 
     conan_add_remote(NAME bincrafters URL
             https://api.bintray.com/conan/bincrafters/public-conan)
-
     conan_cmake_run(
             CONANFILE ${DEPENDENCY_DIR}/${CONANFILE}
             CONAN_COMMAND ${CONAN_PATH}
 
@@ -19,9 +19,7 @@ target_link_libraries(gui
         "$<$<PLATFORM_ID:Linux>:sfml-graphics>"
         "$<$<PLATFORM_ID:Linux>:sfml-window>"
         )
-
-#Copy Assets folder
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+        
 
 set_target_properties(gui PROPERTIES
          LIBRARY_OUTPUT_DIRECTORY  ${CMAKE_CURRENT_BINARY_DIR}/lib
 
@@ -22,6 +22,8 @@ set(STRATEGA_SOURCE_FILES
         Agent/RHEAAgent/RHEAGenome.cpp
         Agent/RHEAAgent/RHEAParameters.cpp
         Agent/RuleBasedAgents/CombatAgent.cpp
+        Agent/RuleBasedAgents/PusherAgent.cpp
+        Agent/RuleBasedAgents/Direction.cpp
         Agent/ScriptedAgent.cpp
         Agent/StateAbstraction/StateFactory.cpp
         Agent/TreeSearchAgents/ActionAbstractionMCTSAgent.cpp
@@ -50,14 +52,9 @@ set(STRATEGA_SOURCE_FILES
         Game/GameRunner.cpp
         Game/RTSGameRunner.cpp
         Game/TBSGameRunner.cpp
-        GUI/AssetCache.cpp
-        GUI/EntityRenderer.cpp
         GUI/GameRenderer.cpp
-        GUI/RTSGameRenderer.cpp
-        GUI/TBSGameRenderer.cpp
-        GUI/TileMap.cpp
-        GUI/Widgets/ActionsController.cpp
-        GUI/Widgets/FogOfWarController.cpp
+
+
         Logging/FileLogger.cpp
         Logging/Log.cpp
         Logging/LoggingScope.cpp
@@ -69,15 +66,45 @@ set(STRATEGA_SOURCE_FILES
         Representation/GameState.cpp
         Representation/Player.cpp
         Representation/TechnologyTree.cpp
-        Representation/Tile.cpp
+        Representation/Tile.cpp       
+        )
+if(NOT SGA_BUILD_HEADLESS)
+   list(APPEND STRATEGA_SOURCE_FILES
+        GUI/AssetCache.cpp        
+        GUI/TextureAtlas.cpp        
+        NewGUI/GridLayout.cpp
+        NewGUI/Widget.cpp
+        NewGUI/World.cpp
+        NewGUI/GridLayoutWidget.cpp
+        NewGUI/MouseInformationWidget.cpp
+        NewGUI/FOWControllerWidget.cpp
+        NewGUI/PlayerInformationWidget.cpp
+        NewGUI/GameStateInformationWidget.cpp
+        NewGUI/ActionsWidget.cpp
+        NewGUI/WorldControllerWidget.cpp
+        NewGUI/SGARenderTarget.cpp
+        NewGUI/SGADrawable.cpp
+
+        NewGUI/GenericGameRenderer.cpp
+        NewGUI/SpriteData.cpp
+        NewGUI/ResourceManager.cpp
         )
+message("Building GUI mode")
+else()
+message("Building HEADLESS mode")
+endif()
+
+#Copy Assets folder
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
 
 list(TRANSFORM STRATEGA_SOURCE_FILES PREPEND "${SUBPROJ_STRATEGA_SRC_DIR}/")
 
 add_library(Stratega STATIC ${STRATEGA_SOURCE_FILES})
 
 target_include_directories(Stratega PUBLIC ${SUBPROJ_STRATEGA_INCLUDE_DIR})
 
+
 function(target_link_libraries_system target)
   set(libs ${ARGN})
   foreach(lib ${libs})
@@ -90,15 +117,23 @@ endfunction(target_link_libraries_system)
 
 target_link_libraries_system(Stratega CONAN_PKG::yaml-cpp)
 target_link_libraries_system(Stratega CONAN_PKG::recastnavigation)
-target_link_libraries_system(Stratega CONAN_PKG::imgui)
-target_link_libraries_system(Stratega imgui)
 
-if(UNIX AND NOT APPLE)
-    target_link_libraries_system(Stratega sfml-system)
-    target_link_libraries_system(Stratega sfml-graphics)
-    target_link_libraries_system(Stratega sfml-window)
-else()
-    target_link_libraries_system(Stratega CONAN_PKG::sfml)
+
+if(CMAKE_SYSTEM_NAME MATCHES Linux)
+target_link_libraries(Stratega Threads::Threads)
+endif()
+
+if(NOT SGA_BUILD_HEADLESS)
+    target_link_libraries_system(Stratega CONAN_PKG::imgui)
+    target_link_libraries_system(Stratega imgui)
+
+    if(UNIX AND NOT APPLE)
+        target_link_libraries_system(Stratega sfml-system)
+        target_link_libraries_system(Stratega sfml-graphics)
+        target_link_libraries_system(Stratega sfml-window)        
+    else()
+        target_link_libraries_system(Stratega CONAN_PKG::sfml)
+    endif()
 endif()
 
 install(TARGETS
 
@@ -1,32 +1,6 @@
 Frequently asked questions
 ##########################
 
-How to change the GUI resolution
-================================
-
-The GUI can be executed in any resolution you want. To change it, simply pass the desire resolution to the game runner. 
-The implementation between c++ and python is slighly different.
-
-.. tabs::
-
-    .. code-tab:: c++
-        :caption: Note that this code is based in the cpp file GUI/main.cpp.
-
-
-        auto resolution = SGA::Vector2f(1200, 800);    
-        ...        
-        auto runner = SGA::createGameRunner(*gameConfig);
-        runner->play(agents.begin(), agents.end(), resolution);
-
-    .. code-tab:: py
-        
-        resolution=stratega.Vector2f(1920,1080)
-        ...
-        runner = stratega.create_runner(config)
-        config_agents = stratega.generate_agents(config)
-        
-        runner.play(config_agents, resolution, 0)
-
 Disable fog of war
 ==================