diff --git a/README.md b/README.md index 4e916b5..bfb7f59 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,11 @@ The sdlcanvas subpackage provides a very simple way to get started with just a f - Linux - Windows - OSX (untested) +- Android -When using just the canvas package without the sdlcanvas subpackage, this can probably also be made to work for Android and iOS, but this is as yet untested and would require the GL interface to be implemented for the platform. +iOS should work as well, but still needs to be implemented. + +Unfortunately using full Go apps using gomobile doesn't work since gomobile does not seem to create a GL view with a stencil buffer, and the canvas package makes heavy use of the stencil buffer. Therefore the ```gomobile bind``` command has to be used together with platform specific projects. # Example diff --git a/examples/android/CanvasAndroidExample/.gitignore b/examples/android/CanvasAndroidExample/.gitignore new file mode 100644 index 0000000..5edb4ee --- /dev/null +++ b/examples/android/CanvasAndroidExample/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/examples/android/CanvasAndroidExample/.idea/caches/build_file_checksums.ser b/examples/android/CanvasAndroidExample/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..1ddb894 Binary files /dev/null and b/examples/android/CanvasAndroidExample/.idea/caches/build_file_checksums.ser differ diff --git a/examples/android/CanvasAndroidExample/.idea/codeStyles/Project.xml b/examples/android/CanvasAndroidExample/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/examples/android/CanvasAndroidExample/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/.idea/encodings.xml b/examples/android/CanvasAndroidExample/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/examples/android/CanvasAndroidExample/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/.idea/gradle.xml b/examples/android/CanvasAndroidExample/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/examples/android/CanvasAndroidExample/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/.idea/misc.xml b/examples/android/CanvasAndroidExample/.idea/misc.xml new file mode 100644 index 0000000..dc34569 --- /dev/null +++ b/examples/android/CanvasAndroidExample/.idea/misc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/.idea/runConfigurations.xml b/examples/android/CanvasAndroidExample/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/examples/android/CanvasAndroidExample/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/app/.gitignore b/examples/android/CanvasAndroidExample/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/examples/android/CanvasAndroidExample/app/build.gradle b/examples/android/CanvasAndroidExample/app/build.gradle new file mode 100644 index 0000000..540fa7d --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/build.gradle @@ -0,0 +1,27 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 26 + defaultConfig { + applicationId "com.example.canvasandroidexample" + minSdkVersion 15 + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.aar']) + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/examples/android/CanvasAndroidExample/app/libs/canvasandroidexample-sources.jar b/examples/android/CanvasAndroidExample/app/libs/canvasandroidexample-sources.jar new file mode 100644 index 0000000..ebf05bc Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/libs/canvasandroidexample-sources.jar differ diff --git a/examples/android/CanvasAndroidExample/app/libs/canvasandroidexample.aar b/examples/android/CanvasAndroidExample/app/libs/canvasandroidexample.aar new file mode 100644 index 0000000..9f6eb98 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/libs/canvasandroidexample.aar differ diff --git a/examples/android/CanvasAndroidExample/app/proguard-rules.pro b/examples/android/CanvasAndroidExample/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/examples/android/CanvasAndroidExample/app/src/androidTest/java/com/example/canvasandroidexample/ExampleInstrumentedTest.java b/examples/android/CanvasAndroidExample/app/src/androidTest/java/com/example/canvasandroidexample/ExampleInstrumentedTest.java new file mode 100644 index 0000000..39b7560 --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/androidTest/java/com/example/canvasandroidexample/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.example.canvasandroidexample; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.example.canvasandroidexample", appContext.getPackageName()); + } +} diff --git a/examples/android/CanvasAndroidExample/app/src/main/AndroidManifest.xml b/examples/android/CanvasAndroidExample/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..ab15940 --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/app/src/main/java/com/example/canvasandroidexample/MainActivity.java b/examples/android/CanvasAndroidExample/app/src/main/java/com/example/canvasandroidexample/MainActivity.java new file mode 100644 index 0000000..c6c10fb --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/java/com/example/canvasandroidexample/MainActivity.java @@ -0,0 +1,61 @@ +package com.example.canvasandroidexample; + +import android.app.Activity; +import android.opengl.*; +import android.os.Bundle; +import android.view.MotionEvent; +import android.view.View; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +import canvasandroidexample.Canvasandroidexample; + +public class MainActivity extends Activity implements GLSurfaceView.Renderer { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + GLSurfaceView view = new GLSurfaceView(this); + view.setEGLContextClientVersion(2); + view.setEGLConfigChooser(8, 8, 8, 8, 0, 8); + view.setRenderer(this); + view.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + int x = Math.round(event.getX()); + int y = Math.round(event.getY()); + if (event.getAction() == MotionEvent.ACTION_DOWN) { + Canvasandroidexample.touchEvent("down", x, y); + } else if (event.getAction() == MotionEvent.ACTION_UP) { + Canvasandroidexample.touchEvent("up", x, y); + } else if (event.getAction() == MotionEvent.ACTION_MOVE) { + Canvasandroidexample.touchEvent("move", x, y); + } + return true; + } + }); + setContentView(view); + } + + @Override + protected void onResume() { + super.onResume(); + } + + @Override + public void onSurfaceCreated(GL10 gl, EGLConfig config) { + Canvasandroidexample.onSurfaceCreated(); + } + + @Override + public void onSurfaceChanged(GL10 gl, int width, int height) { + Canvasandroidexample.onSurfaceChanged(width, height); + } + + @Override + public void onDrawFrame(GL10 gl) { + Canvasandroidexample.onDrawFrame(); + } +} diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/android/CanvasAndroidExample/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c3903ed --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml b/examples/android/CanvasAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..5713f34 --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a2f5908 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..1b52399 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..ff10afd Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..115a4c7 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..dcd3cd8 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..459ca60 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..8ca12fe Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8e19b41 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..b824ebd Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..4c19a13 Binary files /dev/null and b/examples/android/CanvasAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/values/colors.xml b/examples/android/CanvasAndroidExample/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/values/strings.xml b/examples/android/CanvasAndroidExample/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..d8603ef --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + CanvasAndroidExample + diff --git a/examples/android/CanvasAndroidExample/app/src/main/res/values/styles.xml b/examples/android/CanvasAndroidExample/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..ff6c9d2 --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/examples/android/CanvasAndroidExample/app/src/test/java/com/example/canvasandroidexample/ExampleUnitTest.java b/examples/android/CanvasAndroidExample/app/src/test/java/com/example/canvasandroidexample/ExampleUnitTest.java new file mode 100644 index 0000000..11d000b --- /dev/null +++ b/examples/android/CanvasAndroidExample/app/src/test/java/com/example/canvasandroidexample/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.example.canvasandroidexample; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/examples/android/CanvasAndroidExample/build.gradle b/examples/android/CanvasAndroidExample/build.gradle new file mode 100644 index 0000000..1a3d812 --- /dev/null +++ b/examples/android/CanvasAndroidExample/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.2' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/examples/android/CanvasAndroidExample/gradle.properties b/examples/android/CanvasAndroidExample/gradle.properties new file mode 100644 index 0000000..743d692 --- /dev/null +++ b/examples/android/CanvasAndroidExample/gradle.properties @@ -0,0 +1,13 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/examples/android/CanvasAndroidExample/gradle/wrapper/gradle-wrapper.jar b/examples/android/CanvasAndroidExample/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/examples/android/CanvasAndroidExample/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/android/CanvasAndroidExample/gradle/wrapper/gradle-wrapper.properties b/examples/android/CanvasAndroidExample/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..759c3fa --- /dev/null +++ b/examples/android/CanvasAndroidExample/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu May 10 15:38:02 CEST 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/examples/android/CanvasAndroidExample/gradlew b/examples/android/CanvasAndroidExample/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/examples/android/CanvasAndroidExample/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +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 + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +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 + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +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` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# 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" "$@" diff --git a/examples/android/CanvasAndroidExample/gradlew.bat b/examples/android/CanvasAndroidExample/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/examples/android/CanvasAndroidExample/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +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 + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/android/CanvasAndroidExample/settings.gradle b/examples/android/CanvasAndroidExample/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/examples/android/CanvasAndroidExample/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/examples/android/README.md b/examples/android/README.md new file mode 100644 index 0000000..72e796c --- /dev/null +++ b/examples/android/README.md @@ -0,0 +1 @@ +The go bindings were generated with the ```gomobile bind``` command, which results in a .aar and a .jar file. These are in the CanvasAndroidExample/app/libs directory. diff --git a/examples/android/android.go b/examples/android/android.go new file mode 100644 index 0000000..246a974 --- /dev/null +++ b/examples/android/android.go @@ -0,0 +1,45 @@ +package canvasandroidexample + +import ( + "math" + "time" + + "github.com/tfriedel6/canvas" + "github.com/tfriedel6/canvas/glandroidimpl" +) + +var cv *canvas.Canvas +var mx, my float64 + +func TouchEvent(typ string, x, y int) { + mx, my = float64(x), float64(y) +} + +func OnSurfaceCreated() { +} + +func OnSurfaceChanged(w, h int) { + err := canvas.LoadGL(glandroidimpl.GLImpl{}) + if err != nil { + time.Sleep(100 * time.Millisecond) + panic(err) + } + cv = canvas.New(0, 0, 0, 0) + cv.SetSize(w, h) +} + +func OnDrawFrame() { + if cv == nil { + return + } + w, h := float64(cv.Width()), float64(cv.Height()) + + cv.SetFillStyle("#000") + cv.FillRect(0, 0, w, h) + cv.SetFillStyle("#0F0") + cv.FillRect(w*0.25, h*0.25, w*0.5, h*0.5) + cv.SetLineWidth(6) + sqrSize := math.Min(w, h) * 0.1 + cv.SetStrokeStyle("#F00") + cv.StrokeRect(mx-sqrSize/2, my-sqrSize/2, sqrSize, sqrSize) +} diff --git a/glandroidimpl/glandroidimpl.go b/glandroidimpl/glandroidimpl.go new file mode 100644 index 0000000..e1b588c --- /dev/null +++ b/glandroidimpl/glandroidimpl.go @@ -0,0 +1,224 @@ +package glandroidimpl + +// #include +// #include +// #cgo android LDFLAGS: -lGLESv2 +import "C" +import ( + "fmt" + "reflect" + "unsafe" + + "github.com/tfriedel6/canvas" +) + +type GLImpl struct{} + +var _ canvas.GL = GLImpl{} + +func (_ GLImpl) Ptr(data interface{}) unsafe.Pointer { + if data == nil { + return unsafe.Pointer(nil) + } + var addr unsafe.Pointer + v := reflect.ValueOf(data) + switch v.Type().Kind() { + case reflect.Ptr: + e := v.Elem() + switch e.Kind() { + case + reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, + reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, + reflect.Float32, reflect.Float64: + addr = unsafe.Pointer(e.UnsafeAddr()) + default: + panic(fmt.Errorf("unsupported pointer to type %s; must be a slice or pointer to a singular scalar value or the first element of an array or slice", e.Kind())) + } + case reflect.Uintptr: + addr = unsafe.Pointer(v.Pointer()) + case reflect.Slice: + addr = unsafe.Pointer(v.Index(0).UnsafeAddr()) + default: + panic(fmt.Errorf("unsupported type %s; must be a slice or pointer to a singular scalar value or the first element of an array or slice", v.Type())) + } + return addr +} +func (_ GLImpl) ActiveTexture(texture uint32) { + C.glActiveTexture(C.uint(texture)) +} +func (_ GLImpl) AttachShader(program uint32, shader uint32) { + C.glAttachShader(C.uint(program), C.uint(shader)) +} +func (_ GLImpl) BindBuffer(target uint32, buffer uint32) { + C.glBindBuffer(C.uint(target), C.uint(buffer)) +} +func (_ GLImpl) BindTexture(target uint32, texture uint32) { + C.glBindTexture(C.uint(target), C.uint(texture)) +} +func (_ GLImpl) BlendFunc(sfactor uint32, dfactor uint32) { + C.glBlendFunc(C.uint(sfactor), C.uint(dfactor)) +} +func (_ GLImpl) BufferData(target uint32, size int, data unsafe.Pointer, usage uint32) { + C.glBufferData(C.uint(target), C.long(size), data, C.uint(usage)) +} +func (_ GLImpl) Clear(mask uint32) { + C.glClear(C.uint(mask)) +} +func (_ GLImpl) ColorMask(red bool, green bool, blue bool, alpha bool) { + var r, g, b, a C.uchar + if red { + r = 1 + } + if green { + g = 1 + } + if blue { + b = 1 + } + if alpha { + a = 1 + } + C.glColorMask(r, g, b, a) +} +func (_ GLImpl) CompileShader(shader uint32) { + C.glCompileShader(C.uint(shader)) +} +func (_ GLImpl) CreateProgram() uint32 { + return uint32(C.glCreateProgram()) +} +func (_ GLImpl) CreateShader(xtype uint32) uint32 { + return uint32(C.glCreateShader(C.uint(xtype))) +} +func (_ GLImpl) DeleteShader(shader uint32) { + C.glDeleteShader(C.uint(shader)) +} +func (_ GLImpl) DeleteTextures(n int32, textures *uint32) { + C.glDeleteTextures(C.int(n), (*C.uint)(textures)) +} +func (_ GLImpl) DisableVertexAttribArray(index uint32) { + C.glDisableVertexAttribArray(C.uint(index)) +} +func (_ GLImpl) DrawArrays(mode uint32, first int32, count int32) { + C.glDrawArrays(C.uint(mode), C.int(first), C.int(count)) +} +func (_ GLImpl) Enable(cap uint32) { + C.glEnable(C.uint(cap)) +} +func (_ GLImpl) EnableVertexAttribArray(index uint32) { + C.glEnableVertexAttribArray(C.uint(index)) +} +func (_ GLImpl) GenBuffers(n int32, buffers *uint32) { + C.glGenBuffers(C.int(n), (*C.uint)(buffers)) +} +func (_ GLImpl) GenTextures(n int32, textures *uint32) { + C.glGenTextures(C.int(n), (*C.uint)(textures)) +} +func (_ GLImpl) GenerateMipmap(target uint32) { + C.glGenerateMipmap(C.uint(target)) +} +func (_ GLImpl) GetAttribLocation(program uint32, name string) int32 { + cname := C.CString(name) + defer C.free(unsafe.Pointer(cname)) + return int32(C.glGetAttribLocation(C.uint(program), cname)) +} +func (_ GLImpl) GetError() uint32 { + return uint32(C.glGetError()) +} +func (_ GLImpl) GetProgramInfoLog(program uint32) string { + var length C.int + C.glGetProgramiv(C.uint(program), C.GL_INFO_LOG_LENGTH, &length) + if length == 0 { + return "" + } + clog := C.CBytes(make([]byte, int(length)+1)) + defer C.free(clog) + C.glGetProgramInfoLog(C.uint(program), C.int(length), nil, (*C.char)(clog)) + return string(C.GoBytes(clog, length)) +} +func (_ GLImpl) GetProgramiv(program uint32, pname uint32, params *int32) { + C.glGetProgramiv(C.uint(program), C.uint(pname), (*C.int)(params)) +} +func (_ GLImpl) GetShaderInfoLog(program uint32) string { + var length C.int + C.glGetShaderiv(C.uint(program), C.GL_INFO_LOG_LENGTH, &length) + if length == 0 { + return "" + } + clog := C.CBytes(make([]byte, int(length)+1)) + defer C.free(clog) + C.glGetShaderInfoLog(C.uint(program), C.int(length), nil, (*C.char)(clog)) + return string(C.GoBytes(clog, length)) +} +func (_ GLImpl) GetShaderiv(shader uint32, pname uint32, params *int32) { + C.glGetShaderiv(C.uint(shader), C.uint(pname), (*C.int)(params)) + +} +func (_ GLImpl) GetUniformLocation(program uint32, name string) int32 { + cname := C.CString(name) + defer C.free(unsafe.Pointer(cname)) + return int32(C.glGetUniformLocation(C.uint(program), cname)) +} +func (_ GLImpl) LinkProgram(program uint32) { + C.glLinkProgram(C.uint(program)) +} +func (_ GLImpl) ReadPixels(x int32, y int32, width int32, height int32, format uint32, xtype uint32, pixels unsafe.Pointer) { + C.glReadPixels(C.int(x), C.int(y), C.int(width), C.int(height), C.uint(format), C.uint(xtype), pixels) +} +func (_ GLImpl) Scissor(x int32, y int32, width int32, height int32) { + C.glScissor(C.int(x), C.int(y), C.int(width), C.int(height)) +} +func (_ GLImpl) ShaderSource(shader uint32, source string) { + csource := C.CString(source) + defer C.free(unsafe.Pointer(csource)) + C.glShaderSource(C.uint(shader), 1, &csource, nil) +} +func (_ GLImpl) StencilFunc(xfunc uint32, ref int32, mask uint32) { + C.glStencilFunc(C.uint(xfunc), C.int(ref), C.uint(mask)) +} +func (_ GLImpl) StencilMask(mask uint32) { + C.glStencilMask(C.uint(mask)) +} +func (_ GLImpl) StencilOp(fail uint32, zfail uint32, zpass uint32) { + C.glStencilOp(C.uint(fail), C.uint(zfail), C.uint(zpass)) +} +func (_ GLImpl) TexImage2D(target uint32, level int32, internalformat int32, width int32, height int32, border int32, format uint32, xtype uint32, pixels unsafe.Pointer) { + C.glTexImage2D(C.uint(target), C.int(level), C.int(internalformat), C.int(width), C.int(height), C.int(border), C.uint(format), C.uint(xtype), pixels) +} +func (_ GLImpl) TexParameteri(target uint32, pname uint32, param int32) { + C.glTexParameteri(C.uint(target), C.uint(pname), C.int(param)) +} +func (_ GLImpl) TexSubImage2D(target uint32, level int32, xoffset int32, yoffset int32, width int32, height int32, format uint32, xtype uint32, pixels unsafe.Pointer) { + C.glTexSubImage2D(C.uint(target), C.int(level), C.int(xoffset), C.int(yoffset), C.int(width), C.int(height), C.uint(format), C.uint(xtype), pixels) +} +func (_ GLImpl) Uniform1f(location int32, v0 float32) { + C.glUniform1f(C.int(location), C.float(v0)) +} +func (_ GLImpl) Uniform1i(location int32, v0 int32) { + C.glUniform1i(C.int(location), C.int(v0)) +} +func (_ GLImpl) Uniform2f(location int32, v0 float32, v1 float32) { + C.glUniform2f(C.int(location), C.float(v0), C.float(v1)) +} +func (_ GLImpl) Uniform4f(location int32, v0 float32, v1 float32, v2 float32, v3 float32) { + C.glUniform4f(C.int(location), C.float(v0), C.float(v1), C.float(v2), C.float(v3)) +} +func (_ GLImpl) UniformMatrix3fv(location int32, count int32, transpose bool, value *float32) { + var t C.uchar + if transpose { + t = 1 + } + C.glUniformMatrix3fv(C.int(location), C.int(count), t, (*C.float)(value)) +} +func (_ GLImpl) UseProgram(program uint32) { + C.glUseProgram(C.uint(program)) +} +func (_ GLImpl) VertexAttribPointer(index uint32, size int32, xtype uint32, normalized bool, stride int32, offset uint32) { + var n C.uchar + if normalized { + n = 1 + } + C.glVertexAttribPointer(C.uint(index), C.int(size), C.uint(xtype), n, C.int(stride), unsafe.Pointer(uintptr(offset))) +} +func (_ GLImpl) Viewport(x int32, y int32, width int32, height int32) { + C.glViewport(C.int(x), C.int(y), C.int(width), C.int(height)) +}