From f2d2ef1067e45818ea195fa9fc4d2889056d1b16 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Mon, 29 Jul 2019 22:54:50 +0200 Subject: [PATCH] add focus project, fix recovery save on ui thread, fix grid commit, wave_sdk submodule, use PlatformActivity as base for android/quest/focus and extend VRActivity on focus. --- .gitignore | 6 +- .gitmodules | 3 + android/android/build.gradle | 4 +- .../omixlab/panopainter/PlatformActivity.java | 6 + android/focus/CMakeLists.txt | 155 +++++++ android/focus/build-run.bat | 4 + android/focus/build.gradle | 197 +++++++++ android/focus/build_sdk.gradle | 55 +++ android/focus/gradle.properties | 1 + .../focus/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android/focus/gradlew | 164 ++++++++ android/focus/gradlew.bat | 90 ++++ android/focus/local.properties | 9 + android/focus/ppkey.jks | Bin 0 -> 2285 bytes android/focus/src/main/AndroidManifest.xml | 30 ++ android/focus/src/main/cpp/wave_vr.cpp | 398 ++++++++++++++++++ android/focus/src/main/cpp/wave_vr.h | 18 + .../com/omixlab/panopainter/Platform.java | 5 + .../omixlab/panopainter/PlatformActivity.java | 9 + android/quest/build.gradle | 2 +- android/quest/src/main/cpp/oculus_vr.cpp | 16 +- .../omixlab/panopainter/PlatformActivity.java | 6 + android/src/cpp/main.cpp | 16 +- .../com/omixlab/panopainter/MainActivity.java | 8 +- libs/wave_sdk | 1 + src/app_cloud.cpp | 2 +- src/canvas.cpp | 24 +- src/canvas.h | 2 +- src/main.cpp | 2 +- src/node_panel_grid.cpp | 3 - 31 files changed, 1206 insertions(+), 36 deletions(-) create mode 100644 android/android/src/main/java/com/omixlab/panopainter/PlatformActivity.java create mode 100644 android/focus/CMakeLists.txt create mode 100644 android/focus/build-run.bat create mode 100644 android/focus/build.gradle create mode 100644 android/focus/build_sdk.gradle create mode 100644 android/focus/gradle.properties create mode 100644 android/focus/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/focus/gradle/wrapper/gradle-wrapper.properties create mode 100644 android/focus/gradlew create mode 100644 android/focus/gradlew.bat create mode 100644 android/focus/local.properties create mode 100644 android/focus/ppkey.jks create mode 100644 android/focus/src/main/AndroidManifest.xml create mode 100644 android/focus/src/main/cpp/wave_vr.cpp create mode 100644 android/focus/src/main/cpp/wave_vr.h create mode 100644 android/focus/src/main/java/com/omixlab/panopainter/Platform.java create mode 100644 android/focus/src/main/java/com/omixlab/panopainter/PlatformActivity.java create mode 100644 android/quest/src/main/java/com/omixlab/panopainter/PlatformActivity.java create mode 160000 libs/wave_sdk diff --git a/.gitignore b/.gitignore index 79d784a..650b2b9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ PanoPainter.sdf *.iml android/.idea android/android/build/ -android/android/gradle/ android/android/.gradle/ android/android/.externalNativeBuild/ android/android/.idea @@ -21,6 +20,11 @@ android/quest/.gradle/ android/quest/.externalNativeBuild/ android/quest/.idea android/quest/src/main/assets/ +android/focus/build/ +android/focus/.gradle/ +android/focus/.externalNativeBuild/ +android/focus/.idea +android/focus/src/main/assets/ android/local.properties data/brushes diff --git a/.gitmodules b/.gitmodules index 927159e..4ded6dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "libs/glad"] path = libs/glad url = https://bitbucket.org/omigamedev/glad.git +[submodule "libs/wave_sdk"] + path = libs/wave_sdk + url = https://bitbucket.org/omigamedev/wave_sdk.git diff --git a/android/android/build.gradle b/android/android/build.gradle index 49cee59..c82b031 100644 --- a/android/android/build.gradle +++ b/android/android/build.gradle @@ -64,13 +64,13 @@ def ver_tag = "git describe --tags --abbrev=0".execute().text.trim() println classpath android { - compileSdkVersion 26 + compileSdkVersion 28 android.buildToolsVersion "28.0.3" defaultConfig { applicationId = 'com.omixlab.panopainter' minSdkVersion 19 - targetSdkVersion 26 + targetSdkVersion 28 versionCode ver_count versionName "${ver_tag}.${ver_count}" // This block is different from the one you use to link Gradle diff --git a/android/android/src/main/java/com/omixlab/panopainter/PlatformActivity.java b/android/android/src/main/java/com/omixlab/panopainter/PlatformActivity.java new file mode 100644 index 0000000..9b9a805 --- /dev/null +++ b/android/android/src/main/java/com/omixlab/panopainter/PlatformActivity.java @@ -0,0 +1,6 @@ +package com.omixlab.panopainter; + +import android.app.NativeActivity; + +public class PlatformActivity extends NativeActivity { +} diff --git a/android/focus/CMakeLists.txt b/android/focus/CMakeLists.txt new file mode 100644 index 0000000..9bbebf3 --- /dev/null +++ b/android/focus/CMakeLists.txt @@ -0,0 +1,155 @@ +# Sets the minimum version of CMake required to build your native library. +# This ensures that a certain set of CMake features is available to +# your build. + +cmake_minimum_required(VERSION 3.4.1) + +# build native_app_glue as a static lib +add_library( + app-glue STATIC + ../../libs/native_app_glue/android_native_app_glue.c +) + +add_library(wvr_api SHARED IMPORTED) +set_target_properties( + wvr_api + PROPERTIES IMPORTED_LOCATION + ${CMAKE_SOURCE_DIR}/../../libs/wave_sdk/wvr_client/lib/${ANDROID_ABI}/libwvr_api.so +) + +# Specifies a library name, specifies whether the library is STATIC or +# SHARED, and provides relative paths to the source code. You can +# define multiple libraries by adding multiple add.library() commands, +# and CMake builds them for you. When you build your app, Gradle +# automatically packages shared libraries with your APK. + +# now build app's shared lib +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + +add_library( + native-lib SHARED + ../../libs/yoga/yoga/log.cpp + ../../libs/yoga/yoga/Utils.cpp + ../../libs/yoga/yoga/YGConfig.cpp + ../../libs/yoga/yoga/YGEnums.cpp + ../../libs/yoga/yoga/YGLayout.cpp + ../../libs/yoga/yoga/YGMarker.cpp + ../../libs/yoga/yoga/YGNode.cpp + ../../libs/yoga/yoga/YGNodePrint.cpp + ../../libs/yoga/yoga/YGStyle.cpp + ../../libs/yoga/yoga/YGValue.cpp + ../../libs/yoga/yoga/Yoga.cpp + ../../libs/tinyxml2/tinyxml2.cpp + ../../libs/jpeg/jpgd.cpp + ../../libs/jpeg/jpge.cpp + ../../libs/poly2tri/poly2tri/common/shapes.cc + ../../libs/poly2tri/poly2tri/sweep/advancing_front.cc + ../../libs/poly2tri/poly2tri/sweep/cdt.cc + ../../libs/poly2tri/poly2tri/sweep/sweep_context.cc + ../../libs/poly2tri/poly2tri/sweep/sweep.cc + ../../libs/fmt/src/format.cc + ../src/cpp/main.cpp + src/main/cpp/wave_vr.cpp + ../../src/pch.cpp + ../../src/util.cpp + ../../src/rtt.cpp + ../../src/bezier.cpp + ../../src/asset.cpp + ../../src/image.cpp + ../../src/texture.cpp + ../../src/font.cpp + ../../src/shader.cpp + ../../src/shape.cpp + ../../src/app.cpp + ../../src/app_cloud.cpp + ../../src/app_dialogs.cpp + ../../src/app_events.cpp + ../../src/app_layout.cpp + ../../src/app_shaders.cpp + ../../src/app_vr.cpp + ../../src/brush.cpp + ../../src/canvas.cpp + ../../src/canvas_layer.cpp + ../../src/canvas_actions.cpp + ../../src/canvas_modes.cpp + ../../src/log.cpp + ../../src/action.cpp + ../../src/layout.cpp + ../../src/version.cpp + ../../src/node.cpp + ../../src/node_about.cpp + ../../src/node_border.cpp + ../../src/node_button.cpp + ../../src/node_button_custom.cpp + ../../src/node_canvas.cpp + ../../src/node_checkbox.cpp + ../../src/node_color_quad.cpp + ../../src/node_colorwheel.cpp + ../../src/node_combobox.cpp + ../../src/node_changelog.cpp + ../../src/node_dialog_browse.cpp + ../../src/node_dialog_cloud.cpp + ../../src/node_dialog_open.cpp + ../../src/node_dialog_picker.cpp + ../../src/node_dialog_layer_rename.cpp + ../../src/node_dialog_resize.cpp + ../../src/node_icon.cpp + ../../src/node_image.cpp + ../../src/node_image_texture.cpp + ../../src/node_message_box.cpp + ../../src/node_panel_brush.cpp + ../../src/node_panel_color.cpp + ../../src/node_panel_grid.cpp + ../../src/node_panel_floating.cpp + ../../src/node_panel_layer.cpp + ../../src/node_panel_stroke.cpp + ../../src/node_panel_quick.cpp + ../../src/node_popup_menu.cpp + ../../src/node_progress_bar.cpp + ../../src/node_settings.cpp + ../../src/node_slider.cpp + ../../src/node_stroke_preview.cpp + ../../src/node_text.cpp + ../../src/node_text_input.cpp + ../../src/node_tool_bucket.cpp + ../../src/node_usermanual.cpp + ../../src/node_viewport.cpp + ../../src/node_scroll.cpp + ../../src/abr.cpp + ../../src/binary_stream.cpp + ../../src/serializer.cpp + ../../src/settings.cpp +) + +target_include_directories(native-lib PRIVATE + ../../libs/wave_sdk/wvr_client/include + src/main/cpp + ../src/cpp + ../../src + ../../libs/glm + ../../libs/tinyxml2 + ../../libs/yoga + ../../libs/stb + ../../libs/jpeg + ../../libs/curl-android-ios/android/include + ../../libs/poly2tri/poly2tri + ../../libs/base64 + ../../libs/sqlite3 + ../../libs/nanort + ../../libs/native_app_glue + ../../libs/hash-library + ../../libs/fmt/include +) + +# add lib dependencies +target_link_libraries( + native-lib + wvr_api + android + app-glue + ${CMAKE_SOURCE_DIR}/../../libs/curl-android-ios/android/${ANDROID_ABI}/libcurl.a + EGL + GLESv3 + log + z +) diff --git a/android/focus/build-run.bat b/android/focus/build-run.bat new file mode 100644 index 0000000..9036f94 --- /dev/null +++ b/android/focus/build-run.bat @@ -0,0 +1,4 @@ +xcopy /I /D /Y /S /E ..\data src\main\assets\data +call gradlew installDebug +call adb shell am start -n com.omigamedev/android.app.NativeActivity +pause \ No newline at end of file diff --git a/android/focus/build.gradle b/android/focus/build.gradle new file mode 100644 index 0000000..4068c9c --- /dev/null +++ b/android/focus/build.gradle @@ -0,0 +1,197 @@ +import java.util.regex.Matcher +import java.util.regex.Pattern + +buildscript { + repositories { + google() + jcenter() + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath 'com.android.tools.build:gradle:3.3.0' + classpath "gradle.plugin.com.gladed.gradle.androidgitversion:gradle-android-git-version:0.4.5" + } +} + +allprojects { + repositories { + google() // and here + jcenter() + flatDir{ + dirs '../../libs/wave_sdk/wvr_client' + } + } +} + +apply plugin: "com.android.application" +apply plugin: "com.gladed.androidgitversion" + +def jniDir = "src/main/jni" +def aarFilename = "wvr_client" + +// unzip aar +def unzipDir = file("${buildDir}/${aarFilename}") +def aarFile = file("${projectDir}/../../libs/wave_sdk/wvr_client/${aarFilename}.aar") +if (aarFile != null) { + copy { + println 'unzip ' + aarFile + from zipTree(aarFile) + into unzipDir + } +} + +def getCurrentFlavor() { + Gradle gradle = getGradle() + + if (gradle.getStartParameter().getTaskRequests().args.size() == 0) + return "" + String tskReqStr = gradle.getStartParameter().getTaskRequests().args[0][0] + Pattern pattern + + pattern = Pattern.compile("(\\w*)(Release|Debug)") + + Matcher matcher = pattern.matcher( tskReqStr ) + + if( matcher.find() ) + return matcher.group(2).toLowerCase() + else + { + println "NO MATCH FOUND" + return "" + } +} + +def flavor = getCurrentFlavor() +def flavor_cap = getCurrentFlavor().capitalize() + +Properties properties = new Properties() +properties.load(project.rootProject.file('local.properties').newDataInputStream()) +def sdkDir = properties.getProperty("sdk.dir") +def classpath = "build/intermediates/javac/${flavor}/compile${flavor_cap}JavaWithJavac/classes;${sdkDir}/platforms/android-26/android.jar;${unzipDir}/classes.jar" +def activity = "com.omixlab.panopainter.MainActivity" +def outpath = "src/main/cpp" + +def ver_branch = "git rev-parse --abbrev-ref HEAD".execute().text.trim() +def ver_hash = "git log --pretty=format:%h -n 1".execute().text.trim() +def ver_count = Integer.parseInt("git rev-list --count HEAD".execute().text.trim()) +def ver_tag = "git describe --tags --abbrev=0".execute().text.trim() + +println classpath + +android { + compileSdkVersion 28 + android.buildToolsVersion "28.0.3" + + defaultConfig { + applicationId = 'com.omixlab.panopainter' + minSdkVersion 19 + targetSdkVersion 28 + versionCode ver_count + versionName "${ver_tag}.${ver_count}" + // This block is different from the one you use to link Gradle + // to your CMake or ndk-build script. + externalNativeBuild { + // For ndk-build, instead use the ndkBuild block + cmake { + // Passes optional arguments to CMake. + //arguments "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang" + // Sets optional flags for the C compiler. + //cFlags "-D_EXAMPLE_C_FLAG1", "-D_EXAMPLE_C_FLAG2" + // Sets a flag to enable format macro constants for the C++ compiler. + cppFlags "-D__FOCUS__=1" + arguments "-DANDROID_TOOLCHAIN=clang", + //"-DANDROID_PLATFORM=android-19", + "-DANDROID_STL=c++_shared", + "-DCMAKE_BUILD_TYPE=${flavor_cap}", + "-DANDROID_ARM_NEON=TRUE" + } + } + ndk { + // Specifies the ABI configurations of your native + // libraries Gradle should build and package with your APK. + // abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a' + abiFilters 'armeabi-v7a' + } + } + + // productFlavors { + // main { + // externalNativeBuild { + // cmake { + // targets "native-lib-demo" + // } + // } + // } + // } + + signingConfigs { + release { + storeFile file("ppkey.jks") + storePassword "om4r@Pano#Painter_2018" + keyAlias "PanoPainter" + keyPassword "om4r@Pano#Painter_2018" + } + } + + buildTypes { + release { + minifyEnabled false + proguardFile getDefaultProguardFile('proguard-android.txt') + signingConfig signingConfigs.release + } + } + + // Encapsulates your external native build configurations. + externalNativeBuild { + // Encapsulates your CMake build configurations. + cmake { + // Provides a relative path to your CMake build script. + path "CMakeLists.txt" + } + } + + sourceSets { + main { + manifest.srcFile 'src/main/AndroidManifest.xml' + java.srcDirs = ['../src/java', 'src/main/java'] + jniLibs.srcDirs = ['../../libs/wave_sdk/wvr_client/lib'] + res.srcDirs = ['../src/res'] + //assets.srcDirs = ['../../assets'] + } + } + +} + +task copyFiles(type: Copy) { + from '../../data/' + into 'src/main/assets/data' +} +preBuild.dependsOn(copyFiles) + +task generateVersioning(type: Exec) { + workingDir "$projectDir/../../" + commandLine 'python', 'scripts/pre-build.py', flavor +} +copyFiles.dependsOn(generateVersioning) + +task generateJavaH(type: Exec) { + ignoreExitValue true + workingDir "$projectDir" + commandLine 'javah', "-jni", "-force", "-cp", "$classpath", "-d", "$outpath", "$activity" +} +//generateVersioning.dependsOn(generateJavaH) + +tasks.whenTaskAdded { task -> + if (task.name.contains('externalNativeBuild')) { + // This dependecy *is* set. This can be seen by using task copyLibs(type: Copy, dependsOn: 'bundleDebug') + // together with this and get a circular dependency. + task.dependsOn generateJavaH + } +} + +dependencies { + compile fileTree(include: ['*.jar'], dir: 'libs') + compile "com.htc.vr.aar:${aarFilename}@aar" +} diff --git a/android/focus/build_sdk.gradle b/android/focus/build_sdk.gradle new file mode 100644 index 0000000..9997423 --- /dev/null +++ b/android/focus/build_sdk.gradle @@ -0,0 +1,55 @@ +def jniDir = "src/main/jni" +def aarFilename = "wvr_client" + +// unzip aar +def unzipDir = file("${buildDir}/${aarFilename}") +def aarFile = file("${projectDir}/libs/${aarFilename}.aar") +if (aarFile != null) { + copy { + println 'unzip ' + aarFile + from zipTree(aarFile) + into unzipDir + } +} + +android { + defaultConfig { + externalNativeBuild { ndkBuild { + def VR_SDK_ROOT = "${buildDir}/${aarFilename}" + arguments "VR_SDK_ROOT=$VR_SDK_ROOT" + }} + ndk { + abiFilters 'armeabi-v7a' + } + } + + externalNativeBuild { + ndkBuild { + path "${jniDir}/Android.mk" + } + } + + buildTypes { + release { + externalNativeBuild { ndkBuild { + arguments "NDK_DEBUG=0" + }} + } + debug { + externalNativeBuild { ndkBuild { + arguments "NDK_DEBUG=1" + }} + } + } +} + +repositories { + flatDir{ + dirs 'libs' + } +} + +dependencies { + compile fileTree(include: ['*.jar'], dir: 'libs') + compile "com.htc.vr.aar:${aarFilename}@aar" +} diff --git a/android/focus/gradle.properties b/android/focus/gradle.properties new file mode 100644 index 0000000..8bd86f6 --- /dev/null +++ b/android/focus/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx1536M diff --git a/android/focus/gradle/wrapper/gradle-wrapper.jar b/android/focus/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8c0fb64a8698b08ecc4158d828ca593c4928e9dd GIT binary patch literal 49896 zcmagFb986H(k`5d^NVfUwr$(C?M#x1ZQHiZiEVpg+jrjgoQrerx!>1o_ul)D>ebz~ zs=Mmxr&>W81QY-S1PKWQ%N-;H^tS;2*XwVA`dej1RRn1z<;3VgfE4~kaG`A%QSPsR z#ovnZe+tS9%1MfeDyz`RirvdjPRK~p(#^q2(^5@O&NM19EHdvN-A&StN>0g6QA^VN z0Gx%Gq#PD$QMRFzmK+utjS^Y1F0e8&u&^=w5K<;4Rz|i3A=o|IKLY+g`iK6vfr9?+ z-`>gmU&i?FGSL5&F?TXFu`&Js6h;15QFkXp2M1H9|Eq~bpov-GU(uz%mH0n55wUl- zv#~ccAz`F5wlQ>e_KlJS3@{)B?^v*EQM=IxLa&76^y51a((wq|2-`qON>+4dLc{Oo z51}}o^Zen(oAjxDK7b++9_Yg`67p$bPo3~BCpGM7uAWmvIhWc5Gi+gQZ|Pwa-Gll@<1xmcPy z|NZmu6m)g5Ftu~BG&Xdxclw7Cij{xbBMBn-LMII#Slp`AElb&2^Hw+w>(3crLH!;I zN+Vk$D+wP1#^!MDCiad@vM>H#6+`Ct#~6VHL4lzmy;lSdk>`z6)=>Wh15Q2)dQtGqvn0vJU@+(B5{MUc*qs4!T+V=q=wy)<6$~ z!G>e_4dN@lGeF_$q9`Ju6Ncb*x?O7=l{anm7Eahuj_6lA{*#Gv*TaJclevPVbbVYu z(NY?5q+xxbO6%g1xF0r@Ix8fJ~u)VRUp`S%&rN$&e!Od`~s+64J z5*)*WSi*i{k%JjMSIN#X;jC{HG$-^iX+5f5BGOIHWAl*%15Z#!xntpk($-EGKCzKa zT7{siZ9;4TICsWQ$pu&wKZQTCvpI$Xvzwxoi+XkkpeE&&kFb!B?h2hi%^YlXt|-@5 zHJ~%AN!g_^tmn1?HSm^|gCE#!GRtK2(L{9pL#hp0xh zME}|DB>(5)`iE7CM)&_+S}-Bslc#@B5W4_+k4Cp$l>iVyg$KP>CN?SVGZ(&02>iZK zB<^HP$g$Lq*L$BWd?2(F?-MUbNWTJVQdW7$#8a|k_30#vHAD1Z{c#p;bETk0VnU5A zBgLe2HFJ3032$G<`m*OB!KM$*sdM20jm)It5OSru@tXpK5LT>#8)N!*skNu1$TpIw zufjjdp#lyH5bZ%|Iuo|iu9vG1HrIVWLH>278xo>aVBkPN3V$~!=KnlXQ4eDqS7%E% zQ!z^$Q$b^6Q)g#cLpwur(|<0gWHo6A6jc;n`t(V9T;LzTAU{IAu*uEQ%Ort1k+Kn+f_N`9|bxYC+~Z1 zCC1UCWv*Orx$_@ydv9mIe(liLfOr7mhbV@tKw{6)q^1DH1nmvZ0cj215R<~&I<4S| zgnr;9Cdjqpz#o8i0CQjtl`}{c*P)aSdH|abxGdrR)-3z+02-eX(k*B)Uqv6~^nh** z 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +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" ] ; 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"` + + # 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/focus/gradlew.bat b/android/focus/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/android/focus/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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 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 Windowz 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. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +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 + +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/android/focus/local.properties b/android/focus/local.properties new file mode 100644 index 0000000..4d3a32a --- /dev/null +++ b/android/focus/local.properties @@ -0,0 +1,9 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Mon Oct 08 14:04:19 CEST 2018 +ndk.dir=C\:\\Users\\omar\\AppData\\Local\\Android\\Sdk\\ndk-bundle +sdk.dir=C\:\\Users\\omar\\AppData\\Local\\Android\\Sdk diff --git a/android/focus/ppkey.jks b/android/focus/ppkey.jks new file mode 100644 index 0000000000000000000000000000000000000000..0e2fae08f8f81c80e778fc0d9969e1eeedbd23a2 GIT binary patch literal 2285 zcmc(g`8(8$7sqGDm@<0{SUrBoFC5XIp=xK^FHT!pMB0g2Lu8^xB>nr5SM(Y z!Iyl<)KF3gm-#7EvX~$cF9@JPcL5{}t_lM~!730zFqjtvr9l@JEfDE%OE``+@sMys zN#3C|zapxP@3imbFpjr%Mfy#@-Xqu)J-w|fxcm4NeqA!6I8?qB<%O{qcd%W)83`HA z9qc60ui{!r$VXB9e%T(tXA9>i54W#+{}|IWTKH4U>m+2XnaL~t7P&ICnirO!zI^mK zk|HtblCr4h>hJrR{oQFZ%MAH$^N6rUHJ{nj2at_bsp8RbuhvF$H~;yj-jP)H?L(s&dd9D=gJ8hzj98Ea2jx- zl%x3%r0L(=Zh@q1-+y|679~LQ>C6k;&~x_|tVk!)vb8r-kJJ~k&W=>?MfB7yNu7UT z8KBvrbIYl(F-)dZ(1{|~-iOMNf)i%EBPCC&_k3sGypzuREk;8PZ@sz~^KzhHC$E8U zOtiF*{vi!JDb`W^1D+qE6kHJ88@mn`taf~;7?P1>YKaH4YmDeD>95C*Lc3fxGp|fa z2zGCvzJ1Z>|JeA@Ly@GA@*cI-r*dL`rS1&gm0GD;TB7thQ^WIN^B*fgip%k`5_VJG z9^z{6^2K)ga_eIhWzC80yh~ET;%1bCoDYVPZdG+kWqw5Fu zE_+mG*jTSFk@bo0W|hz#o2>6zt@6HC<;;y590kUC#^vn@kbKm6GpS9Q_Thibk=ITA zB%lWZ@%#?Zcya+6h1Pp;dWtDoZ0e%>tN~}%n7C#t_;2LHW1_AKFcwC?`6vPFG zIm~rWZgLQHz>?}8sTg5E=x+c=Asi{>YxX`D(DtFk|4{@A zVM-;21e1wq3sM*c4M_i8%Yzbir1*rO9fAXVC?q1D9LxJnElhX80%evB@lrwIT$ zT39S_PD}s`XmbHZ=fB|pJ|PV(`)|>>ABBeo7T~@bFdRYygFzEeV~;*J+De`sdA-ur zU(SG?+NY|~ereBg8@>s^4~4rX?>%qqskS?pfL>`$%sC*`vOTvpNt2r2uh__rxTc9? z8{QWfD)fu|sgK^3UCN8*K=!w17yIk+FCAl^Sz2}&M5b32bYmY0@+Ax081m>s>JIj# zIj@{nA4$ED;vke2GZkZb8nRklP2jiwsd0FIQwj5MOp?s9>N0#fuG3$#{enruBDLBBT!)i zEmW%&+%uhMC|)(!`)n?7)|dWo5xJMg6%h;)UC*h&rv)%0mMd{9{mw!Dl8TC18e+9` z8^lCM^(ppBR|nW*Y( + + + + + + + + + + + + + + + + + + diff --git a/android/focus/src/main/cpp/wave_vr.cpp b/android/focus/src/main/cpp/wave_vr.cpp new file mode 100644 index 0000000..139e10b --- /dev/null +++ b/android/focus/src/main/cpp/wave_vr.cpp @@ -0,0 +1,398 @@ +#include "pch.h" +#include "wave_vr.h" +#include "log.h" +#include "rtt.h" +#include "app.h" +#include "canvas.h" +#include + +extern "C" bool WVR_EXPORT WVR_IsATWActive(); +extern "C" void WVR_EXPORT WVR_SetATWActive(bool isActive, void *anativeWindow = nullptr); +extern "C" void WVR_EXPORT WVR_PauseATW(); // New Api to replace SetATWActive(false) +extern "C" void WVR_EXPORT WVR_ResumeATW(); // New Api to replace SetATWActive(true) +extern "C" void WVR_EXPORT WVR_OnDisable(); // New Api to replace SetATWActive(false) on Unity3D OnDisable +extern "C" void WVR_EXPORT WVR_OnApplicationQuit(); // New Api to handle OnApplicationQuit case +extern "C" void WVR_EXPORT WVR_SetRenderThreadId(int tid); + +void android_async_lock(); +bool android_async_trylock(); +void android_async_swap(); +void android_async_unlock(); + +RTT ovr_eyes[3][2]; + +struct WaveController : public VRController +{ + void update_state(double predictedDisplayTime, glm::vec3 head_pos) + { + /* + vrapi_GetInputTrackingState(ovr_context, id, predictedDisplayTime, &tracking); + glm::vec3 c_pos = glm::make_vec3((float*)&tracking.HeadPose.Pose.Position); + auto c_rot_ovr = ovrMatrix4f_CreateFromQuaternion(&tracking.HeadPose.Pose.Orientation); + auto c_rot_ovr_tp = ovrMatrix4f_Transpose(&c_rot_ovr); + glm::mat4 c_rot = glm::make_mat4((float*)&c_rot_ovr_tp); + m_mat = glm::translate(c_pos) * c_rot; + + // update controllers + state.Header.ControllerType = ovrControllerType_TrackedRemote; + vrapi_GetCurrentInputState(ovr_context, id, &state.Header); + + update_analog(kButton::Trigger, {state.IndexTrigger, 0}); + update_analog(kButton::Grip, {state.GripTrigger, 0}); + update_analog(kButton::Pad, glm::make_vec2((float*)&state.Joystick)); + update_digital(kButton::Trigger, state.Buttons & ovrButton_Trigger, {state.IndexTrigger, 0}); + update_digital(kButton::Pad, state.Buttons & ovrButton_Joystick, glm::make_vec2((float*)&state.Joystick)); + update_digital(kButton::A, state.Buttons & ovrButton_A); + */ + } + void update_digital(kButton b, bool pressed, glm::vec2 axis = {0, 0}) + { + /* + if (pressed && !m_buttons[(int)b]) + { + m_buttons[(int)b] = true; + App::I.vr_digital(*this, b, kAction::Press, axis); + } + if (!pressed && m_buttons[(int)b]) + { + m_buttons[(int)b] = false; + App::I.vr_digital(*this, b, kAction::Release, axis); + } + */ + } + void update_analog(kButton b, glm::vec2 force) + { + /* + float l = glm::compMax(glm::abs(force)); + const float zero = 0.01f; + if (l > zero && !m_analog_buttons[(int)b]) + { + m_analog_buttons[(int)b] = true; + App::I.vr_analog(*this, b, kAction::Press, force); + } + if (l <= zero && m_analog_buttons[(int)b]) + { + m_analog_buttons[(int)b] = false; + App::I.vr_analog(*this, b, kAction::Release, force); + } + */ + } + + float get_trigger_value() const override { + /* + if (id == -1) + return 0.f; + return state.IndexTrigger; + */ + return 0; + } +}; + +WaveController controllers[2]; +extern struct engine g_engine; + +int vr_main(int argc, char *argv[]) +{ + LOG("vr_main"); + + LOG("WVR_SetATWActive"); + WVR_SetATWActive(true, g_engine.app->window); + + // We has the display config from device service, so we don't this logic. + WVR_RenderInitParams_t pp = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Default }; + WVR_RenderError render_error = WVR_RenderError_LibNotSupported; + render_error = WVR_RenderInit(&pp); + + if (render_error != WVR_RenderError_None) + LOG("WVR Render Init Failed"); + + // Loading the WVR Runtime + WVR_InitError eError = WVR_InitError_None; + LOG("initVR():start call WVR_Init"); + eError = WVR_Init(WVR_AppType_VRContent); + LOG("initVR():start call WVR_Init end"); + if (eError != WVR_InitError_None) { + LOG("Unable to init VR runtime: %s", WVR_GetInitErrorString(eError)); + return 1;// false; + } + + LOG("WVR_SetRenderThreadId"); + WVR_SetRenderThreadId((int)gettid()); + + WVR_InputAttribute inputIdAndTypes[] = { + {WVR_InputId_Alias1_Menu, WVR_InputType_Button, WVR_AnalogType_None}, + {WVR_InputId_Alias1_Touchpad, WVR_InputType_Button | WVR_InputType_Touch | WVR_InputType_Analog, WVR_AnalogType_2D}, + {WVR_InputId_Alias1_Trigger, WVR_InputType_Button , WVR_AnalogType_None}, + {WVR_InputId_Alias1_Digital_Trigger, WVR_InputType_Button , WVR_AnalogType_None} + }; + WVR_SetInputRequest(WVR_DeviceType_HMD, inputIdAndTypes, sizeof(inputIdAndTypes) / sizeof(*inputIdAndTypes)); + WVR_SetInputRequest(WVR_DeviceType_Controller_Right, inputIdAndTypes, sizeof(inputIdAndTypes) / sizeof(*inputIdAndTypes)); + WVR_SetInputRequest(WVR_DeviceType_Controller_Left, inputIdAndTypes, sizeof(inputIdAndTypes) / sizeof(*inputIdAndTypes)); + + // Must initialize render runtime before all OpenGL code. + WVR_RenderInitParams_t param; + param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Timewarp_Asynchronous }; + + WVR_RenderError pError = WVR_RenderInit(¶m); + if (pError != WVR_RenderError_None) { + LOG("Present init failed - Error[%d]", pError); + } + + auto mInteractionMode = WVR_GetInteractionMode(); + auto mGazeTriggerType = WVR_GetGazeTriggerType(); + LOG("initVR() mInteractionMode: %d, mGazeTriggerType: %d", mInteractionMode, mGazeTriggerType); + + uint32_t w, h; + WVR_GetRenderTargetSize(&w, &h); + std::vector rtt_eyes[2]; + WVR_TextureQueueHandle_t tq[2]; + + for (int eye = 0; eye < 2; eye++) + { + tq[eye] = WVR_ObtainTextureQueue(WVR_TextureTarget_2D, WVR_TextureFormat_RGBA, + WVR_TextureType_UnsignedByte, w, h, 0); + for (int i = 0; i < WVR_GetTextureQueueLength(tq[eye]); i++) + { + auto t = WVR_GetTexture(tq[eye], i); + rtt_eyes[eye].emplace_back(); + rtt_eyes[eye].back().create(w, h, (int)t.id); + rtt_eyes[eye].back().bindFramebuffer(); + glClearColor(1, 0, 0, 1); + glClear(GL_COLOR_BUFFER_BIT); + rtt_eyes[eye].back().unbindFramebuffer(); + LOG("WVR create texture %d for eye %d", i, eye); + } + } + + android_async_lock(); + + LOG("init app"); + App::I->initLog(); + App::I->zoom = 1.f; + App::I->width = 1024; + App::I->height = 1024; + App::I->redraw = true; + App::I->init(); + //App::I.resize(1024, 1024); + App::I->vr_active = true; + App::I->has_vr = true; + App::I->vr_only = true; + LOG("init app done"); + + android_async_unlock(); + + LOG("WVR enter render loop"); + bool running = true; + while (running) + { + android_async_lock(); + WVR_DevicePosePair_t devices[WVR_DEVICE_COUNT_LEVEL_1]; + WVR_GetSyncPose(WVR_PoseOriginModel_OriginOnHead, devices, WVR_DEVICE_COUNT_LEVEL_1); + + LOG("WVR RENDER FRAME"); + for (int eye = 0; eye < 2; eye++) + { + int i = WVR_GetAvailableTextureIndex(tq[eye]); + auto t = WVR_GetTexture(tq[eye], i); + WVR_SubmitError e; + e = WVR_SubmitFrame((WVR_Eye)eye, &t, &devices[WVR_DEVICE_HMD].pose); + if (e != WVR_SubmitError_None) + { + LOG("submit error: %d", (int)e) + running = false; + break; + } + } + glClearColor(0, 1, 0, 1); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + android_async_unlock(); + } + LOG("WVR render loop finished"); + return 0; +} + +void wave_init(JavaVM* vm, JNIEnv* jni, jobject activity_class) +{ + //vr_main(0, nullptr); + /* + java.Vm = vm; + java.Env = jni; + java.ActivityObject = activity_class; + + LOG("init OVR"); + const ovrInitParms initParms = vrapi_DefaultInitParms( &java ); + int32_t initResult = vrapi_Initialize( &initParms ); + if ( initResult != VRAPI_INITIALIZE_SUCCESS ) + { + // If intialization failed, vrapi_* function calls will not be available. + exit( 0 ); + } + auto result = ovr_PlatformInitializeAndroid("1687982804637910", activity_class, jni); + LOG("ovr_PlatformInitializeAndroid result %d", result); + */ + LOG("WVR register main"); + //WVR_RegisterMain(vr_main); +} + +void wave_init_vr(EGLDisplay display, EGLContext context, ANativeWindow* surface) +{ + vr_main(0, nullptr); + /* + LOG("init swapchain"); + int rtt_w = vrapi_GetSystemPropertyInt(&java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_WIDTH); + int rtt_h = vrapi_GetSystemPropertyInt(&java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_HEIGHT); + LOG("ovr suggested texture size %d %d", rtt_w, rtt_h); + for (int eye = 0; eye < 2; eye++) + { + swap_chain[eye] = vrapi_CreateTextureSwapChain3(VRAPI_TEXTURE_TYPE_2D, GL_RGBA8, rtt_w, rtt_h, 1, 3); + swap_chain_count = vrapi_GetTextureSwapChainLength(swap_chain[eye]); + for (int i = 0; i < swap_chain_count; i++) + { + auto texid = vrapi_GetTextureSwapChainHandle(swap_chain[eye], i); + if (ovr_eyes[i][eye].create(rtt_w, rtt_h, texid, GL_RGBA8, true)) + { + ovr_eyes[i][eye].bindTexture(); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + ovr_eyes[i][eye].unbindTexture(); + LOG("create eye %d", eye); + } + else + { + LOG("FAILED create fb for eye %d", eye); + } + } + } + + LOG("vrapi_DefaultModeParms"); + ovrModeParms parms = vrapi_DefaultModeParms( &java ); + // No need to reset the FLAG_FULLSCREEN window flag when using a View + //parms.Flags &= ~VRAPI_MODE_FLAG_RESET_WINDOW_FULLSCREEN; + + parms.Flags |= VRAPI_MODE_FLAG_NATIVE_WINDOW; + parms.Display = (size_t)display; + parms.WindowSurface = (size_t)surface; + parms.ShareContext = (size_t)context; + LOG("enter vr mode"); + ovr_context = vrapi_EnterVrMode(&parms); + if (!ovr_context) + { + LOG("EnterVRMode FAILED"); + } + LOG("vr mode entered"); + + vrapi_SetClockLevels(ovr_context, 2, 2); + vrapi_SetPerfThread(ovr_context, VRAPI_PERF_THREAD_TYPE_MAIN, gettid()); + vrapi_SetPerfThread(ovr_context, VRAPI_PERF_THREAD_TYPE_RENDERER, 0); + */ +} + +void wave_release_vr() +{ + /* + vrapi_LeaveVrMode(ovr_context); + ovr_context = nullptr; + for (int eye = 0; eye < 2; eye++) + { + vrapi_DestroyTextureSwapChain(swap_chain[eye]); + swap_chain[eye] = nullptr; + for (int i = 0; i < swap_chain_count; i++) + ovr_eyes[eye][i].destroy(); + } + swap_chain_index = 0; + swap_chain_count = 0; + LOG("leave vr mode"); + */ +} + +void wave_draw(float dt) +{ + /* + const double predictedDisplayTime = vrapi_GetPredictedDisplayTime(ovr_context, ovr_frame); + const ovrTracking2 tracking = vrapi_GetPredictedTracking2(ovr_context, predictedDisplayTime); + auto pose_ovr = ovrMatrix4f_CreateFromQuaternion(&tracking.HeadPose.Pose.Orientation); + auto pose_ovr_tp = ovrMatrix4f_Transpose(&pose_ovr); + glm::mat4 pose = glm::make_mat4(reinterpret_cast(&pose_ovr_tp)); + glm::vec3 head_pos = glm::make_vec3((float*)&tracking.HeadPose.Pose.Position); + + if (controllers[0].id == -1) + { + // init controller + ovrInputCapabilityHeader capsHeader; + for (int i = 0; ; i++) + { + if ( vrapi_EnumerateInputDevices( ovr_context, i, &capsHeader ) >= 0 ) + { + if ( capsHeader.Type == ovrControllerType_TrackedRemote ) + { + ovrInputTrackedRemoteCapabilities remoteCaps; + remoteCaps.Header = capsHeader; + if ( vrapi_GetInputDeviceCapabilities( ovr_context, &remoteCaps.Header ) >= 0 ) + { + // remote is connected + if (remoteCaps.ControllerCapabilities & ovrControllerCaps_RightHand) + { + // right controller found + controllers[0].id = capsHeader.DeviceID; + LOG("found controller id %d", (int)controllers[0].id); + break; + } + } + } + } + else + { + break; + } + } + } + + if (controllers[0].id != -1) + { + controllers[0].update_state(predictedDisplayTime, head_pos); + App::I.vr_controllers[0] = controllers[0]; + } + App::I.vr_head = pose; + App::I.vr_update(dt); + + // update hmd + auto layer = vrapi_DefaultLayerProjection2(); + //ovrVector4f red = {1, 1, 0, 1}; + //auto layer = vrapi_DefaultLayerSolidColorProjection2(&red); + layer.HeadPose = tracking.HeadPose; + for (int eye = 0; eye < 2; eye++) + { + auto& rtt = ovr_eyes[swap_chain_index][eye]; + rtt.bindFramebuffer(); + rtt.clear({1, 0, 1, 1}); + glViewport(0, 0, rtt.getWidth(), rtt.getHeight()); + auto proj_ovr = ovrMatrix4f_Transpose(&tracking.Eye[eye].ProjectionMatrix); + glm::mat4 proj = glm::make_mat4(reinterpret_cast(&proj_ovr)); + auto view_ovr = ovrMatrix4f_Transpose(&tracking.Eye[eye].ViewMatrix); + glm::mat4 view = glm::make_mat4(reinterpret_cast(&view_ovr)); + App::I.vr_draw(proj, view, pose); + rtt.unbindFramebuffer(); + layer.Textures[eye].ColorSwapChain = swap_chain[eye]; + layer.Textures[eye].SwapChainIndex = swap_chain_index; + layer.Textures[eye].TexCoordsFromTanAngles = + ovrMatrix4f_TanAngleMatrixFromProjection(&tracking.Eye[eye].ProjectionMatrix); + } + layer.Header.Flags |= VRAPI_FRAME_LAYER_FLAG_CHROMATIC_ABERRATION_CORRECTION; + + const ovrLayerHeader2 * layers[] = { &layer.Header }; + + ovrSubmitFrameDescription2 frameDesc = { 0 }; + frameDesc.Flags = 0; + frameDesc.SwapInterval = 1; + frameDesc.FrameIndex = ovr_frame; + frameDesc.DisplayTime = predictedDisplayTime; + frameDesc.LayerCount = 1; + frameDesc.Layers = layers; + + vrapi_SubmitFrame2(ovr_context, &frameDesc); + + ovr_frame++; + swap_chain_index = (swap_chain_index + 1) % swap_chain_count; + */ +} diff --git a/android/focus/src/main/cpp/wave_vr.h b/android/focus/src/main/cpp/wave_vr.h new file mode 100644 index 0000000..a8cfd0a --- /dev/null +++ b/android/focus/src/main/cpp/wave_vr.h @@ -0,0 +1,18 @@ +#pragma once + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +void wave_init(JavaVM* vm, JNIEnv* jni, jobject activity_class); +void wave_init_vr(EGLDisplay display, EGLContext context, ANativeWindow* surface); +void wave_release_vr(); +void wave_draw(float dt); diff --git a/android/focus/src/main/java/com/omixlab/panopainter/Platform.java b/android/focus/src/main/java/com/omixlab/panopainter/Platform.java new file mode 100644 index 0000000..f84e928 --- /dev/null +++ b/android/focus/src/main/java/com/omixlab/panopainter/Platform.java @@ -0,0 +1,5 @@ +package com.omixlab.panopainter; + +public class Platform { + public static final String[] Libs = new String[]{"wvr_api"}; +} diff --git a/android/focus/src/main/java/com/omixlab/panopainter/PlatformActivity.java b/android/focus/src/main/java/com/omixlab/panopainter/PlatformActivity.java new file mode 100644 index 0000000..ef9627b --- /dev/null +++ b/android/focus/src/main/java/com/omixlab/panopainter/PlatformActivity.java @@ -0,0 +1,9 @@ +package com.omixlab.panopainter; + +import com.htc.vr.sdk.VR; +import com.htc.vr.sdk.VRActivity; +import com.htc.vr.sdk.VRNativeActivity; +import com.omixlab.panopainter.Platform; + +public class PlatformActivity extends VRActivity { +} diff --git a/android/quest/build.gradle b/android/quest/build.gradle index 49575cc..ab5ff0c 100644 --- a/android/quest/build.gradle +++ b/android/quest/build.gradle @@ -83,7 +83,7 @@ android { // Sets optional flags for the C compiler. //cFlags "-D_EXAMPLE_C_FLAG1", "-D_EXAMPLE_C_FLAG2" // Sets a flag to enable format macro constants for the C++ compiler. - cppFlags "-D__QUEST__" + cppFlags "-D__QUEST__=1" arguments "-DANDROID_TOOLCHAIN=clang", //"-DANDROID_PLATFORM=android-19", "-DANDROID_STL=c++_shared", diff --git a/android/quest/src/main/cpp/oculus_vr.cpp b/android/quest/src/main/cpp/oculus_vr.cpp index be8b199..5e322d0 100644 --- a/android/quest/src/main/cpp/oculus_vr.cpp +++ b/android/quest/src/main/cpp/oculus_vr.cpp @@ -44,12 +44,12 @@ struct QuestController : public VRController if (pressed && !m_buttons[(int)b]) { m_buttons[(int)b] = true; - App::I.vr_digital(*this, b, kAction::Press, axis); + App::I->vr_digital(*this, b, kAction::Press, axis); } if (!pressed && m_buttons[(int)b]) { m_buttons[(int)b] = false; - App::I.vr_digital(*this, b, kAction::Release, axis); + App::I->vr_digital(*this, b, kAction::Release, axis); } } void update_analog(kButton b, glm::vec2 force) @@ -59,12 +59,12 @@ struct QuestController : public VRController if (l > zero && !m_analog_buttons[(int)b]) { m_analog_buttons[(int)b] = true; - App::I.vr_analog(*this, b, kAction::Press, force); + App::I->vr_analog(*this, b, kAction::Press, force); } if (l <= zero && m_analog_buttons[(int)b]) { m_analog_buttons[(int)b] = false; - App::I.vr_analog(*this, b, kAction::Release, force); + App::I->vr_analog(*this, b, kAction::Release, force); } } @@ -205,10 +205,10 @@ void oculus_draw(float dt) if (controllers[0].id != -1) { controllers[0].update_state(predictedDisplayTime, head_pos); - App::I.vr_controllers[0] = controllers[0]; + App::I->vr_controllers[0] = controllers[0]; } - App::I.vr_head = pose; - App::I.vr_update(dt); + App::I->vr_head = pose; + App::I->vr_update(dt); // update hmd auto layer = vrapi_DefaultLayerProjection2(); @@ -225,7 +225,7 @@ void oculus_draw(float dt) glm::mat4 proj = glm::make_mat4(reinterpret_cast(&proj_ovr)); auto view_ovr = ovrMatrix4f_Transpose(&tracking.Eye[eye].ViewMatrix); glm::mat4 view = glm::make_mat4(reinterpret_cast(&view_ovr)); - App::I.vr_draw(proj, view, pose); + App::I->vr_draw(proj, view, pose); rtt.unbindFramebuffer(); layer.Textures[eye].ColorSwapChain = swap_chain[eye]; layer.Textures[eye].SwapChainIndex = swap_chain_index; diff --git a/android/quest/src/main/java/com/omixlab/panopainter/PlatformActivity.java b/android/quest/src/main/java/com/omixlab/panopainter/PlatformActivity.java new file mode 100644 index 0000000..9b9a805 --- /dev/null +++ b/android/quest/src/main/java/com/omixlab/panopainter/PlatformActivity.java @@ -0,0 +1,6 @@ +package com.omixlab.panopainter; + +import android.app.NativeActivity; + +public class PlatformActivity extends NativeActivity { +} diff --git a/android/src/cpp/main.cpp b/android/src/cpp/main.cpp index 7aeeadc..95ac54c 100644 --- a/android/src/cpp/main.cpp +++ b/android/src/cpp/main.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include // for prctl( PR_SET_NAME ) #include @@ -37,6 +38,8 @@ #ifdef __QUEST__ #include "oculus_vr.h" +#elif __FOCUS__ +#include "wave_vr.h" #endif typedef void (*GLDEBUGPROC)(GLenum source, @@ -234,6 +237,13 @@ std::function pick_file_callback; std::function pick_file_callback_context; extern "C" { +#ifdef __FOCUS__ +JNIEXPORT void JNICALL Java_com_omixlab_panopainter_MainActivity_init_vr(JNIEnv *env, jobject activity, jobject am) +{ + Asset::m_am = AAssetManager_fromJava(env, am); + wave_init(0, 0, 0); +} +#endif JNIEXPORT void JNICALL Java_com_omixlab_panopainter_MainActivity_pickFileCallback(JNIEnv *env, jobject, jstring path) { const char* path_utf = env->GetStringUTFChars(path, nullptr); @@ -538,6 +548,8 @@ static int engine_init_display(struct engine* engine) { #ifdef __QUEST__ oculus_init_vr(display, context, engine->app->window); +#elif __FOCUS__ + wave_init_vr(display, context, engine->app->window); #endif if (resuming_context) @@ -663,7 +675,7 @@ static int engine_init_display(struct engine* engine) { #else float density = get_display_density(); LOG("density %f", density); - App::I->zoom = density;// / 1.5; + App::I->zoom = density / 1.5; App::I->width = w; App::I->height = h; App::I->redraw = true; @@ -1017,6 +1029,8 @@ void android_main(struct android_app* state) { #ifdef __QUEST__ oculus_init(state->activity->vm, jni, state->activity->clazz); +#elif __FOCUS__ + wave_init(state->activity->vm, jni, state->activity->clazz); #endif // Note that AttachCurrentThread will reset the thread name. diff --git a/android/src/java/com/omixlab/panopainter/MainActivity.java b/android/src/java/com/omixlab/panopainter/MainActivity.java index 63ab78f..ad80763 100644 --- a/android/src/java/com/omixlab/panopainter/MainActivity.java +++ b/android/src/java/com/omixlab/panopainter/MainActivity.java @@ -1,11 +1,11 @@ package com.omixlab.panopainter; import android.Manifest; -import android.app.NativeActivity; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.AssetManager; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; @@ -16,9 +16,7 @@ import android.view.ViewTreeObserver; import java.io.File; -import com.omixlab.panopainter.Platform; - -public class MainActivity extends NativeActivity { +public class MainActivity extends PlatformActivity { static { for (String lib : Platform.Libs) System.loadLibrary(lib); @@ -29,6 +27,7 @@ public class MainActivity extends NativeActivity { @Override protected void onCreate(Bundle savedInstanceState) { + //init_vr(getAssets()); super.onCreate(savedInstanceState); clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); checkPermissionReadStorage(); @@ -50,6 +49,7 @@ public class MainActivity extends NativeActivity { }); } + public native void init_vr(AssetManager am); public native void pickFileCallback(String path); public native void pickExternalCallback(String path); public native void contentRectChanged(int wnd_w, int wnd_h, int rect_left, int rect_top, int rect_right, int rect_bottom); diff --git a/libs/wave_sdk b/libs/wave_sdk new file mode 160000 index 0000000..b47b1a2 --- /dev/null +++ b/libs/wave_sdk @@ -0,0 +1 @@ +Subproject commit b47b1a2aa08d2a0ca476500526503661a8156976 diff --git a/src/app_cloud.cpp b/src/app_cloud.cpp index 77a739b..aadf262 100644 --- a/src/app_cloud.cpp +++ b/src/app_cloud.cpp @@ -25,7 +25,7 @@ void App::cloud_upload() if (Canvas::I->m_unsaved) { - Canvas::I->project_save_thread(doc_path); + Canvas::I->project_save_thread(doc_path, true); } auto pb = show_progress("Uploading"); diff --git a/src/canvas.cpp b/src/canvas.cpp index 4711ab5..93b873f 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -2275,7 +2275,7 @@ void Canvas::project_save(std::function on_complete) { std::thread t([=] { BT_SetTerminate(); - bool ret = project_save_thread(App::I->doc_path); + bool ret = project_save_thread(App::I->doc_path, true); if (on_complete) on_complete(ret); }); @@ -2290,7 +2290,7 @@ void Canvas::project_save(std::string file_path, std::function on_co { std::thread t([=] { BT_SetTerminate(); - bool ret = project_save_thread(file_path); + bool ret = project_save_thread(file_path, true); if (on_complete) on_complete(ret); }); @@ -2302,7 +2302,7 @@ void Canvas::project_save(std::string file_path, std::function on_co } } -bool Canvas::project_save_thread(std::string file_path) +bool Canvas::project_save_thread(std::string file_path, bool show_progress) { // already saved, nothing to do if (!m_unsaved && file_path == App::I->doc_path) @@ -2355,14 +2355,10 @@ bool Canvas::project_save_thread(std::string file_path) // load thumbnail Image thumb = thumbnail_generate(ppi_header.thumb_header.width, ppi_header.thumb_header.height); - auto pb = std::make_shared(); - pb->m_manager = &App::I->layout; - pb->init(); - pb->create(); - pb->loaded(); - pb->m_progress->SetWidthP(0); - pb->m_title->set_text("Saving Pano Project"); - App::I->layout[App::I->main_id]->add_child(pb); + + std::shared_ptr pb; + if (show_progress) + pb = App::I->show_progress("Saving Pano Project"); thumb.flip(); fwrite(thumb.data(), thumb.size(), 1, fp); @@ -2423,7 +2419,8 @@ bool Canvas::project_save_thread(std::string file_path) } progress++; float p = (float)progress / total * 100.f; - pb->m_progress->SetWidthP(p); + if (show_progress) + pb->m_progress->SetWidthP(p); LOG("progress: %f", p); } } @@ -2464,7 +2461,8 @@ bool Canvas::project_save_thread(std::string file_path) m_newdoc = false; } - pb->destroy(); + if (show_progress) + pb->destroy(); App::I->title_update(); return success; diff --git a/src/canvas.h b/src/canvas.h index ffe29e2..e7953ff 100644 --- a/src/canvas.h +++ b/src/canvas.h @@ -210,7 +210,7 @@ public: void export_cubes(); void project_save(std::function on_complete = nullptr); void project_save(std::string file_path, std::function on_complete = nullptr); - bool project_save_thread(std::string file_path); + bool project_save_thread(std::string file_path, bool show_progress); void project_open(std::string file_path, std::function on_complete = nullptr); bool project_open_thread(std::string file_path); void inject_xmp(std::string jpg_path); diff --git a/src/main.cpp b/src/main.cpp index de9bef7..88e7269 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -531,7 +531,7 @@ static void SetupExceptionHandler() oss << std::put_time(&tm, "%d-%m-%Y %H-%M-%S"); auto path = App::I->data_path + "/" + App::I->doc_name + "-recovery (" + oss.str() + ").ppi"; - Canvas::I->project_save_thread(path); + Canvas::I->project_save_thread(path, false); static char abspath[MAX_PATH]; GetFullPathNameA(path.c_str(), MAX_PATH, abspath, NULL); static char message[4096]; diff --git a/src/node_panel_grid.cpp b/src/node_panel_grid.cpp index 6712bc2..086503e 100644 --- a/src/node_panel_grid.cpp +++ b/src/node_panel_grid.cpp @@ -137,13 +137,10 @@ void NodePanelGrid::init_controls() }; m_commit->on_click = [this](Node*) { - gl_state gl; - gl.save(); Canvas::I->draw_objects([this](const glm::mat4& camera, const glm::mat4& proj, int i) { draw_heightmap(proj, camera, true); }); m_groud_opacity->set_value(0); - gl.restore(); }; m_hm_texres->on_select = [this](Node*, int index) { int texres = get_texres();