Merge remote-tracking branch 'origin/master' into orxpy-v2

Author: hcarty

.extern

@@ -1 +1 @@
-e0b9300c29fa
+03cccb9d2b2c

.github/workflows/main.yml

@@ -1,12 +1,15 @@
-name: BuildAll
+name: Build All
 on: push
+env:
+  ORX: ${{github.workspace}}/code
 jobs:
-  
   # Visual Studio
   build-vs:
     name: Visual Studio
     strategy:
       matrix:
+        os:
+          - windows
         version:
           # - 2017 # Not supported by GitHub hosted runners
           - 2019
@@ -18,18 +21,21 @@ jobs:
         platform:
           # - x86 # Not supported by GitHub hosted runners
           - x64
-    runs-on:
-      - windows-${{matrix.version}}
+        include:
+          - os: windows
+            runner: windows-latest
+            setup: setup.bat
+    runs-on: ${{matrix.runner}}
     steps:
       - uses: actions/checkout@v4
       - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: ${{matrix.platform}}
-      - name: Set ORX environment variable
-        run: echo ORX=%CD%\code>> %GITHUB_ENV%
-        shell: cmd
       - name: Setup
-        run: ./setup.bat
+        uses: ./.github/workflows/setup
+        with:
+          os: ${{matrix.os}}
+          setup: ${{matrix.setup}}
       - name: Build engine
         run: msbuild code\build\windows\vs${{matrix.version}}\orx.sln -m -t:rebuild -property:Configuration=${{matrix.config}}
       - name: Build tutorials
@@ -82,28 +88,14 @@ jobs:
             platform: 32 # Not supported by GitHub hosted runners
           - os: mac
             platform: 32 # Not supported by GitHub hosted runners
-    runs-on:
-      - ${{matrix.runner}}
+    runs-on: ${{matrix.runner}}
     steps:
       - uses: actions/checkout@v4
-      - name: Add 32bit architecture
-        run: sudo dpkg --add-architecture i386
-        if: matrix.os == 'linux'
-      - name: Update OS (apt)
-        run: sudo apt-get -qq update
-        if: matrix.os == 'linux'
-      - name: Install OS deps
-        run: sudo apt-get -y install gcc-multilib g++-multilib freeglut3-dev freeglut3-dev:i386 libxrandr-dev libxrandr-dev:i386
-        if: matrix.os == 'linux'
-      - name: Set ORX environment variable
-        run: echo ORX=%CD%\code>> %GITHUB_ENV%
-        shell: cmd
-        if: matrix.os == 'windows'
-      - name: Set ORX environment variable
-        run: echo ORX=$PWD/code>> $GITHUB_ENV
-        if: matrix.os != 'windows'
       - name: Setup
-        run: ./${{matrix.setup}}
+        uses: ./.github/workflows/setup
+        with:
+          os: ${{matrix.os}}
+          setup: ${{matrix.setup}}
       - name: Build engine
         working-directory: code/build/${{matrix.os}}/gmake
         run: ${{matrix.make}} config=${{matrix.config}}${{matrix.platform}}
@@ -132,6 +124,8 @@ jobs:
     name: iOS
     strategy:
       matrix:
+        os:
+          - mac
         config:
           - Debug
           - Profile
@@ -140,21 +134,35 @@ jobs:
           - os
           - simulator
         include:
+          - os: mac
+            runner: macos-latest
+            setup: setup.sh
           - platform: simulator
             extra: -destination 'platform=iOS Simulator,name=iPhone 15'
-    runs-on: macos-latest
+    runs-on: ${{matrix.runner}}
     steps:
       - uses: actions/checkout@v4
       - name: Setup
-        run: ./setup.sh
+        uses: ./.github/workflows/setup
+        with:
+          os: ${{matrix.os}}
+          setup: ${{matrix.setup}}
       - name: Build engine
         working-directory: code/build/ios/xcode/orx-ios.xcodeproj
         run: xcodebuild -workspace project.xcworkspace -scheme orxLIB -configuration=${{matrix.config}} -sdk iphone${{matrix.platform}} ${{matrix.extra}}
 
   # Android
   build-android:
     name: Android
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os:
+          - linux
+        include:
+          - os: linux
+            runner: ubuntu-latest
+            setup: setup.sh
+    runs-on: ${{matrix.runner}}
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
@@ -164,13 +172,75 @@ jobs:
           distribution: 'temurin'
       - name: Set up Android SDK
         uses: android-actions/setup-android@v3
-      - name: Set ORX environment variable
-        run: echo ORX=$PWD/code>> $GITHUB_ENV
       - name: Setup
-        run: ./setup.sh
+        uses: ./.github/workflows/setup
+        with:
+          os: ${{matrix.os}}
+          setup: ${{matrix.setup}}
       - name: Build engine
         working-directory: code/build/android
         run: ./gradlew clean assemble publishAllPublicationsToOrxRepository
       - name: Build demo
         working-directory: code/demo/android
         run: ./gradlew clean assemble
+
+  # Web
+  build-web:
+    name: Web (HTML5)
+    strategy:
+      matrix:
+        os:
+          - windows
+          - linux
+          - mac
+        config:
+          - debug
+          - profile
+          - release
+        include:
+          - os: windows
+            runner: windows-latest
+            setup: setup.bat
+            init: init.bat
+            make: mingw32-make
+            emsdk_env: emsdk/emsdk_env.ps1
+          - os: linux
+            runner: ubuntu-latest
+            setup: setup.sh
+            init: init.sh
+            make: make
+            emsdk_env: emsdk/emsdk_env.sh
+          - os: mac
+            runner: macos-latest
+            setup: setup.sh
+            init: init.sh
+            make: make
+            emsdk_env: emsdk/emsdk_env.sh
+    runs-on: ${{matrix.runner}}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Emscripten
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install latest
+          ./emsdk activate latest
+      - name: Setup
+        uses: ./.github/workflows/setup
+        with:
+          os: ${{matrix.os}}
+          setup: ${{matrix.setup}}
+      - name: Build engine
+        working-directory: code/build/${{matrix.os}}/gmake
+        run: |
+          . ../../../../${{matrix.emsdk_env}}
+          ${{matrix.make}} config=release64 CFLAGS=-D__orxHEADLESS__
+          emmake make config=${{matrix.config}}web
+      - name: Create project
+        run: ./${{matrix.init}} test
+      - name: Build project
+        working-directory: test/build/${{matrix.os}}/gmake
+        run: |
+          . ../../../../${{matrix.emsdk_env}}
+          ${{matrix.make}} config=release64
+          emmake make config=${{matrix.config}}web

.github/workflows/setup/action.yml

@@ -0,0 +1,30 @@
+name: Setup
+inputs:
+  os:
+    required: true
+    type: string
+  setup:
+    required: true
+    type: string
+runs:
+  using: 'composite'
+  steps:
+    - name: Update OS (deps)
+      run: |
+        sudo dpkg --add-architecture i386
+        sudo apt-get -qq update
+        sudo apt-get -y install gcc-multilib g++-multilib freeglut3-dev freeglut3-dev:i386 libxrandr-dev libxrandr-dev:i386
+      shell: bash
+      if: inputs.os == 'linux'
+    - name: Set ORX environment variable
+      run: echo ORX=%CD%\code>> %GITHUB_ENV%
+      shell: cmd
+      if: inputs.os == 'windows'
+    - name: Cache extern
+      uses: actions/cache@v4
+      with:
+        path: cache
+        key: orx-extern
+    - name: Setup
+      run: ./${{inputs.setup}}
+      shell: bash

.vscode/tasks.json

@@ -71,12 +71,13 @@
       }
     },
     {
-      "label": "Build orx (debug, profile, release)",
+      "label": "Build orx (debug, profile, release, web)",
       "dependsOrder": "sequence",
       "dependsOn": [
         "Build orx (debug)",
         "Build orx (profile)",
-        "Build orx (release)"
+        "Build orx (release)",
+        "Build orx (web)"
       ],
       "problemMatcher": "$gcc"
     },
@@ -124,6 +125,15 @@
         "command": "mingw32-make.exe -j config=release64"
       }
     },
+    {
+      "label": "Build orx (web)",
+      "dependsOn": [
+        "Build orx (release)"
+      ],
+      "group": "build",
+      "type": "shell",
+      "command": "emmake make -j config=releaseweb"
+    },
     {
       "label": "Run bounce demo (debug)",
       "dependsOn": [

README.html

@@ -1221,7 +1221,7 @@
   color: var(--color-danger-fg);
 }
 </style><title>README</title></head><body><article class="markdown-body"><p align="center">
-    <a href="https://orx-project.org" rel="nofollow"><img src="/C:/workspace/orx/logo.svg" alt="Orx Engine" width="400" height="auto" style="max-width: 100%;"></a>
+    <a href="https://orx-project.org" rel="nofollow"><img src="/C:/workspace/orx/logo.png" alt="Orx Engine" width="400" height="auto" style="max-width: 100%;"></a>
     <br>
     <strong>A (HEAVILY) DATA-DRIVEN 2D GAME ENGINE</strong>
 </p>
@@ -1234,7 +1234,7 @@
 </p>
 <p align="center">
     <a href="https://orx-project.org" rel="nofollow"><img src="https://camo.githubusercontent.com/8a4af2e34c57dde5f954dca6e40b51223dfa01dba5a49670ef1b7965474147d0/68747470733a2f2f696d672e736869656c64732e696f2f776562736974653f75726c3d68747470732533412532462532466f72782d70726f6a6563742e6f7267" alt="site" data-canonical-src="https://img.shields.io/website?url=https%3A%2F%2Forx-project.org" style="max-width: 100%;"></a>
-    <a href="https://wiki.orx-project.org" rel="nofollow"><img src="https://camo.githubusercontent.com/c8c225d76fd37faa8289c0d2b8826722b528c81ec393977399817210f2dee694/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d732d77696e646f77732532302537432532306c696e75782532302537432532306d6163253230253743253230616e64726f6964253230253743253230696f732d726564" alt="platforms" data-canonical-src="https://img.shields.io/badge/platforms-windows%20%7C%20linux%20%7C%20mac%20%7C%20android%20%7C%20ios-red" style="max-width: 100%;"></a>
+    <a href="https://wiki.orx-project.org" rel="nofollow"><img src="https://camo.githubusercontent.com/38124bd081453633b8d3500c2194ed1bcbdc183143019827e3197b30d589579e/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d732d77696e646f77732532302537432532306c696e75782532302537432532306d61632532302537432532307765622f68746d6c35253230253743253230616e64726f6964253230253743253230696f732d726564" alt="platforms" data-canonical-src="https://img.shields.io/badge/platforms-windows%20%7C%20linux%20%7C%20mac%20%7C%20web/html5%20%7C%20android%20%7C%20ios-red" style="max-width: 100%;"></a>
     <a href="https://github.com/orx/orx/releases"><img src="https://camo.githubusercontent.com/ab9053b92c4edff02ed5a3467a714ae400ccffc26a6aa42dfb011ad2d6ce142a/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f762f72656c656173652f6f72782f6f72783f636f6c6f723d6f72616e6765" alt="releases" data-canonical-src="https://img.shields.io/github/v/release/orx/orx?color=orange" style="max-width: 100%;"></a>
 </p>
 <p align="center">
@@ -1303,6 +1303,7 @@
 <li>Linux (x86/x86-64 with codelite, codeblocks and GNU makefile)</li>
 <li>Windows (x86/x86-64 with vs2017, vs2019 &amp; vs2022, x86/x86-64 mingw-w64 (14.2.0) with codelite, codeblocks and GNU makefile)</li>
 <li>MacOS X (x86/x86-64 with xcode or x86/x86-64 with codelite, codeblocks and GNU makefile), version 10.6+</li>
+<li>Web/HTML5 (Emscripten)</li>
 <li>Android (Gradle build files, simulator &amp; device)</li>
 <li>iOS (iPhone/iPod Touch/iPad, simulator &amp; device with xcode)</li>
 </ul>
@@ -1534,6 +1535,10 @@
 <td>orx is being compiled for Linux</td>
 </tr>
 <tr>
+<td align="center"><code>__orxWEB__</code></td>
+<td>orx is being compiled for Web/HTML5</td>
+</tr>
+<tr>
 <td align="center"><code>__orxIOS__</code></td>
 <td>orx is being compiled for iOS</td>
 </tr>

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-    <a href="https://orx-project.org"><img src="./logo.svg" alt="Orx Engine" width="400" height="auto"></a>
+    <a href="https://orx-project.org"><img src="./logo.png" alt="Orx Engine" width="400" height="auto"></a>
     <br />
     <strong>A (HEAVILY) DATA-DRIVEN 2D GAME ENGINE</strong>
 </p>
@@ -14,7 +14,7 @@
 
 <p align="center">
     <a href="https://orx-project.org"><img src="https://img.shields.io/website?url=https%3A%2F%2Forx-project.org" alt="site"></a>
-    <a href="https://wiki.orx-project.org"><img src="https://img.shields.io/badge/platforms-windows%20%7C%20linux%20%7C%20mac%20%7C%20android%20%7C%20ios-red" alt="platforms"></a>
+    <a href="https://wiki.orx-project.org"><img src="https://img.shields.io/badge/platforms-windows%20%7C%20linux%20%7C%20mac%20%7C%20web/html5%20%7C%20android%20%7C%20ios-red" alt="platforms"></a>
     <a href="https://github.com/orx/orx/releases"><img src="https://img.shields.io/github/v/release/orx/orx?color=orange" alt="releases"></a>
 </p>
 
@@ -102,6 +102,7 @@ The engine compiles for, and is tested on:
 - Linux (x86/x86-64 with codelite, codeblocks and GNU makefile)
 - Windows (x86/x86-64 with vs2017, vs2019 & vs2022, x86/x86-64 mingw-w64 (14.2.0) with codelite, codeblocks and GNU makefile)
 - MacOS X (x86/x86-64 with xcode or x86/x86-64 with codelite, codeblocks and GNU makefile), version 10.6+
+- Web/HTML5 (Emscripten)
 - Android (Gradle build files, simulator & device)
 - iOS (iPhone/iPod Touch/iPad, simulator & device with xcode)
 
@@ -269,6 +270,7 @@ for which you're compiling. Here's a quick list of these flags:
   `__orxWINDOWS__`        | orx is being compiled for Windows
   `__orxMAC__`            | orx is being compiled for MacOS X
   `__orxLINUX__`          | orx is being compiled for Linux
+  `__orxWEB__`            | orx is being compiled for Web/HTML5
   `__orxIOS__`            | orx is being compiled for iOS
   `__orxANDROID__`        | orx is being compiled for Android
   `__orxCPP__`            | orx is being compiled with a C++ compiler