History

Switch Oculus mobile to single draw FBO with multiple color attachments

Brad Davis committed 7 years ago

Commit 19f856b1 parent cb311406 files · +369 −89Browse files

Showing the changes to android/libraries/oculus/src/main/java (1 of 6 files). Show all

Unified · Split

android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java+4−3
@@ -7,6 +7,7 @@ · 6 unmodified lines
7//7//
8package io.highfidelity.oculus;8package io.highfidelity.oculus;
9 9
10import android.content.res.AssetManager;
10import android.os.Bundle;11import android.os.Bundle;
11import android.util.Log;12import android.util.Log;
12import android.view.Surface;13import android.view.Surface;
@@ -24,7 +25,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca · 11 unmodified lines
24 private static final String TAG = OculusMobileActivity.class.getSimpleName();25 private static final String TAG = OculusMobileActivity.class.getSimpleName();
25 static { System.loadLibrary("oculusMobile"); }26 static { System.loadLibrary("oculusMobile"); }
26 27
27 private native void nativeOnCreate();28 private native void nativeOnCreate(AssetManager assetManager);
28 private native static void nativeOnResume();29 private native static void nativeOnResume();
29 private native static void nativeOnPause();30 private native static void nativeOnPause();
30 private native static void nativeOnSurfaceChanged(Surface s);31 private native static void nativeOnSurfaceChanged(Surface s);
@@ -53,7 +54,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca · 22 unmodified lines
53 mView = new SurfaceView(this);54 mView = new SurfaceView(this);
54 mView.getHolder().addCallback(this);55 mView.getHolder().addCallback(this);
55 56
56 nativeOnCreate();57 nativeOnCreate(getAssets());
57 questNativeOnCreate();58 questNativeOnCreate();
58 }59 }
59 60
@@ -81,7 +82,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca · 21 unmodified lines
81 Log.w(TAG, "QQQ onResume");82 Log.w(TAG, "QQQ onResume");
82 super.onResume();83 super.onResume();
83 //Reconnect the global reference back to handler84 //Reconnect the global reference back to handler
84 nativeOnCreate();85 nativeOnCreate(getAssets());
85 86
86 questNativeOnResume();87 questNativeOnResume();
87 nativeOnResume();88 nativeOnResume();