Merge pull request #134 from still-flow/fix_hyperroid

Fix hyperroid builds

.github/workflows/gh_ci_android.yml

@@ -0,0 +1,68 @@
+name: Github CI on Android
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  android_build:
+    name: Test build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Validate gradle-wrapper.jar
+      uses: gradle/wrapper-validation-action@v1
+    - name: Install build dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install gcc libsdl1.2-dev libsdl-ttf2.0-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libglew-dev libpng-dev
+    - name: Build
+      run: |
+        cd hyperroid
+        ./copy.sh
+        ./gradlew assembleDebug
+    - name: Upload APK
+      uses: actions/upload-artifact@v2
+      with:
+        name: hyperroid_debug
+        path: hyperroid/app/build/outputs/apk/debug/app-debug.apk
+
+  android_test:
+    needs: android_build
+    name: Test-run in emulator
+    runs-on: macos-latest
+    steps:
+    - name: Download APK
+      uses: actions/download-artifact@v2
+      with:
+        name: hyperroid_debug
+    - name: Create a helper wait script
+      run: |
+        cat > wait-for-load.sh << ENDOFSCRIPT
+        #!/bin/sh
+        while ! adb logcat -d "HyperRogue:V" "*:S" | grep "Game initialized"
+        do
+          sleep 2
+        done
+        ENDOFSCRIPT
+        chmod u+x wait-for-load.sh
+    - name: Run in emulator
+      uses: ReactiveCircus/android-emulator-runner@v2.11.1
+      with:
+        api-level: 28
+        emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -no-snapstorage -noaudio -no-boot-anim -skin 1440x2560
+        script: |
+          adb wait-for-device
+          adb install -t app-debug.apk
+          adb shell am start -W -n com.roguetemple.hyperroid/com.roguetemple.hyperroid.HyperRogue
+          ./wait-for-load.sh
+          adb shell input keyevent 41 # send "M" keypress to display main menu
+          adb shell screencap /sdcard/hyperroid.png
+          adb pull /sdcard/hyperroid.png
+    - name: Upload screenshot
+      uses: actions/upload-artifact@v2
+      with:
+        name: screenshot
+        path: hyperroid.png

fake.cpp

@@ -615,6 +615,7 @@ EX void configure() {
     };
   }
   
+#if CAP_COMMANDLINE
 int readArgs() {
   using namespace arg;
            
@@ -631,6 +632,7 @@ int readArgs() {
   }
 
 auto fundamentalhook = addHook(hooks_args, 100, readArgs);
+#endif
 
 EX }
 

hyperroid/README.md

@@ -1,8 +1,8 @@
 This directory contains the sources of the Android port of HyperRogue.
 
 You should copy the sound and music files from HyperRogue's main directory to
-the directories here; also `language-data.cpp` file generated during HyperRogue's build
-process is required. This is done by the script `copy.sh`.
+the directories here; also `autohdr.h` and `language-data.cpp` files generated during HyperRogue's build
+process are required. This is done by the script `copy.sh`.
 
 The 'low quality' versions of music files are already in their location (copying them
 is uncommented in copy.sh).

hyperroid/app/src/main/jni/hyper.cpp

@@ -169,6 +169,8 @@ Java_com_roguetemple_hyperroid_HyperRogue_glhrinit(MOBPAR_FORMAL)
 {
     __android_log_print(ANDROID_LOG_WARN, "HyperRogue", "glhr::init %d\n", 0);
     #if HNEW
+    // matched_programs get clobbered on activity destruction -- force their re-creation
+    if (!matched_programs.empty()) matched_programs.clear();
     glhr::init();
     #endif
     __android_log_print(ANDROID_LOG_WARN, "HyperRogue", "glhr::init done %d\n", 0);
@@ -310,7 +312,7 @@ extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_draw(MOBPAR_FORMAL) {
   // text is drawn with 'textured'  
   dynamicval<eModel> p(pmodel, mdManual);
   current_display->next_shader_flags = GF_TEXTURE;
-  current_display->set_all(0);
+  current_display->set_all(0, 0);
   glhr::set_depthtest(false);
   current_display->set_viewport(0);
   current_display->set_mask(0);

hyperroid/copy.sh

@@ -7,12 +7,12 @@ mkdir -p app/src/main/res/raw/
 #do cp ../music/hr3-$x.ogg app/src/main/res/raw/$x.ogg
 #done
 
-# make sure that language-data.cpp is generated
-if [ ! -f ../language-data.cpp ]; then
-    echo "File language-data.cpp not found! Trying to compile and run langen"
-    cd ..
-    g++ langen.cpp -o langen
-    ./langen > language-data.cpp
-    ls -l langen language-data.cpp
-    cd hyperroid
+# make sure autohdr.h is generated
+# language-data.cpp is a make dependency of autohdr.h, so it's generated as well
+if [ ! -f ../autohdr.h ]; then
+    echo "generating autohdr.h..."
+    LAST_PWD=$(pwd); cd ..
+    make -f Makefile.simple autohdr.h
+    cd $LAST_PWD
 fi
+

hyperroid/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

hyperroid/gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

mobile.cpp

@@ -250,7 +250,7 @@ EX void mobile_draw(MOBPAR_FORMAL) {
         if(h < rad*SKIPFAC) { lmouseover = cwt.at; mousedest.d = -1; }
         else {
           double d = vid.revcontrol ? -1 : 1;
-          mouseh = hpxy(dx * d / rad, dy * d / rad);
+          mouseh = shiftless(hpxy(dx * d / rad, dy * d / rad));
           calcMousedest();          
           }
         }
@@ -270,7 +270,7 @@ EX void mobile_draw(MOBPAR_FORMAL) {
   inmenu = isize(screens) > 1;
 
   if(!inmenu && vid.stereo_mode == sLR && ors::mode)
-    mousex = vid.xres/2, mousey = vid.yres/2, mouseh = sphereflip * C0;
+    mousex = vid.xres/2, mousey = vid.yres/2, mouseh = shiftless(sphereflip * C0);
 
   frames++;
   models::configure();
@@ -352,7 +352,7 @@ EX void mobile_draw(MOBPAR_FORMAL) {
   
 #if CAP_RUG
   if(andmode == 1 && normal_reaction && rug::rugged && clicked)
-    rug::move_forward((ticks - lticks_rug) / 2500.);
+    rug::finger_on(2, (ticks - lticks_rug) / 2500.);
 #endif
   
   lticks_rug = ticks;

sky.cpp

@@ -446,7 +446,9 @@ EX void make_air() {
     if(vid.antialias & AA_LINES)
       glEnable(GL_LINE_SMOOTH);
 
+#if CAP_SDL
     if(anyshiftclick) IMAGESAVE(airbuf->render(), "air.png");
+#endif
     rb.reset();
     }
 

surface.cpp

@@ -843,7 +843,9 @@ int surface_args() {
   }
 #endif
 
+#if CAP_COMMANDLINE
 auto surface_hook = addHook(hooks_args, 100, surface_args);
+#endif
 
 void display_coverage() {