Fixing asset and script distribution

Author: Atraxus

Intern/rayx-core/CMakeLists.txt

@@ -158,12 +158,31 @@ add_custom_command(
 )
 # -----------------
 
+# ---- Scripts ----
+# Define the source and destination paths
+set(SCRIPT_SRC_DIR "${CMAKE_SOURCE_DIR}/Scripts/plot.py")
+# Set the destination directory for the Scripts directory based on the build type
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(SCRIPT_DST_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Scripts/plot.py")
+else()
+    set(SCRIPT_DST_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Scripts/plot.py")
+endif()
+
+# Copy the Scripts directory to the binary output directory after building
+message(STATUS "Copying Scripts directory from ${SCRIPT_SRC_DIR} to ${SCRIPT_DST_DIR}")
+add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy ${SCRIPT_SRC_DIR} ${SCRIPT_DST_DIR}
+    COMMENT "Copying Scripts directory to build output directory..."
+)
+# -----------------
+
 # ---- CPack ----
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_CONTACT "Your Name <[email protected]>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Your Project Description")
-install(DIRECTORY ${DATA_SRC_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(FILES ${SCRIPT_SRC_DIR} DESTINATION bin/Scripts)
 
 include(CPack)
 

Intern/rayx-ui/CMakeLists.txt

@@ -32,6 +32,19 @@ if(Vulkan_FOUND)
     target_compile_definitions(${PROJECT_NAME} PRIVATE
         GLM_FORCE_RADIANS
         GLM_FORCE_DEPTH_ZERO_TO_ONE)
+
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(RESOURCE_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Assets)
+    else()
+        set(RESOURCE_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Assets)
+    endif()
+
+    message(STATUS "Resource directory: ${RESOURCE_DIR}")
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${PROJECT_SOURCE_DIR}/res
+        ${RESOURCE_DIR}
+    )
     # -----------------
 
 
@@ -42,10 +55,16 @@ if(Vulkan_FOUND)
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shaders
                 DESTINATION ./bin
                 FILES_MATCHING PATTERN "*_*.spv")
+        install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Assets
+                DESTINATION ./bin
+                FILES_MATCHING PATTERN "*")
     else()
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Shaders
                 DESTINATION ./bin
                 FILES_MATCHING PATTERN "*_*.spv")
+        install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Assets
+                DESTINATION ./bin
+                FILES_MATCHING PATTERN "*")
     endif()
     include(InstallRequiredSystemLibraries)
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")

Intern/rayx-ui/res/icons/rayx-logo.png

@@ -26,7 +26,7 @@ Texture::Texture(Device& device) : m_Device{device} {
     // Read in image
     int texWidth, texHeight, _;
     // STBI_rgb_alpha hopefully always forces 4 channels
-    std::filesystem::path path = RAYX::canonicalizeRepositoryPath("Intern/rayx-ui/res/textures/default.png");
+    std::filesystem::path path = getExecutablePath() / "Assets" / "textures" / "default.png";
     stbi_uc* pixels = stbi_load(path.string().c_str(), &texWidth, &texHeight, &_, STBI_rgb_alpha);
     if (!pixels) {
         RAYX_ERR << "Failed to load texture image";

Intern/rayx-ui/src/GraphicsCore/Texture.cpp

@@ -127,10 +127,9 @@ UIHandler::UIHandler(const Window& window, const Device& device, VkFormat imageF
     // Upload fonts
     {
         // Setup style
-        m_smallFont =
-            m_IO.Fonts->AddFontFromFileTTF(RAYX::canonicalizeRepositoryPath("./Intern/rayx-ui/res/fonts/Roboto-Regular.ttf").string().c_str(), 16.0f);
-        m_largeFont =
-            m_IO.Fonts->AddFontFromFileTTF(RAYX::canonicalizeRepositoryPath("./Intern/rayx-ui/res/fonts/Roboto-Regular.ttf").string().c_str(), 24.0f);
+        const std::filesystem::path fontPath = getExecutablePath() / "Assets/fonts/Roboto-Regular.ttf";
+        m_smallFont = m_IO.Fonts->AddFontFromFileTTF(fontPath.string().c_str(), 16.0f);
+        m_largeFont = m_IO.Fonts->AddFontFromFileTTF(fontPath.string().c_str(), 24.0f);
 
         ImGui_ImplVulkan_CreateFontsTexture();
     }

Intern/rayx-ui/src/UserInterface/UIHandler.cpp

@@ -111,7 +111,7 @@ void TerminalApp::tracePath(const std::filesystem::path& path) {
                 RAYX_ERR << "Have you selected .csv exporting?";
             }
 
-            auto cmd = std::string("python ") + RAYX::canonicalizeRepositoryPath(std::string("Scripts/plot.py")).string() + " " + file;
+            auto cmd = std::string("python ") + getExecutablePath().string() + "/Scripts/plot.py " + file;
             auto ret = system(cmd.c_str());
             if (ret != 0) {
                 RAYX_WARN << "received error code while printing";