From a2d58c5761adcbee71494edbe90c317a62cd2c62 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 23 Jul 2019 16:39:17 -0700 Subject: [PATCH 01/17] Stubs for googlevr --- webxr/Cargo.toml | 6 ++++++ webxr/build.rs | 28 ++++++++++++++++++++++++++++ webxr/googlevr/mod.rs | 4 ++++ webxr/lib.rs | 8 ++++++++ 4 files changed, 46 insertions(+) create mode 100644 webxr/build.rs create mode 100644 webxr/googlevr/mod.rs diff --git a/webxr/Cargo.toml b/webxr/Cargo.toml index 23c320bd..89eaa56f 100644 --- a/webxr/Cargo.toml +++ b/webxr/Cargo.toml @@ -22,6 +22,8 @@ path = "lib.rs" glwindow = ["glutin"] headless = [] ipc = ["webxr-api/ipc"] +googlevr = ["gvr-sys"] + [dependencies] webxr-api = { path = "../webxr-api" } @@ -29,3 +31,7 @@ euclid = "0.20" gleam = "0.6" glutin = { version = "0.21", optional = true } log = "0.4" +gvr-sys = { version = "0.7", optional = true } + +[build-dependencies] +gl_generator = "0.11" diff --git a/webxr/build.rs b/webxr/build.rs new file mode 100644 index 00000000..9cf2184f --- /dev/null +++ b/webxr/build.rs @@ -0,0 +1,28 @@ +use gl_generator::{Api, Fallbacks, Profile, Registry}; +use std::env; +use std::fs::{self, File}; +use std::path::Path; + +fn main() { + // Copy AARs + if let Ok(aar_out_dir) = env::var("AAR_OUT_DIR") { + fs::copy( + &Path::new("googlevr/aar/GVRService.aar"), + &Path::new(&aar_out_dir).join("GVRService.aar"), + ) + .unwrap(); + } + + if !cfg!(feature = "googlevr") { + return; + } + + let out_dir = env::var("OUT_DIR").unwrap(); + + // GLES 2.0 bindings + let mut file = File::create(&Path::new(&out_dir).join("gles_bindings.rs")).unwrap(); + let gles_reg = Registry::new(Api::Gles2, (3, 0), Profile::Core, Fallbacks::All, []); + gles_reg + .write_bindings(gl_generator::StaticGenerator, &mut file) + .unwrap(); +} diff --git a/webxr/googlevr/mod.rs b/webxr/googlevr/mod.rs new file mode 100644 index 00000000..6d14e193 --- /dev/null +++ b/webxr/googlevr/mod.rs @@ -0,0 +1,4 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + diff --git a/webxr/lib.rs b/webxr/lib.rs index 685398dc..86bebbbb 100644 --- a/webxr/lib.rs +++ b/webxr/lib.rs @@ -9,3 +9,11 @@ pub mod glwindow; #[cfg(feature = "headless")] pub mod headless; + +#[cfg(feature = "googlevr")] +pub mod googlevr; + +#[cfg(feature = "googlevr")] +mod gl { + include!(concat!(env!("OUT_DIR"), "/gles_bindings.rs")); +} From 6f8aab0feb082905ccf93bf8ed9647ef8b12e8ab Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 23 Jul 2019 16:43:20 -0700 Subject: [PATCH 02/17] Pull in gradle stuff from rust-webvr --- .gitignore | 7 + webxr/googlevr/aar/GVRService.aar | Bin 0 -> 6806 bytes webxr/googlevr/gradle/Makefile | 18 ++ webxr/googlevr/gradle/build.gradle | 48 +++++ .../gradle/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + webxr/googlevr/gradle/gradlew | 160 +++++++++++++++ webxr/googlevr/gradle/gradlew.bat | 90 +++++++++ webxr/googlevr/gradle/settings.gradle | 1 + .../gradle/src/main/AndroidManifest.xml | 19 ++ .../main/java/com/rust/webvr/GVRService.java | 188 ++++++++++++++++++ 11 files changed, 537 insertions(+) create mode 100644 webxr/googlevr/aar/GVRService.aar create mode 100644 webxr/googlevr/gradle/Makefile create mode 100644 webxr/googlevr/gradle/build.gradle create mode 100644 webxr/googlevr/gradle/gradle/wrapper/gradle-wrapper.jar create mode 100644 webxr/googlevr/gradle/gradle/wrapper/gradle-wrapper.properties create mode 100755 webxr/googlevr/gradle/gradlew create mode 100644 webxr/googlevr/gradle/gradlew.bat create mode 100644 webxr/googlevr/gradle/settings.gradle create mode 100644 webxr/googlevr/gradle/src/main/AndroidManifest.xml create mode 100644 webxr/googlevr/gradle/src/main/java/com/rust/webvr/GVRService.java diff --git a/.gitignore b/.gitignore index e0ba890b..7cab1323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ *~ target Cargo.lock + +.idea +.vscode +.gradle/ +build/ +*.iml +local.properties diff --git a/webxr/googlevr/aar/GVRService.aar b/webxr/googlevr/aar/GVRService.aar new file mode 100644 index 0000000000000000000000000000000000000000..b6c4fd8b528c5eaac328c625c61576608e5b4a03 GIT binary patch literal 6806 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 NXIK4GXFvVx^k0PUEoA@z literal 0 HcmV?d00001 diff --git a/webxr/googlevr/gradle/Makefile b/webxr/googlevr/gradle/Makefile new file mode 100644 index 00000000..04ede16f --- /dev/null +++ b/webxr/googlevr/gradle/Makefile @@ -0,0 +1,18 @@ +SOURCES = \ + src/main/java/com/rust/webvr/GVRService.java \ + src/main/AndroidManifest.xml \ + build.gradle \ + settings.gradle \ + gradle/wrapper/gradle-wrapper.properties \ + gradle/wrapper/gradle-wrapper.jar + +OUTPUT_AAR = build/outputs/aar/GVRService-release.aar +FINAL_AAR = ../aar/GVRService.aar + +all: $(FINAL_AAR) + +$(OUTPUT_AAR): $(SOURCES) + ./gradlew assembleRelease && touch $(OUTPUT_AAR) + +$(FINAL_AAR): $(OUTPUT_AAR) + cp $(OUTPUT_AAR) $(FINAL_AAR) diff --git a/webxr/googlevr/gradle/build.gradle b/webxr/googlevr/gradle/build.gradle new file mode 100644 index 00000000..379b66ba --- /dev/null +++ b/webxr/googlevr/gradle/build.gradle @@ -0,0 +1,48 @@ +buildscript { + repositories { + jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.1.3' + } +} + +apply plugin: 'com.android.library' + +android { + compileSdkVersion 25 + buildToolsVersion "27.0.3" + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 25 + versionCode 1 + versionName "1.0.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + repositories { + jcenter() + } + + dependencies { + implementation 'com.google.vr:sdk-base:1.120.0' + } +} + +repositories { + maven { + url 'https://maven.google.com/' + name 'Google' + } +} \ No newline at end of file diff --git a/webxr/googlevr/gradle/gradle/wrapper/gradle-wrapper.jar b/webxr/googlevr/gradle/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 GIT binary patch literal 53636 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ⅅ8zCNKueM5c!$)^mKpZNR!eIlFST57ePGQcqCqedAQ3UaUEzpjM--5V4YO zY22VxQm%$2NDnwfK+jkz=i2>NjAM6&P1DdcO<*Xs1-lzdXWn#LGSxwhPH7N%D8-zCgpFWt@`LgNYI+Fh^~nSiQmwH0^>E>*O$47MqfQza@Ce z1wBw;igLc#V2@y-*~Hp?jA1)+MYYyAt|DV_8RQCrRY@sAviO}wv;3gFdO>TE(=9o? z=S(r=0oT`w24=ihA=~iFV5z$ZG74?rmYn#eanx(!Hkxcr$*^KRFJKYYB&l6$WVsJ^ z-Iz#HYmE)Da@&seqG1fXsTER#adA&OrD2-T(z}Cwby|mQf{0v*v3hq~pzF`U`jenT z=XHXeB|fa?Ws$+9ADO0rco{#~+`VM?IXg7N>M0w1fyW1iiKTA@p$y zSiAJ%-Mg{m>&S4r#Tw@?@7ck}#oFo-iZJCWc`hw_J$=rw?omE{^tc59ftd`xq?jzf zo0bFUI=$>O!45{!c4?0KsJmZ#$vuYpZLo_O^oHTmmLMm0J_a{Nn`q5tG1m=0ecv$T z5H7r0DZGl6be@aJ+;26EGw9JENj0oJ5K0=^f-yBW2I0jqVIU};NBp*gF7_KlQnhB6 z##d$H({^HXj@il`*4^kC42&3)(A|tuhs;LygA-EWFSqpe+%#?6HG6}mE215Z4mjO2 zY2^?5$<8&k`O~#~sSc5Fy`5hg5#e{kG>SAbTxCh{y32fHkNryU_c0_6h&$zbWc63T z7|r?X7_H!9XK!HfZ+r?FvBQ$x{HTGS=1VN<>Ss-7M3z|vQG|N}Frv{h-q623@Jz*@ ziXlZIpAuY^RPlu&=nO)pFhML5=ut~&zWDSsn%>mv)!P1|^M!d5AwmSPIckoY|0u9I zTDAzG*U&5SPf+@c_tE_I!~Npfi$?gX(kn=zZd|tUZ_ez(xP+)xS!8=k(<{9@<+EUx zYQgZhjn(0qA#?~Q+EA9oh_Jx5PMfE3#KIh#*cFIFQGi)-40NHbJO&%ZvL|LAqU=Rw zf?Vr4qkUcKtLr^g-6*N-tfk+v8@#Lpl~SgKyH!+m9?T8B>WDWK22;!i5&_N=%f{__ z-LHb`v-LvKqTJZCx~z|Yg;U_f)VZu~q7trb%C6fOKs#eJosw&b$nmwGwP;Bz`=zK4 z>U3;}T_ptP)w=vJaL8EhW;J#SHA;fr13f=r#{o)`dRMOs-T;lp&Toi@u^oB_^pw=P zp#8Geo2?@!h2EYHY?L;ayT}-Df0?TeUCe8Cto{W0_a>!7Gxmi5G-nIIS;X{flm2De z{SjFG%knZoVa;mtHR_`*6)KEf=dvOT3OgT7C7&-4P#4X^B%VI&_57cBbli()(%zZC?Y0b;?5!f22UleQ=9h4_LkcA!Xsqx@q{ko&tvP_V@7epFs}AIpM{g??PA>U(sk$Gum>2Eu zD{Oy{$OF%~?B6>ixQeK9I}!$O0!T3#Ir8MW)j2V*qyJ z8Bg17L`rg^B_#rkny-=<3fr}Y42+x0@q6POk$H^*p3~Dc@5uYTQ$pfaRnIT}Wxb;- zl!@kkZkS=l)&=y|21veY8yz$t-&7ecA)TR|=51BKh(@n|d$EN>18)9kSQ|GqP?aeM ztXd9C&Md$PPF*FVs*GhoHM2L@D$(Qf%%x zwQBUt!jM~GgwluBcwkgwQ!249uPkNz3u@LSYZgmpHgX|P#8!iKk^vSKZ;?)KE$92d z2U>y}VWJ0&zjrIqddM3dz-nU%>bL&KU%SA|LiiUU7Ka|c=jF|vQ1V)Jz`JZe*j<5U6~RVuBEVJoY~ z&GE+F$f>4lN=X4-|9v*5O*Os>>r87u z!_1NSV?_X&HeFR1fOFb8_P)4lybJ6?1BWK`Tv2;4t|x1<#@17UO|hLGnrB%nu)fDk zfstJ4{X4^Y<8Lj<}g2^kksSefQTMuTo?tJLCh zC~>CR#a0hADw!_Vg*5fJwV{~S(j8)~sn>Oyt(ud2$1YfGck77}xN@3U_#T`q)f9!2 zf>Ia;Gwp2_C>WokU%(z2ec8z94pZyhaK+e>3a9sj^-&*V494;p9-xk+u1Jn#N_&xs z59OI2w=PuTErv|aNcK*>3l^W*p3}fjXJjJAXtBA#%B(-0--s;1U#f8gFYW!JL+iVG zV0SSx5w8eVgE?3Sg@eQv)=x<+-JgpVixZQNaZr}3b8sVyVs$@ndkF5FYKka@b+YAh z#nq_gzlIDKEs_i}H4f)(VQ!FSB}j>5znkVD&W0bOA{UZ7h!(FXrBbtdGA|PE1db>s z$!X)WY)u#7P8>^7Pjjj-kXNBuJX3(pJVetTZRNOnR5|RT5D>xmwxhAn)9KF3J05J; z-Mfb~dc?LUGqozC2p!1VjRqUwwDBnJhOua3vCCB-%ykW_ohSe?$R#dz%@Gym-8-RA zjMa_SJSzIl8{9dV+&63e9$4;{=1}w2=l+_j_Dtt@<(SYMbV-18&%F@Zl7F_5! z@xwJ0wiDdO%{}j9PW1(t+8P7Ud79yjY>x>aZYWJL_NI?bI6Y02`;@?qPz_PRqz(7v``20`- z033Dy|4;y6di|>cz|P-z|6c&3f&g^OAt8aN0Zd&0yZ>dq2aFCsE<~Ucf$v{sL=*++ zBxFSa2lfA+Y%U@B&3D=&CBO&u`#*nNc|PCY7XO<}MnG0VR764XrHtrb5zwC*2F!Lp zE<~Vj0;z!S-|3M4DFxuQ=`ShTf28<9p!81(0hFbGNqF%0gg*orez9!qt8e%o@Yfl@ zhvY}{@3&f??}7<`p>FyU;7?VkKbh8_=csozU=|fH&szgZ{=NDCylQ>EH^x5!K3~-V z)_2Y>0uJ`Z0Pb58y`RL+&n@m9tJ)O<%q#&u#DAIt+-rRt0eSe1MTtMl@W)H$b3D)@ z*A-1bUgZI)>HdcI4&W>P4W5{-j=s5p5`cbQ+{(g0+RDnz!TR^mxSLu_y#SDVKrj8i zA^hi6>jMGM;`$9Vfb-Yf!47b)Ow`2OKtNB=z|Kxa$5O}WPo;(Dc^`q(7X8kkeFyO8 z{XOq^07=u|7*P2`m;>PIFf=i80MKUxsN{d2cX0M+REsE*20+WQ79T9&cqT>=I_U% z{=8~^Isg(Nzo~`4iQfIb_#CVCD>#5h>=-Z#5dH}WxYzn%0)GAm6L2WdUdP=0_h>7f z(jh&7%1i(ZOn+}D8$iGK4Vs{pmHl_w4Qm-46H9>4^{3dz^DZDh+dw)6Xd@CpQNK$j z{CU;-cmpK=egplZ3y3%y=sEnCJ^eYVKXzV8H2_r*fJ*%*B;a1_lOpt6)IT1IAK2eB z{rie|uDJUrbgfUE>~C>@RO|m5ex55F{=~Bb4Cucp{ok7Yf9V}QuZ`#Gc|WaqsQlK- zKaV)iMRR__&Ak2Z=IM9R9g5$WM4u{a^C-7uX*!myEym z#_#p^T!P~#Dx$%^K>Y_nj_3J*E_LwJ60-5Xu=LkJAwcP@|0;a&+|+ZX`Jbj9P5;T% z|KOc}4*#4o{U?09`9Hz`Xo-I!P=9XfIrr*MQ}y=$!qgv?_J38^bNb4kM&_OVg^_=Eu-qG5U(fw0KMgH){C8pazq~51rN97hf#20-7=aK0)N|UM H-+%o-(+5aQ literal 0 HcmV?d00001 diff --git a/webxr/googlevr/gradle/gradle/wrapper/gradle-wrapper.properties b/webxr/googlevr/gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..f156f27a --- /dev/null +++ b/webxr/googlevr/gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Nov 28 14:43:10 PST 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/webxr/googlevr/gradle/gradlew b/webxr/googlevr/gradle/gradlew new file mode 100755 index 00000000..9d82f789 --- /dev/null +++ b/webxr/googlevr/gradle/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 + +# 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 + +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"` + 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 + +# 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/webxr/googlevr/gradle/gradlew.bat b/webxr/googlevr/gradle/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/webxr/googlevr/gradle/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/webxr/googlevr/gradle/settings.gradle b/webxr/googlevr/gradle/settings.gradle new file mode 100644 index 00000000..332416ed --- /dev/null +++ b/webxr/googlevr/gradle/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'GVRService' \ No newline at end of file diff --git a/webxr/googlevr/gradle/src/main/AndroidManifest.xml b/webxr/googlevr/gradle/src/main/AndroidManifest.xml new file mode 100644 index 00000000..4de55b82 --- /dev/null +++ b/webxr/googlevr/gradle/src/main/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/webxr/googlevr/gradle/src/main/java/com/rust/webvr/GVRService.java b/webxr/googlevr/gradle/src/main/java/com/rust/webvr/GVRService.java new file mode 100644 index 00000000..6f2b3d2e --- /dev/null +++ b/webxr/googlevr/gradle/src/main/java/com/rust/webvr/GVRService.java @@ -0,0 +1,188 @@ +package com.rust.webvr; + +import android.app.Activity; +import android.app.Application; +import android.content.pm.ActivityInfo; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.view.WindowManager; +import android.widget.FrameLayout; +import android.widget.FrameLayout.LayoutParams; + +import com.google.vr.ndk.base.AndroidCompat; +import com.google.vr.ndk.base.GvrLayout; + +class GVRService implements Application.ActivityLifecycleCallbacks { + private Activity mActivity; + private GvrLayout gvrLayout; + private long mPtr = 0; // Native Rustlang struct pointer + private boolean mPresenting = false; + private boolean mPaused = false; + private boolean mGvrResumed = false; + + private static native void nativeOnPause(long ptr); + private static native void nativeOnResume(long ptr); + + void init(final Activity activity, long ptr) { + mActivity = activity; + mPtr = ptr; + + Runnable initGvr = new Runnable() { + @Override + public void run() { + gvrLayout = new GvrLayout(activity); + // Decouple the app framerate from the display framerate + if (gvrLayout.setAsyncReprojectionEnabled(true)) { + // Android N hint to tune apps for a predictable, + // consistent level of device performance over long periods of time. + // The system automatically disables this mode when the window + // is no longer in focus. + AndroidCompat.setSustainedPerformanceMode(activity, true); + } + gvrLayout.setPresentationView(new View(activity)); + + activity.getApplication().registerActivityLifecycleCallbacks(GVRService.this); + + // Wait until completed + synchronized(this) { + this.notify(); + } + } + }; + + synchronized (initGvr) { + activity.runOnUiThread(initGvr); + try { + initGvr.wait(); + } + catch (Exception ex) { + Log.e("rust-webvr", Log.getStackTraceString(ex)); + } + } + } + + // Called from Native + public long getNativeContext() { + return gvrLayout.getGvrApi().getNativeGvrContext(); + } + + private void start() { + if (mPresenting) { + return; + } + + mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + mActivity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + if (!AndroidCompat.setVrModeEnabled(mActivity, true)) { + Log.w("rust-webvr", "setVrModeEnabled failed"); + } + + // Show GvrLayout + FrameLayout rootLayout = (FrameLayout)mActivity.findViewById(android.R.id.content); + rootLayout.addView(gvrLayout, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + + if (!mGvrResumed) { + gvrLayout.onResume(); + mGvrResumed = true; + } + mPresenting = true; + } + + + // Called from Native + public void startPresent() { + mActivity.runOnUiThread(new Runnable() { + @Override + public void run() { + start(); + } + }); + } + + public void stopPresent() { + mActivity.runOnUiThread(new Runnable() { + @Override + public void run() { + if (!mPresenting) { + return; + } + mPresenting = false; + // Hide GvrLayout + FrameLayout rootLayout = (FrameLayout)mActivity.findViewById(android.R.id.content); + rootLayout.removeView(gvrLayout); + + AndroidCompat.setVrModeEnabled(mActivity, false); + mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER); + mActivity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + }); + } + + // Called from JNI + public static Object create(Activity activity, long ptr) { + GVRService service = new GVRService(); + service.init(activity, ptr); + return service; + } + + // ActivityLifecycleCallbacks + @Override + public void onActivityCreated(Activity activity, Bundle savedInstanceState) { + + } + + @Override + public void onActivityStarted(Activity activity) { + if (activity != mActivity) { + return; + } + if (mPaused && gvrLayout != null && !mGvrResumed) { + gvrLayout.onResume(); + mGvrResumed = true; + mPaused = false; + nativeOnResume(mPtr); + } + } + + @Override + public void onActivityResumed(Activity activity) { + + } + + @Override + public void onActivityPaused(Activity activity) { + + } + + @Override + public void onActivityStopped(Activity activity) { + if (activity != mActivity) { + return; + } + + if (mPresenting && gvrLayout != null && mGvrResumed) { + gvrLayout.onPause(); + mGvrResumed = false; + mPaused = true; + nativeOnPause(mPtr); + } + } + + @Override + public void onActivitySaveInstanceState(Activity activity, Bundle outState) { + + } + + @Override + public void onActivityDestroyed(Activity activity) { + if (mActivity == activity) { + if (gvrLayout != null) { + gvrLayout.shutdown(); + gvrLayout = null; + } + activity.getApplication().unregisterActivityLifecycleCallbacks(this); + mActivity = null; // Don't leak activity + } + } +} From af009360b1d08a6eebd3b44deee547a3174fee0e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 23 Jul 2019 16:51:56 -0700 Subject: [PATCH 03/17] Add GoogleVRDevice and GoogleVRDiscovery stubs --- webxr/googlevr/mod.rs | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/webxr/googlevr/mod.rs b/webxr/googlevr/mod.rs index 6d14e193..b5a956b2 100644 --- a/webxr/googlevr/mod.rs +++ b/webxr/googlevr/mod.rs @@ -2,3 +2,90 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +use gleam::gl::GLsync; + +use webxr_api::Device; +use webxr_api::Discovery; +use webxr_api::Error; +use webxr_api::Event; +use webxr_api::EventBuffer; +use webxr_api::EventCallback; +use webxr_api::Floor; +use webxr_api::Frame; +use webxr_api::InputSource; +use webxr_api::Native; +use webxr_api::Quitter; +use webxr_api::Session; +use webxr_api::SessionBuilder; +use webxr_api::SessionMode; +use webxr_api::Views; + +use euclid::default::Size2D; +use euclid::RigidTransform3D; + +pub struct GoogleVRDiscovery {} + +impl GoogleVRDiscovery { + pub fn new() -> Self { + GoogleVRDiscovery {} + } +} +impl Discovery for GoogleVRDiscovery { + fn request_session(&mut self, mode: SessionMode, xr: SessionBuilder) -> Result { + if self.supports_session(mode) { + xr.spawn(move || GoogleVRDevice::new()) + } else { + Err(Error::NoMatchingDevice) + } + } + + fn supports_session(&self, mode: SessionMode) -> bool { + mode == SessionMode::ImmersiveVR + } +} + +pub struct GoogleVRDevice { + events: EventBuffer, +} + +impl GoogleVRDevice { + pub fn new() -> Result { + Ok(GoogleVRDevice { + events: Default::default(), + }) + } +} + +impl Device for GoogleVRDevice { + fn floor_transform(&self) -> RigidTransform3D { + unimplemented!() + } + + fn views(&self) -> Views { + unimplemented!() + } + + fn wait_for_animation_frame(&mut self) -> Frame { + unimplemented!() + } + + fn render_animation_frame(&mut self, _texture_id: u32, _size: Size2D, _sync: GLsync) { + unimplemented!() + } + + fn initial_inputs(&self) -> Vec { + vec![] + } + + fn set_event_callback(&mut self, _callback: Box) { + unimplemented!() + } + + fn quit(&mut self) { + self.events.callback(Event::SessionEnd); + } + + fn set_quitter(&mut self, _: Quitter) { + // do nothing for now until we need the quitter + } +} From 06eef9fe2c8050f67b66e1b920b595ef8923094e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 23 Jul 2019 17:00:09 -0700 Subject: [PATCH 04/17] Add JNI utils --- webxr/Cargo.toml | 5 +- webxr/googlevr/mod.rs | 3 +- webxr/jni_utils.rs | 105 ++++++++++++++++++++++++++++++++++++++++++ webxr/lib.rs | 3 ++ 4 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 webxr/jni_utils.rs diff --git a/webxr/Cargo.toml b/webxr/Cargo.toml index 89eaa56f..7157cc69 100644 --- a/webxr/Cargo.toml +++ b/webxr/Cargo.toml @@ -22,7 +22,7 @@ path = "lib.rs" glwindow = ["glutin"] headless = [] ipc = ["webxr-api/ipc"] -googlevr = ["gvr-sys"] +googlevr = ["gvr-sys", "android_injected_glue"] [dependencies] @@ -33,5 +33,8 @@ glutin = { version = "0.21", optional = true } log = "0.4" gvr-sys = { version = "0.7", optional = true } +[target.'cfg(target_os = "android")'.dependencies] +android_injected_glue = { version = "0.2.2", optional = true } + [build-dependencies] gl_generator = "0.11" diff --git a/webxr/googlevr/mod.rs b/webxr/googlevr/mod.rs index b5a956b2..12213a76 100644 --- a/webxr/googlevr/mod.rs +++ b/webxr/googlevr/mod.rs @@ -23,7 +23,7 @@ use webxr_api::Views; use euclid::default::Size2D; use euclid::RigidTransform3D; -pub struct GoogleVRDiscovery {} +pub struct GoogleVRDiscovery { } impl GoogleVRDiscovery { pub fn new() -> Self { @@ -89,3 +89,4 @@ impl Device for GoogleVRDevice { // do nothing for now until we need the quitter } } + diff --git a/webxr/jni_utils.rs b/webxr/jni_utils.rs new file mode 100644 index 00000000..a01979e9 --- /dev/null +++ b/webxr/jni_utils.rs @@ -0,0 +1,105 @@ +use android_injected_glue as android; +use android_injected_glue::ffi as ndk; +use std::ffi::CString; +use std::mem; +use std::ptr; + +pub struct JNIScope { + pub vm: *mut ndk::_JavaVM, + pub env: *mut ndk::JNIEnv, + pub activity: ndk::jobject, +} + +impl JNIScope { + pub unsafe fn attach() -> Result { + let mut env: *mut ndk::JNIEnv = mem::uninitialized(); + let activity: &ndk::ANativeActivity = mem::transmute(android::get_app().activity); + let vm: &mut ndk::_JavaVM = mem::transmute(activity.vm); + let vmf: &ndk::JNIInvokeInterface = mem::transmute(vm.functions); + + // Attach is required because native_glue is running in a separate thread + if (vmf.AttachCurrentThread)(vm as *mut _, &mut env as *mut _, ptr::null_mut()) != 0 { + return Err("JNI AttachCurrentThread failed".into()); + } + + Ok(JNIScope { + vm: vm, + env: env, + activity: activity.clazz, + }) + } + + pub unsafe fn find_class(&self, class_name: &str) -> Result { + // jni.FindClass doesn't find our classes because the attached thread has not our classloader. + // NativeActivity's classloader is used to fix this issue. + let env = self.env; + let jni = self.jni(); + + let activity_class = (jni.GetObjectClass)(env, self.activity); + if activity_class.is_null() { + return Err("Didn't find NativeActivity class".into()); + } + let method = self.get_method( + activity_class, + "getClassLoader", + "()Ljava/lang/ClassLoader;", + false, + ); + let classloader = (jni.CallObjectMethod)(env, self.activity, method); + if classloader.is_null() { + return Err("Didn't find NativeActivity's classloader".into()); + } + let classloader_class = (jni.GetObjectClass)(env, classloader); + let load_method = self.get_method( + classloader_class, + "loadClass", + "(Ljava/lang/String;)Ljava/lang/Class;", + false, + ); + + // Load our class using the classloader. + let class_name = CString::new(class_name).unwrap(); + let class_name = (jni.NewStringUTF)(env, class_name.as_ptr()); + let java_class = + (jni.CallObjectMethod)(env, classloader, load_method, class_name) as ndk::jclass; + (jni.DeleteLocalRef)(env, class_name); + + Ok(java_class) + } + + pub unsafe fn get_method( + &self, + class: ndk::jclass, + method: &str, + signature: &str, + is_static: bool, + ) -> ndk::jmethodID { + let method = CString::new(method).unwrap(); + let signature = CString::new(signature).unwrap(); + let jni = self.jni(); + + if is_static { + (jni.GetStaticMethodID)(self.env, class, method.as_ptr(), signature.as_ptr()) + } else { + (jni.GetMethodID)(self.env, class, method.as_ptr(), signature.as_ptr()) + } + } + + pub fn jni(&self) -> &mut ndk::JNINativeInterface { + unsafe { mem::transmute((*self.env).functions) } + } + + pub fn jni_from_env(env: *mut ndk::JNIEnv) -> *mut ndk::JNINativeInterface { + unsafe { (*env).functions as *mut _ } + } +} + +impl Drop for JNIScope { + // Autodetach JNI thread + fn drop(&mut self) { + unsafe { + let vmf: &ndk::JNIInvokeInterface = mem::transmute((*self.vm).functions); + (vmf.DetachCurrentThread)(self.vm); + } + } +} diff --git a/webxr/lib.rs b/webxr/lib.rs index 86bebbbb..b5cbc3ea 100644 --- a/webxr/lib.rs +++ b/webxr/lib.rs @@ -17,3 +17,6 @@ pub mod googlevr; mod gl { include!(concat!(env!("OUT_DIR"), "/gles_bindings.rs")); } + +#[cfg(all(feature = "googlevr", target_os = "android"))] +pub(crate) mod jni_utils; From 1d91d130bedc693ba6f3f1f4b3dacaf2002a6631 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 23 Jul 2019 17:04:26 -0700 Subject: [PATCH 05/17] Split up googlevr module --- webxr/googlevr/device.rs | 62 +++++++++++++++++++++++++ webxr/googlevr/discovery.rs | 28 ++++++++++++ webxr/googlevr/mod.rs | 90 ++----------------------------------- 3 files changed, 93 insertions(+), 87 deletions(-) create mode 100644 webxr/googlevr/device.rs create mode 100644 webxr/googlevr/discovery.rs diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs new file mode 100644 index 00000000..c18d6726 --- /dev/null +++ b/webxr/googlevr/device.rs @@ -0,0 +1,62 @@ +use gleam::gl::GLsync; + +use webxr_api::Device; +use webxr_api::Error; +use webxr_api::Event; +use webxr_api::EventBuffer; +use webxr_api::EventCallback; +use webxr_api::Floor; +use webxr_api::Frame; +use webxr_api::InputSource; +use webxr_api::Native; +use webxr_api::Quitter; +use webxr_api::Views; + +use euclid::default::Size2D; +use euclid::RigidTransform3D; + +pub struct GoogleVRDevice { + events: EventBuffer, +} + +impl GoogleVRDevice { + pub fn new() -> Result { + Ok(GoogleVRDevice { + events: Default::default(), + }) + } +} + +impl Device for GoogleVRDevice { + fn floor_transform(&self) -> RigidTransform3D { + unimplemented!() + } + + fn views(&self) -> Views { + unimplemented!() + } + + fn wait_for_animation_frame(&mut self) -> Frame { + unimplemented!() + } + + fn render_animation_frame(&mut self, _texture_id: u32, _size: Size2D, _sync: GLsync) { + unimplemented!() + } + + fn initial_inputs(&self) -> Vec { + vec![] + } + + fn set_event_callback(&mut self, _callback: Box) { + unimplemented!() + } + + fn quit(&mut self) { + self.events.callback(Event::SessionEnd); + } + + fn set_quitter(&mut self, _: Quitter) { + // do nothing for now until we need the quitter + } +} diff --git a/webxr/googlevr/discovery.rs b/webxr/googlevr/discovery.rs new file mode 100644 index 00000000..f9afd5e5 --- /dev/null +++ b/webxr/googlevr/discovery.rs @@ -0,0 +1,28 @@ +use webxr_api::Discovery; +use webxr_api::Error; +use webxr_api::Session; +use webxr_api::SessionBuilder; +use webxr_api::SessionMode; + +use super::device::GoogleVRDevice; + +pub struct GoogleVRDiscovery {} + +impl GoogleVRDiscovery { + pub fn new() -> Self { + GoogleVRDiscovery {} + } +} +impl Discovery for GoogleVRDiscovery { + fn request_session(&mut self, mode: SessionMode, xr: SessionBuilder) -> Result { + if self.supports_session(mode) { + xr.spawn(move || GoogleVRDevice::new()) + } else { + Err(Error::NoMatchingDevice) + } + } + + fn supports_session(&self, mode: SessionMode) -> bool { + mode == SessionMode::ImmersiveVR + } +} diff --git a/webxr/googlevr/mod.rs b/webxr/googlevr/mod.rs index 12213a76..096676ad 100644 --- a/webxr/googlevr/mod.rs +++ b/webxr/googlevr/mod.rs @@ -2,91 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use gleam::gl::GLsync; - -use webxr_api::Device; -use webxr_api::Discovery; -use webxr_api::Error; -use webxr_api::Event; -use webxr_api::EventBuffer; -use webxr_api::EventCallback; -use webxr_api::Floor; -use webxr_api::Frame; -use webxr_api::InputSource; -use webxr_api::Native; -use webxr_api::Quitter; -use webxr_api::Session; -use webxr_api::SessionBuilder; -use webxr_api::SessionMode; -use webxr_api::Views; - -use euclid::default::Size2D; -use euclid::RigidTransform3D; - -pub struct GoogleVRDiscovery { } - -impl GoogleVRDiscovery { - pub fn new() -> Self { - GoogleVRDiscovery {} - } -} -impl Discovery for GoogleVRDiscovery { - fn request_session(&mut self, mode: SessionMode, xr: SessionBuilder) -> Result { - if self.supports_session(mode) { - xr.spawn(move || GoogleVRDevice::new()) - } else { - Err(Error::NoMatchingDevice) - } - } - - fn supports_session(&self, mode: SessionMode) -> bool { - mode == SessionMode::ImmersiveVR - } -} - -pub struct GoogleVRDevice { - events: EventBuffer, -} - -impl GoogleVRDevice { - pub fn new() -> Result { - Ok(GoogleVRDevice { - events: Default::default(), - }) - } -} - -impl Device for GoogleVRDevice { - fn floor_transform(&self) -> RigidTransform3D { - unimplemented!() - } - - fn views(&self) -> Views { - unimplemented!() - } - - fn wait_for_animation_frame(&mut self) -> Frame { - unimplemented!() - } - - fn render_animation_frame(&mut self, _texture_id: u32, _size: Size2D, _sync: GLsync) { - unimplemented!() - } - - fn initial_inputs(&self) -> Vec { - vec![] - } - - fn set_event_callback(&mut self, _callback: Box) { - unimplemented!() - } - - fn quit(&mut self) { - self.events.callback(Event::SessionEnd); - } - - fn set_quitter(&mut self, _: Quitter) { - // do nothing for now until we need the quitter - } -} +pub use discovery::GoogleVRDiscovery; +pub(crate) mod device; +pub(crate) mod discovery; From 291d94433e95cc32297fd1d8729f9612bad97be2 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 23 Jul 2019 17:18:29 -0700 Subject: [PATCH 06/17] Import discovery code from rust-webvr/..../googlevr/service.rs --- webxr-api/error.rs | 1 + webxr/googlevr/device.rs | 4 +- webxr/googlevr/discovery.rs | 157 +++++++++++++++++++++++++++++++++++- webxr/googlevr/mod.rs | 7 ++ 4 files changed, 164 insertions(+), 5 deletions(-) diff --git a/webxr-api/error.rs b/webxr-api/error.rs index dee06b0e..ec0de677 100644 --- a/webxr-api/error.rs +++ b/webxr-api/error.rs @@ -14,4 +14,5 @@ use serde::{Deserialize, Serialize}; pub enum Error { NoMatchingDevice, CommunicationError, + BackendSpecific(String), } diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index c18d6726..7f787e45 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -4,11 +4,11 @@ use webxr_api::Device; use webxr_api::Error; use webxr_api::Event; use webxr_api::EventBuffer; -use webxr_api::EventCallback; use webxr_api::Floor; use webxr_api::Frame; use webxr_api::InputSource; use webxr_api::Native; +use webxr_api::Sender; use webxr_api::Quitter; use webxr_api::Views; @@ -48,7 +48,7 @@ impl Device for GoogleVRDevice { vec![] } - fn set_event_callback(&mut self, _callback: Box) { + fn set_event_dest(&mut self, _dest: Sender) { unimplemented!() } diff --git a/webxr/googlevr/discovery.rs b/webxr/googlevr/discovery.rs index f9afd5e5..1ed385de 100644 --- a/webxr/googlevr/discovery.rs +++ b/webxr/googlevr/discovery.rs @@ -6,13 +6,43 @@ use webxr_api::SessionMode; use super::device::GoogleVRDevice; -pub struct GoogleVRDiscovery {} +#[cfg(target_os = "android")] +use crate::jni_utils::JNIScope; +#[cfg(target_os = "android")] +use android_injected_glue::ffi as ndk; +use gvr_sys as gvr; +use std::ptr; + +#[cfg(target_os = "android")] +const SERVICE_CLASS_NAME: &'static str = "com/rust/webvr/GVRService"; + +pub struct GoogleVRDiscovery { + ctx: *mut gvr::gvr_context, + controller_ctx: *mut gvr::gvr_controller_context, + #[cfg(target_os = "android")] + pub java_object: ndk::jobject, + #[cfg(target_os = "android")] + pub java_class: ndk::jclass, +} impl GoogleVRDiscovery { - pub fn new() -> Self { - GoogleVRDiscovery {} + pub fn new() -> Result { + let mut this = Self::new_uninit(); + unsafe { + this.create_context().map_err(Error::BackendSpecific)?; + } + if this.ctx.is_null() { + return Err(Error::BackendSpecific( + "GoogleVR SDK failed to initialize".into(), + )); + } + unsafe { + this.create_controller_context(); + } + Ok(this) } } + impl Discovery for GoogleVRDiscovery { fn request_session(&mut self, mode: SessionMode, xr: SessionBuilder) -> Result { if self.supports_session(mode) { @@ -26,3 +56,124 @@ impl Discovery for GoogleVRDiscovery { mode == SessionMode::ImmersiveVR } } + +impl GoogleVRDiscovery { + #[cfg(target_os = "android")] + pub fn new_uninit() -> Self { + Self { + ctx: ptr::null_mut(), + controller_ctx: ptr::null_mut(), + java_object: ptr::null_mut(), + java_class: ptr::null_mut(), + } + } + + #[cfg(not(target_os = "android"))] + pub fn new_uninit() -> Self { + Self { + ctx: ptr::null_mut(), + controller_ctx: ptr::null_mut(), + } + } + + // On Android, the gvr_context must be be obtained from + // the Java GvrLayout object via GvrLayout.getGvrApi().getNativeGvrContext() + // Java code is implemented in GVRService. It handles the life cycle of the GvrLayout. + // JNI code is used to comunicate with that Java code. + #[cfg(target_os = "android")] + unsafe fn create_context(&mut self) -> Result<(), String> { + use std::mem; + + let jni_scope = JNIScope::attach()?; + + let jni = jni_scope.jni(); + let env = jni_scope.env; + + // Use NativeActivity's classloader to find our class + self.java_class = jni_scope.find_class(SERVICE_CLASS_NAME)?; + if self.java_class.is_null() { + return Err("Didn't find GVRService class".into()); + }; + self.java_class = (jni.NewGlobalRef)(env, self.java_class); + + // Create GVRService instance and own it as a globalRef. + let method = jni_scope.get_method( + self.java_class, + "create", + "(Landroid/app/Activity;J)Ljava/lang/Object;", + true, + ); + let thiz: usize = mem::transmute(self as *mut GoogleVRDiscovery); + self.java_object = (jni.CallStaticObjectMethod)( + env, + self.java_class, + method, + jni_scope.activity, + thiz as ndk::jlong, + ); + if self.java_object.is_null() { + return Err("Failed to create GVRService instance".into()); + }; + self.java_object = (jni.NewGlobalRef)(env, self.java_object); + + // Finally we have everything required to get the gvr_context pointer from java :) + let method = jni_scope.get_method(self.java_class, "getNativeContext", "()J", false); + let pointer = (jni.CallLongMethod)(env, self.java_object, method); + self.ctx = pointer as *mut gvr::gvr_context; + if self.ctx.is_null() { + return Err("Failed to getNativeGvrContext from java GvrLayout".into()); + } + + Ok(()) + } + + #[cfg(not(target_os = "android"))] + unsafe fn create_context(&mut self) -> Result<(), String> { + self.ctx = gvr::gvr_create(); + Ok(()) + } + + unsafe fn create_controller_context(&mut self) { + let options = gvr::gvr_controller_get_default_options(); + self.controller_ctx = gvr::gvr_controller_create_and_init(options, self.ctx); + gvr::gvr_controller_resume(self.controller_ctx); + } + + pub fn on_pause(&self) { + unimplemented!() + } + + pub fn on_resume(&self) { + unimplemented!() + } +} + +#[cfg(target_os = "android")] +#[no_mangle] +#[allow(non_snake_case)] +#[allow(dead_code)] +pub extern "C" fn Java_com_rust_webvr_GVRService_nativeOnPause( + _: *mut ndk::JNIEnv, + service: ndk::jlong, +) { + use std::mem; + unsafe { + let service: *mut GoogleVRDiscovery = mem::transmute(service as usize); + (*service).on_pause(); + } +} + +#[cfg(target_os = "android")] +#[no_mangle] +#[allow(non_snake_case)] +#[allow(dead_code)] +pub extern "C" fn Java_com_rust_webvr_GVRService_nativeOnResume( + _: *mut ndk::JNIEnv, + service: ndk::jlong, +) { + use std::mem; + unsafe { + let service: *mut GoogleVRDiscovery = mem::transmute(service as usize); + (*service).on_resume(); + } +} diff --git a/webxr/googlevr/mod.rs b/webxr/googlevr/mod.rs index 096676ad..863f760b 100644 --- a/webxr/googlevr/mod.rs +++ b/webxr/googlevr/mod.rs @@ -6,3 +6,10 @@ pub use discovery::GoogleVRDiscovery; pub(crate) mod device; pub(crate) mod discovery; + +// Export functions called from Java +#[cfg(target_os = "android")] +pub mod jni { + pub use super::discovery::Java_com_rust_webvr_GVRService_nativeOnPause; + pub use super::discovery::Java_com_rust_webvr_GVRService_nativeOnResume; +} From 218f5ecd95440e0c2a19e02d22be07af8abb10b7 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 25 Jul 2019 15:38:41 -0700 Subject: [PATCH 07/17] Add basic device initialization state --- webxr/googlevr/device.rs | 85 +++++++++++++++++++++++++++++++++++-- webxr/googlevr/discovery.rs | 43 +++++++++++++++++-- 2 files changed, 121 insertions(+), 7 deletions(-) diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index 7f787e45..a0aa2280 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -15,15 +15,92 @@ use webxr_api::Views; use euclid::default::Size2D; use euclid::RigidTransform3D; -pub struct GoogleVRDevice { +use gvr_sys as gvr; +use std::ptr; + +use super::discovery::SendPtr; + +#[cfg(target_os = "android")] +use android_injected_glue::ffi as ndk; + +pub(crate) struct GoogleVRDevice { events: EventBuffer, + + #[cfg(target_os = "android")] + java_class: ndk::jclass, + ctx: *mut gvr::gvr_context, + controller_ctx: *mut gvr::gvr_controller_context, + viewport_list: *mut gvr::gvr_buffer_viewport_list, + left_eye_vp: *mut gvr::gvr_buffer_viewport, + right_eye_vp: *mut gvr::gvr_buffer_viewport, + render_size: gvr::gvr_sizei, + swap_chain: *mut gvr::gvr_swap_chain, + frame: *mut gvr::gvr_frame, + } impl GoogleVRDevice { - pub fn new() -> Result { - Ok(GoogleVRDevice { + #[cfg(target_os = "android")] + pub fn new(ctx: SendPtr<*mut gvr::gvr_context>, controller_ctx: SendPtr<*mut gvr::gvr_controller_context>, java_class: SendPtr) -> Result { + let mut device = GoogleVRDevice { + events: Default::default(), + ctx: ctx.get(), controller_ctx: controller_ctx.get(), java_class: java_class.get(), + viewport_list: ptr::null_mut(), + left_eye_vp: ptr::null_mut(), + right_eye_vp: ptr::null_mut(), + render_size: gvr::gvr_sizei { + width: 0, + height: 0, + }, + swap_chain: ptr::null_mut(), + frame: ptr::null_mut(), + }; + device.init(); + Ok(device) + } + + #[cfg(not(target_os = "android"))] + pub fn new(ctx: SendPtr<*mut gvr::gvr_context>, controller_ctx: SendPtr<*mut gvr::gvr_controller_context>) -> Result { + let mut device = GoogleVRDevice { events: Default::default(), - }) + ctx: ctx.get(), controller_ctx: controller_ctx.get(), + viewport_list: ptr::null_mut(), + left_eye_vp: ptr::null_mut(), + right_eye_vp: ptr::null_mut(), + render_size: gvr::gvr_sizei { + width: 0, + height: 0, + }, + swap_chain: ptr::null_mut(), + frame: ptr::null_mut(), + }; + device.init(); + Ok(device) + } + + + fn init(&mut self) { + unsafe { + let list = gvr::gvr_buffer_viewport_list_create(self.ctx); + + // gvr_refresh_viewer_profile must be called before getting recommended bufer viewports. + gvr::gvr_refresh_viewer_profile(self.ctx); + + // Gets the recommended buffer viewport configuration, populating a previously + // allocated gvr_buffer_viewport_list object. The updated values include the + // per-eye recommended viewport and field of view for the target. + gvr::gvr_get_recommended_buffer_viewports(self.ctx, list); + + // Create viewport buffers for both eyes. + self.left_eye_vp = gvr::gvr_buffer_viewport_create(self.ctx); + gvr::gvr_buffer_viewport_list_get_item(list, gvr::gvr_eye::GVR_LEFT_EYE as usize, self.left_eye_vp); + self.right_eye_vp = gvr::gvr_buffer_viewport_create(self.ctx); + gvr::gvr_buffer_viewport_list_get_item(list, gvr::gvr_eye::GVR_RIGHT_EYE as usize, self.right_eye_vp); + + // The following fields are expected to be null at initialization + // self.frame = ptr::null_mut(); + // self.swap_chain = ptr::null_mut(); + } } } diff --git a/webxr/googlevr/discovery.rs b/webxr/googlevr/discovery.rs index 1ed385de..d357c902 100644 --- a/webxr/googlevr/discovery.rs +++ b/webxr/googlevr/discovery.rs @@ -16,13 +16,29 @@ use std::ptr; #[cfg(target_os = "android")] const SERVICE_CLASS_NAME: &'static str = "com/rust/webvr/GVRService"; +/// Quick way to make Sendable pointers +#[derive(Copy, Clone)] +pub(crate) struct SendPtr(T); + +unsafe impl Send for SendPtr {} + +impl SendPtr<*mut T> { + pub unsafe fn new(ptr: *mut T) -> Self { + SendPtr(ptr) + } + + pub fn get(self) -> *mut T { + self.0 + } +} + pub struct GoogleVRDiscovery { ctx: *mut gvr::gvr_context, controller_ctx: *mut gvr::gvr_controller_context, #[cfg(target_os = "android")] - pub java_object: ndk::jobject, + java_object: ndk::jobject, #[cfg(target_os = "android")] - pub java_class: ndk::jclass, + java_class: ndk::jclass, } impl GoogleVRDiscovery { @@ -44,9 +60,30 @@ impl GoogleVRDiscovery { } impl Discovery for GoogleVRDiscovery { + #[cfg(target_os = "android")] + fn request_session(&mut self, mode: SessionMode, xr: SessionBuilder) -> Result { + let (ctx, controller_ctx, java_class); + unsafe { + ctx = SendPtr::new(self.ctx); + controller_ctx = SendPtr::new(self.controller_ctx); + java_class = SendPtr::new(self.java_class); + } + if self.supports_session(mode) { + xr.spawn(move || GoogleVRDevice::new(ctx, controller_ctx, java_class)) + } else { + Err(Error::NoMatchingDevice) + } + } + + #[cfg(not(target_os = "android"))] fn request_session(&mut self, mode: SessionMode, xr: SessionBuilder) -> Result { + let (ctx, controller_ctx); + unsafe { + ctx = SendPtr::new(self.ctx); + controller_ctx = SendPtr::new(self.controller_ctx); + } if self.supports_session(mode) { - xr.spawn(move || GoogleVRDevice::new()) + xr.spawn(move || GoogleVRDevice::new(ctx, controller_ctx)) } else { Err(Error::NoMatchingDevice) } From a3c9eb45be1f7812c15c3691ae07ad1c17e622d0 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 25 Jul 2019 15:55:03 -0700 Subject: [PATCH 08/17] GL initialization --- webxr/Cargo.toml | 2 +- webxr/googlevr/device.rs | 157 ++++++++++++++++++++++++++++++++------- webxr/lib.rs | 3 + 3 files changed, 135 insertions(+), 27 deletions(-) diff --git a/webxr/Cargo.toml b/webxr/Cargo.toml index 7157cc69..0291cdb7 100644 --- a/webxr/Cargo.toml +++ b/webxr/Cargo.toml @@ -30,7 +30,7 @@ webxr-api = { path = "../webxr-api" } euclid = "0.20" gleam = "0.6" glutin = { version = "0.21", optional = true } -log = "0.4" +log = "0.4.6" gvr-sys = { version = "0.7", optional = true } [target.'cfg(target_os = "android")'.dependencies] diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index a0aa2280..7764f09c 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -8,15 +8,20 @@ use webxr_api::Floor; use webxr_api::Frame; use webxr_api::InputSource; use webxr_api::Native; -use webxr_api::Sender; use webxr_api::Quitter; +use webxr_api::Sender; use webxr_api::Views; +use crate::gl; + use euclid::default::Size2D; use euclid::RigidTransform3D; use gvr_sys as gvr; -use std::ptr; +use gvr_sys::gvr_color_format_type::*; +use gvr_sys::gvr_depth_stencil_format_type::*; +use gvr_sys::gvr_feature::*; +use std::{mem, ptr}; use super::discovery::SendPtr; @@ -25,6 +30,9 @@ use android_injected_glue::ffi as ndk; pub(crate) struct GoogleVRDevice { events: EventBuffer, + multiview: bool, + multisampling: bool, + depth: bool, #[cfg(target_os = "android")] java_class: ndk::jclass, @@ -36,15 +44,25 @@ pub(crate) struct GoogleVRDevice { render_size: gvr::gvr_sizei, swap_chain: *mut gvr::gvr_swap_chain, frame: *mut gvr::gvr_frame, - + fbo_id: u32, } impl GoogleVRDevice { #[cfg(target_os = "android")] - pub fn new(ctx: SendPtr<*mut gvr::gvr_context>, controller_ctx: SendPtr<*mut gvr::gvr_controller_context>, java_class: SendPtr) -> Result { + pub fn new( + ctx: SendPtr<*mut gvr::gvr_context>, + controller_ctx: SendPtr<*mut gvr::gvr_controller_context>, + java_class: SendPtr, + ) -> Result { let mut device = GoogleVRDevice { events: Default::default(), - ctx: ctx.get(), controller_ctx: controller_ctx.get(), java_class: java_class.get(), + multiview: false, + multisampling: false, + depth: false, + + ctx: ctx.get(), + controller_ctx: controller_ctx.get(), + java_class: java_class.get(), viewport_list: ptr::null_mut(), left_eye_vp: ptr::null_mut(), right_eye_vp: ptr::null_mut(), @@ -54,16 +72,28 @@ impl GoogleVRDevice { }, swap_chain: ptr::null_mut(), frame: ptr::null_mut(), + fbo_id: 0, }; - device.init(); + unsafe { + device.init(); + device.initialize_gl(); + } Ok(device) } #[cfg(not(target_os = "android"))] - pub fn new(ctx: SendPtr<*mut gvr::gvr_context>, controller_ctx: SendPtr<*mut gvr::gvr_controller_context>) -> Result { + pub fn new( + ctx: SendPtr<*mut gvr::gvr_context>, + controller_ctx: SendPtr<*mut gvr::gvr_controller_context>, + ) -> Result { let mut device = GoogleVRDevice { events: Default::default(), - ctx: ctx.get(), controller_ctx: controller_ctx.get(), + multiview: false, + multisampling: false, + depth: false, + + ctx: ctx.get(), + controller_ctx: controller_ctx.get(), viewport_list: ptr::null_mut(), left_eye_vp: ptr::null_mut(), right_eye_vp: ptr::null_mut(), @@ -73,33 +103,108 @@ impl GoogleVRDevice { }, swap_chain: ptr::null_mut(), frame: ptr::null_mut(), + fbo_id: 0, }; - device.init(); + unsafe { + device.init(); + device.initialize_gl(); + } Ok(device) } + unsafe fn init(&mut self) { + let list = gvr::gvr_buffer_viewport_list_create(self.ctx); + + // gvr_refresh_viewer_profile must be called before getting recommended bufer viewports. + gvr::gvr_refresh_viewer_profile(self.ctx); + + // Gets the recommended buffer viewport configuration, populating a previously + // allocated gvr_buffer_viewport_list object. The updated values include the + // per-eye recommended viewport and field of view for the target. + gvr::gvr_get_recommended_buffer_viewports(self.ctx, list); + + // Create viewport buffers for both eyes. + self.left_eye_vp = gvr::gvr_buffer_viewport_create(self.ctx); + gvr::gvr_buffer_viewport_list_get_item( + list, + gvr::gvr_eye::GVR_LEFT_EYE as usize, + self.left_eye_vp, + ); + self.right_eye_vp = gvr::gvr_buffer_viewport_create(self.ctx); + gvr::gvr_buffer_viewport_list_get_item( + list, + gvr::gvr_eye::GVR_RIGHT_EYE as usize, + self.right_eye_vp, + ); + } - fn init(&mut self) { - unsafe { - let list = gvr::gvr_buffer_viewport_list_create(self.ctx); + unsafe fn initialize_gl(&mut self) { + // Note: In some scenarios gvr_initialize_gl crashes if gvr_refresh_viewer_profile call isn't called before. + gvr::gvr_refresh_viewer_profile(self.ctx); + // Initializes gvr necessary GL-related objects. + gvr::gvr_initialize_gl(self.ctx); + + // GVR_FEATURE_MULTIVIEW must be checked after gvr_initialize_gl is called or the function will crash. + if self.multiview && !gvr::gvr_is_feature_supported(self.ctx, GVR_FEATURE_MULTIVIEW as i32) + { + self.multiview = false; + warn!("Multiview not supported. Fallback to standar framebuffer.") + } - // gvr_refresh_viewer_profile must be called before getting recommended bufer viewports. - gvr::gvr_refresh_viewer_profile(self.ctx); + // Create a framebuffer required to attach and + // blit the external texture into the main gvr pixel buffer. + gl::GenFramebuffers(1, &mut self.fbo_id); + + // Initialize gvr swap chain + let spec = gvr::gvr_buffer_spec_create(self.ctx); + self.render_size = self.recommended_render_size(); + + if self.multiview { + // Multiview requires half size because the buffer is a texture array with 2 half width layers. + gvr::gvr_buffer_spec_set_multiview_layers(spec, 2); + gvr::gvr_buffer_spec_set_size( + spec, + gvr::gvr_sizei { + width: self.render_size.width / 2, + height: self.render_size.height, + }, + ); + } else { + gvr::gvr_buffer_spec_set_size(spec, self.render_size); + } - // Gets the recommended buffer viewport configuration, populating a previously - // allocated gvr_buffer_viewport_list object. The updated values include the - // per-eye recommended viewport and field of view for the target. - gvr::gvr_get_recommended_buffer_viewports(self.ctx, list); + if self.multisampling { + gvr::gvr_buffer_spec_set_samples(spec, 2); + } else { + gvr::gvr_buffer_spec_set_samples(spec, 0); + } + gvr::gvr_buffer_spec_set_color_format(spec, GVR_COLOR_FORMAT_RGBA_8888 as i32); + + if self.depth { + gvr::gvr_buffer_spec_set_depth_stencil_format( + spec, + GVR_DEPTH_STENCIL_FORMAT_DEPTH_16 as i32, + ); + } else { + gvr::gvr_buffer_spec_set_depth_stencil_format( + spec, + GVR_DEPTH_STENCIL_FORMAT_NONE as i32, + ); + } - // Create viewport buffers for both eyes. - self.left_eye_vp = gvr::gvr_buffer_viewport_create(self.ctx); - gvr::gvr_buffer_viewport_list_get_item(list, gvr::gvr_eye::GVR_LEFT_EYE as usize, self.left_eye_vp); - self.right_eye_vp = gvr::gvr_buffer_viewport_create(self.ctx); - gvr::gvr_buffer_viewport_list_get_item(list, gvr::gvr_eye::GVR_RIGHT_EYE as usize, self.right_eye_vp); + self.swap_chain = gvr::gvr_swap_chain_create(self.ctx, mem::transmute(&spec), 1); + gvr::gvr_buffer_spec_destroy(mem::transmute(&spec)); + } - // The following fields are expected to be null at initialization - // self.frame = ptr::null_mut(); - // self.swap_chain = ptr::null_mut(); + fn recommended_render_size(&self) -> gvr::gvr_sizei { + // GVR SDK states that thee maximum effective render target size can be very large. + // Most applications need to scale down to compensate. + // Half pixel sizes are used by scaling each dimension by sqrt(2)/2 ~= 7/10ths. + let render_target_size = + unsafe { gvr::gvr_get_maximum_effective_render_target_size(self.ctx) }; + gvr::gvr_sizei { + width: (7 * render_target_size.width) / 10, + height: (7 * render_target_size.height) / 10, } } } diff --git a/webxr/lib.rs b/webxr/lib.rs index b5cbc3ea..ac23d4c7 100644 --- a/webxr/lib.rs +++ b/webxr/lib.rs @@ -4,6 +4,9 @@ //! This crate defines the Rust implementation of WebXR for various devices. +#[macro_use] +extern crate log; + #[cfg(feature = "glwindow")] pub mod glwindow; From 3f1a51bc618c336ab26b1f629b5f0df32c528135 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 25 Jul 2019 16:46:02 -0700 Subject: [PATCH 09/17] Enter and exit presentation mode --- webxr/googlevr/device.rs | 78 ++++++++++++++++++++++++++++++++++++- webxr/googlevr/discovery.rs | 5 ++- 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index 7764f09c..26ecf336 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -27,6 +27,8 @@ use super::discovery::SendPtr; #[cfg(target_os = "android")] use android_injected_glue::ffi as ndk; +#[cfg(target_os = "android")] +use crate::jni_utils::JNIScope; pub(crate) struct GoogleVRDevice { events: EventBuffer, @@ -36,6 +38,8 @@ pub(crate) struct GoogleVRDevice { #[cfg(target_os = "android")] java_class: ndk::jclass, + #[cfg(target_os = "android")] + java_object: ndk::jobject, ctx: *mut gvr::gvr_context, controller_ctx: *mut gvr::gvr_controller_context, viewport_list: *mut gvr::gvr_buffer_viewport_list, @@ -45,6 +49,7 @@ pub(crate) struct GoogleVRDevice { swap_chain: *mut gvr::gvr_swap_chain, frame: *mut gvr::gvr_frame, fbo_id: u32, + presenting: bool, } impl GoogleVRDevice { @@ -53,6 +58,7 @@ impl GoogleVRDevice { ctx: SendPtr<*mut gvr::gvr_context>, controller_ctx: SendPtr<*mut gvr::gvr_controller_context>, java_class: SendPtr, + java_object: SendPtr, ) -> Result { let mut device = GoogleVRDevice { events: Default::default(), @@ -63,6 +69,7 @@ impl GoogleVRDevice { ctx: ctx.get(), controller_ctx: controller_ctx.get(), java_class: java_class.get(), + java_object: java_object.get(), viewport_list: ptr::null_mut(), left_eye_vp: ptr::null_mut(), right_eye_vp: ptr::null_mut(), @@ -73,11 +80,14 @@ impl GoogleVRDevice { swap_chain: ptr::null_mut(), frame: ptr::null_mut(), fbo_id: 0, + presenting: false, }; unsafe { device.init(); - device.initialize_gl(); } + // XXXManishearth figure out how to block until presentation + // starts + device.start_present(); Ok(device) } @@ -104,11 +114,14 @@ impl GoogleVRDevice { swap_chain: ptr::null_mut(), frame: ptr::null_mut(), fbo_id: 0, + presenting: false, }; unsafe { device.init(); - device.initialize_gl(); } + // XXXManishearth figure out how to block until presentation + // starts + device.start_present(); Ok(device) } @@ -207,6 +220,66 @@ impl GoogleVRDevice { height: (7 * render_target_size.height) / 10, } } + + + #[cfg(target_os = "android")] + fn start_present(&mut self) { + if self.presenting { + return; + } + self.presenting = true; + unsafe { + if let Ok(jni_scope) = JNIScope::attach() { + let jni = jni_scope.jni(); + let env = jni_scope.env; + let method = jni_scope.get_method(self.java_class, "startPresent", "()V", false); + (jni.CallVoidMethod)(env, self.java_object, method); + } + } + + if self.swap_chain.is_null() { + unsafe { + self.initialize_gl(); + debug_assert!(!self.swap_chain.is_null()); + } + } + } + + #[cfg(not(target_os = "android"))] + fn start_present(&mut self) { + if self.presenting { + return; + } + self.presenting = true; + if self.swap_chain.is_null() { + unsafe { + self.initialize_gl(); + debug_assert!(!self.swap_chain.is_null()); + } + } + } + + // Hint to indicate that we are going to stop sending frames to the device + #[cfg(target_os = "android")] + fn stop_present(&mut self) { + if !self.presenting { + return; + } + self.presenting = false; + unsafe { + if let Ok(jni_scope) = JNIScope::attach() { + let jni = jni_scope.jni(); + let env = jni_scope.env; + let method = jni_scope.get_method(self.java_class, "stopPresent", "()V", false); + (jni.CallVoidMethod)(env, self.java_object, method); + } + } + } + + #[cfg(not(target_os = "android"))] + fn stop_present(&mut self) { + self.presenting = false; + } } impl Device for GoogleVRDevice { @@ -235,6 +308,7 @@ impl Device for GoogleVRDevice { } fn quit(&mut self) { + self.stop_present(); self.events.callback(Event::SessionEnd); } diff --git a/webxr/googlevr/discovery.rs b/webxr/googlevr/discovery.rs index d357c902..7c31e51b 100644 --- a/webxr/googlevr/discovery.rs +++ b/webxr/googlevr/discovery.rs @@ -62,14 +62,15 @@ impl GoogleVRDiscovery { impl Discovery for GoogleVRDiscovery { #[cfg(target_os = "android")] fn request_session(&mut self, mode: SessionMode, xr: SessionBuilder) -> Result { - let (ctx, controller_ctx, java_class); + let (ctx, controller_ctx, java_class, java_object); unsafe { ctx = SendPtr::new(self.ctx); controller_ctx = SendPtr::new(self.controller_ctx); java_class = SendPtr::new(self.java_class); + java_object = SendPtr::new(self.java_object); } if self.supports_session(mode) { - xr.spawn(move || GoogleVRDevice::new(ctx, controller_ctx, java_class)) + xr.spawn(move || GoogleVRDevice::new(ctx, controller_ctx, java_class, java_object)) } else { Err(Error::NoMatchingDevice) } From 51be74dab50162044cfbf9eef6e518335a05f91e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 26 Jul 2019 10:55:41 -0700 Subject: [PATCH 10/17] Support fetching eye parameters --- webxr/googlevr/device.rs | 98 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 7 deletions(-) diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index 26ecf336..9298bd1d 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -7,15 +7,23 @@ use webxr_api::EventBuffer; use webxr_api::Floor; use webxr_api::Frame; use webxr_api::InputSource; +use webxr_api::LeftEye; use webxr_api::Native; use webxr_api::Quitter; +use webxr_api::RightEye; use webxr_api::Sender; +use webxr_api::View; use webxr_api::Views; use crate::gl; -use euclid::default::Size2D; +use euclid::default::Size2D as DefaultSize2D; +use euclid::Point2D; +use euclid::Rect; use euclid::RigidTransform3D; +use euclid::Size2D; +use euclid::Transform3D; +use euclid::Vector3D; use gvr_sys as gvr; use gvr_sys::gvr_color_format_type::*; @@ -25,16 +33,20 @@ use std::{mem, ptr}; use super::discovery::SendPtr; -#[cfg(target_os = "android")] -use android_injected_glue::ffi as ndk; #[cfg(target_os = "android")] use crate::jni_utils::JNIScope; +#[cfg(target_os = "android")] +use android_injected_glue::ffi as ndk; pub(crate) struct GoogleVRDevice { events: EventBuffer, multiview: bool, multisampling: bool, depth: bool, + left_view: View, + right_view: View, + near: f32, + far: f32, #[cfg(target_os = "android")] java_class: ndk::jclass, @@ -52,6 +64,14 @@ pub(crate) struct GoogleVRDevice { presenting: bool, } +fn empty_view() -> View { + View { + transform: RigidTransform3D::identity(), + projection: Transform3D::identity(), + viewport: Default::default(), + } +} + impl GoogleVRDevice { #[cfg(target_os = "android")] pub fn new( @@ -65,6 +85,11 @@ impl GoogleVRDevice { multiview: false, multisampling: false, depth: false, + left_view: empty_view(), + right_view: empty_view(), + // https://github.com/servo/webxr/issues/32 + near: 0.1, + far: 1000.0, ctx: ctx.get(), controller_ctx: controller_ctx.get(), @@ -88,6 +113,7 @@ impl GoogleVRDevice { // XXXManishearth figure out how to block until presentation // starts device.start_present(); + device.initialize_views(); Ok(device) } @@ -101,6 +127,11 @@ impl GoogleVRDevice { multiview: false, multisampling: false, depth: false, + left_view: empty_view(), + right_view: empty_view(), + // https://github.com/servo/webxr/issues/32 + near: 0.1, + far: 1000.0, ctx: ctx.get(), controller_ctx: controller_ctx.get(), @@ -122,6 +153,7 @@ impl GoogleVRDevice { // XXXManishearth figure out how to block until presentation // starts device.start_present(); + device.initialize_views(); Ok(device) } @@ -221,7 +253,6 @@ impl GoogleVRDevice { } } - #[cfg(target_os = "android")] fn start_present(&mut self) { if self.presenting { @@ -280,22 +311,62 @@ impl GoogleVRDevice { fn stop_present(&mut self) { self.presenting = false; } + + fn initialize_views(&mut self) { + unsafe { + self.left_view = self.fetch_eye(gvr::gvr_eye::GVR_LEFT_EYE, self.left_eye_vp); + self.right_view = self.fetch_eye(gvr::gvr_eye::GVR_RIGHT_EYE, self.right_eye_vp); + } + } + + unsafe fn fetch_eye(&self, eye: gvr::gvr_eye, vp: *mut gvr::gvr_buffer_viewport) -> View { + let eye_fov = gvr::gvr_buffer_viewport_get_source_fov(vp); + let projection = fov_to_projection_matrix(&eye_fov, self.near, self.far); + + // this matrix converts from head space to eye space, + // i.e. it's the inverse of the offset + let eye_mat = gvr::gvr_get_eye_from_head_matrix(self.ctx, eye as i32); + // XXXManishearth we should decompose the matrix properly instead of assuming it's + // only translation + let transform = Vector3D::new(-eye_mat.m[0][3], -eye_mat.m[1][3], -eye_mat.m[2][3]).into(); + + let size = Size2D::new(self.render_size.width / 2, self.render_size.height); + let origin = if eye == gvr::gvr_eye::GVR_LEFT_EYE { + Point2D::origin() + } else { + Point2D::new(self.render_size.width / 2, 0) + }; + let viewport = Rect::new(origin, size); + + View { + projection, + transform, + viewport, + } + } } impl Device for GoogleVRDevice { fn floor_transform(&self) -> RigidTransform3D { - unimplemented!() + // GoogleVR doesn't know about the floor + // XXXManishearth perhaps we should report a guesstimate value here + RigidTransform3D::identity() } fn views(&self) -> Views { - unimplemented!() + Views::Stereo(self.left_view.clone(), self.right_view.clone()) } fn wait_for_animation_frame(&mut self) -> Frame { unimplemented!() } - fn render_animation_frame(&mut self, _texture_id: u32, _size: Size2D, _sync: GLsync) { + fn render_animation_frame( + &mut self, + _texture_id: u32, + _size: DefaultSize2D, + _sync: GLsync, + ) { unimplemented!() } @@ -316,3 +387,16 @@ impl Device for GoogleVRDevice { // do nothing for now until we need the quitter } } + +#[inline] +fn fov_to_projection_matrix( + fov: &gvr::gvr_rectf, + near: f32, + far: f32, +) -> Transform3D { + let left = -fov.left.to_radians().tan() * near; + let right = fov.right.to_radians().tan() * near; + let top = fov.top.to_radians().tan() * near; + let bottom = -fov.bottom.to_radians().tan() * near; + Transform3D::ortho(left, right, bottom, top, near, far) +} From 50c73416239e7ae30e4a769aaeaa33a9dabf3665 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 26 Jul 2019 11:20:11 -0700 Subject: [PATCH 11/17] Support fetching a new frame --- webxr/googlevr/device.rs | 122 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index 9298bd1d..3ea9d823 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -13,6 +13,7 @@ use webxr_api::Quitter; use webxr_api::RightEye; use webxr_api::Sender; use webxr_api::View; +use webxr_api::Viewer; use webxr_api::Views; use crate::gl; @@ -38,6 +39,11 @@ use crate::jni_utils::JNIScope; #[cfg(target_os = "android")] use android_injected_glue::ffi as ndk; +// 50ms is a good estimate recommended by the GVR Team. +// It takes in account the time between frame submission (without vsync) and +// when the rendered image is sent to the physical pixels on the display. +const PREDICTION_OFFSET_NANOS: i64 = 50000000; // 50ms + pub(crate) struct GoogleVRDevice { events: EventBuffer, multiview: bool, @@ -60,8 +66,10 @@ pub(crate) struct GoogleVRDevice { render_size: gvr::gvr_sizei, swap_chain: *mut gvr::gvr_swap_chain, frame: *mut gvr::gvr_frame, + synced_head_matrix: gvr::gvr_mat4f, fbo_id: u32, presenting: bool, + frame_bound: bool, } fn empty_view() -> View { @@ -104,8 +112,10 @@ impl GoogleVRDevice { }, swap_chain: ptr::null_mut(), frame: ptr::null_mut(), + synced_head_matrix: gvr_identity_matrix(), fbo_id: 0, presenting: false, + frame_bound: false, }; unsafe { device.init(); @@ -144,8 +154,10 @@ impl GoogleVRDevice { }, swap_chain: ptr::null_mut(), frame: ptr::null_mut(), + synced_head_matrix: gvr_identity_matrix(), fbo_id: 0, presenting: false, + frame_bound: false, }; unsafe { device.init(); @@ -344,6 +356,85 @@ impl GoogleVRDevice { viewport, } } + + fn bind_framebuffer(&mut self) { + // No op + if self.frame.is_null() { + warn!("null frame with context"); + return; + } + + unsafe { + if self.frame_bound { + // Required to avoid some warnings from the GVR SDK. + // It doesn't like binding the same framebuffer multiple times. + gvr::gvr_frame_unbind(self.frame); + } + // gvr_frame_bind_buffer may make the current active texture unit dirty + let mut active_unit = 0; + gl::GetIntegerv(gl::ACTIVE_TEXTURE, &mut active_unit); + + // Bind daydream FBO + gvr::gvr_frame_bind_buffer(self.frame, 0); + self.frame_bound = true; + + // Restore texture unit + gl::ActiveTexture(active_unit as u32); + } + } + + fn update_recommended_buffer_viewports(&self) { + unsafe { + gvr::gvr_get_recommended_buffer_viewports(self.ctx, self.viewport_list); + if self.multiview { + // gvr_get_recommended_buffer_viewports function assumes that the client is not + // using multiview to render to multiple layers simultaneously. + // The uv and source layers need to be updated for multiview. + let fullscreen_uv = gvr_texture_bounds(&[0.0, 0.0, 1.0, 1.0]); + // Left eye + gvr::gvr_buffer_viewport_set_source_uv(self.left_eye_vp, fullscreen_uv); + gvr::gvr_buffer_viewport_set_source_layer(self.left_eye_vp, 0); + // Right eye + gvr::gvr_buffer_viewport_set_source_uv(self.right_eye_vp, fullscreen_uv); + gvr::gvr_buffer_viewport_set_source_layer(self.right_eye_vp, 1); + // Update viewport list + gvr::gvr_buffer_viewport_list_set_item(self.viewport_list, 0, self.left_eye_vp); + gvr::gvr_buffer_viewport_list_set_item(self.viewport_list, 1, self.right_eye_vp); + } + } + } + + fn fetch_head_matrix(&mut self) -> RigidTransform3D { + let mut next_vsync = unsafe { gvr::gvr_get_time_point_now() }; + next_vsync.monotonic_system_time_nanos += PREDICTION_OFFSET_NANOS; + unsafe { + let m = gvr::gvr_get_head_space_from_start_space_rotation(self.ctx, next_vsync); + self.synced_head_matrix = gvr::gvr_apply_neck_model(self.ctx, m, 1.0); + }; + unimplemented!("need to decompose matrix") + } + + unsafe fn acquire_frame(&mut self) { + if !self.frame.is_null() { + warn!("frame not submitted"); + // Release acquired frame if the user has not called submit_Frame() + gvr::gvr_frame_submit( + mem::transmute(&self.frame), + self.viewport_list, + self.synced_head_matrix, + ); + } + + self.update_recommended_buffer_viewports(); + // Handle resize + let size = self.recommended_render_size(); + if size.width != self.render_size.width || size.height != self.render_size.height { + gvr::gvr_swap_chain_resize_buffer(self.swap_chain, 0, size); + self.render_size = size; + } + + self.frame = gvr::gvr_swap_chain_acquire_frame(self.swap_chain); + } } impl Device for GoogleVRDevice { @@ -358,7 +449,14 @@ impl Device for GoogleVRDevice { } fn wait_for_animation_frame(&mut self) -> Frame { - unimplemented!() + unsafe { + self.acquire_frame(); + } + // Predict head matrix + Frame { + transform: self.fetch_head_matrix(), + inputs: vec![], + } } fn render_animation_frame( @@ -400,3 +498,25 @@ fn fov_to_projection_matrix( let bottom = -fov.bottom.to_radians().tan() * near; Transform3D::ortho(left, right, bottom, top, near, far) } + +#[inline] +fn gvr_texture_bounds(array: &[f32; 4]) -> gvr::gvr_rectf { + gvr::gvr_rectf { + left: array[0], + right: array[0] + array[2], + bottom: array[1], + top: array[1] + array[3], + } +} + +#[inline] +fn gvr_identity_matrix() -> gvr::gvr_mat4f { + gvr::gvr_mat4f { + m: [ + [1.0, 0.0, 0.0, 0.0], + [0.0, 1.0, 0.0, 0.0], + [0.0, 0.0, 1.0, 0.0], + [0.0, 0.0, 0.0, 1.0], + ], + } +} From e8c623f074fdc2eeb3d8ad1cce120a42952b2f44 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 26 Jul 2019 11:36:18 -0700 Subject: [PATCH 12/17] Support rendering a frame --- webxr/googlevr/device.rs | 91 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 4 deletions(-) diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index 3ea9d823..dfd944de 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -68,6 +68,7 @@ pub(crate) struct GoogleVRDevice { frame: *mut gvr::gvr_frame, synced_head_matrix: gvr::gvr_mat4f, fbo_id: u32, + fbo_texture: u32, presenting: bool, frame_bound: bool, } @@ -114,6 +115,7 @@ impl GoogleVRDevice { frame: ptr::null_mut(), synced_head_matrix: gvr_identity_matrix(), fbo_id: 0, + fbo_texture: 0, presenting: false, frame_bound: false, }; @@ -156,6 +158,7 @@ impl GoogleVRDevice { frame: ptr::null_mut(), synced_head_matrix: gvr_identity_matrix(), fbo_id: 0, + fbo_texture: 0, presenting: false, frame_bound: false, }; @@ -435,6 +438,78 @@ impl GoogleVRDevice { self.frame = gvr::gvr_swap_chain_acquire_frame(self.swap_chain); } + + fn render_layer(&mut self, texture_id: u32, texture_size: DefaultSize2D) { + if self.frame.is_null() { + warn!("null frame when calling render_layer"); + return; + } + debug_assert!(self.fbo_id > 0); + + unsafe { + // Save current fbo to restore it when the frame is submitted. + let mut current_fbo = 0; + gl::GetIntegerv(gl::FRAMEBUFFER_BINDING, &mut current_fbo); + + if self.fbo_texture != texture_id { + // Attach external texture to the used later in BlitFramebuffer. + gl::BindFramebuffer(gl::FRAMEBUFFER, self.fbo_id); + gl::FramebufferTexture2D( + gl::FRAMEBUFFER, + gl::COLOR_ATTACHMENT0, + gl::TEXTURE_2D, + texture_id, + 0, + ); + self.fbo_texture = texture_id; + } + + // BlitFramebuffer: external texture to gvr pixel buffer + self.bind_framebuffer(); + gl::BindFramebuffer(gl::READ_FRAMEBUFFER, self.fbo_id); + gl::BlitFramebuffer( + 0, + 0, + texture_size.width, + texture_size.height, + 0, + 0, + self.render_size.width, + self.render_size.height, + gl::COLOR_BUFFER_BIT, + gl::LINEAR, + ); + gvr::gvr_frame_unbind(self.frame); + self.frame_bound = false; + // Restore bound fbo + gl::BindFramebuffer(gl::FRAMEBUFFER, current_fbo as u32); + + // set up uvs + // XXXManishearth do we need to negotiate size here? + // gvr::gvr_buffer_viewport_set_source_uv(self.left_eye_vp, gvr_texture_bounds(&layer.left_bounds)); + // gvr::gvr_buffer_viewport_set_source_uv(self.right_eye_vp, gvr_texture_bounds(&layer.right_bounds)); + } + } + + fn submit_frame(&mut self) { + if self.frame.is_null() { + warn!("null frame with context"); + return; + } + + unsafe { + if self.frame_bound { + gvr::gvr_frame_unbind(self.frame); + self.frame_bound = false; + } + // submit frame + gvr::gvr_frame_submit( + mem::transmute(&self.frame), + self.viewport_list, + self.synced_head_matrix, + ); + } + } } impl Device for GoogleVRDevice { @@ -461,11 +536,19 @@ impl Device for GoogleVRDevice { fn render_animation_frame( &mut self, - _texture_id: u32, - _size: DefaultSize2D, - _sync: GLsync, + texture_id: u32, + texture_size: DefaultSize2D, + sync: Option, ) { - unimplemented!() + self.render_layer(texture_id, texture_size); + self.submit_frame(); + if let Some(sync) = sync { + unsafe { + // XXXManishearth we really should figure out how + // to use gleam here + gl::WaitSync(sync as *const _, 0, gl::TIMEOUT_IGNORED); + } + } } fn initial_inputs(&self) -> Vec { From 4c55803b0ac1c00acca61e05a80dd72834bddb61 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 26 Jul 2019 11:38:25 -0700 Subject: [PATCH 13/17] Clean up some unimplementeds --- webxr/googlevr/device.rs | 4 ++-- webxr/googlevr/discovery.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index dfd944de..8d2ea983 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -555,8 +555,8 @@ impl Device for GoogleVRDevice { vec![] } - fn set_event_dest(&mut self, _dest: Sender) { - unimplemented!() + fn set_event_dest(&mut self, dest: Sender) { + self.events.upgrade(dest); } fn quit(&mut self) { diff --git a/webxr/googlevr/discovery.rs b/webxr/googlevr/discovery.rs index 7c31e51b..77f178af 100644 --- a/webxr/googlevr/discovery.rs +++ b/webxr/googlevr/discovery.rs @@ -178,11 +178,11 @@ impl GoogleVRDiscovery { } pub fn on_pause(&self) { - unimplemented!() + warn!("focus/blur not yet supported") } pub fn on_resume(&self) { - unimplemented!() + warn!("focus/blur not yet supported") } } From 28a76c0653bcc0f2b1a1e1557e452d72556b310f Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 26 Jul 2019 13:43:41 -0700 Subject: [PATCH 14/17] Add input --- webxr/googlevr/device.rs | 34 +++++++++++++++++++-- webxr/googlevr/input.rs | 66 ++++++++++++++++++++++++++++++++++++++++ webxr/googlevr/mod.rs | 1 + 3 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 webxr/googlevr/input.rs diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index 8d2ea983..108295fa 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -6,12 +6,15 @@ use webxr_api::Event; use webxr_api::EventBuffer; use webxr_api::Floor; use webxr_api::Frame; +use webxr_api::InputFrame; +use webxr_api::InputId; use webxr_api::InputSource; use webxr_api::LeftEye; use webxr_api::Native; use webxr_api::Quitter; use webxr_api::RightEye; use webxr_api::Sender; +use webxr_api::TargetRayMode; use webxr_api::View; use webxr_api::Viewer; use webxr_api::Views; @@ -33,6 +36,7 @@ use gvr_sys::gvr_feature::*; use std::{mem, ptr}; use super::discovery::SendPtr; +use super::input::GoogleVRController; #[cfg(target_os = "android")] use crate::jni_utils::JNIScope; @@ -53,6 +57,7 @@ pub(crate) struct GoogleVRDevice { right_view: View, near: f32, far: f32, + input: Option, #[cfg(target_os = "android")] java_class: ndk::jclass, @@ -99,6 +104,7 @@ impl GoogleVRDevice { // https://github.com/servo/webxr/issues/32 near: 0.1, far: 1000.0, + input: None, ctx: ctx.get(), controller_ctx: controller_ctx.get(), @@ -144,6 +150,7 @@ impl GoogleVRDevice { // https://github.com/servo/webxr/issues/32 near: 0.1, far: 1000.0, + input: None, ctx: ctx.get(), controller_ctx: controller_ctx.get(), @@ -196,6 +203,10 @@ impl GoogleVRDevice { gvr::gvr_eye::GVR_RIGHT_EYE as usize, self.right_eye_vp, ); + + if let Ok(input) = GoogleVRController::new(self.ctx, self.controller_ctx) { + self.input = Some(input); + } } unsafe fn initialize_gl(&mut self) { @@ -510,6 +521,17 @@ impl GoogleVRDevice { ); } } + + fn input_state(&self) -> Vec { + if let Some(ref i) = self.input { + vec![InputFrame { + target_ray_origin: i.state(), + id: InputId(0), + }] + } else { + vec![] + } + } } impl Device for GoogleVRDevice { @@ -530,7 +552,7 @@ impl Device for GoogleVRDevice { // Predict head matrix Frame { transform: self.fetch_head_matrix(), - inputs: vec![], + inputs: self.input_state(), } } @@ -552,7 +574,15 @@ impl Device for GoogleVRDevice { } fn initial_inputs(&self) -> Vec { - vec![] + if let Some(ref i) = self.input { + vec![InputSource { + handedness: i.handedness(), + id: InputId(0), + target_ray_mode: TargetRayMode::TrackedPointer, + }] + } else { + vec![] + } } fn set_event_dest(&mut self, dest: Sender) { diff --git a/webxr/googlevr/input.rs b/webxr/googlevr/input.rs new file mode 100644 index 00000000..d1df5d94 --- /dev/null +++ b/webxr/googlevr/input.rs @@ -0,0 +1,66 @@ +use gvr_sys as gvr; +use gvr_sys::gvr_controller_api_status::*; +use gvr_sys::gvr_controller_handedness::*; + +use euclid::RigidTransform3D; +use euclid::Rotation3D; +use std::ffi::CStr; +use std::mem; +use webxr_api::Handedness; +use webxr_api::Input; +use webxr_api::Native; + +pub struct GoogleVRController { + ctx: *mut gvr::gvr_context, + controller_ctx: *mut gvr::gvr_controller_context, + state: *mut gvr::gvr_controller_state, +} + +impl GoogleVRController { + pub unsafe fn new( + ctx: *mut gvr::gvr_context, + controller_ctx: *mut gvr::gvr_controller_context, + ) -> Result { + let gamepad = Self { + ctx: ctx, + controller_ctx: controller_ctx, + state: gvr::gvr_controller_state_create(), + }; + gvr::gvr_controller_state_update(controller_ctx, 0, gamepad.state); + let api_status = gvr::gvr_controller_state_get_api_status(gamepad.state); + if api_status != GVR_CONTROLLER_API_OK as i32 { + let message = CStr::from_ptr(gvr::gvr_controller_api_status_to_string(api_status)); + return Err(message.to_string_lossy().into()); + } + + Ok(gamepad) + } + + pub fn handedness(&self) -> Handedness { + let handeness = unsafe { + let prefs = gvr::gvr_get_user_prefs(self.ctx); + gvr::gvr_user_prefs_get_controller_handedness(prefs) + }; + if handeness == GVR_CONTROLLER_LEFT_HANDED as i32 { + Handedness::Left + } else { + Handedness::Right + } + } + + pub fn state(&self) -> RigidTransform3D { + unsafe { + gvr::gvr_controller_state_update(self.controller_ctx, 0, self.state); + let quat = gvr::gvr_controller_state_get_orientation(self.state); + Rotation3D::unit_quaternion(quat.qx, quat.qy, quat.qz, quat.qw).into() + } + } +} + +impl Drop for GoogleVRController { + fn drop(&mut self) { + unsafe { + gvr::gvr_controller_state_destroy(mem::transmute(&self.state)); + } + } +} diff --git a/webxr/googlevr/mod.rs b/webxr/googlevr/mod.rs index 863f760b..0257057a 100644 --- a/webxr/googlevr/mod.rs +++ b/webxr/googlevr/mod.rs @@ -6,6 +6,7 @@ pub use discovery::GoogleVRDiscovery; pub(crate) mod device; pub(crate) mod discovery; +pub(crate) mod input; // Export functions called from Java #[cfg(target_os = "android")] From f20f85ac542643401a71b21bdc65b6a7d0676da1 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 26 Jul 2019 13:43:59 -0700 Subject: [PATCH 15/17] Remove unused function --- webxr/jni_utils.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/webxr/jni_utils.rs b/webxr/jni_utils.rs index a01979e9..b984b237 100644 --- a/webxr/jni_utils.rs +++ b/webxr/jni_utils.rs @@ -88,10 +88,6 @@ impl JNIScope { pub fn jni(&self) -> &mut ndk::JNINativeInterface { unsafe { mem::transmute((*self.env).functions) } } - - pub fn jni_from_env(env: *mut ndk::JNIEnv) -> *mut ndk::JNINativeInterface { - unsafe { (*env).functions as *mut _ } - } } impl Drop for JNIScope { From 986be65e13c782f2e4d96a82e577d4da793ae258 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 26 Jul 2019 14:31:11 -0700 Subject: [PATCH 16/17] Fill in matrix decomposition code --- webxr/googlevr/device.rs | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/webxr/googlevr/device.rs b/webxr/googlevr/device.rs index 108295fa..91eea43c 100644 --- a/webxr/googlevr/device.rs +++ b/webxr/googlevr/device.rs @@ -25,6 +25,7 @@ use euclid::default::Size2D as DefaultSize2D; use euclid::Point2D; use euclid::Rect; use euclid::RigidTransform3D; +use euclid::Rotation3D; use euclid::Size2D; use euclid::Transform3D; use euclid::Vector3D; @@ -354,7 +355,7 @@ impl GoogleVRDevice { let eye_mat = gvr::gvr_get_eye_from_head_matrix(self.ctx, eye as i32); // XXXManishearth we should decompose the matrix properly instead of assuming it's // only translation - let transform = Vector3D::new(-eye_mat.m[0][3], -eye_mat.m[1][3], -eye_mat.m[2][3]).into(); + let transform = decompose_rigid(&eye_mat).inverse(); let size = Size2D::new(self.render_size.width / 2, self.render_size.height); let origin = if eye == gvr::gvr_eye::GVR_LEFT_EYE { @@ -425,7 +426,7 @@ impl GoogleVRDevice { let m = gvr::gvr_get_head_space_from_start_space_rotation(self.ctx, next_vsync); self.synced_head_matrix = gvr::gvr_apply_neck_model(self.ctx, m, 1.0); }; - unimplemented!("need to decompose matrix") + decompose_rigid(&self.synced_head_matrix) } unsafe fn acquire_frame(&mut self) { @@ -633,3 +634,35 @@ fn gvr_identity_matrix() -> gvr::gvr_mat4f { ], } } + +fn decompose_rotation(mat: &gvr::gvr_mat4f) -> Rotation3D { + // https://math.stackexchange.com/a/3183435/24293 + let m = &mat.m; + if m[2][2] < 0. { + if m[0][0] > m[1][1] { + let t = 1. + m[0][0] - m[1][1] - m[2][2]; + Rotation3D::unit_quaternion(t, m[0][1] + m[1][0], m[2][0] + m[0][2], m[1][2] - m[2][1]) + } else { + let t = 1. - m[0][0] + m[1][1] - m[2][2]; + Rotation3D::unit_quaternion(m[0][1] + m[1][0], t, m[1][2] + m[2][1], m[2][0] - m[0][2]) + } + } else { + if m[0][0] < -m[1][1] { + let t = 1. - m[0][0] - m[1][1] + m[2][2]; + Rotation3D::unit_quaternion(m[2][0] + m[0][2], m[1][2] + m[2][1], t, m[0][1] - m[1][0]) + } else { + let t = 1. + m[0][0] + m[1][1] + m[2][2]; + Rotation3D::unit_quaternion(m[1][2] - m[2][1], m[2][0] - m[0][2], m[0][1] - m[1][0], t) + } + } +} + +fn decompose_translation(mat: &gvr::gvr_mat4f) -> Vector3D { + Vector3D::new(mat.m[0][3], mat.m[1][3], mat.m[2][3]) +} + +fn decompose_rigid(mat: &gvr::gvr_mat4f) -> RigidTransform3D { + // Rigid transform matrices formed by applying a rotation first and then a translation + // decompose cleanly based on their rotation and translation components. + RigidTransform3D::new(decompose_rotation(mat), decompose_translation(mat)) +} From b00d8793df46cba6ff12ba39788830fd573bd90d Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 29 Jul 2019 15:34:52 -0700 Subject: [PATCH 17/17] Add travis for GVR --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1074bbd..b43b0bbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,10 @@ before_script: script: - cargo fmt --all -- --check - cd webxr - - cargo build --features=glwindow,headless - - cargo build --features=ipc,glwindow,headless + - cargo build --features=glwindow,headless,googlevr + - cargo build --features=ipc,glwindow,headless,googlevr + - rustup target add arm-linux-androideabi + - cargo build --target arm-linux-androideabi --features=ipc,googlevr notifications: webhooks: http://build.servo.org:54856/travis