Merge pull request #159 from JacobDomagala/151-v003-release

[#151]: `v0.0.3` release

Author: JacobDomagala

.github/workflows/code_quality.yml

@@ -18,16 +18,19 @@ jobs:
         echo "#!/bin/bash
         root_dir=\${1}
         build_dir=\${2}
-        pip install conan==1.59.0 --break-system-packages
-        conan install \$root_dir --install-folder=build --build=missing --settings=build_type=Release -c tools.system.package_manager:mode=install
+        pip install conan --break-system-packages
+        conan profile detect
+        conan install \$root_dir --output-folder=build --build=missing --settings=build_type=Release -c tools.system.package_manager:mode=install
         wget https://sdk.lunarg.com/sdk/download/1.3.216.0/linux/vulkansdk-linux-x86_64-1.3.216.0.tar.gz
-        tar xf vulkansdk-linux-x86_64-1.3.216.0.tar.gz -C \$root_dir/dependencies
-        source \$root_dir/dependencies/1.3.216.0/setup-env.sh" > init_script.sh
+        mkdir vulkan
+        tar xf vulkansdk-linux-x86_64-1.3.216.0.tar.gz -C \$root_dir/vulkan
+        source \$root_dir/vulkan/1.3.216.0/setup-env.sh" > init_script.sh
 
     - name: Run static analysis
       uses: JacobDomagala/StaticAnalysis@master
       with:
-        exclude_dir: dependencies
+        cmake_args: -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
+        exclude_dir: vulkan
         init_script: init_script.sh
         apt_pckgs: xorg-dev python3-pip
         verbose: true

.github/workflows/ubuntu.yml

@@ -28,7 +28,7 @@ jobs:
         libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-dri3-dev \
         libxcb-util-dev libxcb-cursor-dev
 
-        pip install conan==1.59.0
+        pip install conan
 
         wget https://sdk.lunarg.com/sdk/download/$SDK_VERSION/linux/vulkansdk-linux-x86_64-$SDK_VERSION.tar.gz
         tar xf vulkansdk-linux-x86_64-$SDK_VERSION.tar.gz
@@ -46,8 +46,7 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         # Use newer ABI
-        conan profile new default --detect
-        conan profile update settings.compiler.libcxx=libstdc++11 default
+        conan profile detect
         conan install $GITHUB_WORKSPACE --output-folder=build --build=missing --settings=build_type=$BUILD_TYPE
 
     - name: Run CMake
@@ -56,7 +55,8 @@ jobs:
       run: |
         source ${{runner.workspace}}/Looper/$SDK_VERSION/setup-env.sh
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWARNINGS_AS_ERRORS=ON -DENABLE_INCLUDE_WHAT_YOU_USE=OFF\
-           -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=OFF -DENABLE_SANITIZER_LEAK=ON -DUNITY_BUILD=ON
+           -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=OFF -DENABLE_SANITIZER_LEAK=ON -DUNITY_BUILD=ON\
+           -DCMAKE_TOOLCHAIN_FILE=build/conan_toolchain.cmake
 
     - name: Build
       working-directory: ${{runner.workspace}}/build

.github/workflows/windows.yml

@@ -39,8 +39,6 @@ jobs:
     - name: Install Conan
       id: conan
       uses: turtlebrowser/get-conan@main
-      with:
-        version: 1.59.0
 
     - name: Cache Conan packages
       id: cache-conan
@@ -60,7 +58,7 @@ jobs:
       run: |
         $env:VULKAN_SDK="$env:VULKAN_DIR\$env:SDK_VERSION"
 
-        cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE
+        cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=${{runner.workspace}}\build\build\conan_toolchain.cmake
         cmake --build . --config $env:BUILD_TYPE > output.txt
         cat output.txt
 

.gitignore

@@ -318,4 +318,5 @@ dependencies/glfw/glfw*
 *imgui.ini
 /CMakeSettings.json
 *.cache/*
-compile_commands.json
+compile_commands.json
+CMakeUserPresets.json

CMakeLists.txt

@@ -36,7 +36,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(cmake/util_functions.cmake)
 
-add_subdirectory(dependencies)
 add_subdirectory(engine)
 add_subdirectory(game)
 add_subdirectory(editor)
@@ -47,4 +46,4 @@ compile_shader(SOURCE_FILE "${SHADERS_PATH}/default.frag"  OUTPUT_FILE_NAME "${S
 compile_shader(SOURCE_FILE "${SHADERS_PATH}/ui.vert"  OUTPUT_FILE_NAME "${SHADERS_PATH}/ui.vert.spv")
 compile_shader(SOURCE_FILE "${SHADERS_PATH}/ui.frag"  OUTPUT_FILE_NAME "${SHADERS_PATH}/ui.frag.spv")
 compile_shader(SOURCE_FILE "${SHADERS_PATH}/line.vert"  OUTPUT_FILE_NAME "${SHADERS_PATH}/line.vert.spv")
-compile_shader(SOURCE_FILE "${SHADERS_PATH}/line.frag"  OUTPUT_FILE_NAME "${SHADERS_PATH}/line.frag.spv")
+compile_shader(SOURCE_FILE "${SHADERS_PATH}/line.frag"  OUTPUT_FILE_NAME "${SHADERS_PATH}/line.frag.spv")

README.md

@@ -4,8 +4,7 @@
 # Looper
 Looper is a game engine with an integrated editor and a 2D type game with a level editor, all written in modern C++20. It uses Vulkan for rendering and ImGui/glfw3 for UI and window/input handling. The project is compatible with Ubuntu and Windows.
 
-
-[![Watch the video](https://raw.githubusercontent.com/wiki/JacobDomagala/Looper/Looper_github.gif)](https://www.youtube.com/watch?v=Qh-vOKMPQGQ)
+![gif](https://raw.githubusercontent.com/wiki/JacobDomagala/Looper/Looper_github.gif)
 
 ## Requirements
 - C++20 compatible compiler (e.g. GCC, Clang, MSVC)
@@ -22,9 +21,6 @@ The typical build process would look like this:
 # Create build directory
 mkdir build && cd build
 
-# Use newer ABI
-conan profile new default --detect
-conan profile update settings.compiler.libcxx=libstdc++11 default
 conan install .. --output-folder=build --build=missing --settings=build_type=Release
 
 # Generate build system for Windows/Linux
@@ -43,5 +39,9 @@ cmake --build .
 ## Contributing
 If you would like to contribute to the project, please fork the repository and submit a pull request with your proposed changes. We welcome any improvements or new features that enhance the functionality and user experience of Looper.
 
+## Youtube
+For past and future video logs, please visit my [Youtube](https://www.youtube.com/watch?v=Qh-vOKMPQGQ&list=PLRLVUsGGaSH-s0A_2w_eo2LQEfTZuqi7Y) channel. <br>
+[![Playlist](https://img.youtube.com/vi/cyZFLKrvoPc/0.jpg)](https://www.youtube.com/watch?v=cyZFLKrvoPc&list=PLRLVUsGGaSH-s0A_2w_eo2LQEfTZuqi7Y "YouTube Playlist")
+
 ## License
 Please refer to the LICENSE file in the repository for details on the licensing of this project.

conanfile.txt

@@ -4,10 +4,10 @@
 fmt/10.1.0
 glfw/3.3.8
 imgui/1.89.9
-stb/20200203
+stb/cci.20230920
 glm/0.9.9.8
 nlohmann_json/3.11.2
 
 [generators]
-cmake_find_package_multi
-cmake
+CMakeToolchain
+CMakeDeps

dependencies/CMakeLists.txt

@@ -593,7 +593,7 @@ Editor::Render(VkCommandBuffer cmdBuffer)
          const auto idx = static_cast< size_t >(layer);
          const auto& numObjects = renderData.numMeshes.at(idx);
          const auto renderThisLayer = renderLayerToDraw_ == -1 ? true : renderLayerToDraw_ == layer;
-         
+
          if (numObjects == 0 or !renderThisLayer)
          {
             continue;
@@ -804,6 +804,8 @@ Editor::CreateLevel(const std::string& name, const glm::ivec2& size)
    m_levelFileName = (LEVELS_DIR / (name + ".dgl")).string();
    gui_.LevelLoaded(m_currentLevel);
 
+   m_currentLevel->GenerateTextureForCollision();
+
    SetupRendererData();
 }
 
@@ -1037,14 +1039,20 @@ Editor::Update()
 
    if (m_animateGameObject && m_currentSelectedGameObject)
    {
-      auto moveBy = std::dynamic_pointer_cast< Animatable >(m_currentSelectedGameObject)
-                       ->SingleAnimate(m_deltaTime);
+      const auto& animatable = std::dynamic_pointer_cast< Animatable >(m_currentSelectedGameObject);
+      auto moveBy = animatable->SingleAnimate(deltaTime_);
 
       if (glm::length(moveBy) > 0.0f)
       {
+         const auto prevPosition = m_currentSelectedGameObject->GetPreviousPosition();
+         const auto direction = m_currentSelectedGameObject->GetPosition() - prevPosition;
+
+         const auto viewAngle = glm::atan(direction.y, direction.x);
+
+         m_currentSelectedGameObject->Rotate(viewAngle);
          m_currentSelectedGameObject->Move(moveBy);
       }
-      else
+      else if (animatable->AnimationFinished())
       {
          m_animateGameObject = false;
       }
@@ -1123,6 +1131,8 @@ Editor::MainLoop()
       while (IsRunning() and (singleFrameTimer.count() >= TARGET_TIME_MICRO))
       {
          const time::ScopedTimer frameTimer(&timeLastFrame_);
+
+         deltaTime_ = m_timer.GetMsDeltaTime();
          InputManager::PollEvents();
 
          // Run all deffered work units
@@ -1159,6 +1169,8 @@ Editor::MainLoop()
          {
             LaunchGameLoop();
          }
+
+         m_timer.ToggleTimer();
       }
    }
 }