sigonasr2
/
jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #756 from neph1/osvr_viewmanager

Browse Source 
making VRViewManagerOSVR more similar to VRViewManagerOpenVR
empirephoenix-patch-1
Rickard Edén 7 years ago committed by GitHub
parent ec121f025f 30de635cdf
commit e4ce70d0ba
2 changed files with 480 additions and 569 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 922
      jme3-vr/src/main/java/com/jme3/input/vr/OSVR.java
  2. 127
      jme3-vr/src/main/java/com/jme3/util/VRViewManagerOSVR.java

922
jme3-vr/src/main/java/com/jme3/input/vr/OSVR.java
Unescape View File

@ -1,461 +1,461 @@
/* /*
https://github.com/sensics/OSVR-RenderManager/blob/master/examples/RenderManagerOpenGLCAPIExample.cpp https://github.com/sensics/OSVR-RenderManager/blob/master/examples/RenderManagerOpenGLCAPIExample.cpp
- JVM crashes often.. placing breakpoints during initialization clears it up most of the time (WHY!?) - JVM crashes often.. placing breakpoints during initialization clears it up most of the time (WHY!?)
- OSVR is just unstable.. any way to improve things? - OSVR is just unstable.. any way to improve things?
- render manager looks good, but left eye seems stretched - render manager looks good, but left eye seems stretched
*/ */
package com.jme3.input.vr; package com.jme3.input.vr;
import com.jme3.app.VREnvironment; import com.jme3.app.VREnvironment;
import com.jme3.math.Matrix4f; import com.jme3.math.Matrix4f;
import com.jme3.math.Quaternion; import com.jme3.math.Quaternion;
import com.jme3.math.Vector2f; import com.jme3.math.Vector2f;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
import com.jme3.renderer.Camera; import com.jme3.renderer.Camera;
import com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary; import com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary;
import com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary; import com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary;
import com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig; import com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig;
import com.jme3.system.osvr.osvrmatrixconventions.OSVR_Pose3; import com.jme3.system.osvr.osvrmatrixconventions.OSVR_Pose3;
import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_OpenResultsOpenGL; import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_OpenResultsOpenGL;
import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_RenderBufferOpenGL; import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_RenderBufferOpenGL;
import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_RenderInfoOpenGL; import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_RenderInfoOpenGL;
import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_RenderParams; import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_RenderParams;
import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_ViewportDescription; import com.jme3.system.osvr.osvrrendermanageropengl.OSVR_ViewportDescription;
import com.jme3.system.osvr.osvrrendermanageropengl.OsvrRenderManagerOpenGLLibrary; import com.jme3.system.osvr.osvrrendermanageropengl.OsvrRenderManagerOpenGLLibrary;
import com.ochafik.lang.jnaerator.runtime.NativeSize; import com.ochafik.lang.jnaerator.runtime.NativeSize;
import com.ochafik.lang.jnaerator.runtime.NativeSizeByReference; import com.ochafik.lang.jnaerator.runtime.NativeSizeByReference;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.ptr.PointerByReference; import com.sun.jna.ptr.PointerByReference;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.util.logging.Logger; import java.util.logging.Logger;
/** /**
* A class that wraps an <a href="http://www.osvr.org/">OSVR</a> system. * A class that wraps an <a href="http://www.osvr.org/">OSVR</a> system.
* @author reden - phr00t - https://github.com/phr00t * @author reden - phr00t - https://github.com/phr00t
* @author Julien Seinturier - (c) 2016 - JOrigin project - <a href="http://www.jorigin.org">http:/www.jorigin.org</a> * @author Julien Seinturier - (c) 2016 - JOrigin project - <a href="http://www.jorigin.org">http:/www.jorigin.org</a>
*/ */
public class OSVR implements VRAPI { public class OSVR implements VRAPI {
private static final Logger logger = Logger.getLogger(OSVR.class.getName()); private static final Logger logger = Logger.getLogger(OSVR.class.getName());
/** /**
* The first viewer index. * The first viewer index.
*/ */
public static final int FIRST_VIEWER = 0; public static final int FIRST_VIEWER = 0;
/** /**
* The left eye index. * The left eye index.
*/ */
public static final int EYE_LEFT = 0; public static final int EYE_LEFT = 0;
/** /**
* The right eye index. * The right eye index.
*/ */
public static final int EYE_RIGHT = 1; public static final int EYE_RIGHT = 1;
/** /**
* The size of the left eye. * The size of the left eye.
*/ */
public static final NativeSize EYE_LEFT_SIZE = new NativeSize(EYE_LEFT); public static final NativeSize EYE_LEFT_SIZE = new NativeSize(EYE_LEFT);
/** /**
* The size of the right eye. * The size of the right eye.
*/ */
public static final NativeSize EYE_RIGHT_SIZE = new NativeSize(EYE_RIGHT); public static final NativeSize EYE_RIGHT_SIZE = new NativeSize(EYE_RIGHT);
/** /**
* The default J String. * The default J String.
*/ */
public static byte[] defaultJString = { 'j', (byte)0 }; public static byte[] defaultJString = { 'j', (byte)0 };
/** /**
* The default OpenGL String. * The default OpenGL String.
*/ */
public static byte[] OpenGLString = { 'O', 'p', 'e', 'n', 'G', 'L', (byte)0 }; public static byte[] OpenGLString = { 'O', 'p', 'e', 'n', 'G', 'L', (byte)0 };
private final Matrix4f[] eyeMatrix = new Matrix4f[2]; private final Matrix4f[] eyeMatrix = new Matrix4f[2];
private PointerByReference grabRM; private PointerByReference grabRM;
private PointerByReference grabRMOGL; private PointerByReference grabRMOGL;
private PointerByReference grabRIC; private PointerByReference grabRIC;
OSVR_RenderParams.ByValue renderParams; OSVR_RenderParams.ByValue renderParams;
OsvrClientKitLibrary.OSVR_ClientContext context; OsvrClientKitLibrary.OSVR_ClientContext context;
com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue graphicsLibrary; com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue graphicsLibrary;
Pointer renderManager, renderManagerOpenGL, renderInfoCollection, registerBufferState; Pointer renderManager, renderManagerOpenGL, renderInfoCollection, registerBufferState;
OSVRInput VRinput; OSVRInput VRinput;
NativeSize numRenderInfo; NativeSize numRenderInfo;
NativeSizeByReference grabNumInfo = new NativeSizeByReference(); NativeSizeByReference grabNumInfo = new NativeSizeByReference();
OSVR_RenderInfoOpenGL.ByValue eyeLeftInfo, eyeRightInfo; OSVR_RenderInfoOpenGL.ByValue eyeLeftInfo, eyeRightInfo;
Matrix4f hmdPoseLeftEye; Matrix4f hmdPoseLeftEye;
Matrix4f hmdPoseRightEye; Matrix4f hmdPoseRightEye;
Vector3f hmdPoseLeftEyeVec, hmdPoseRightEyeVec, hmdSeatToStand; Vector3f hmdPoseLeftEyeVec, hmdPoseRightEyeVec, hmdSeatToStand;
OSVR_DisplayConfig displayConfig; OSVR_DisplayConfig displayConfig;
OSVR_Pose3 hmdPose = new OSVR_Pose3(); OSVR_Pose3 hmdPose = new OSVR_Pose3();
Vector3f storePos = new Vector3f(); Vector3f storePos = new Vector3f();
Quaternion storeRot = new Quaternion(); Quaternion storeRot = new Quaternion();
PointerByReference presentState = new PointerByReference(); PointerByReference presentState = new PointerByReference();
OSVR_OpenResultsOpenGL openResults = new OSVR_OpenResultsOpenGL(); OSVR_OpenResultsOpenGL openResults = new OSVR_OpenResultsOpenGL();
long glfwContext; long glfwContext;
long renderManagerContext; long renderManagerContext;
long wglGLFW; long wglGLFW;
long wglRM; long wglRM;
boolean initSuccess = false; boolean initSuccess = false;
boolean flipEyes = false; boolean flipEyes = false;
private VREnvironment environment = null; private VREnvironment environment = null;
/** /**
* Create a new <a href="http://www.osvr.org/">OSVR</a> system attached to the given {@link VREnvironment VR environment}. * Create a new <a href="http://www.osvr.org/">OSVR</a> system attached to the given {@link VREnvironment VR environment}.
* @param environment the {@link VREnvironment VR environment} to which the input is attached. * @param environment the {@link VREnvironment VR environment} to which the input is attached.
*/ */
public OSVR(VREnvironment environment){ public OSVR(VREnvironment environment){
this.environment = environment; this.environment = environment;
} }
/** /**
* Access to the underlying OSVR structures. * Access to the underlying OSVR structures.
* @param leftView the left viewport. * @param leftView the left viewport.
* @param rightView the right viewport. * @param rightView the right viewport.
* @param leftBuffer the left buffer. * @param leftBuffer the left buffer.
* @param rightBuffer the right buffer. * @param rightBuffer the right buffer.
* @return <code>true</code> if the structure are accessible and <code>false</code> otherwise. * @return <code>true</code> if the structure are accessible and <code>false</code> otherwise.
*/ */
public boolean handleRenderBufferPresent(OSVR_ViewportDescription.ByValue leftView, OSVR_ViewportDescription.ByValue rightView, public boolean handleRenderBufferPresent(OSVR_ViewportDescription.ByValue leftView, OSVR_ViewportDescription.ByValue rightView,
OSVR_RenderBufferOpenGL.ByValue leftBuffer, OSVR_RenderBufferOpenGL.ByValue rightBuffer) { OSVR_RenderBufferOpenGL.ByValue leftBuffer, OSVR_RenderBufferOpenGL.ByValue rightBuffer) {
if( eyeLeftInfo == null || eyeRightInfo == null ) return false; if( eyeLeftInfo == null || eyeRightInfo == null ) return false;
byte retval; byte retval;
OsvrRenderManagerOpenGLLibrary.osvrRenderManagerStartPresentRenderBuffers(presentState); OsvrRenderManagerOpenGLLibrary.osvrRenderManagerStartPresentRenderBuffers(presentState);
getEyeInfo(); getEyeInfo();
OsvrRenderManagerOpenGLLibrary.osvrRenderManagerPresentRenderBufferOpenGL(presentState.getValue(), leftBuffer, eyeLeftInfo, leftView); OsvrRenderManagerOpenGLLibrary.osvrRenderManagerPresentRenderBufferOpenGL(presentState.getValue(), leftBuffer, eyeLeftInfo, leftView);
OsvrRenderManagerOpenGLLibrary.osvrRenderManagerPresentRenderBufferOpenGL(presentState.getValue(), rightBuffer, eyeRightInfo, rightView); OsvrRenderManagerOpenGLLibrary.osvrRenderManagerPresentRenderBufferOpenGL(presentState.getValue(), rightBuffer, eyeRightInfo, rightView);
retval = OsvrRenderManagerOpenGLLibrary.osvrRenderManagerFinishPresentRenderBuffers(renderManager, presentState.getValue(), renderParams, (byte)0); retval = OsvrRenderManagerOpenGLLibrary.osvrRenderManagerFinishPresentRenderBuffers(renderManager, presentState.getValue(), renderParams, (byte)0);
return retval == 0; // only check the last error, since if something errored above, the last call won't work & all calls will log to syserr return retval == 0; // only check the last error, since if something errored above, the last call won't work & all calls will log to syserr
} }
@Override @Override
public boolean initialize() { public boolean initialize() {
logger.config("Initialize OSVR system."); logger.config("Initialize OSVR system.");
hmdPose.setAutoSynch(false); hmdPose.setAutoSynch(false);
context = OsvrClientKitLibrary.osvrClientInit(defaultJString, 0); context = OsvrClientKitLibrary.osvrClientInit(defaultJString, 0);
VRinput = new OSVRInput(environment); VRinput = new OSVRInput(environment);
initSuccess = context != null && VRinput.init(); initSuccess = context != null && VRinput.init();
if( initSuccess ) { if( initSuccess ) {
PointerByReference grabDisplay = new PointerByReference(); PointerByReference grabDisplay = new PointerByReference();
byte retval = OsvrDisplayLibrary.osvrClientGetDisplay(context, grabDisplay); byte retval = OsvrDisplayLibrary.osvrClientGetDisplay(context, grabDisplay);
if( retval != 0 ) { if( retval != 0 ) {
System.out.println("OSVR Get Display Error: " + retval); System.out.println("OSVR Get Display Error: " + retval);
initSuccess = false; initSuccess = false;
return false; return false;
} }
displayConfig = new OSVR_DisplayConfig(grabDisplay.getValue()); displayConfig = new OSVR_DisplayConfig(grabDisplay.getValue());
System.out.println("Waiting for the display to fully start up, including receiving initial pose update..."); System.out.println("Waiting for the display to fully start up, including receiving initial pose update...");
int i = 400; int i = 400;
while (OsvrDisplayLibrary.osvrClientCheckDisplayStartup(displayConfig) != 0) { while (OsvrDisplayLibrary.osvrClientCheckDisplayStartup(displayConfig) != 0) {
if( i-- < 0 ) { if( i-- < 0 ) {
System.out.println("Couldn't get display startup update in time, continuing anyway..."); System.out.println("Couldn't get display startup update in time, continuing anyway...");
break; break;
} }
OsvrClientKitLibrary.osvrClientUpdate(context); OsvrClientKitLibrary.osvrClientUpdate(context);
try { try {
Thread.sleep(5); Thread.sleep(5);
} catch(Exception e) { } } catch(Exception e) { }
} }
System.out.println("OK, display startup status is good!"); System.out.println("OK, display startup status is good!");
} }
return initSuccess; return initSuccess;
} }
/** /**
* Grab the current GLFW context. * Grab the current GLFW context.
*/ */
public void grabGLFWContext() { public void grabGLFWContext() {
// get current conext // get current conext
wglGLFW = org.lwjgl.opengl.WGL.wglGetCurrentContext(); wglGLFW = org.lwjgl.opengl.WGL.wglGetCurrentContext();
glfwContext = org.lwjgl.glfw.GLFW.glfwGetCurrentContext(); glfwContext = org.lwjgl.glfw.GLFW.glfwGetCurrentContext();
} }
/** /**
* Enable context sharing. * Enable context sharing.
* @return <code>true</code> if the context is successfully shared and <code>false</code> otherwise. * @return <code>true</code> if the context is successfully shared and <code>false</code> otherwise.
*/ */
public boolean shareContext() { public boolean shareContext() {
if( org.lwjgl.opengl.WGL.wglShareLists(wglRM, wglGLFW)) { if( org.lwjgl.opengl.WGL.wglShareLists(wglRM, wglGLFW)) {
System.out.println("Context sharing success!"); System.out.println("Context sharing success!");
return true; return true;
} else { } else {
System.out.println("Context sharing problem..."); System.out.println("Context sharing problem...");
return false; return false;
} }
} }
@Override @Override
public boolean initVRCompositor(boolean allowed) { public boolean initVRCompositor(boolean allowed) {
if( !allowed || renderManager != null ) return false; if( !allowed || renderManager != null ) return false;
grabGLFWContext(); grabGLFWContext();
graphicsLibrary = new com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue(); graphicsLibrary = new com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue();
graphicsLibrary.toolkit = null; graphicsLibrary.toolkit = null;
graphicsLibrary.setAutoSynch(false); graphicsLibrary.setAutoSynch(false);
grabRM = new PointerByReference(); grabRMOGL = new PointerByReference(); grabRM = new PointerByReference(); grabRMOGL = new PointerByReference();
byte retval = OsvrRenderManagerOpenGLLibrary.osvrCreateRenderManagerOpenGL(context, OpenGLString, graphicsLibrary, grabRM, grabRMOGL); byte retval = OsvrRenderManagerOpenGLLibrary.osvrCreateRenderManagerOpenGL(context, OpenGLString, graphicsLibrary, grabRM, grabRMOGL);
if( retval == 0 ) { if( retval == 0 ) {
renderManager = grabRM.getValue(); renderManagerOpenGL = grabRMOGL.getValue(); renderManager = grabRM.getValue(); renderManagerOpenGL = grabRMOGL.getValue();
if( renderManager == null || renderManagerOpenGL == null ) { if( renderManager == null || renderManagerOpenGL == null ) {
System.out.println("Render Manager Created NULL, error!"); System.out.println("Render Manager Created NULL, error!");
return false; return false;
} }
openResults.setAutoSynch(false); openResults.setAutoSynch(false);
retval = OsvrRenderManagerOpenGLLibrary.osvrRenderManagerOpenDisplayOpenGL(renderManager, openResults); retval = OsvrRenderManagerOpenGLLibrary.osvrRenderManagerOpenDisplayOpenGL(renderManager, openResults);
if( retval == 0 ) { if( retval == 0 ) {
wglRM = org.lwjgl.opengl.WGL.wglGetCurrentContext(); wglRM = org.lwjgl.opengl.WGL.wglGetCurrentContext();
renderManagerContext = org.lwjgl.glfw.GLFW.glfwGetCurrentContext(); renderManagerContext = org.lwjgl.glfw.GLFW.glfwGetCurrentContext();
shareContext(); shareContext();
OsvrClientKitLibrary.osvrClientUpdate(context); OsvrClientKitLibrary.osvrClientUpdate(context);
renderParams = new OSVR_RenderParams.ByValue(); renderParams = new OSVR_RenderParams.ByValue();
renderParams.setAutoSynch(false); renderParams.setAutoSynch(false);
OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetDefaultRenderParams(renderParams); OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetDefaultRenderParams(renderParams);
grabRIC = new PointerByReference(); grabRIC = new PointerByReference();
retval = OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetRenderInfoCollection(renderManager, renderParams, grabRIC); retval = OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetRenderInfoCollection(renderManager, renderParams, grabRIC);
if( retval == 0 ) { if( retval == 0 ) {
renderInfoCollection = grabRIC.getValue(); renderInfoCollection = grabRIC.getValue();
OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetNumRenderInfoInCollection(renderInfoCollection, grabNumInfo); OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetNumRenderInfoInCollection(renderInfoCollection, grabNumInfo);
numRenderInfo = grabNumInfo.getValue(); numRenderInfo = grabNumInfo.getValue();
eyeLeftInfo = new OSVR_RenderInfoOpenGL.ByValue(); eyeLeftInfo = new OSVR_RenderInfoOpenGL.ByValue();
eyeRightInfo = new OSVR_RenderInfoOpenGL.ByValue(); eyeRightInfo = new OSVR_RenderInfoOpenGL.ByValue();
eyeLeftInfo.setAutoSynch(false); eyeLeftInfo.setAutoSynch(false);
eyeRightInfo.setAutoSynch(false); eyeRightInfo.setAutoSynch(false);
return true; return true;
} }
OsvrRenderManagerOpenGLLibrary.osvrDestroyRenderManager(renderManager); OsvrRenderManagerOpenGLLibrary.osvrDestroyRenderManager(renderManager);
System.out.println("OSVR Render Manager Info Collection Error: " + retval); System.out.println("OSVR Render Manager Info Collection Error: " + retval);
return false; return false;
} }
OsvrRenderManagerOpenGLLibrary.osvrDestroyRenderManager(renderManager); OsvrRenderManagerOpenGLLibrary.osvrDestroyRenderManager(renderManager);
System.out.println("OSVR Open Render Manager Display Error: " + retval); System.out.println("OSVR Open Render Manager Display Error: " + retval);
return false; return false;
} }
System.out.println("OSVR Create Render Manager Error: " + retval); System.out.println("OSVR Create Render Manager Error: " + retval);
return false; return false;
} }
@Override @Override
public OsvrClientKitLibrary.OSVR_ClientContext getVRSystem() { public OsvrClientKitLibrary.OSVR_ClientContext getVRSystem() {
return context; return context;
} }
@Override @Override
public Pointer getCompositor() { public Pointer getCompositor() {
return renderManager; return renderManager;
} }
@Override @Override
public String getName() { public String getName() {
return "OSVR"; return "OSVR";
} }
@Override @Override
public VRInputAPI getVRinput() { public VRInputAPI getVRinput() {
return VRinput; return VRinput;
} }
@Override @Override
public void setFlipEyes(boolean set) { public void setFlipEyes(boolean set) {
flipEyes = set; flipEyes = set;
} }
@Override @Override
public void printLatencyInfoToConsole(boolean set) { public void printLatencyInfoToConsole(boolean set) {
} }
@Override @Override
public int getDisplayFrequency() { public int getDisplayFrequency() {
return 60; //debug display frequency return 60; //debug display frequency
} }
@Override @Override
public void destroy() { public void destroy() {
if( renderManager != null ) OsvrRenderManagerOpenGLLibrary.osvrDestroyRenderManager(renderManager); if( renderManager != null ) OsvrRenderManagerOpenGLLibrary.osvrDestroyRenderManager(renderManager);
if( displayConfig != null ) OsvrDisplayLibrary.osvrClientFreeDisplay(displayConfig); if( displayConfig != null ) OsvrDisplayLibrary.osvrClientFreeDisplay(displayConfig);
} }
@Override @Override
public boolean isInitialized() { public boolean isInitialized() {
return initSuccess; return initSuccess;
} }
@Override @Override
public void reset() { public void reset() {
// TODO: no native OSVR reset function // TODO: no native OSVR reset function
// may need to take current position and negate it from future values // may need to take current position and negate it from future values
} }
@Override @Override
public void getRenderSize(Vector2f store) { public void getRenderSize(Vector2f store) {
if( eyeLeftInfo == null || eyeLeftInfo.viewport.width == 0.0 ) { if( eyeLeftInfo == null || eyeLeftInfo.viewport.width == 0.0 ) {
store.x = 1280f; store.y = 720f; store.x = 1280f; store.y = 720f;
} else { } else {
store.x = (float)eyeLeftInfo.viewport.width; store.x = (float)eyeLeftInfo.viewport.width;
store.y = (float)eyeLeftInfo.viewport.height; store.y = (float)eyeLeftInfo.viewport.height;
} }
} }
/** /**
* Read and update the eye info from the underlying OSVR system. * Read and update the eye info from the underlying OSVR system.
*/ */
public void getEyeInfo() { public void getEyeInfo() {
OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetRenderInfoFromCollectionOpenGL(renderInfoCollection, EYE_LEFT_SIZE, eyeLeftInfo); OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetRenderInfoFromCollectionOpenGL(renderInfoCollection, EYE_LEFT_SIZE, eyeLeftInfo);
OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetRenderInfoFromCollectionOpenGL(renderInfoCollection, EYE_RIGHT_SIZE, eyeRightInfo); OsvrRenderManagerOpenGLLibrary.osvrRenderManagerGetRenderInfoFromCollectionOpenGL(renderInfoCollection, EYE_RIGHT_SIZE, eyeRightInfo);
eyeLeftInfo.read(); eyeRightInfo.read(); eyeLeftInfo.read(); eyeRightInfo.read();
} }
/* /*
@Override @Override
public float getFOV(int dir) { public float getFOV(int dir) {
return 105f; //default FOV return 105f; //default FOV
} }
*/ */
@Override @Override
public float getInterpupillaryDistance() { public float getInterpupillaryDistance() {
return 0.065f; //default IPD return 0.065f; //default IPD
} }
@Override @Override
public Quaternion getOrientation() { public Quaternion getOrientation() {
storeRot.set((float)-hmdPose.rotation.data[1], storeRot.set((float)hmdPose.rotation.data[1],
(float)hmdPose.rotation.data[2], (float)hmdPose.rotation.data[2],
(float)-hmdPose.rotation.data[3], (float)hmdPose.rotation.data[3],
(float)hmdPose.rotation.data[0]); (float)hmdPose.rotation.data[0]);
if( storeRot.equals(Quaternion.ZERO) ) storeRot.set(Quaternion.DIRECTION_Z); if( storeRot.equals(Quaternion.ZERO) ) storeRot.set(Quaternion.DIRECTION_Z);
return storeRot; return storeRot;
} }
@Override @Override
public Vector3f getPosition() { public Vector3f getPosition() {
storePos.x = (float)-hmdPose.translation.data[0]; storePos.x = (float)-hmdPose.translation.data[0];
storePos.y = (float)hmdPose.translation.data[1]; storePos.y = (float)hmdPose.translation.data[1];
storePos.z = (float)-hmdPose.translation.data[2]; storePos.z = (float)-hmdPose.translation.data[2];
return storePos; return storePos;
} }
@Override @Override
public void getPositionAndOrientation(Vector3f storePos, Quaternion storeRot) { public void getPositionAndOrientation(Vector3f storePos, Quaternion storeRot) {
storePos.x = (float)-hmdPose.translation.data[0]; storePos.x = (float)-hmdPose.translation.data[0];
storePos.y = (float)hmdPose.translation.data[1]; storePos.y = (float)hmdPose.translation.data[1];
storePos.z = (float)-hmdPose.translation.data[2]; storePos.z = (float)-hmdPose.translation.data[2];
storeRot.set((float)-hmdPose.rotation.data[1], storeRot.set((float)hmdPose.rotation.data[1],
(float)hmdPose.rotation.data[2], (float)hmdPose.rotation.data[2],
(float)-hmdPose.rotation.data[3], (float)hmdPose.rotation.data[3],
(float)hmdPose.rotation.data[0]); (float)hmdPose.rotation.data[0]);
if( storeRot.equals(Quaternion.ZERO) ) storeRot.set(Quaternion.DIRECTION_Z); if( storeRot.equals(Quaternion.ZERO) ) storeRot.set(Quaternion.DIRECTION_Z);
} }
@Override @Override
public void updatePose() { public void updatePose() {
if( context == null || displayConfig == null ) return; if( context == null || displayConfig == null ) return;
OsvrClientKitLibrary.osvrClientUpdate(context); OsvrClientKitLibrary.osvrClientUpdate(context);
OsvrDisplayLibrary.osvrClientGetViewerPose(displayConfig, FIRST_VIEWER, hmdPose.getPointer()); OsvrDisplayLibrary.osvrClientGetViewerPose(displayConfig, FIRST_VIEWER, hmdPose.getPointer());
VRinput.updateControllerStates(); VRinput.updateControllerStates();
hmdPose.read(); hmdPose.read();
} }
@Override @Override
public Matrix4f getHMDMatrixProjectionLeftEye(Camera cam) { public Matrix4f getHMDMatrixProjectionLeftEye(Camera cam) {
if( eyeLeftInfo == null ) return cam.getProjectionMatrix(); if( eyeLeftInfo == null ) return cam.getProjectionMatrix();
if( eyeMatrix[EYE_LEFT] == null ) { if( eyeMatrix[EYE_LEFT] == null ) {
FloatBuffer tfb = FloatBuffer.allocate(16); FloatBuffer tfb = FloatBuffer.allocate(16);
com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.osvrClientGetViewerEyeSurfaceProjectionMatrixf(displayConfig, 0, (byte)EYE_LEFT, 0, cam.getFrustumNear(), cam.getFrustumFar(), (short)0, tfb); com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.osvrClientGetViewerEyeSurfaceProjectionMatrixf(displayConfig, 0, (byte)EYE_LEFT, 0, cam.getFrustumNear(), cam.getFrustumFar(), (short)0, tfb);
eyeMatrix[EYE_LEFT] = new Matrix4f(); eyeMatrix[EYE_LEFT] = new Matrix4f();
eyeMatrix[EYE_LEFT].set(tfb.get(0), tfb.get(4), tfb.get(8), tfb.get(12), eyeMatrix[EYE_LEFT].set(tfb.get(0), tfb.get(4), tfb.get(8), tfb.get(12),
tfb.get(1), tfb.get(5), tfb.get(9), tfb.get(13), tfb.get(1), tfb.get(5), tfb.get(9), tfb.get(13),
tfb.get(2), tfb.get(6), tfb.get(10), tfb.get(14), tfb.get(2), tfb.get(6), tfb.get(10), tfb.get(14),
tfb.get(3), tfb.get(7), tfb.get(11), tfb.get(15)); tfb.get(3), tfb.get(7), tfb.get(11), tfb.get(15));
} }
return eyeMatrix[EYE_LEFT]; return eyeMatrix[EYE_LEFT];
} }
@Override @Override
public Matrix4f getHMDMatrixProjectionRightEye(Camera cam) { public Matrix4f getHMDMatrixProjectionRightEye(Camera cam) {
if( eyeRightInfo == null ) return cam.getProjectionMatrix(); if( eyeRightInfo == null ) return cam.getProjectionMatrix();
if( eyeMatrix[EYE_RIGHT] == null ) { if( eyeMatrix[EYE_RIGHT] == null ) {
FloatBuffer tfb = FloatBuffer.allocate(16); FloatBuffer tfb = FloatBuffer.allocate(16);
com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.osvrClientGetViewerEyeSurfaceProjectionMatrixf(displayConfig, 0, (byte)EYE_RIGHT, 0, cam.getFrustumNear(), cam.getFrustumFar(), (short)0, tfb); com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.osvrClientGetViewerEyeSurfaceProjectionMatrixf(displayConfig, 0, (byte)EYE_RIGHT, 0, cam.getFrustumNear(), cam.getFrustumFar(), (short)0, tfb);
eyeMatrix[EYE_RIGHT] = new Matrix4f(); eyeMatrix[EYE_RIGHT] = new Matrix4f();
eyeMatrix[EYE_RIGHT].set(tfb.get(0), tfb.get(4), tfb.get(8), tfb.get(12), eyeMatrix[EYE_RIGHT].set(tfb.get(0), tfb.get(4), tfb.get(8), tfb.get(12),
tfb.get(1), tfb.get(5), tfb.get(9), tfb.get(13), tfb.get(1), tfb.get(5), tfb.get(9), tfb.get(13),
tfb.get(2), tfb.get(6), tfb.get(10), tfb.get(14), tfb.get(2), tfb.get(6), tfb.get(10), tfb.get(14),
tfb.get(3), tfb.get(7), tfb.get(11), tfb.get(15)); tfb.get(3), tfb.get(7), tfb.get(11), tfb.get(15));
} }
return eyeMatrix[EYE_RIGHT]; return eyeMatrix[EYE_RIGHT];
} }
@Override @Override
public Vector3f getHMDVectorPoseLeftEye() { public Vector3f getHMDVectorPoseLeftEye() {
if( hmdPoseLeftEyeVec == null ) { if( hmdPoseLeftEyeVec == null ) {
hmdPoseLeftEyeVec = new Vector3f(); hmdPoseLeftEyeVec = new Vector3f();
hmdPoseLeftEyeVec.x = 0.065f * -0.5f; hmdPoseLeftEyeVec.x = 0.065f * -0.5f;
if( flipEyes == false ) hmdPoseLeftEyeVec.x *= -1f; // it seems these need flipping if( flipEyes == false ) hmdPoseLeftEyeVec.x *= -1f; // it seems these need flipping
} }
return hmdPoseLeftEyeVec; return hmdPoseLeftEyeVec;
} }
@Override @Override
public Vector3f getHMDVectorPoseRightEye() { public Vector3f getHMDVectorPoseRightEye() {
if( hmdPoseRightEyeVec == null ) { if( hmdPoseRightEyeVec == null ) {
hmdPoseRightEyeVec = new Vector3f(); hmdPoseRightEyeVec = new Vector3f();
hmdPoseRightEyeVec.x = 0.065f * 0.5f; hmdPoseRightEyeVec.x = 0.065f * 0.5f;
if( flipEyes == false ) hmdPoseRightEyeVec.x *= -1f; // it seems these need flipping if( flipEyes == false ) hmdPoseRightEyeVec.x *= -1f; // it seems these need flipping
} }
return hmdPoseRightEyeVec; return hmdPoseRightEyeVec;
} }
@Override @Override
public Vector3f getSeatedToAbsolutePosition() { public Vector3f getSeatedToAbsolutePosition() {
return Vector3f.ZERO; return Vector3f.ZERO;
} }
@Override @Override
public Matrix4f getHMDMatrixPoseLeftEye() { public Matrix4f getHMDMatrixPoseLeftEye() {
// not actually used internally... // not actually used internally...
/*if( hmdPoseLeftEye != null ) { /*if( hmdPoseLeftEye != null ) {
return hmdPoseLeftEye; return hmdPoseLeftEye;
} else { } else {
FloatBuffer mat = FloatBuffer.allocate(16); FloatBuffer mat = FloatBuffer.allocate(16);
OsvrDisplayLibrary.osvrClientGetViewerEyeViewMatrixf(displayConfig, FIRST_VIEWER, (byte)EYE_LEFT, OsvrDisplayLibrary.osvrClientGetViewerEyeViewMatrixf(displayConfig, FIRST_VIEWER, (byte)EYE_LEFT,
(short)(OsvrMatrixConventionsLibrary.OSVR_MatrixVectorFlags.OSVR_MATRIX_COLVECTORS | (short)(OsvrMatrixConventionsLibrary.OSVR_MatrixVectorFlags.OSVR_MATRIX_COLVECTORS |
OsvrMatrixConventionsLibrary.OSVR_MatrixOrderingFlags.OSVR_MATRIX_COLMAJOR), tempfb); OsvrMatrixConventionsLibrary.OSVR_MatrixOrderingFlags.OSVR_MATRIX_COLMAJOR), tempfb);
hmdPoseLeftEye = new Matrix4f(tempfb.array()); hmdPoseLeftEye = new Matrix4f(tempfb.array());
return hmdPoseLeftEye; return hmdPoseLeftEye;
}*/ }*/
return null; return null;
} }
@Override @Override
public Matrix4f getHMDMatrixPoseRightEye() { public Matrix4f getHMDMatrixPoseRightEye() {
// not actually used internally... // not actually used internally...
/*if( hmdPoseRightEye != null ) { /*if( hmdPoseRightEye != null ) {
return hmdPoseRightEye; return hmdPoseRightEye;
} else { } else {
OsvrDisplayLibrary.osvrClientGetViewerEyeViewMatrixf(displayConfig, FIRST_VIEWER, (byte)EYE_RIGHT, OsvrDisplayLibrary.osvrClientGetViewerEyeViewMatrixf(displayConfig, FIRST_VIEWER, (byte)EYE_RIGHT,
(short)(OsvrMatrixConventionsLibrary.OSVR_MatrixVectorFlags.OSVR_MATRIX_COLVECTORS | (short)(OsvrMatrixConventionsLibrary.OSVR_MatrixVectorFlags.OSVR_MATRIX_COLVECTORS |
OsvrMatrixConventionsLibrary.OSVR_MatrixOrderingFlags.OSVR_MATRIX_COLMAJOR), tempfb); OsvrMatrixConventionsLibrary.OSVR_MatrixOrderingFlags.OSVR_MATRIX_COLMAJOR), tempfb);
hmdPoseRightEye = new Matrix4f(tempfb.array()); hmdPoseRightEye = new Matrix4f(tempfb.array());
return hmdPoseRightEye; return hmdPoseRightEye;
}*/ }*/
return null; return null;
} }
@Override @Override
public HmdType getType() { public HmdType getType() {
return HmdType.OSVR; return HmdType.OSVR;
} }
} }

127
jme3-vr/src/main/java/com/jme3/util/VRViewManagerOSVR.java
Unescape View File

@ -50,18 +50,6 @@ import com.sun.jna.ptr.PointerByReference;
public class VRViewManagerOSVR extends AbstractVRViewManager{ public class VRViewManagerOSVR extends AbstractVRViewManager{
private static final Logger logger = Logger.getLogger(VRViewManagerOpenVR.class.getName()); private static final Logger logger = Logger.getLogger(VRViewManagerOpenVR.class.getName());
private Camera leftCamera;
private ViewPort leftViewport;
private FilterPostProcessor leftPostProcessor;
private Texture2D leftEyeTexture;
private Texture2D leftEyeDepth;
private Camera rightCamera;
private ViewPort rightViewport;
private FilterPostProcessor rightPostProcessor;
private Texture2D rightEyeTexture;
private Texture2D rightEyeDepth;
// OpenVR values // OpenVR values
private Texture_t leftTextureType; private Texture_t leftTextureType;
private Texture_t rightTextureType; private Texture_t rightTextureType;
@ -73,15 +61,10 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
OSVR_ViewportDescription.ByValue osvr_viewDescRight; OSVR_ViewportDescription.ByValue osvr_viewDescRight;
Pointer osvr_rmBufferState; Pointer osvr_rmBufferState;
//private static boolean useCustomDistortion;
private float heightAdjustment;
private Texture2D dualEyeTex; private Texture2D dualEyeTex;
private final PointerByReference grabRBS = new PointerByReference(); private final PointerByReference grabRBS = new PointerByReference();
private float resMult = 1f;
//final & temp values for camera calculations //final & temp values for camera calculations
private final Vector3f finalPosition = new Vector3f(); private final Vector3f finalPosition = new Vector3f();
private final Quaternion finalRotation = new Quaternion(); private final Quaternion finalRotation = new Quaternion();
@ -96,42 +79,6 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
this.environment = environment; this.environment = environment;
} }
/**
* Get the {@link Camera camera} attached to the left eye.
* @return the {@link Camera camera} attached to the left eye.
* @see #getRightCamera()
*/
public Camera getLeftCamera() {
return leftCamera;
}
/**
* Get the {@link Camera camera} attached to the right eye.
* @return the {@link Camera camera} attached to the right eye.
* @see #getLeftCamera()
*/
public Camera getRightCamera() {
return rightCamera;
}
/**
* Get the {@link ViewPort viewport} attached to the left eye.
* @return the {@link ViewPort viewport} attached to the left eye.
* @see #getRightViewPort()
*/
public ViewPort getLeftViewPort() {
return leftViewport;
}
/**
* Get the {@link ViewPort viewport} attached to the right eye.
* @return the {@link ViewPort viewport} attached to the right eye.
* @see #getLeftViewPort()
*/
public ViewPort getRightViewPort() {
return rightViewport;
}
/** /**
* Get the identifier of the left eye texture. * Get the identifier of the left eye texture.
* @return the identifier of the left eye texture. * @return the identifier of the left eye texture.
@ -162,42 +109,6 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
return (int)dualEyeTex.getImage().getId(); return (int)dualEyeTex.getImage().getId();
} }
/**
* Get the height adjustment to apply to the cameras before rendering.
* @return the height adjustment to apply to the cameras before rendering.
* @see #setHeightAdjustment(float)
*/
public float getHeightAdjustment() {
return heightAdjustment;
}
/**
* Set the height adjustment to apply to the cameras before rendering.
* @param amount the height adjustment to apply to the cameras before rendering.
* @see #getHeightAdjustment()
*/
public void setHeightAdjustment(float amount) {
heightAdjustment = amount;
}
/**
* Get the resolution multiplier.
* @return the resolution multiplier.
* @see #setResolutionMultiplier(float)
*/
public float getResolutionMuliplier() {
return resMult;
}
/**
* Set the resolution multiplier.
* @param resMult the resolution multiplier.
* @see #getResolutionMuliplier()
*/
public void setResolutionMultiplier(float resMult) {
this.resMult = resMult;
}
/** /**
* Initialize the system binds of the textures. * Initialize the system binds of the textures.
*/ */
@ -442,8 +353,8 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
// other adjustments // other adjustments
size.x *= xMult; size.x *= xMult;
size.x *= resMult; size.x *= getResolutionMuliplier();
size.y *= resMult; size.y *= getResolutionMuliplier();
if( cam.getWidth() != size.x || cam.getHeight() != size.y ){ if( cam.getWidth() != size.x || cam.getHeight() != size.y ){
cam.resize((int)size.x, (int)size.y, false); cam.resize((int)size.x, (int)size.y, false);
@ -469,10 +380,10 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
return; return;
} }
leftEyeTexture = (Texture2D) leftViewport.getOutputFrameBuffer().getColorBuffer().getTexture(); leftEyeTexture = (Texture2D) getLeftViewPort().getOutputFrameBuffer().getColorBuffer().getTexture();
rightEyeTexture = (Texture2D)rightViewport.getOutputFrameBuffer().getColorBuffer().getTexture(); rightEyeTexture = (Texture2D)getRightViewPort().getOutputFrameBuffer().getColorBuffer().getTexture();
leftEyeDepth = (Texture2D) leftViewport.getOutputFrameBuffer().getDepthBuffer().getTexture(); leftEyeDepth = (Texture2D) getLeftViewPort().getOutputFrameBuffer().getDepthBuffer().getTexture();
rightEyeDepth = (Texture2D)rightViewport.getOutputFrameBuffer().getDepthBuffer().getTexture(); rightEyeDepth = (Texture2D)getRightViewPort().getOutputFrameBuffer().getDepthBuffer().getTexture();
// main viewport is either going to be a distortion scene or nothing // main viewport is either going to be a distortion scene or nothing
// mirroring is handled by copying framebuffers // mirroring is handled by copying framebuffers
@ -587,7 +498,7 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
if( obsPosition != null ){ if( obsPosition != null ){
finalPosition.addLocal(obsPosition); finalPosition.addLocal(obsPosition);
} }
finalPosition.y += heightAdjustment; finalPosition.y += getHeightAdjustment();
cam.setFrame(finalPosition, finalRotation); cam.setFrame(finalPosition, finalRotation);
} }
@ -595,7 +506,7 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
* Handles moving filters from the main view to each eye * Handles moving filters from the main view to each eye
*/ */
public void moveScreenProcessingToEyes() { public void moveScreenProcessingToEyes() {
if( rightViewport == null ){ if( getRightViewPort() == null ){
return; return;
} }
@ -617,7 +528,7 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
* @param sourceViewport the {@link ViewPort viewport} that contains the processors to use. * @param sourceViewport the {@link ViewPort viewport} that contains the processors to use.
*/ */
public void syncScreenProcessing(ViewPort sourceViewport) { public void syncScreenProcessing(ViewPort sourceViewport) {
if( rightViewport == null ){ if( getRightViewPort() == null ){
return; return;
} }
@ -631,13 +542,13 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
// clear out all filters & processors, to start from scratch // clear out all filters & processors, to start from scratch
rightPostProcessor.removeAllFilters(); rightPostProcessor.removeAllFilters();
leftPostProcessor.removeAllFilters(); leftPostProcessor.removeAllFilters();
leftViewport.clearProcessors(); getLeftViewPort().clearProcessors();
rightViewport.clearProcessors(); getRightViewPort().clearProcessors();
// if we have no processors to sync, don't add the FilterPostProcessor // if we have no processors to sync, don't add the FilterPostProcessor
if( sourceViewport.getProcessors().isEmpty() ) return; if( sourceViewport.getProcessors().isEmpty() ) return;
// add post processors we just made, which are empty // add post processors we just made, which are empty
leftViewport.addProcessor(leftPostProcessor); getLeftViewPort().addProcessor(leftPostProcessor);
rightViewport.addProcessor(rightPostProcessor); getRightViewPort().addProcessor(rightPostProcessor);
// go through all of the filters in the processors list // go through all of the filters in the processors list
// add them to the left viewport processor & clone them to the right // add them to the left viewport processor & clone them to the right
for(SceneProcessor sceneProcessor : sourceViewport.getProcessors()) { for(SceneProcessor sceneProcessor : sourceViewport.getProcessors()) {
@ -670,8 +581,8 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
VRDirectionalLightShadowRenderer dlsr = (VRDirectionalLightShadowRenderer) sceneProcessor; VRDirectionalLightShadowRenderer dlsr = (VRDirectionalLightShadowRenderer) sceneProcessor;
VRDirectionalLightShadowRenderer dlsrRight = dlsr.clone(); VRDirectionalLightShadowRenderer dlsrRight = dlsr.clone();
dlsrRight.setLight(dlsr.getLight()); dlsrRight.setLight(dlsr.getLight());
rightViewport.getProcessors().add(0, dlsrRight); getRightViewPort().getProcessors().add(0, dlsrRight);
leftViewport.getProcessors().add(0, sceneProcessor); getLeftViewPort().getProcessors().add(0, sceneProcessor);
} }
} }
// make sure each has a translucent filter renderer // make sure each has a translucent filter renderer
@ -718,16 +629,16 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
//org.lwjgl.opengl.GL11.glEnable(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER_SRGB); //org.lwjgl.opengl.GL11.glEnable(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER_SRGB);
if( !environment.isInstanceRendering()) { if( !environment.isInstanceRendering()) {
leftViewport = setupViewBuffers(leftCamera, LEFT_VIEW_NAME); leftViewPort = setupViewBuffers(leftCamera, LEFT_VIEW_NAME);
rightCamera = leftCamera.clone(); rightCamera = leftCamera.clone();
if( environment.getVRHardware() != null ){ if( environment.getVRHardware() != null ){
rightCamera.setProjectionMatrix(environment.getVRHardware().getHMDMatrixProjectionRightEye(rightCamera)); rightCamera.setProjectionMatrix(environment.getVRHardware().getHMDMatrixProjectionRightEye(rightCamera));
} }
rightViewport = setupViewBuffers(rightCamera, RIGHT_VIEW_NAME); rightViewPort = setupViewBuffers(rightCamera, RIGHT_VIEW_NAME);
} else { } else {
System.err.println("[VRViewManager] THIS CODE NEED CHANGES !!!"); System.err.println("[VRViewManager] THIS CODE NEED CHANGES !!!");
leftViewport = environment.getApplication().getViewPort(); leftViewPort = environment.getApplication().getViewPort();
//leftViewport.attachScene(app.getRootNode()); //leftViewport.attachScene(app.getRootNode());
rightCamera = leftCamera.clone(); rightCamera = leftCamera.clone();
if( environment.getVRHardware() != null ){ if( environment.getVRHardware() != null ){
@ -742,7 +653,7 @@ public class VRViewManagerOSVR extends AbstractVRViewManager{
} }
// setup gui // setup gui
environment.getVRGUIManager().setupGui(leftCamera, rightCamera, leftViewport, rightViewport); environment.getVRGUIManager().setupGui(leftCamera, rightCamera, getLeftViewPort(), getRightViewPort());
if( environment.getVRHardware() != null ) { if( environment.getVRHardware() != null ) {
// call these to cache the results internally // call these to cache the results internally

Write Preview
Loading…
Cancel
Save