Group 8 - Manual World - Development

.gitignore

@@ -22,11 +22,3 @@ cmake-build-*/
 
 #mac
 .DS_Store
-
-#savedata/ #issues with xml save location
-
-savedata/GPAgent/*.xml
-#AgentData_*.xml
-
-
-site

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "third_party/SFML"]
 	path = third_party/SFML
 	url = https://github.com/SFML/SFML.git
-[submodule "third_party/tinyxml2"]
-	path = third_party/tinyxml2
-	url = https://github.com/leethomason/tinyxml2.git

CMakeLists.txt

@@ -6,182 +6,91 @@ project(CSE_491)
 # For now, default to building both the main app and tests
 set(BUILD_MAIN 1)
 set(BUILD_TESTS 1)
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "Test")
-    set(BUILD_MAIN 0)
-    set(BUILD_TESTS 1)
-endif ()
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Test")
+  set(BUILD_MAIN 0)
+  set(BUILD_TESTS 1)
+endif()
 
 # Create a function to make .cmake files simpler
 function(add_source_to_target TARGET_NAME SOURCE_PATH)
-    message(STATUS "Loading source: ${SOURCE_PATH}")
-    target_sources(${TARGET_NAME}
-            PRIVATE ${CMAKE_SOURCE_DIR}/${SOURCE_PATH}
-            )
+  message(STATUS "Loading source: ${SOURCE_PATH}")
+  target_sources(${TARGET_NAME}
+    PRIVATE ${CMAKE_SOURCE_DIR}/${SOURCE_PATH}
+    )
 endfunction()
 
 # Set the necessary C++ flags, some of which are configuration-specific
 set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wcast-align -Winfinite-recursion -Wnon-virtual-dtor -Wnull-dereference -Woverloaded-virtual -pedantic")
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wcast-align -Winfinite-recursion -Wnon-virtual-dtor -Wnull-dereference -Woverloaded-virtual -pedantic")
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-set(CMAKE_CXX_FLAGS_COVERAGE "-O2 -g -fcoverage-mapping -fprofile-instr-generate -fprofile-arcs")
+
 
 # Place all executables in the executable directory
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/executable)
 
 # Move assets to build directory
 file(COPY ./assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-
-#option(BUILD_CLANG_LLVM "Build with clang for LLVM" OFF)
-option(SANITIZE_MEMORY "Build with sanitizers for GP" OFF)
-if (SANITIZE_MEMORY)
-
-    set(BUILD_MAIN 0)
-    set(BUILD_TESTS 0)
-
-    set(CMAKE_CXX_COMPILER "/opt/homebrew/opt/llvm/bin/clang++")
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=memory")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=memory")
-
-    set(XML_SRC_DIR third_party/tinyxml2)
-    set(XML_BUILD_DIR xml_build)
-    add_subdirectory(${XML_SRC_DIR} ${XML_BUILD_DIR})
-
-    #added the executable
-    add_executable(gp_train_main source/gp_train_main.cpp)
-
-    #linking the targets
-    target_sources(gp_train_main PRIVATE source/core/Entity.cpp)
-    target_include_directories(gp_train_main
-            PRIVATE ${CMAKE_SOURCE_DIR}/source/core
-            ${CMAKE_SOURCE_DIR}/source/Agents
-            )
-    target_link_libraries(gp_train_main
-            PRIVATE tinyxml2
-            PRIVATE pthread
-            )
-
-
-endif ()
-
-
-
-
-
-# Build the gp_train_main executable, if requested without SFML and Catch2
-option(BUILD_GP_ONLY "Build only gp_main.cpp" OFF)
-if (BUILD_GP_ONLY)
-    set(BUILD_MAIN 0)
-    set(BUILD_TESTS 0)
-
-    # Configure all of tinyxml2
-    set(XML_SRC_DIR third_party/tinyxml2)
-    set(XML_BUILD_DIR xml_build)
-    add_subdirectory(${XML_SRC_DIR} ${XML_BUILD_DIR})
-
-    #added the executable
-    add_executable(gp_train_main source/gp_train_main.cpp)
-
-    #linking the targets
-    target_sources(gp_train_main PRIVATE source/core/Entity.cpp)
-    target_include_directories(gp_train_main
-            PRIVATE ${CMAKE_SOURCE_DIR}/source/core
-            ${CMAKE_SOURCE_DIR}/source/Agents
-            )
-    target_link_libraries(gp_train_main
-            PRIVATE tinyxml2
-            PRIVATE pthread
-            )
-
-endif ()
-
-
 # Build the main application executables, if requested
-if (${BUILD_MAIN})
-#    line to set santizers
-#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=[sanitizer]")
-#     can be set to address, undefined, thread, memory, or leak
+if(${BUILD_MAIN})
+
+  # Configure all of SFML
+  set(SFML_SRC_DIR third_party/SFML)
+  set(SFML_BUILD_DIR sfml_build)
+  add_subdirectory(${SFML_SRC_DIR} ${SFML_BUILD_DIR})
+
+  # Find all the main files for the various applications
+  # Currently this means any *.cpp file in the root of source
+  file(GLOB EXE_SOURCES CONFIGURE_DEPENDS RELATIVE ${CMAKE_SOURCE_DIR}/source source/*.cpp)
+  message(STATUS "List of main files to build: ${EXE_SOURCES}")
+
+  # Loop through each executable and build it! 
+  foreach(EXE_SOURCE ${EXE_SOURCES})
+    # Rip the .cpp off the end of the string
+    string(REPLACE ".cpp" "" EXE_NAME ${EXE_SOURCE})
+    # Create list of source files (currently just the one .cpp file)
+    # Create executable and link to includes / libraries
+    add_executable(${EXE_NAME} ${CMAKE_SOURCE_DIR}/source/${EXE_SOURCE})
+    target_include_directories(${EXE_NAME}
+      PRIVATE ${CMAKE_SOURCE_DIR}/source
+      )
+    target_link_libraries(${EXE_NAME}
+      PRIVATE sfml-window sfml-audio sfml-graphics sfml-system sfml-network
+      )
+    if(EXISTS ${CMAKE_SOURCE_DIR}/source/${EXE_NAME}.cmake)
+      message(STATUS "Loading ${EXE_NAME}.cmake")
+      include(${CMAKE_SOURCE_DIR}/source/${EXE_NAME}.cmake)
+    else()
+      message(WARNING "Cannot find ${EXE_NAME}.cmake")
+    endif()
+  endforeach()
+endif()
 
-    # Configure all of SFML
+# Build the test executables, if requested
+if(${BUILD_TESTS})
+
+  # Configure Catch
+  set(CATCH_SRC_DIR third_party/Catch2)
+  set(CATCH_BUILD_DIR catch_build)
+  add_subdirectory(${CATCH_SRC_DIR} ${CATCH_BUILD_DIR})
+
+  # Configure only the networking portion of SFML
+  if(NOT ${BUILD_MAIN})
+    set(SFML_BUILD_WINDOW FALSE)
+    set(SFML_BUILD_GRAPHICS FALSE)
+    set(SFML_BUILD_AUDIO FALSE)
     set(SFML_SRC_DIR third_party/SFML)
     set(SFML_BUILD_DIR sfml_build)
     add_subdirectory(${SFML_SRC_DIR} ${SFML_BUILD_DIR})
+  endif()
 
+  # Setup CTest
+  include(CTest)
+  enable_testing()
 
-    #configure the xml library
-    set(XML_SRC_DIR third_party/tinyxml2)
-    set(XML_BUILD_DIR xml_build)
-    add_subdirectory(${XML_SRC_DIR} ${XML_BUILD_DIR})
-
-
-    # Find all the main files for the various applications
-    # Currently this means any *.cpp file in the root of source
-    file(GLOB EXE_SOURCES CONFIGURE_DEPENDS RELATIVE ${CMAKE_SOURCE_DIR}/source source/*.cpp)
-    message(STATUS "List of main files to build: ${EXE_SOURCES}")
-
-
-
-    # Loop through each executable and build it!
-    foreach (EXE_SOURCE ${EXE_SOURCES})
-        # Rip the .cpp off the end of the string
-        string(REPLACE ".cpp" "" EXE_NAME ${EXE_SOURCE})
-        # Create list of source files (currently just the one .cpp file)
-        # Create executable and link to includes / libraries
-        add_executable(${EXE_NAME} ${CMAKE_SOURCE_DIR}/source/${EXE_SOURCE} ${CMAKE_SOURCE_DIR}/source/core/Entity.cpp)
-        target_include_directories(${EXE_NAME}
-                PRIVATE ${CMAKE_SOURCE_DIR}/source
-                )
-        target_link_libraries(${EXE_NAME}
-                PRIVATE sfml-window sfml-audio sfml-graphics sfml-system sfml-network
-                )
-
-        target_link_libraries(${EXE_NAME}
-                PRIVATE tinyxml2
-                )
-
-        if (EXISTS ${CMAKE_SOURCE_DIR}/source/${EXE_NAME}.cmake)
-            message(STATUS "Loading ${EXE_NAME}.cmake")
-            include(${CMAKE_SOURCE_DIR}/source/${EXE_NAME}.cmake)
-        else ()
-            message(WARNING "Cannot find ${EXE_NAME}.cmake")
-        endif ()
-    endforeach ()
-endif ()
-
-# Build the test executables, if requested
-if (${BUILD_TESTS})
-
-    # Configure Catch
-    set(CATCH_SRC_DIR third_party/Catch2)
-    set(CATCH_BUILD_DIR catch_build)
-    add_subdirectory(${CATCH_SRC_DIR} ${CATCH_BUILD_DIR})
-
-
-    # Configure only the networking portion of SFML
-    if (NOT ${BUILD_MAIN})
-        set(SFML_BUILD_WINDOW FALSE)
-        set(SFML_BUILD_GRAPHICS FALSE)
-        set(SFML_BUILD_AUDIO FALSE)
-        set(SFML_SRC_DIR third_party/SFML)
-        set(SFML_BUILD_DIR sfml_build)
-        add_subdirectory(${SFML_SRC_DIR} ${SFML_BUILD_DIR})
-
-        set(XML_SRC_DIR third_party/tinyxml2)
-        set(XML_BUILD_DIR xml_build)
-        add_subdirectory(${XML_SRC_DIR} ${XML_BUILD_DIR})
-
-
-    endif ()
-
-
-    # Setup CTest
-    include(CTest)
-    enable_testing()
-
-    # Tunnel into test directory CMake infrastructure
-    add_subdirectory(tests)
-endif ()
+  # Tunnel into test directory CMake infrastructure
+  add_subdirectory(tests)
+endif()

assets/grids/team8_grid_large.grid

@@ -1,5 +1,5 @@
-^^^      ^^^~~     ^^^^^^^^^^^^^^           ^^^^^^
-^         ^^~~     ^^^^^^^^^^^^^^^^^^^       ^^^^^
+^^^      ^^^~~     ^^^^^^^^^^^^^^}          ^^^^^^
+^  }      ^^~~     ^^^^^^^^^^^^^^^^^^^       ^^^^^
    ^^^     ~~~     ^^^^^^^^^^^^^                  
   ^^^^^    ~~^         ^^^^^                    ^^
   ^^^^    ~~~^^^         ^     ^^              ^^^
@@ -8,13 +8,13 @@
 ^     ~~~^^^^^^^^^       ^^^^^^^^^^       ^^^^^^^^
 ^   ^^~~              ^^^^^^^^^^^^         ^^^^^^^
 ^  ^^^~~      ^^^     ^^^^^^^        ^^^      ^^^^
-^   ^^^~~~^^^^^^^^^              ^^^^^^^^^^^^~~~~~
+^ { ^^^~~~^^^^^^^^^              ^^^^^^^^^^^^~~~~~
 ^^  ^^^^~~~~^^^^^^^^^^       ^^^^^^^^^^^^^~~~~~~~~
 ^^^   ^   ~~~~~^^^^^^^^^   ^^^^^^^^^~~~~~~~~~^^^^^
 ^^^        ^^~~~~~~^^^^^  ^^^^^~~~~~~~^^^^^^^  ^^^
 ^     ^         ~~~~~~~~##~~~~~~~^^^^^^^^^^    ^^^
 ^^   ^^^^^           ~~~##~~~~^^^^^^^^^       ^^^^
 ^^  ^^^^^^^^^^                     ^^           ^^
-^    ^^^^^^^^^^^^^          ^^^          ^        
+^    ^^^^^^^^^^^^^          ^^^          ^  {     
 ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^       
-^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        
+^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^