Merged to master.

Author: anirul

.github/workflows/cmake-multi-platform.yml

@@ -0,0 +1,77 @@
+# build the Frame code on linux and run the test
+# copy from https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
+name: CMake on multiple platforms
+
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: true
+      # Matrix not used, missing windows knowledge to do build it
+      # clang compiler not working with ubuntu because issue with std lib and clang (tested with clang15)
+      matrix:
+        os: [ubuntu-latest]
+        build_type: [Release]
+        c_compiler: [gcc]
+        cpp_compiler: [g++]
+        triplet: [x64-linux-release]
+        include:
+          - os: ubuntu-latest
+            c_compiler: gcc
+            cpp_compiler: g++
+            triplet: x64-linux-release
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        lfs: true
+        submodules: true
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+    - name: apt install
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: |
+        sudo apt update 
+        sudo apt install -y libxmu-dev libxi-dev libgl-dev libglx-dev libgles-dev \
+         build-essential libx11-xcb-dev libegl1-mesa-dev libopengl-dev \
+        libxkbcommon-dev libwayland-dev libxrandr-dev mesa-vulkan-drivers libglu1-mesa-dev libdrm-dev libegl-dev libglm-dev 
+      # the dependency list is too big but at least it works
+      # https://packages.ubuntu.com/search
+    - name: vcpkg build
+      id: vcpkg
+      uses: johnwason/vcpkg-action@v6 #cache build so improve the build time a lot
+      with:
+        manifest-dir: ${{ github.workspace }} # Set to directory containing vcpkg.json
+        triplet: "${{ matrix.triplet }}"
+        token: ${{ github.token }}
+        github-binarycache: true
+        cache-key: "${{ matrix.triplet }}" # TODO must use sha1 of vcpkg.json and triplet
+    - name: Configure CMake
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DBUILD_SKIP_CLIENT=ON
+        ${{ steps.vcpkg.outputs.vcpkg-cmake-config }}
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -S ${{ github.workspace }} ; 
+    - name: Build
+      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      run: >
+        CC="${{ matrix.c_compiler }}" CXX="${{ matrix.cpp_compiler }}" cmake 
+        --build ${{ steps.strings.outputs.build-output-dir }} --verbose -j 4  
+    - name: Show files after
+      run: ls -ltrR ${{ github.workspace }}
+    - name: Run tests
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}
+      run:  xvfb-run ctest --build-config ${{ matrix.build_type }}

.github/workflows/main.yml

@@ -25,6 +25,7 @@ jobs:
       run: |
         git clone https://github.com/microsoft/vcpkg.git
         cd vcpkg
+        git checkout tags/2024.02.14
         ./bootstrap-vcpkg.bat
         ./vcpkg integrate install
 

CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # C++ standard version.
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Adding subfolder property.

examples/02-scene_simple/CMakeLists.txt

@@ -3,6 +3,7 @@
 add_executable(02_SceneSimple
   WIN32
     main.cpp
+    modal_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../../asset/json/scene_simple.json
 )
 

examples/02-scene_simple/main.cpp

@@ -13,8 +13,10 @@
 #include "frame/file/file_system.h"
 #include "frame/file/image_stb.h"
 #include "frame/gui/draw_gui_factory.h"
+#include "frame/gui/window_logger.h"
 #include "frame/gui/window_resolution.h"
 #include "frame/window_factory.h"
+#include "modal_info.h"
 
 // From: https://sourceforge.net/p/predef/wiki/OperatingSystems/
 #if defined(_WIN32) || defined(_WIN64)
@@ -39,11 +41,16 @@ try
         frame::RenderingAPIEnum::OPENGL,
         size);
     auto& device = win->GetDevice();
-    auto gui_window = frame::gui::CreateDrawGui(*win.get());
+    auto gui_window = frame::gui::CreateDrawGui(*win.get(), {}, 20.0f);
     auto gui_resolution = std::make_unique<frame::gui::WindowResolution>(
         "Resolution", size, win->GetDesktopSize(), win->GetPixelPerInch());
     ptr_window_resolution = gui_resolution.get();
     gui_window->AddWindow(std::move(gui_resolution));
+    gui_window->AddWindow(std::make_unique<frame::gui::WindowLogger>("Logger"));
+    // Set the main window in full.
+    // gui_window->SetVisible(false);
+    gui_window->AddModalWindow(
+        std::make_unique<ModalInfo>("Info", "This is a test modal window."));
     win->GetDevice().AddPlugin(std::move(gui_window));
     frame::common::Application app(std::move(win));
     do

examples/02-scene_simple/modal_info.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "frame/gui/gui_window_interface.h"
+#include <imgui.h>
+
+class ModalInfo : public frame::gui::GuiWindowInterface
+{
+  public:
+    ModalInfo(const std::string& name, const std::string& text) :
+		name_(name), text_(text)
+    {
+    }
+    bool DrawCallback() override
+    {
+        ImGui::TextUnformatted(text_.c_str());
+        if (ImGui::Button("Ok"))
+        {
+            end_ = true;
+        }
+        return true;
+    }
+    bool End() const override
+    {
+        return end_;
+    }
+    std::string GetName() const override
+    {
+        return name_;
+    }
+    void SetName(const std::string& name) override
+    {
+        name_ = name;
+    }
+
+  private:
+    bool end_ = false;
+    std::string name_;
+	std::string text_;
+};

examples/04-point_cloud/main.cpp

@@ -52,7 +52,7 @@ try
     frame::gui::WindowResolution* ptr_window_resolution = nullptr;
     frame::gui::WindowCamera* ptr_window_camera = nullptr;
     frame::gui::WindowCubemap* ptr_window_cubemap = nullptr;
-    auto gui_window = frame::gui::CreateDrawGui(*win.get());
+    auto gui_window = frame::gui::CreateDrawGui(*win.get(), {}, 20.0f);
     {
         auto gui_resolution = std::make_unique<frame::gui::WindowResolution>(
             "Resolution", size, win->GetDesktopSize(), win->GetPixelPerInch());

include/frame/buffer_interface.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include <cstdint>
 
 #include "frame/name_interface.h"
 

include/frame/camera.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/glm.hpp>
 
 namespace frame

include/frame/common/application.h

@@ -22,7 +22,12 @@ class Application
      * @param window: The unique pointer to the window (should have been
      *        created prior).
      */
-    Application(std::unique_ptr<frame::WindowInterface>&& window);
+    Application(std::unique_ptr<frame::WindowInterface> window);
+    /**
+     * @brief Get the Window object.
+     * @return The window.
+     */
+    frame::WindowInterface& GetWindow();
     /**
      * @brief Startup this will initialized the inner level of the window
      *        according to a path.
@@ -34,7 +39,7 @@ class Application
      * @brief Same as previously but this use a level.
      * @param level: A unique pointer to a level.
      */
-    void Startup(std::unique_ptr<frame::LevelInterface>&& level);
+    void Startup(std::unique_ptr<frame::LevelInterface> level);
     /**
      * @brief A helper function that call the inner resize of the window.
      * @param size: The new size of the window.