Merge github.com:Advanced-Effects/Rendering-Lab-App

Author: kaixoo12

.github/workflows/build.yml

@@ -0,0 +1,55 @@
+# This piece of code was made by ChatGPT because I don't care enough to learn this
+
+name: Build project
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: 📥 Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive  # Gets submodules
+
+    - name: Cache APT Packages
+      uses: awalsh128/[email protected]
+      with:
+        packages: cmake ninja-build clang g++ mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libfontconfig1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev libharfbuzz-dev libicu-dev
+
+    - name: ⚙️ Set up dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y cmake ninja-build clang g++
+        sudo apt-get install -y mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev
+        sudo apt-get install -y libglew-dev libglfw3-dev libglm-dev
+        sudo apt-get install -y libfontconfig1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev
+        sudo apt-get install -y libharfbuzz-dev libicu-dev
+
+    - name: Cache build directory
+      uses: actions/cache@v4
+      with:
+        path: build/
+        key: ${{ runner.os }}-build-${{ hashFiles('**/CMakeLists.txt', '**/*.cpp') }}
+        restore-keys: |
+          ${{ runner.os }}-build-
+
+    - name: 🏗️ Configure and build
+      run: |
+        mkdir -p build
+        cd build
+        cmake ..
+        cmake --build . -j$(nproc)
+
+    - name: 📦 Upload executable
+      uses: actions/upload-artifact@v4
+      with:
+        name: RenderingLab
+        path: |
+          build/*
+        if-no-files-found: error

README.md

@@ -2,11 +2,11 @@
 
 An application to test (in isolation) the rendering capabilities of Advanced Effects.
 
-# Roadmap
+## Roadmap
 
 - [x] 🖥️ An OpenGL basic application.
 - [x] 🎨 Integrated with Skia2D.
-- [ ] 🟥 That can draw objects
+- [x] 🟥 That can draw objects
 - [ ] 🕐 animate keyframes with interpolation
 - [ ] 💨 Apply Effects and Modes
 

app/CMakeLists.txt

@@ -1,6 +1,9 @@
 message("-- Creating main executable with target name ${CMAKE_PROJECT_NAME}")
 add_executable(${CMAKE_PROJECT_NAME} main.cpp)
 
+# Tell CMake to find .dlls in 'build/src' so it can find libskia.friction.so
+target_link_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_BINARY_DIR}/src)
+
 include(skia/FindSkiaSystem)
 
 set(EXECUTABLE_LIBRARIES

src/CMakeLists.txt

@@ -28,3 +28,6 @@ set(MODULE_LINK ${LIBRARY_DEPENDENCIES})
 set(MODULE_CUSTOM_DIRECTORIES ${CMAKE_BINARY_DIR}/src)
 
 finish_module()
+
+# tell target where to find .dlls
+target_link_directories(lib${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_BINARY_DIR}/src)

src/ISkiaGLWindow.cpp

@@ -11,8 +11,9 @@
 sk_sp<SkSurface> ISkiaGLWindow::obtainSkiaSurfaceFromCurrentGLContext() {
         auto glContext = m_glWindow->glContext();
 
-        // You've already created your OpenGL context and bound it.
-        sk_sp<const GrGLInterface> interface = nullptr;
+        // Grabs the OpenGL context that is currently set as "current"
+        // (we set it with `glfwMakeContextCurrent` in `main.cpp`)
+        auto interface = GrGLMakeNativeInterface();
 
         const GrContextOptions &grOptions = GrContextOptions();
         m_graphicsContext = GrContext::MakeGL(interface, grOptions);