Merge branch 'SuperTux:master' into tux-run

.github/workflows/macos.yml

@@ -30,14 +30,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, macos-11]
+        os: [macos-11]
         build_type: [Debug, Release]
         glbinding: [ON, OFF]
         include:
-          - os: macos-10.15
-            build_type: Release
-            glbinding: OFF
-            release: ON
           - os: macos-11
             build_type: Release
             glbinding: OFF
@@ -52,7 +48,7 @@ jobs:
           submodules: true
 
       - name: Install macos dependencies
-        if: ${{ matrix.os == 'macos-10.15' ||  matrix.os == 'macos-11' }}
+        if: ${{ matrix.os == 'macos-11' }}
         run: |
           brew install cmake googletest bash rename libogg libvorbis glew\
                        openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz  \
@@ -85,8 +81,7 @@ jobs:
                    -DWARNINGS=ON -DWERROR=ON -DGLBINDING_ENABLED=$GLBINDING    \
                    -DENABLE_DISCORD=ON -DCMAKE_INSTALL_MESSAGE=NEVER           \
                    -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_SUBDIR_BIN=bin        \
-                   -DINSTALL_SUBDIR_SHARE=share/supertux2 -DBUILD_TESTS=ON     \
-                   -DCMAKE_EXE_LINKER_FLAGS="-L/usr/local/lib"
+                   -DINSTALL_SUBDIR_SHARE=share/supertux2 -DBUILD_TESTS=ON
 
       - name: Build and install
         working-directory: build
@@ -138,9 +133,6 @@ jobs:
         env:
           OS: ${{ matrix.os }}
         run: |
-          if [ "$OS" = "macos-10.15" ]; then
-            rename 's/.dmg/-10.15.dmg/' build/upload/SuperTux-*
-          fi
           if [ "$OS" = "macos-11" ]; then
             rename 's/.dmg/-11.dmg/' build/upload/SuperTux-*
           fi

.github/workflows/wasm.yml

@@ -31,7 +31,7 @@ jobs:
       matrix:
         build_type: ["Release", "Debug"]
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -46,38 +46,8 @@ jobs:
           sudo apt-get install -y git cmake build-essential curl zip
           git clone https://github.com/emscripten-core/emsdk.git
           cd emsdk
-          ./emsdk install 1.40.1
-          ./emsdk activate 1.40.1
-          # Fixes a bug in emscripten - see https://github.com/emscripten-core/emscripten/issues/13590
-          sed -i "s/\#define MALLOC_ALIGNMENT ((size_t)(2 \* sizeof(void \*)))/#define MALLOC_ALIGNMENT 16/g" upstream/emscripten/system/lib/dlmalloc.c
-          # Fixes a bug with the libjpeg port - see https://github.com/emscripten-core/emscripten/pull/13878
-          sed -i 's/2b581c60ae401a79bbbe748ff2deeda5acd50bfd2ea22e5926e36d34b9ebcffb6580b0ff48e972c1441583e30e21e1ea821ca0423f9c67ce08a31dffabdbe6b7/b2affe9a1688bd49fc033f4682c4a242d4ee612f1affaef532f5adcb4602efc4433c4a52a4b3d69e7440ff1f6413b1b041b419bc90efd6d697999961a9a6afb7/g' upstream/emscripten/tools/ports/libjpeg.py
-          sed -i 's/https:\/\/dl.bintray.com\/homebrew\/mirror\/jpeg-9c.tar.gz/https:\/\/storage.googleapis.com\/webassembly\/emscripten-ports\/jpegsrc.v9c.tar.gz/g' upstream/emscripten/tools/ports/libjpeg.py
-
-      - name: Install vcpkg and dependencies
-        run: |
-          source ~/emsdk/emsdk_env.sh
-          cd ~
-          git clone https://github.com/microsoft/vcpkg
-          ./vcpkg/bootstrap-vcpkg.sh
-          ./vcpkg/vcpkg integrate install
-          ./vcpkg/vcpkg install glbinding:wasm32-emscripten
-          ./vcpkg/vcpkg install libpng:wasm32-emscripten
-          ./vcpkg/vcpkg install libogg:wasm32-emscripten
-          ./vcpkg/vcpkg install libvorbis:wasm32-emscripten
-          ./vcpkg/vcpkg install glm:wasm32-emscripten
-          ./vcpkg/vcpkg install zlib:wasm32-emscripten
-
-      - name: Step To run on failure
-        if: ${{ failure() }}
-        run: | 
-          cat /home/runner/vcpkg/buildtrees/libogg/config-wasm32-emscripten-dbg-CMakeCache.txt.log
-          cat /home/runner/vcpkg/buildtrees/libogg/config-wasm32-emscripten-rel-CMakeCache.txt.log
-          cat /home/runner/vcpkg/buildtrees/libogg/config-wasm32-emscripten-out.log
-
-      - name: Patch SDL_ttf
-        working-directory: external/SDL_ttf
-        run: git apply ../../mk/emscripten/SDL_ttf.patch
+          ./emsdk install latest
+          ./emsdk activate latest
 
       - name: Configure build
         env:
@@ -86,10 +56,8 @@ jobs:
           source ~/emsdk/emsdk_env.sh
           mkdir build
           cd build
-          emcmake cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_OPENGLES2=ON \
-                -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake\
-                -DVCPKG_TARGET_TRIPLET=wasm32-emscripten -DGLBINDING_ENABLED=ON\
-                -DEMSCRIPTEN=1 -DWARNINGS=ON -DWERROR=ON ..
+          # TODO: Re-add -DWERROR=ON when warnings will be fixed
+          emcmake cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWARNINGS=ON ..
 
       - name: Sync data folder
         working-directory: build
@@ -111,7 +79,7 @@ jobs:
         env:
           BUILD_TYPE: ${{ matrix.build_type }}
         run: |
-          rm supertux2.html && cp template.html supertux2.html
+          cp template.html supertux2.html
           mkdir upload/
           mv supertux2* upload/
 
@@ -129,4 +97,5 @@ jobs:
           cd build/upload/
           mv supertux2.html index.html
           zip supertux2.zip *
-          curl -F "archive=@$(pwd)/supertux2.zip" -F "message=$(git log --format=%B -n 1 | head -1)" $UPLOAD_URL
+          # TODO: Decomment (or replace URL with a different host)
+          # curl -F "archive=@$(pwd)/supertux2.zip" -F "message=$(git log --format=%B -n 1 | head -1)" $UPLOAD_URL

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "tools/miniswig"]
 	path = tools/miniswig
 	url = https://github.com/WindstilleTeam/miniswig
+[submodule "external/glm"]
+	path = external/glm
+	url = https://github.com/g-truc/glm.git

CMakeLists.txt

@@ -50,6 +50,13 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+# This should be set only with windows Visual Studio generator builds
+string(TOLOWER "${CMAKE_GENERATOR_PLATFORM}" PLATFORM)
+if(${PLATFORM} MATCHES "arm64")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_ARM64_ /DMY_CPU_LE")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_ARM64_ /DMY_CPU_LE")
+endif()
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/mk/cmake)
 include(ConfigureFiles)
 include(ExternalProject)
@@ -97,14 +104,16 @@ if(EMSCRIPTEN)
   set(CMAKE_EXECUTABLE_SUFFIX .html)
   set(IS_EMSCRIPTEN_BUILD ON)
 
-  set(USE_FLAGS " -sUSE_SDL=2 -sFULL_ES2=1 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=2 -sUSE_PTHREADS=1 -sDISABLE_EXCEPTION_CATCHING=0 --preload-file ${BUILD_CONFIG_DATA_DIR} -sTOTAL_MEMORY=67108864 -sALLOW_MEMORY_GROWTH=1 -sSDL2_IMAGE_FORMATS='[\"png\",\"jpg\"]' --use-preload-plugins")
+  set(EM_USE_FLAGS "-sDISABLE_EXCEPTION_CATCHING=0")
+  set(EM_LINK_FLAGS " -sTOTAL_MEMORY=67108864 -sALLOW_MEMORY_GROWTH=1 -sERROR_ON_UNDEFINED_SYMBOLS=0 --preload-file ${BUILD_CONFIG_DATA_DIR} --use-preload-plugins -lidbfs.js")
   if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(USE_FLAGS "${USE_FLAGS} -fsanitize=undefined -sSAFE_HEAP=1 -sASSERTIONS=1 -sDEMANGLE_SUPPORT=1")
+    set(EM_USE_FLAGS "${EM_USE_FLAGS} -fsanitize=undefined")
+    set(EM_LINK_FLAGS "${EM_LINK_FLAGS} -fsanitize=undefined -sSAFE_HEAP=1 -sASSERTIONS=1 -sDEMANGLE_SUPPORT=1")
   endif()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${USE_FLAGS} -sERROR_ON_UNDEFINED_SYMBOLS=0")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${USE_FLAGS} -sERROR_ON_UNDEFINED_SYMBOLS=0")
-  set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${USE_FLAGS} -sERROR_ON_UNDEFINED_SYMBOLS=0 -lidbfs.js")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${USE_FLAGS} -sERROR_ON_UNDEFINED_SYMBOLS=0 -lidbfs.js")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EM_USE_FLAGS}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EM_USE_FLAGS}")
+  set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${EM_USE_FLAGS} ${EM_LINK_FLAGS}")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${EM_USE_FLAGS} ${EM_LINK_FLAGS}")
 endif()
 
 # TODO: Add " OR ANDROID OR IOS" to this
@@ -148,6 +157,7 @@ endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   add_definitions(-DMACOSX)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
 endif()
 
 ## Add lots of dependencies to compiler switches
@@ -227,7 +237,7 @@ target_link_libraries(supertux2 supertux2_lib)
 set_target_properties(supertux2_lib PROPERTIES OUTPUT_NAME supertux2_lib)
 set_target_properties(supertux2_lib PROPERTIES COMPILE_FLAGS "${SUPERTUX2_EXTRA_WARNING_FLAGS}")
 if(EMSCRIPTEN)
-  target_link_options(supertux2 PUBLIC -sEXPORTED_FUNCTIONS=['_main','_set_resolution','_save_config','_onDownloadProgress','_onDownloadFinished','_onDownloadError','_onDownloadAborted','_getExceptionMessage'] PUBLIC -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap'] PUBLIC -sEXTRA_EXPORTED_RUNTIME_METHODS=['ccall','cwrap'])
+  target_link_options(supertux2 PUBLIC -sEXPORTED_FUNCTIONS=['_main','_set_resolution','_save_config','_onDownloadProgress','_onDownloadFinished','_onDownloadError','_onDownloadAborted','_getExceptionMessage'] PUBLIC -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap'])
 endif()
 
 if(WIN32 AND NOT VCPKG_BUILD)
@@ -254,18 +264,20 @@ if(NOT EMSCRIPTEN)
   target_link_libraries(supertux2_lib PUBLIC LibSDL2 LibSDL2_image)
 endif()
 
-target_link_libraries(supertux2_lib PUBLIC LibSDL2_ttf)
 target_link_libraries(supertux2_lib PUBLIC LibSquirrel)
 target_link_libraries(supertux2_lib PUBLIC LibSqstdlib)
 target_link_libraries(supertux2_lib PUBLIC LibTinygettext)
 target_link_libraries(supertux2_lib PUBLIC LibSexp)
 target_link_libraries(supertux2_lib PUBLIC LibSavePNG)
 target_link_libraries(supertux2_lib PUBLIC LibPartioZip)
 target_link_libraries(supertux2_lib PUBLIC LibOpenAL)
-target_link_libraries(supertux2_lib PUBLIC LibOggVorbis)
 target_link_libraries(supertux2_lib PUBLIC LibGlm)
 target_link_libraries(supertux2_lib PUBLIC LibFmt)
 target_link_libraries(supertux2_lib PUBLIC LibPhysfs)
+if(NOT EMSCRIPTEN)
+  target_link_libraries(supertux2_lib PUBLIC LibSDL2_ttf)
+  target_link_libraries(supertux2_lib PUBLIC LibOggVorbis)
+endif()
 
 if(HAVE_OPENGL)
   target_link_libraries(supertux2_lib PUBLIC LibOpenGL)

INSTALL.md

@@ -109,6 +109,11 @@ For ease of use, here are some installation lines for some Linux distributions:
   sudo apt-get update && sudo apt-get install -y cmake build-essential libogg-dev libvorbis-dev libopenal-dev libsdl2-dev libsdl2-image-dev libfreetype6-dev libraqm-dev libcurl4-openssl-dev libglew-dev libharfbuzz-dev libfribidi-dev libglm-dev zlib1g-dev
   ```
 
+- ArchLinux (using sudo, as of June 3rd 2023)
+  ```
+  sudo pacman -Sy cmake base-devel libogg libvorbis openal sdl2 sdl2_image freetype2 libraqm curl openssl glew harfbuzz fribidi glm zlib
+  ```
+
 ### Linux/UNIX using CMake
 
 SuperTux uses CMake to generate a set of Makefiles for the build
@@ -458,57 +463,43 @@ toolchain; newer versions are known not to work properly.
 git submodule update --init --recursive
 ```
 
-1. Patch SDL_ttf by applying the patch in `mk/emscripten/SDL_ttf.patch`:
-```
-# For git users:
-git apply mk/emscripten/SDL_ttf.patch
-
-# If you do not have git installed:
-patch -p1 < mk/emscripten/SDL_ttf.patch
-```
-
-2. Install dependencies using Vcpkg (Make sure you enabled Emscripten and ran
-`source .../emsdk_env.sh`!):
+1. Install [Emscripten](emscripten.org):
 ```
-vcpkg integrate install
-vcpkg install --target wasm32-emscripten glbinding libpng libogg libvorbis glm zlib
+git clone https://github.com/emscripten-core/emsdk.git
+cd emsdk
+./emsdk install latest
+./emsdk activate latest
+source ./emsdk_env.sh
 ```
 
-3. Run CMake using Emscripten's wrapper:
+2. Run CMake using Emscripten's wrapper:
 ```
-emcmake cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENGLES2=ON -DCMAKE_TOOLCHAIN_FILE=/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=wasm32-emscripten -DGLBINDING_ENABLED=ON -DEMSCRIPTEN=1 ..
+# Make sure you ran `source /path/to/emsdk/emsdk_env.sh` if you opened a new terminal since last step!
+emcmake cmake -DCMAKE_BUILD_TYPE=Release ..
 ```
-Replace `/path/to/vcpkg` with the absolute path to where Vcpkg is installed.
-Note that Debug builds are generally unplayably slow. Also, the
-`-DENABLE_OPENGLES2=ON` flag is optional and will enable using WebGL instead of
-the SDL renderer. Currently, the WebGL renderer is much slower than the SDL
-renderer.
 
-4. Copy data files to the build folder, as Emscripten will package them to make
+3. Copy data files to the build folder, as Emscripten will package them to make
 them usable from WASM:
 ```
 rsync -aP ../data/ data/
 ```
 
-5. Build SuperTux:
+4. Build SuperTux:
 ```
 emmake make -j$(nproc || sysctl -n hw.ncpu || echo 2)
 ```
 
-6. Replace the Emscripten HTML template with SuperTux's custom container:
+5. Replace the Emscripten HTML template with SuperTux's custom container:
 ```
-rm supertux2.html && cp template.html supertux2.html
+cp template.html supertux2.html
 ```
 You may skip the step above you intend to directly open the `template.html` file;
 note that SuperTux won't work if it is not located in the custom template, as it
 requires some custom JavaScript functions to work properly.
 
-7. Run the Emscripten webserver:
+6. Run the Emscripten webserver:
 ```
-# Without --no-browser, Emscripten does not wait for data to finish downloading,
-# which fails the process. It only works by launching Emscripten in no-browser
-# mode, and then by opening the browser manually.
-emrun --no_browser .
+emrun supertux2.html
 ```
 
 You can now play SuperTux by opening `http://localhost:6931/supertux2.html` in

data/images/background/corrupted_forest/test

@@ -0,0 +1 @@
+dgbyfjgfjduku

data/images/creatures/dive_mine/dive_mine.sprite

@@ -0,0 +1,58 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (fps 12.0)
+  (hitbox 14 19 32 32)
+  (images "left-0.png"
+          "left-1.png"
+          "left-2.png"
+          "left-3.png"
+		  "left-4.png"
+		  "left-5.png"
+		  "left-6.png"
+		  "left-7.png"
+		  "left-8.png"
+		  "left-9.png"
+		  "left-10.png"
+		  "left-11.png"))
+
+ (action
+  (name "right")
+  (fps 12.0)
+  (hitbox 14 19 32 32)
+  (mirror-action "left"))
+
+ (action
+  (name "iced-left")
+  (hitbox 5 8 32 32)
+  (images "left-0.png"))
+
+ (action
+  (name "iced-right")
+  (hitbox 5 8 32 32)
+  (mirror-action "iced-left"))
+
+ (action
+  (name "ticking-left")
+  (fps 15.0)
+  (hitbox 14 19 32 32)
+  (images "ticking-0.png"
+          "ticking-1.png"
+          "ticking-2.png"
+          "ticking-3.png"
+          "ticking-4.png"
+		  "ticking-5.png"
+		  "ticking-6.png"
+		  "ticking-7.png"
+		  "ticking-8.png"
+		  "ticking-9.png"
+          ))
+
+
+ (action
+  (name "ticking-right")
+  (fps 15.0)
+  (hitbox 14 19 32 32)
+  (mirror-action "ticking-left"))
+
+)

data/images/creatures/dive_mine/ticking_glow/ticking_glow.sprite

@@ -0,0 +1,19 @@
+(supertux-sprite
+    (action
+      (name "idle")
+      (fps 15)
+      (images "ticking_glow-4.png")
+      (hitbox 48 48 0 0)
+    )
+
+    (action
+      (name "ticking")
+      (fps 15)
+      (images "ticking_glow-0.png"
+              "ticking_glow-1.png"
+              "ticking_glow-2.png"
+              "ticking_glow-3.png"
+              "ticking_glow-4.png")
+      (hitbox 48 48 0 0)
+    )
+)