Merge branch 'feature/ci-asm' into develop

guillaumeblanc · Feb 17, 2024 · b8338f7 · b8338f7
2 parents 0f1e2e2 + c40422f
commit b8338f7
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 10 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -58,7 +58,7 @@ jobs:
             compiler_cxx: clang++-15
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install OpenGL dependency
       run: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -12,7 +12,7 @@ jobs:
           - build_type: Release
             option: default
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install fbx sdk
       if: matrix.option != 'no_fbx'

diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -0,0 +1,24 @@
+name: wasm
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
+      with:
+        repository: emscripten-core/emsdk
+        path: extern/emsdk
+    - name: Build
+      run: |
+        ./build-utils/em-build.sh
+    - name: Uploads artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: samples
+        path: |
+          build-wasm/samples/**/*.html
+          build-wasm/samples/**/*.js
+          build-wasm/samples/**/*.wasm
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -12,7 +12,7 @@ jobs:
           - build_type: Release
             option: default
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install fbx sdk
       if: matrix.option != 'no_fbx'

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+Next release
+----------------------
+
+* Build pipeline
+  - Adds CI for WebAssembly.
+
 Release version 0.14.3
 ----------------------
 

diff --git a/README.md b/README.md
@@ -18,17 +18,17 @@ Documentation and samples are available from [ozz-animation website](http://guil
 Supported platforms
 -------------------
 
-Ozz is tested on Linux, Mac OS and Windows, for x86, x86-64 and ARM architectures. The run-time code (ozz_base, ozz_animation, ozz_geometry) depends only on c++11, on the C and the C++ standard libraries, and has no OS specific code. Portability to any other platform shouldn't be an issue.
+ozz-animation is tested on WebAssembly, Linux, macOS and Windows, for x86, x86-64 and ARM architectures. The run-time code (ozz_base, ozz_animation, ozz_geometry) depends only on c++11, on the C and the C++ standard libraries, and has no OS specific code. Portability to any other platform shouldn't be an issue.
 
 Samples, tools and tests depend on external libraries (glfw, tinygltf, Fbx SDK, jsoncpp, gtest, ...), which could limit portability.
 
 Build status
 ------------
 
-|         | Linux  | macOS | Windows |
-| ------- | ------ | ------ | ------- |
-| master  | [![Linux](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml/badge.svg?branch=master)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml) | [![macOS](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml/badge.svg?branch=master)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml) | [![Windows](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml/badge.svg?branch=master)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml) |
-| develop | [![Linux](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml/badge.svg?branch=develop)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml) | [![macOS](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml/badge.svg?branch=develop)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml) | [![Windows](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml/badge.svg?branch=develop)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml) |
+|         | Linux  | macOS | Windows | WebAssembly |
+| ------- | ------ | ------ | ------- | ------- |
+| master  | [![Linux](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml/badge.svg?branch=master)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml) | [![macOS](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml/badge.svg?branch=master)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml) | [![Windows](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml/badge.svg?branch=master)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml) | [![WASM](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/wasm.yml/badge.svg?branch=master)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/wasm.yml) |
+| develop | [![Linux](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml/badge.svg?branch=develop)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/linux.yml) | [![macOS](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml/badge.svg?branch=develop)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/macos.yml) | [![Windows](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml/badge.svg?branch=develop)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/windows.yml) | [![WASM](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/wasm.yml/badge.svg?branch=develop)](https://github.com/guillaumeblanc/ozz-animation/actions/workflows/wasm.yml) |
 
 The dashboard for all branches is available [here](http://guillaumeblanc.github.io/ozz-animation/documentation/dashboard/).
 

diff --git a/build-utils/em-build.sh b/build-utils/em-build.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Setup emscripten
+cd extern/emsdk
+./emsdk install latest
+./emsdk activate latest
+source ./emsdk_env.sh
+cd ../..
+
+
+# Setup cmake
+mkdir build-wasm
+cd build-wasm
+
+if [[ $# -eq 0 ]] ; then
+  emcmake cmake -DCMAKE_BUILD_TYPE=Release ..
+else
+  emcmake cmake -DCMAKE_BUILD_TYPE=$1 ..
+fi
+
+# Build
+cmake --build .
diff --git a/samples/framework/CMakeLists.txt b/samples/framework/CMakeLists.txt
@@ -30,6 +30,8 @@ add_library(sample_framework STATIC
 if(NOT EMSCRIPTEN)
   add_subdirectory(${PROJECT_SOURCE_DIR}/extern/glfw glfw)
   target_link_libraries(sample_framework glfw)
+else()
+  target_link_options(sample_framework PUBLIC -sUSE_GLFW=2)
 endif()
 
 target_link_libraries(sample_framework

diff --git a/samples/framework/application.cc b/samples/framework/application.cc
@@ -278,7 +278,7 @@ Application::LoopStatus Application::OneLoop(int _loops) {
   }
 #else
   int width, height;
-  if (emscripten_get_canvas_element_size(nullptr, &width, &height) !=
+  if (emscripten_get_canvas_element_size("#canvas", &width, &height) !=
       EMSCRIPTEN_RESULT_SUCCESS) {
     return kBreakFailure;
   }

diff --git a/samples/framework/internal/shader.cc b/samples/framework/internal/shader.cc
@@ -339,7 +339,8 @@ ozz::unique_ptr<PointsShader> PointsShader::Build() {
       "void main() {\n"
       "  vec4 vertex = vec4(a_position.xyz, 1.);\n"
       "  gl_Position = u_mvp * vertex;\n"
-      "  gl_PointSize = a_screen_space == 0. ? a_size / gl_Position.w : a_size;\n"
+      "  gl_PointSize = a_screen_space == 0. ? a_size / gl_Position.w : "
+      "a_size;\n"
       "  v_vertex_color = a_color;\n"
       "}\n";
   const char* kSimplePointsPS =