jme3-vr JavaDoc corrections (comments only)

jme3-vr/src/main/java/com/jme3/app/VRAppState.java

@@ -1,7 +1,7 @@
 package com.jme3.app;
 
 /*
- * Copyright (c) 2009-2018 jMonkeyEngine
+ * Copyright (c) 2009-2019 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -291,7 +291,7 @@ public class VRAppState extends AbstractAppState {
     }
     
     /**
-     * Get the scene observer. If no observer has been set, this method return the application {@link #getCamera() camera}.
+     * Get the scene observer. If no observer has been set, this method returns the application camera.
      * @return the scene observer. 
      * @see #setObserver(Spatial)
      */
@@ -300,7 +300,7 @@ public class VRAppState extends AbstractAppState {
     }
     
     /**
-     * Set the scene observer. The VR headset will be linked to it. If no observer is set, the VR headset is linked to the application {@link #getCamera() camera}.
+     * Set the scene observer. The VR headset will be linked to it. If no observer is set, the VR headset is linked to the application camera.
      * @param observer the scene observer.
      */
     public void setObserver(Spatial observer) {

jme3-vr/src/main/java/com/jme3/app/VREnvironment.java

@@ -97,7 +97,6 @@ public class VREnvironment {
 	
 	/**
 	 * Set the VR bounds.
-	 * @return the VR bounds.
 	 * @see #getVRBounds()
 	 */
 	public void setVRBounds(VRBounds bounds){

jme3-vr/src/main/java/com/jme3/input/vr/VRViewManager.java

@@ -161,7 +161,7 @@ public interface VRViewManager {
      * Send the rendering result as textures to the two eyes. 
      * This method should be called after all the rendering operations 
      * (for example at the end of the {@link AppState#postRender() postRender()} method of the attached app state.)
-     * @see #preRender()
+     * @see #render()
      */
     public void postRender();
     

jme3-vr/src/main/java/com/jme3/input/vr/osvr/OSVRViewManager.java

@@ -441,7 +441,7 @@ public class OSVRViewManager extends AbstractVRViewManager{
     
     /**
      * Update the VR view manager. 
-     * This method is called by the attached {@link VRApplication VR application} and should not be called manually.
+     * This method is called by the attached VR application and should not be called manually.
      * @param tpf the time per frame.
      */
     public void update(float tpf) {

jme3-vr/src/main/java/com/jme3/shadow/AbstractShadowFilterVR.java

@@ -1,7 +1,7 @@
 package com.jme3.shadow;
 
 /*
- * Copyright (c) 2009-2018 jMonkeyEngine
+ * Copyright (c) 2009-2019 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,8 +69,6 @@ public abstract class AbstractShadowFilterVR<T extends AbstractShadowRendererVR>
      * @param manager the application asset manager
      * @param shadowMapSize the size of the rendered shadowmaps (512,1024,2048,
      * etc...)
-     * @param nbShadowMaps the number of shadow maps rendered (the more shadow
-     * maps the more quality, the less fps).
      * @param shadowRenderer the shadowRenderer to use for this Filter
      */
     @SuppressWarnings("all")

jme3-vr/src/main/java/com/jme3/shadow/AbstractShadowRendererVR.java

@@ -1,7 +1,7 @@
 package com.jme3.shadow;
 
 /*
- * Copyright (c) 2009-2018 jMonkeyEngine
+ * Copyright (c) 2009-2019 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -364,7 +364,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl
      *
      * @param shadowMapIndex the index of the shadow map being rendered
      * @param shadowMapOccluders the list of occluders
-     * @return
+     * @return a list of occluders
      */
     protected abstract GeometryList getOccludersToRender(int shadowMapIndex, GeometryList shadowMapOccluders);
 
@@ -684,7 +684,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl
     
     /**
      * returns true if the light source bounding box is in the view frustum
-     * @return 
+     * @return true if box in frustum
      */
     protected abstract boolean checkCulling(Camera viewCam);
     

jme3-vr/src/main/java/com/jme3/shadow/DirectionalLightShadowRendererVR.java

@@ -1,7 +1,7 @@
 package com.jme3.shadow;
 
 /*
- * Copyright (c) 2009-2018 jMonkeyEngine
+ * Copyright (c) 2009-2019 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -293,9 +293,9 @@ public class DirectionalLightShadowRendererVR extends AbstractShadowRendererVR {
     }
 
     /**
-     * Directional light are always in the view frustum
+     * Directional light is always in the view frustum
      * @param viewCam
-     * @return 
+     * @return true
      */
     @Override
     protected boolean checkCulling(Camera viewCam) {

jme3-vr/src/main/java/com/jme3/system/jopenvr/CameraVideoStreamFrameHeader_t.java

@@ -11,7 +11,7 @@ import java.util.List;
  */
 public class CameraVideoStreamFrameHeader_t extends Structure {
 	/**
-	 * @see EVRTrackedCameraFrameType<br>
+
 	 * C type : EVRTrackedCameraFrameType
 	 */
 	public int eFrameType;

jme3-vr/src/main/java/com/jme3/system/jopenvr/JOpenVRLibrary.java

@@ -33,7 +33,6 @@ public class JOpenVRLibrary implements Library {
 */	
 	/**
 	 * Init the native binding to the underlying system library.
-	 * @return <code>true</code> if the link is effective and <code>false</code> otherwise.
 	 */
 	public static void init() throws UnsatisfiedLinkError {
         Native.unregister(JOpenVRLibrary.class);
@@ -1817,7 +1816,6 @@ public class JOpenVRLibrary implements Library {
 	/**
 	 * Original signature : <code>intptr_t VR_GetGenericInterface(const char*, EVRInitError*)</code><br>
 	 * <i>native declaration : headers\openvr_capi.h:1929</i><br>
-	 * @deprecated use the safer methods {@link #VR_GetGenericInterface(java.lang.String, java.nio.IntBuffer)} and {@link #VR_GetGenericInterface(com.sun.jna.Pointer, com.sun.jna.ptr.IntByReference)} instead
 	 */
 	@Deprecated 
 	public static native IntByReference VR_GetGenericInterface(Pointer pchInterfaceVersion, IntByReference peError);

jme3-vr/src/main/java/com/jme3/system/jopenvr/Texture_t.java

@@ -16,12 +16,10 @@ public class Texture_t extends Structure {
 	 */
 	public int handle;
 	/**
-	 * @see ETextureType<br>
 	 * C type : ETextureType
 	 */
 	public int eType;
 	/**
-	 * @see EColorSpace<br>
 	 * C type : EColorSpace
 	 */
 	public int eColorSpace;

jme3-vr/src/main/java/com/jme3/system/jopenvr/TrackedDevicePose_t.java

@@ -17,7 +17,6 @@ public class TrackedDevicePose_t extends Structure {
 	/** C type : HmdVector3_t */
 	public HmdVector3_t vAngularVelocity;
 	/**
-	 * @see ETrackingResult<br>
 	 * C type : ETrackingResult
 	 */
 	public int eTrackingResult;

jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Property_t.java

@@ -13,7 +13,6 @@ public class VREvent_Property_t extends Structure {
 	/** C type : PropertyContainerHandle_t */
 	public long container;
 	/**
-	 * @see ETrackedDeviceProperty<br>
 	 * C type : ETrackedDeviceProperty
 	 */
 	public int prop;

jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionMaskPrimitive_t.java

@@ -11,7 +11,6 @@ import java.util.List;
  */
 public class VROverlayIntersectionMaskPrimitive_t extends Structure {
 	/**
-	 * @see EVROverlayIntersectionMaskPrimitiveType<br>
 	 * C type : EVROverlayIntersectionMaskPrimitiveType
 	 */
 	public int m_nPrimitiveType;

jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionParams_t.java

@@ -15,7 +15,7 @@ public class VROverlayIntersectionParams_t extends Structure {
 	/** C type : HmdVector3_t */
 	public HmdVector3_t vDirection;
 	/**
-	 * @see ETrackingUniverseOrigin<br>
+
 	 * C type : ETrackingUniverseOrigin
 	 */
 	public int eOrigin;

jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientkit/OsvrClientKitLibrary.java

@@ -19,41 +19,45 @@ public class OsvrClientKitLibrary implements Library {
             Native.register(OsvrClientKitLibrary.class, OsvrClientKitLibrary.JNA_NATIVE_LIB);
 	}
 	/**
-	 * @brief Initialize the library.<br>
+	 * Initialize the library.
 	 * @param applicationIdentifier A null terminated string identifying your<br>
 	 * application. Reverse DNS format strongly suggested.<br>
 	 * @param flags initialization options (reserved) - pass 0 for now.<br>
-	 * @returns Client context - will be needed for subsequent calls<br>
+	 * @return Client context - will be needed for subsequent calls<br>
 	 * Original signature : <code>OSVR_ClientContext osvrClientInit(const char[], uint32_t)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientInit(byte[], int)} and {@link #osvrClientInit(com.sun.jna.Pointer, int)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientInit(byte[], int)}
+         * instead
 	 */
 	@Deprecated 
 	public static native OsvrClientKitLibrary.OSVR_ClientContext osvrClientInit(Pointer applicationIdentifier, int flags);
 	/**
-	 * @brief Initialize the library.<br>
+	 * Initialize the library.
 	 * @param applicationIdentifier A null terminated string identifying your<br>
 	 * application. Reverse DNS format strongly suggested.<br>
 	 * @param flags initialization options (reserved) - pass 0 for now.<br>
-	 * @returns Client context - will be needed for subsequent calls<br>
+	 * @return Client context - will be needed for subsequent calls<br>
 	 * Original signature : <code>OSVR_ClientContext osvrClientInit(const char[], uint32_t)</code>
 	 */
 	public static native OsvrClientKitLibrary.OSVR_ClientContext osvrClientInit(byte applicationIdentifier[], int flags);
 	/**
-	 * @brief Updates the state of the context - call regularly in your mainloop.<br>
+	 * Updates the state of the context - call regularly in your mainloop.
 	 * @param ctx Client context<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientUpdate(OSVR_ClientContext)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientUpdate(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext)} and {@link #osvrClientUpdate(com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientUpdate(OsvrClientKitLibrary.OSVR_ClientContext)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientUpdate(Pointer ctx);
 	/**
-	 * @brief Updates the state of the context - call regularly in your mainloop.<br>
+	 * Updates the state of the context - call regularly in your mainloop.
 	 * @param ctx Client context<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientUpdate(OSVR_ClientContext)</code>
 	 */
 	public static native byte osvrClientUpdate(OsvrClientKitLibrary.OSVR_ClientContext ctx);
 	/**
-	 * @brief Checks to see if the client context is fully started up and connected<br>
+	 * Checks to see if the client context is fully started up and connected
 	 * properly to a server.<br>
 	 * If this reports that the client context is not OK, there may not be a server<br>
 	 * running, or you may just have to call osvrClientUpdate() a few times to<br>
@@ -63,12 +67,14 @@ public class OsvrClientKitLibrary implements Library {
 	 * @return OSVR_RETURN_FAILURE if not yet fully connected/initialized, or if<br>
 	 * some other error (null context) occurs.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientCheckStatus(OSVR_ClientContext)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientCheckStatus(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext)} and {@link #osvrClientCheckStatus(com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientCheckStatus(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientCheckStatus(Pointer ctx);
 	/**
-	 * @brief Checks to see if the client context is fully started up and connected<br>
+	 * Checks to see if the client context is fully started up and connected
 	 * properly to a server.<br>
 	 * If this reports that the client context is not OK, there may not be a server<br>
 	 * running, or you may just have to call osvrClientUpdate() a few times to<br>
@@ -81,77 +87,85 @@ public class OsvrClientKitLibrary implements Library {
 	 */
 	public static native byte osvrClientCheckStatus(OsvrClientKitLibrary.OSVR_ClientContext ctx);
 	/**
-	 * @brief Shutdown the library.<br>
+	 * Shut down the library.
 	 * @param ctx Client context<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientShutdown(OSVR_ClientContext)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientShutdown(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext)} and {@link #osvrClientShutdown(com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientShutdown(OsvrClientKitLibrary.OSVR_ClientContext)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientShutdown(Pointer ctx);
 	/**
-	 * @brief Shutdown the library.<br>
+	 * Shut down the library.
 	 * @param ctx Client context<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientShutdown(OSVR_ClientContext)</code>
 	 */
 	public static native byte osvrClientShutdown(OsvrClientKitLibrary.OSVR_ClientContext ctx);
 	/**
-	 * @brief Log a message from the client.<br>
+	 * Log a message from the client.
 	 * Original signature : <code>void osvrClientLog(OSVR_ClientContext, OSVR_LogLevel, const char*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientLog(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, int, java.lang.String)} and {@link #osvrClientLog(com.sun.jna.Pointer, int, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientLog(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, int, java.lang.String)}
+         * instead
 	 */
 	@Deprecated 
 	public static native void osvrClientLog(Pointer ctx, int severity, Pointer message);
 	/**
-	 * @brief Log a message from the client.<br>
+	 * Log a message from the client.
 	 * Original signature : <code>void osvrClientLog(OSVR_ClientContext, OSVR_LogLevel, const char*)</code>
 	 */
 	public static native void osvrClientLog(OsvrClientKitLibrary.OSVR_ClientContext ctx, int severity, String message);
 	/**
-	 * @brief Get the interface associated with the given path.<br>
+	 * Get the interface associated with the given path.
 	 * @param ctx Client context<br>
 	 * @param path A resource path (null-terminated string)<br>
-	 * @param[out] iface The interface object. May be freed when no longer needed,<br>
+	 * @param iface The interface object. May be freed when no longer needed,<br>
 	 * otherwise it will be freed when the context is closed.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetInterface(OSVR_ClientContext, const char[], OSVR_ClientInterface*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetInterface(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, byte[], com.sun.jna.ptr.PointerByReference)} and {@link #osvrClientGetInterface(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.ptr.PointerByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetInterface(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, byte[], com.sun.jna.ptr.PointerByReference)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetInterface(Pointer ctx, Pointer path, Pointer iface);
 	/**
-	 * @brief Get the interface associated with the given path.<br>
+	 * Get the interface associated with the given path.
 	 * @param ctx Client context<br>
 	 * @param path A resource path (null-terminated string)<br>
-	 * @param[out] iface The interface object. May be freed when no longer needed,<br>
+	 * @param iface The interface object. May be freed when no longer needed,<br>
 	 * otherwise it will be freed when the context is closed.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetInterface(OSVR_ClientContext, const char[], OSVR_ClientInterface*)</code>
 	 */
 	public static native byte osvrClientGetInterface(OsvrClientKitLibrary.OSVR_ClientContext ctx, byte path[], PointerByReference iface);
 	/**
-	 * @brief Get the interface associated with the given path.<br>
+	 * Get the interface associated with the given path.
 	 * @param ctx Client context<br>
 	 * @param path A resource path (null-terminated string)<br>
-	 * @param[out] iface The interface object. May be freed when no longer needed,<br>
+	 * @param iface The interface object. May be freed when no longer needed,<br>
 	 * otherwise it will be freed when the context is closed.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetInterface(OSVR_ClientContext, const char[], OSVR_ClientInterface*)</code>
 	 */
 	public static native byte osvrClientGetInterface(Pointer ctx, Pointer path, PointerByReference iface);
 	/**
-	 * @brief Free an interface object before context closure.<br>
+	 * Free an interface object before context closure.
 	 * @param ctx Client context<br>
 	 * @param iface The interface object<br>
-	 * @returns OSVR_RETURN_SUCCESS unless a null context or interface was passed<br>
+	 * @return OSVR_RETURN_SUCCESS unless a null context or interface was passed<br>
 	 * or the given interface was not found in the context (i.e. had already been<br>
 	 * freed)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientFreeInterface(OSVR_ClientContext, OSVR_ClientInterface)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientFreeInterface(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface)} and {@link #osvrClientFreeInterface(com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientFreeInterface(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientFreeInterface(Pointer ctx, Pointer iface);
 	/**
-	 * @brief Free an interface object before context closure.<br>
+	 * Free an interface object before context closure.
 	 * @param ctx Client context<br>
 	 * @param iface The interface object<br>
-	 * @returns OSVR_RETURN_SUCCESS unless a null context or interface was passed<br>
+	 * @return OSVR_RETURN_SUCCESS unless a null context or interface was passed<br>
 	 * or the given interface was not found in the context (i.e. had already been<br>
 	 * freed)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientFreeInterface(OSVR_ClientContext, OSVR_ClientInterface)</code>
@@ -159,7 +173,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrClientFreeInterface(OsvrClientKitLibrary.OSVR_ClientContext ctx, OsvrClientKitLibrary.OSVR_ClientInterface iface);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterPoseCallback(OSVR_ClientInterface, OSVR_PoseCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterPoseCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterPoseCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterPoseCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterPoseCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -167,7 +183,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterPoseCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterPositionCallback(OSVR_ClientInterface, OSVR_PositionCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterPositionCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterPositionCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterPositionCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterPositionCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -175,7 +193,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterPositionCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterOrientationCallback(OSVR_ClientInterface, OSVR_OrientationCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterOrientationCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterOrientationCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterOrientationCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterOrientationCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -183,7 +203,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterOrientationCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterVelocityCallback(OSVR_ClientInterface, OSVR_VelocityCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterVelocityCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterVelocityCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterVelocityCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -191,7 +213,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterLinearVelocityCallback(OSVR_ClientInterface, OSVR_LinearVelocityCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterLinearVelocityCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterLinearVelocityCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterLinearVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterLinearVelocityCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -199,7 +223,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterLinearVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterAngularVelocityCallback(OSVR_ClientInterface, OSVR_AngularVelocityCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterAngularVelocityCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterAngularVelocityCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterAngularVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterAngularVelocityCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -207,7 +233,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterAngularVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterAccelerationCallback(OSVR_ClientInterface, OSVR_AccelerationCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterAccelerationCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterAccelerationCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterAccelerationCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterAccelerationCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -215,7 +243,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterAccelerationCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterLinearAccelerationCallback(OSVR_ClientInterface, OSVR_LinearAccelerationCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterLinearAccelerationCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterLinearAccelerationCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterLinearAccelerationCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterLinearAccelerationCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -223,7 +253,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterLinearAccelerationCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterAngularAccelerationCallback(OSVR_ClientInterface, OSVR_AngularAccelerationCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterAngularAccelerationCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterAngularAccelerationCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterAngularAccelerationCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterAngularAccelerationCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -231,7 +263,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterAngularAccelerationCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterButtonCallback(OSVR_ClientInterface, OSVR_ButtonCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterButtonCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterButtonCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterButtonCallback(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Callback, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterButtonCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -239,7 +273,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterButtonCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Callback cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterAnalogCallback(OSVR_ClientInterface, OSVR_AnalogCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterAnalogCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterAnalogCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterAnalogCallback(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Callback, com.sun.jna.Pointer)} 
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterAnalogCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -247,7 +283,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterAnalogCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Callback cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterImagingCallback(OSVR_ClientInterface, OSVR_ImagingCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterImagingCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterImagingCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterImagingCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterImagingCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -255,7 +293,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterImagingCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterLocation2DCallback(OSVR_ClientInterface, OSVR_Location2DCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterLocation2DCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterLocation2DCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterLocation2DCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterLocation2DCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -263,7 +303,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterLocation2DCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterDirectionCallback(OSVR_ClientInterface, OSVR_DirectionCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterDirectionCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterDirectionCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterDirectionCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterDirectionCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -271,7 +313,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterDirectionCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterEyeTracker2DCallback(OSVR_ClientInterface, OSVR_EyeTracker2DCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterEyeTracker2DCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterEyeTracker2DCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterEyeTracker2DCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterEyeTracker2DCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -279,7 +323,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterEyeTracker2DCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterEyeTracker3DCallback(OSVR_ClientInterface, OSVR_EyeTracker3DCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterEyeTracker3DCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterEyeTracker3DCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterEyeTracker3DCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterEyeTracker3DCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -287,7 +333,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterEyeTracker3DCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterEyeTrackerBlinkCallback(OSVR_ClientInterface, OSVR_EyeTrackerBlinkCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterEyeTrackerBlinkCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterEyeTrackerBlinkCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterEyeTrackerBlinkCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterEyeTrackerBlinkCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -295,7 +343,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterEyeTrackerBlinkCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterNaviVelocityCallback(OSVR_ClientInterface, OSVR_NaviVelocityCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterNaviVelocityCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterNaviVelocityCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterNaviVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterNaviVelocityCallback(Pointer iface, Pointer cb, Pointer userdata);
@@ -303,7 +353,9 @@ public class OsvrClientKitLibrary implements Library {
 	public static native byte osvrRegisterNaviVelocityCallback(OsvrClientKitLibrary.OSVR_ClientInterface iface, Pointer cb, Pointer userdata);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrRegisterNaviPositionCallback(OSVR_ClientInterface, OSVR_NaviPositionCallback, void*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrRegisterNaviPositionCallback(osvrclientkit.OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)} and {@link #osvrRegisterNaviPositionCallback(com.sun.jna.Pointer, com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrRegisterNaviPositionCallback(OsvrClientKitLibrary.OSVR_ClientInterface, com.sun.jna.Pointer, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrRegisterNaviPositionCallback(Pointer iface, Pointer cb, Pointer userdata);

jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OsvrClientReportTypesLibrary.java

@@ -33,7 +33,7 @@ public class OsvrClientReportTypesLibrary implements Library {
 	/** Original signature : <code>void osvrVec3SetZ(OSVR_Vec3*, double)</code> */
 	public static native void osvrVec3SetZ(OSVR_Vec3 v, double val);
 	/**
-	 * @brief Set a Vec3 to the zero vector<br>
+	 * Set a Vec3 to the zero vector.
 	 * Original signature : <code>void osvrVec3Zero(OSVR_Vec3*)</code>
 	 */
 	public static native void osvrVec3Zero(OSVR_Vec3 v);
@@ -54,12 +54,12 @@ public class OsvrClientReportTypesLibrary implements Library {
 	/** Original signature : <code>void osvrQuatSetZ(OSVR_Quaternion*, double)</code> */
 	public static native void osvrQuatSetZ(OSVR_Quaternion q, double val);
 	/**
-	 * @brief Set a quaternion to the identity rotation<br>
+	 * Set a quaternion to the identity rotation.
 	 * Original signature : <code>void osvrQuatSetIdentity(OSVR_Quaternion*)</code>
 	 */
 	public static native void osvrQuatSetIdentity(OSVR_Quaternion q);
 	/**
-	 * @brief Set a pose to identity<br>
+	 * Set a pose to identity.
 	 * Original signature : <code>void osvrPose3SetIdentity(OSVR_Pose3*)</code>
 	 */
 	public static native void osvrPose3SetIdentity(OSVR_Pose3 pose);
@@ -72,7 +72,7 @@ public class OsvrClientReportTypesLibrary implements Library {
 	/** Original signature : <code>void osvrVec2SetY(OSVR_Vec2*, double)</code> */
 	public static native void osvrVec2SetY(OSVR_Vec2 v, double val);
 	/**
-	 * @brief Set a Vec2 to the zero vector<br>
+	 * Set a Vec2 to the zero vector.
 	 * Original signature : <code>void osvrVec2Zero(OSVR_Vec2*)</code>
 	 */
 	public static native void osvrVec2Zero(OSVR_Vec2 v);

jme3-vr/src/main/java/com/jme3/system/osvr/osvrdisplay/OsvrDisplayLibrary.java

@@ -27,7 +27,7 @@ public class OsvrDisplayLibrary implements Library {
 		Native.register(OsvrDisplayLibrary.class, OsvrDisplayLibrary.JNA_NATIVE_LIB);
 	}
 	/**
-	 * @brief Allocates a display configuration object populated with data from the<br>
+	 * Allocates a display configuration object populated with data from the<br>
 	 * OSVR system.<br>
 	 * Before this call will succeed, your application will need to be correctly<br>
 	 * and fully connected to an OSVR server. You may consider putting this call in<br>
@@ -55,19 +55,21 @@ public class OsvrDisplayLibrary implements Library {
 	 * practice, typically more) osvrClientUpdate() must be performed before a new<br>
 	 * tracker report is available to populate that state. See<br>
 	 * osvrClientCheckDisplayStartup() to query if all startup data is available.<br>
-	 * @todo Decide if relative viewport should be constant in a display config,<br>
+	 * todo Decide if relative viewport should be constant in a display config,<br>
 	 * and update docs accordingly.<br>
-	 * @todo Decide if distortion params should be constant in a display config,<br>
+	 * todo Decide if distortion params should be constant in a display config,<br>
 	 * and update docs accordingly.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or some other<br>
 	 * error occurred, in which case the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetDisplay(OSVR_ClientContext, OSVR_DisplayConfig*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetDisplay(osvrdisplay.OsvrDisplayLibrary.OSVR_ClientContext, com.sun.jna.ptr.PointerByReference)} and {@link #osvrClientGetDisplay(com.sun.jna.Pointer, com.sun.jna.ptr.PointerByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetDisplay(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, com.sun.jna.ptr.PointerByReference)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetDisplay(Pointer ctx, Pointer disp);
 	/**
-	 * @brief Allocates a display configuration object populated with data from the<br>
+	 * Allocates a display configuration object populated with data from the<br>
 	 * OSVR system.<br>
 	 * Before this call will succeed, your application will need to be correctly<br>
 	 * and fully connected to an OSVR server. You may consider putting this call in<br>
@@ -95,9 +97,9 @@ public class OsvrDisplayLibrary implements Library {
 	 * practice, typically more) osvrClientUpdate() must be performed before a new<br>
 	 * tracker report is available to populate that state. See<br>
 	 * osvrClientCheckDisplayStartup() to query if all startup data is available.<br>
-	 * @todo Decide if relative viewport should be constant in a display config,<br>
+	 * todo Decide if relative viewport should be constant in a display config,<br>
 	 * and update docs accordingly.<br>
-	 * @todo Decide if distortion params should be constant in a display config,<br>
+	 * todo Decide if distortion params should be constant in a display config,<br>
 	 * and update docs accordingly.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or some other<br>
 	 * error occurred, in which case the output argument is unmodified.<br>
@@ -105,7 +107,7 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetDisplay(OsvrClientKitLibrary.OSVR_ClientContext ctx, PointerByReference disp);
 	/**
-	 * @brief Allocates a display configuration object populated with data from the<br>
+	 * Allocates a display configuration object populated with data from the<br>
 	 * OSVR system.<br>
 	 * Before this call will succeed, your application will need to be correctly<br>
 	 * and fully connected to an OSVR server. You may consider putting this call in<br>
@@ -133,9 +135,9 @@ public class OsvrDisplayLibrary implements Library {
 	 * practice, typically more) osvrClientUpdate() must be performed before a new<br>
 	 * tracker report is available to populate that state. See<br>
 	 * osvrClientCheckDisplayStartup() to query if all startup data is available.<br>
-	 * @todo Decide if relative viewport should be constant in a display config,<br>
+	 * todo Decide if relative viewport should be constant in a display config,<br>
 	 * and update docs accordingly.<br>
-	 * @todo Decide if distortion params should be constant in a display config,<br>
+	 * todo Decide if distortion params should be constant in a display config,<br>
 	 * and update docs accordingly.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or some other<br>
 	 * error occurred, in which case the output argument is unmodified.<br>
@@ -143,19 +145,21 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetDisplay(Pointer ctx, PointerByReference disp);
 	/**
-	 * @brief Frees a display configuration object. The corresponding context must<br>
+	 * Frees a display configuration object. The corresponding context must<br>
 	 * still be open.<br>
 	 * If you fail to call this, it will be automatically called as part of<br>
 	 * clean-up when the corresponding context is closed.<br>
 	 * @return OSVR_RETURN_FAILURE if a null config was passed, or if the given<br>
 	 * display object was already freed.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientFreeDisplay(OSVR_DisplayConfig)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientFreeDisplay(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig)} and {@link #osvrClientFreeDisplay(com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientFreeDisplay(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientFreeDisplay(Pointer disp);
 	/**
-	 * @brief Frees a display configuration object. The corresponding context must<br>
+	 * Frees a display configuration object. The corresponding context must<br>
 	 * still be open.<br>
 	 * If you fail to call this, it will be automatically called as part of<br>
 	 * clean-up when the corresponding context is closed.<br>
@@ -165,7 +169,7 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientFreeDisplay(OsvrDisplayLibrary.OSVR_DisplayConfig disp);
 	/**
-	 * @brief Checks to see if a display is fully configured and ready, including<br>
+	 * Checks to see if a display is fully configured and ready, including<br>
 	 * having received its first pose update.<br>
 	 * Once this first succeeds, it will continue to succeed for the lifetime of<br>
 	 * the display config object, so it is not necessary to keep calling once you<br>
@@ -173,12 +177,14 @@ public class OsvrDisplayLibrary implements Library {
 	 * @return OSVR_RETURN_FAILURE if a null config was passed, or if the given<br>
 	 * display config object was otherwise not ready for full use.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientCheckDisplayStartup(OSVR_DisplayConfig)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientCheckDisplayStartup(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig)} and {@link #osvrClientCheckDisplayStartup(com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientCheckDisplayStartup(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientCheckDisplayStartup(Pointer disp);
 	/**
-	 * @brief Checks to see if a display is fully configured and ready, including<br>
+	 * Checks to see if a display is fully configured and ready, including<br>
 	 * having received its first pose update.<br>
 	 * Once this first succeeds, it will continue to succeed for the lifetime of<br>
 	 * the display config object, so it is not necessary to keep calling once you<br>
@@ -189,97 +195,97 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientCheckDisplayStartup(OsvrDisplayLibrary.OSVR_DisplayConfig disp);
 	/**
-	 * @brief A display config can have one or more display inputs to pass pixels<br>
+	 * A display config can have one or more display inputs to pass pixels<br>
 	 * over (HDMI/DVI connections, etc): retrieve the number of display inputs in<br>
 	 * the current configuration.<br>
 	 * @param disp Display config object.<br>
-	 * @param[out] numDisplayInputs Number of display inputs in the logical display<br>
+	 * @param numDisplayInputs Number of display inputs in the logical display<br>
 	 * topology, **constant** throughout the active, valid lifetime of a display<br>
 	 * config object.<br>
-	 * @sa OSVR_DisplayInputCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in<br>
 	 * which case the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumDisplayInputs(OSVR_DisplayConfig, OSVR_DisplayInputCount*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetNumDisplayInputs(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, java.nio.ByteBuffer)} and {@link #osvrClientGetNumDisplayInputs(com.sun.jna.Pointer, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetNumDisplayInputs(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, java.nio.ByteBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetNumDisplayInputs(Pointer disp, Pointer numDisplayInputs);
 	/**
-	 * @brief A display config can have one or more display inputs to pass pixels<br>
+	 * A display config can have one or more display inputs to pass pixels<br>
 	 * over (HDMI/DVI connections, etc): retrieve the number of display inputs in<br>
 	 * the current configuration.<br>
 	 * @param disp Display config object.<br>
-	 * @param[out] numDisplayInputs Number of display inputs in the logical display<br>
+	 * @param numDisplayInputs Number of display inputs in the logical display<br>
 	 * topology, **constant** throughout the active, valid lifetime of a display<br>
 	 * config object.<br>
-	 * @sa OSVR_DisplayInputCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in<br>
 	 * which case the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumDisplayInputs(OSVR_DisplayConfig, OSVR_DisplayInputCount*)</code>
 	 */
 	public static native byte osvrClientGetNumDisplayInputs(OsvrDisplayLibrary.OSVR_DisplayConfig disp, ByteBuffer numDisplayInputs);
 	/**
-	 * @brief Retrieve the pixel dimensions of a given display input for a display<br>
+	 * Retrieve the pixel dimensions of a given display input for a display<br>
 	 * config<br>
 	 * @param disp Display config object.<br>
 	 * @param displayInputIndex The zero-based index of the display input.<br>
-	 * @param[out] width Width (in pixels) of the display input.<br>
+	 * @param width Width (in pixels) of the display input.<br>
-	 * @param[out] height Height (in pixels) of the display input.<br>
+	 * @param height Height (in pixels) of the display input.<br>
 	 * The out parameters are **constant** throughout the active, valid lifetime of<br>
 	 * a display config object.<br>
-	 * @sa OSVR_DisplayDimension<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in<br>
 	 * which case the output arguments are unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetDisplayDimensions(OSVR_DisplayConfig, OSVR_DisplayInputCount, OSVR_DisplayDimension*, OSVR_DisplayDimension*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetDisplayDimensions(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, byte, java.nio.IntBuffer, java.nio.IntBuffer)} and {@link #osvrClientGetDisplayDimensions(com.sun.jna.Pointer, byte, com.sun.jna.ptr.IntByReference, com.sun.jna.ptr.IntByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetDisplayDimensions(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, byte, java.nio.IntBuffer, java.nio.IntBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetDisplayDimensions(Pointer disp, byte displayInputIndex, IntByReference width, IntByReference height);
 	/**
-	 * @brief Retrieve the pixel dimensions of a given display input for a display<br>
+	 * Retrieve the pixel dimensions of a given display input for a display<br>
 	 * config<br>
 	 * @param disp Display config object.<br>
 	 * @param displayInputIndex The zero-based index of the display input.<br>
-	 * @param[out] width Width (in pixels) of the display input.<br>
+	 * @param width Width (in pixels) of the display input.<br>
-	 * @param[out] height Height (in pixels) of the display input.<br>
+	 * @param height Height (in pixels) of the display input.<br>
 	 * The out parameters are **constant** throughout the active, valid lifetime of<br>
 	 * a display config object.<br>
-	 * @sa OSVR_DisplayDimension<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in<br>
 	 * which case the output arguments are unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetDisplayDimensions(OSVR_DisplayConfig, OSVR_DisplayInputCount, OSVR_DisplayDimension*, OSVR_DisplayDimension*)</code>
 	 */
 	public static native byte osvrClientGetDisplayDimensions(OsvrDisplayLibrary.OSVR_DisplayConfig disp, byte displayInputIndex, IntBuffer width, IntBuffer height);
 	/**
-	 * @brief A display config can have one (or theoretically more) viewers:<br>
+	 * A display config can have one (or theoretically more) viewers:<br>
 	 * retrieve the viewer count.<br>
 	 * @param disp Display config object.<br>
-	 * @param[out] viewers Number of viewers in the logical display topology,<br>
+	 * @param viewers Number of viewers in the logical display topology,<br>
 	 * *constant** throughout the active, valid lifetime of a display config<br>
 	 * object.<br>
-	 * @sa OSVR_ViewerCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumViewers(OSVR_DisplayConfig, OSVR_ViewerCount*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetNumViewers(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, java.nio.IntBuffer)} and {@link #osvrClientGetNumViewers(com.sun.jna.Pointer, com.sun.jna.ptr.IntByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetNumViewers(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, java.nio.IntBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetNumViewers(Pointer disp, IntByReference viewers);
 	/**
-	 * @brief A display config can have one (or theoretically more) viewers:<br>
+	 * A display config can have one (or theoretically more) viewers:<br>
 	 * retrieve the viewer count.<br>
 	 * @param disp Display config object.<br>
-	 * @param[out] viewers Number of viewers in the logical display topology,<br>
+	 * @param viewers Number of viewers in the logical display topology,<br>
 	 * *constant** throughout the active, valid lifetime of a display config<br>
 	 * object.<br>
-	 * @sa OSVR_ViewerCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumViewers(OSVR_DisplayConfig, OSVR_ViewerCount*)</code>
 	 */
 	public static native byte osvrClientGetNumViewers(OsvrDisplayLibrary.OSVR_DisplayConfig disp, IntBuffer viewers);
 	/**
-	 * @brief Get the pose of a viewer in a display config.<br>
+	 * Get the pose of a viewer in a display config.<br>
 	 * Note that there may not necessarily be any surfaces rendered from this pose<br>
 	 * (it's the unused "center" eye in a stereo configuration, for instance) so<br>
 	 * only use this if it makes integration into your engine or existing<br>
@@ -288,12 +294,14 @@ public class OsvrDisplayLibrary implements Library {
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or no pose was<br>
 	 * yet available, in which case the pose argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerPose(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_Pose3*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerPose(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, com.sun.jna.Pointer)} and {@link #osvrClientGetViewerPose(com.sun.jna.Pointer, int, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerPose(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerPose(Pointer disp, int viewer, Pointer pose);
 	/**
-	 * @brief Get the pose of a viewer in a display config.<br>
+	 * Get the pose of a viewer in a display config.<br>
 	 * Note that there may not necessarily be any surfaces rendered from this pose<br>
 	 * (it's the unused "center" eye in a stereo configuration, for instance) so<br>
 	 * only use this if it makes integration into your engine or existing<br>
@@ -305,89 +313,93 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetViewerPose(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, Pointer pose);
 	/**
-	 * @brief Each viewer in a display config can have one or more "eyes" which<br>
+	 * Each viewer in a display config can have one or more "eyes" which<br>
 	 * have a substantially similar pose: get the count.<br>
 	 * @param disp Display config object.<br>
 	 * @param viewer Viewer ID<br>
-	 * @param[out] eyes Number of eyes for this viewer in the logical display<br>
+	 * @param eyes Number of eyes for this viewer in the logical display<br>
 	 * topology, **constant** throughout the active, valid lifetime of a display<br>
 	 * config object<br>
-	 * @sa OSVR_EyeCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumEyesForViewer(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetNumEyesForViewer(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, java.nio.ByteBuffer)} and {@link #osvrClientGetNumEyesForViewer(com.sun.jna.Pointer, int, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetNumEyesForViewer(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, java.nio.ByteBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetNumEyesForViewer(Pointer disp, int viewer, Pointer eyes);
 	/**
-	 * @brief Each viewer in a display config can have one or more "eyes" which<br>
+	 * Each viewer in a display config can have one or more "eyes" which<br>
 	 * have a substantially similar pose: get the count.<br>
 	 * @param disp Display config object.<br>
 	 * @param viewer Viewer ID<br>
-	 * @param[out] eyes Number of eyes for this viewer in the logical display<br>
+	 * @param eyes Number of eyes for this viewer in the logical display<br>
 	 * topology, **constant** throughout the active, valid lifetime of a display<br>
 	 * config object<br>
-	 * @sa OSVR_EyeCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumEyesForViewer(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount*)</code>
 	 */
 	public static native byte osvrClientGetNumEyesForViewer(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, ByteBuffer eyes);
 	/**
-	 * @brief Get the "viewpoint" for the given eye of a viewer in a display<br>
+	 * Get the "viewpoint" for the given eye of a viewer in a display<br>
 	 * config.<br>
 	 * Will only succeed if osvrClientCheckDisplayStartup() succeeds.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
-	 * @param[out] pose Room-space pose (not relative to pose of the viewer)<br>
+	 * @param pose Room-space pose (not relative to pose of the viewer)<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or no pose was<br>
 	 * yet available, in which case the pose argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyePose(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_Pose3*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyePose(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, com.sun.jna.Pointer)} and {@link #osvrClientGetViewerEyePose(com.sun.jna.Pointer, int, byte, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyePose(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, com.sun.jna.Pointer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyePose(Pointer disp, int viewer, byte eye, Pointer pose);
 	/**
-	 * @brief Get the "viewpoint" for the given eye of a viewer in a display<br>
+	 * Get the "viewpoint" for the given eye of a viewer in a display<br>
 	 * config.<br>
 	 * Will only succeed if osvrClientCheckDisplayStartup() succeeds.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
-	 * @param[out] pose Room-space pose (not relative to pose of the viewer)<br>
+	 * @param pose Room-space pose (not relative to pose of the viewer)<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or no pose was<br>
 	 * yet available, in which case the pose argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyePose(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_Pose3*)</code>
 	 */
 	public static native byte osvrClientGetViewerEyePose(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, Pointer pose);
 	/**
-	 * @brief Get the view matrix (inverse of pose) for the given eye of a<br>
+	 * Get the view matrix (inverse of pose) for the given eye of a<br>
 	 * viewer in a display config - matrix of **doubles**.<br>
 	 * Will only succeed if osvrClientCheckDisplayStartup() succeeds.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] mat Pass a double[::OSVR_MATRIX_SIZE] to get the transformation<br>
+	 * @param mat Pass a double[::OSVR_MATRIX_SIZE] to get the transformation<br>
 	 * matrix from room space to eye space (not relative to pose of the viewer)<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or no pose was<br>
 	 * yet available, in which case the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeViewMatrixd(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_MatrixConventions, double*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeViewMatrixd(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, short, java.nio.DoubleBuffer)} and {@link #osvrClientGetViewerEyeViewMatrixd(com.sun.jna.Pointer, int, byte, short, com.sun.jna.ptr.DoubleByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyeViewMatrixd(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, short, java.nio.DoubleBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeViewMatrixd(Pointer disp, int viewer, byte eye, short flags, DoubleByReference mat);
 	/**
-	 * @brief Get the view matrix (inverse of pose) for the given eye of a<br>
+	 * Get the view matrix (inverse of pose) for the given eye of a<br>
 	 * viewer in a display config - matrix of **doubles**.<br>
 	 * Will only succeed if osvrClientCheckDisplayStartup() succeeds.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] mat Pass a double[::OSVR_MATRIX_SIZE] to get the transformation<br>
+	 * @param mat Pass a double[::OSVR_MATRIX_SIZE] to get the transformation<br>
 	 * matrix from room space to eye space (not relative to pose of the viewer)<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or no pose was<br>
 	 * yet available, in which case the output argument is unmodified.<br>
@@ -395,31 +407,33 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetViewerEyeViewMatrixd(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, short flags, DoubleBuffer mat);
 	/**
-	 * @brief Get the view matrix (inverse of pose) for the given eye of a<br>
+	 * Get the view matrix (inverse of pose) for the given eye of a<br>
 	 * viewer in a display config - matrix of **floats**.<br>
 	 * Will only succeed if osvrClientCheckDisplayStartup() succeeds.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] mat Pass a float[::OSVR_MATRIX_SIZE] to get the transformation<br>
+	 * @param mat Pass a float[::OSVR_MATRIX_SIZE] to get the transformation<br>
 	 * matrix from room space to eye space (not relative to pose of the viewer)<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or no pose was<br>
 	 * yet available, in which case the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeViewMatrixf(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_MatrixConventions, float*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeViewMatrixf(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, short, java.nio.FloatBuffer)} and {@link #osvrClientGetViewerEyeViewMatrixf(com.sun.jna.Pointer, int, byte, short, com.sun.jna.ptr.FloatByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyeViewMatrixf(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, short, java.nio.FloatBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeViewMatrixf(Pointer disp, int viewer, byte eye, short flags, FloatByReference mat);
 	/**
-	 * @brief Get the view matrix (inverse of pose) for the given eye of a<br>
+	 * Get the view matrix (inverse of pose) for the given eye of a<br>
 	 * viewer in a display config - matrix of **floats**.<br>
 	 * Will only succeed if osvrClientCheckDisplayStartup() succeeds.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] mat Pass a float[::OSVR_MATRIX_SIZE] to get the transformation<br>
+	 * @param mat Pass a float[::OSVR_MATRIX_SIZE] to get the transformation<br>
 	 * matrix from room space to eye space (not relative to pose of the viewer)<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed or no pose was<br>
 	 * yet available, in which case the output argument is unmodified.<br>
@@ -427,39 +441,39 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetViewerEyeViewMatrixf(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, short flags, FloatBuffer mat);
 	/**
-	 * @brief Each eye of each viewer in a display config has one or more surfaces<br>
+	 * Each eye of each viewer in a display config has one or more surfaces<br>
 	 * (aka "screens") on which content should be rendered.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
-	 * @param[out] surfaces Number of surfaces (numbered [0, surfaces - 1]) for the<br>
+	 * @param surfaces Number of surfaces (numbered [0, surfaces - 1]) for the<br>
 	 * given viewer and eye. **Constant** throughout the active, valid lifetime of<br>
 	 * a display config object.<br>
-	 * @sa OSVR_SurfaceCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumSurfacesForViewerEye(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetNumSurfacesForViewerEye(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, java.nio.IntBuffer)} and {@link #osvrClientGetNumSurfacesForViewerEye(com.sun.jna.Pointer, int, byte, com.sun.jna.ptr.IntByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetNumSurfacesForViewerEye(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, java.nio.IntBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetNumSurfacesForViewerEye(Pointer disp, int viewer, byte eye, IntByReference surfaces);
 	/**
-	 * @brief Each eye of each viewer in a display config has one or more surfaces<br>
+	 * Each eye of each viewer in a display config has one or more surfaces<br>
 	 * (aka "screens") on which content should be rendered.<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
-	 * @param[out] surfaces Number of surfaces (numbered [0, surfaces - 1]) for the<br>
+	 * @param surfaces Number of surfaces (numbered [0, surfaces - 1]) for the<br>
 	 * given viewer and eye. **Constant** throughout the active, valid lifetime of<br>
 	 * a display config object.<br>
-	 * @sa OSVR_SurfaceCount<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetNumSurfacesForViewerEye(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount*)</code>
 	 */
 	public static native byte osvrClientGetNumSurfacesForViewerEye(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, IntBuffer surfaces);
 	/**
-	 * @brief Get the dimensions/location of the viewport **within the display<br>
+	 * Get the dimensions/location of the viewport **within the display<br>
 	 * input** for a surface seen by an eye of a viewer in a display config. (This<br>
 	 * does not include other video inputs that may be on a single virtual desktop,<br>
 	 * etc. or explicitly account for display configurations that use multiple<br>
@@ -470,21 +484,23 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] left Output: Distance in pixels from the left of the video input<br>
+	 * @param left Output: Distance in pixels from the left of the video input<br>
 	 * to the left of the viewport.<br>
-	 * @param[out] bottom Output: Distance in pixels from the bottom of the video<br>
+	 * @param bottom Output: Distance in pixels from the bottom of the video<br>
 	 * input to the bottom of the viewport.<br>
-	 * @param[out] width Output: Width of viewport in pixels.<br>
+	 * @param width Output: Width of viewport in pixels.<br>
-	 * @param[out] height Output: Height of viewport in pixels.<br>
+	 * @param height Output: Height of viewport in pixels.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output arguments are unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetRelativeViewportForViewerEyeSurface(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, OSVR_ViewportDimension*, OSVR_ViewportDimension*, OSVR_ViewportDimension*, OSVR_ViewportDimension*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetRelativeViewportForViewerEyeSurface(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer)} and {@link #osvrClientGetRelativeViewportForViewerEyeSurface(com.sun.jna.Pointer, int, byte, int, com.sun.jna.ptr.IntByReference, com.sun.jna.ptr.IntByReference, com.sun.jna.ptr.IntByReference, com.sun.jna.ptr.IntByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetRelativeViewportForViewerEyeSurface(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetRelativeViewportForViewerEyeSurface(Pointer disp, int viewer, byte eye, int surface, IntByReference left, IntByReference bottom, IntByReference width, IntByReference height);
 	/**
-	 * @brief Get the dimensions/location of the viewport **within the display<br>
+	 * Get the dimensions/location of the viewport **within the display<br>
 	 * input** for a surface seen by an eye of a viewer in a display config. (This<br>
 	 * does not include other video inputs that may be on a single virtual desktop,<br>
 	 * etc. or explicitly account for display configurations that use multiple<br>
@@ -495,19 +511,19 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] left Output: Distance in pixels from the left of the video input<br>
+	 * @param left Output: Distance in pixels from the left of the video input<br>
 	 * to the left of the viewport.<br>
-	 * @param[out] bottom Output: Distance in pixels from the bottom of the video<br>
+	 * @param bottom Output: Distance in pixels from the bottom of the video<br>
 	 * input to the bottom of the viewport.<br>
-	 * @param[out] width Output: Width of viewport in pixels.<br>
+	 * @param width Output: Width of viewport in pixels.<br>
-	 * @param[out] height Output: Height of viewport in pixels.<br>
+	 * @param height Output: Height of viewport in pixels.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output arguments are unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetRelativeViewportForViewerEyeSurface(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, OSVR_ViewportDimension*, OSVR_ViewportDimension*, OSVR_ViewportDimension*, OSVR_ViewportDimension*)</code>
 	 */
 	public static native byte osvrClientGetRelativeViewportForViewerEyeSurface(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, int surface, IntBuffer left, IntBuffer bottom, IntBuffer width, IntBuffer height);
 	/**
-	 * @brief Get the index of the display input for a surface seen by an eye of a<br>
+	 * Get the index of the display input for a surface seen by an eye of a<br>
 	 * viewer in a display config.<br>
 	 * This is the OSVR-assigned display input: it may not (and in practice,<br>
 	 * usually will not) match any platform-specific display indices. This function<br>
@@ -517,21 +533,23 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] displayInput Zero-based index of the display input pixels for<br>
+	 * @param displayInput Zero-based index of the display input pixels for<br>
 	 * this surface are tranmitted over.<br>
 	 * This association is **constant** throughout the active, valid lifetime of a<br>
 	 * display config object.<br>
-	 * @sa osvrClientGetNumDisplayInputs(),<br>
+         * @see #osvrClientGetNumDisplayInputs(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, java.nio.ByteBuffer) 
-	 * osvrClientGetRelativeViewportForViewerEyeSurface()<br>
+         * @see #osvrClientGetRelativeViewportForViewerEyeSurface(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer)
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which<br>
 	 * case the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceDisplayInputIndex(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, OSVR_DisplayInputCount*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeSurfaceDisplayInputIndex(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.ByteBuffer)} and {@link #osvrClientGetViewerEyeSurfaceDisplayInputIndex(com.sun.jna.Pointer, int, byte, int, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyeSurfaceDisplayInputIndex(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.ByteBuffer)} 
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeSurfaceDisplayInputIndex(Pointer disp, int viewer, byte eye, int surface, Pointer displayInput);
 	/**
-	 * @brief Get the index of the display input for a surface seen by an eye of a<br>
+	 * Get the index of the display input for a surface seen by an eye of a<br>
 	 * viewer in a display config.<br>
 	 * This is the OSVR-assigned display input: it may not (and in practice,<br>
 	 * usually will not) match any platform-specific display indices. This function<br>
@@ -541,19 +559,19 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] displayInput Zero-based index of the display input pixels for<br>
+	 * @param displayInput Zero-based index of the display input pixels for<br>
 	 * this surface are tranmitted over.<br>
 	 * This association is **constant** throughout the active, valid lifetime of a<br>
 	 * display config object.<br>
-	 * @sa osvrClientGetNumDisplayInputs(),<br>
+         * @see #osvrClientGetNumDisplayInputs(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, java.nio.ByteBuffer) 
-	 * osvrClientGetRelativeViewportForViewerEyeSurface()<br>
+         * @see #osvrClientGetRelativeViewportForViewerEyeSurface(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer)
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which<br>
 	 * case the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceDisplayInputIndex(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, OSVR_DisplayInputCount*)</code>
 	 */
 	public static native byte osvrClientGetViewerEyeSurfaceDisplayInputIndex(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, int surface, ByteBuffer displayInput);
 	/**
-	 * @brief Get the projection matrix for a surface seen by an eye of a viewer<br>
+	 * Get the projection matrix for a surface seen by an eye of a viewer<br>
 	 * in a display config. (double version)<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
@@ -564,17 +582,19 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param far Distance from viewpoint to far clipping plane - must be positive<br>
 	 * and not equal to near, typically greater than near.<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] matrix Output projection matrix: supply an array of 16<br>
+	 * @param matrix Output projection matrix: supply an array of 16<br>
 	 * (::OSVR_MATRIX_SIZE) doubles.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceProjectionMatrixd(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, double, double, OSVR_MatrixConventions, double*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeSurfaceProjectionMatrixd(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, double, double, short, java.nio.DoubleBuffer)} and {@link #osvrClientGetViewerEyeSurfaceProjectionMatrixd(com.sun.jna.Pointer, int, byte, int, double, double, short, com.sun.jna.ptr.DoubleByReference)} instead
+	 * @deprecated use the safer method 
+         * {@link #osvrClientGetViewerEyeSurfaceProjectionMatrixd(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, double, double, short, java.nio.DoubleBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeSurfaceProjectionMatrixd(Pointer disp, int viewer, byte eye, int surface, double near, double far, short flags, DoubleByReference matrix);
 	/**
-	 * @brief Get the projection matrix for a surface seen by an eye of a viewer<br>
+	 * Get the projection matrix for a surface seen by an eye of a viewer<br>
 	 * in a display config. (double version)<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
@@ -585,7 +605,7 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param far Distance from viewpoint to far clipping plane - must be positive<br>
 	 * and not equal to near, typically greater than near.<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] matrix Output projection matrix: supply an array of 16<br>
+	 * @param matrix Output projection matrix: supply an array of 16<br>
 	 * (::OSVR_MATRIX_SIZE) doubles.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
@@ -593,7 +613,7 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetViewerEyeSurfaceProjectionMatrixd(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, int surface, double near, double far, short flags, DoubleBuffer matrix);
 	/**
-	 * @brief Get the projection matrix for a surface seen by an eye of a viewer<br>
+	 * Get the projection matrix for a surface seen by an eye of a viewer<br>
 	 * in a display config. (float version)<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
@@ -604,17 +624,19 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param far Distance to far clipping plane - must be nonzero, typically<br>
 	 * positive and greater than near.<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] matrix Output projection matrix: supply an array of 16<br>
+	 * @param matrix Output projection matrix: supply an array of 16<br>
 	 * (::OSVR_MATRIX_SIZE) floats.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceProjectionMatrixf(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, float, float, OSVR_MatrixConventions, float*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeSurfaceProjectionMatrixf(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, float, float, short, java.nio.FloatBuffer)} and {@link #osvrClientGetViewerEyeSurfaceProjectionMatrixf(com.sun.jna.Pointer, int, byte, int, float, float, short, com.sun.jna.ptr.FloatByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyeSurfaceProjectionMatrixf(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, float, float, short, java.nio.FloatBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeSurfaceProjectionMatrixf(Pointer disp, int viewer, byte eye, int surface, float near, float far, short flags, FloatByReference matrix);
 	/**
-	 * @brief Get the projection matrix for a surface seen by an eye of a viewer<br>
+	 * Get the projection matrix for a surface seen by an eye of a viewer<br>
 	 * in a display config. (float version)<br>
 	 * @param disp Display config object<br>
 	 * @param viewer Viewer ID<br>
@@ -625,7 +647,7 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param far Distance to far clipping plane - must be nonzero, typically<br>
 	 * positive and greater than near.<br>
 	 * @param flags Bitwise OR of matrix convention flags (see @ref MatrixFlags)<br>
-	 * @param[out] matrix Output projection matrix: supply an array of 16<br>
+	 * @param matrix Output projection matrix: supply an array of 16<br>
 	 * (::OSVR_MATRIX_SIZE) floats.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
@@ -633,7 +655,7 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetViewerEyeSurfaceProjectionMatrixf(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, int surface, float near, float far, short flags, FloatBuffer matrix);
 	/**
-	 * @brief Get the clipping planes (positions at unit distance) for a surface<br>
+	 * Get the clipping planes (positions at unit distance) for a surface<br>
 	 * seen by an eye of a viewer<br>
 	 * in a display config.<br>
 	 * This is only for use in integrations that cannot accept a fully-formulated<br>
@@ -648,19 +670,21 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] left Distance to left clipping plane<br>
+	 * @param left Distance to left clipping plane<br>
-	 * @param[out] right Distance to right clipping plane<br>
+	 * @param right Distance to right clipping plane<br>
-	 * @param[out] bottom Distance to bottom clipping plane<br>
+	 * @param bottom Distance to bottom clipping plane<br>
-	 * @param[out] top Distance to top clipping plane<br>
+	 * @param top Distance to top clipping plane<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output arguments are unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceProjectionClippingPlanes(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, double*, double*, double*, double*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeSurfaceProjectionClippingPlanes(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.DoubleBuffer, java.nio.DoubleBuffer, java.nio.DoubleBuffer, java.nio.DoubleBuffer)} and {@link #osvrClientGetViewerEyeSurfaceProjectionClippingPlanes(com.sun.jna.Pointer, int, byte, int, com.sun.jna.ptr.DoubleByReference, com.sun.jna.ptr.DoubleByReference, com.sun.jna.ptr.DoubleByReference, com.sun.jna.ptr.DoubleByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyeSurfaceProjectionClippingPlanes(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.DoubleBuffer, java.nio.DoubleBuffer, java.nio.DoubleBuffer, java.nio.DoubleBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeSurfaceProjectionClippingPlanes(Pointer disp, int viewer, byte eye, int surface, DoubleByReference left, DoubleByReference right, DoubleByReference bottom, DoubleByReference top);
 	/**
-	 * @brief Get the clipping planes (positions at unit distance) for a surface<br>
+	 * Get the clipping planes (positions at unit distance) for a surface<br>
 	 * seen by an eye of a viewer<br>
 	 * in a display config.<br>
 	 * This is only for use in integrations that cannot accept a fully-formulated<br>
@@ -675,17 +699,17 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] left Distance to left clipping plane<br>
+	 * @param left Distance to left clipping plane<br>
-	 * @param[out] right Distance to right clipping plane<br>
+	 * @param right Distance to right clipping plane<br>
-	 * @param[out] bottom Distance to bottom clipping plane<br>
+	 * @param bottom Distance to bottom clipping plane<br>
-	 * @param[out] top Distance to top clipping plane<br>
+	 * @param top Distance to top clipping plane<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output arguments are unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceProjectionClippingPlanes(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, double*, double*, double*, double*)</code>
 	 */
 	public static native byte osvrClientGetViewerEyeSurfaceProjectionClippingPlanes(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, int surface, DoubleBuffer left, DoubleBuffer right, DoubleBuffer bottom, DoubleBuffer top);
 	/**
-	 * @brief Determines if a surface seen by an eye of a viewer in a display<br>
+	 * Determines if a surface seen by an eye of a viewer in a display<br>
 	 * config requests some distortion to be performed.<br>
 	 * This simply reports true or false, and does not specify which kind of<br>
 	 * distortion implementations have been parameterized for this display. For<br>
@@ -695,18 +719,20 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] distortionRequested Output parameter: whether distortion is<br>
+	 * @param distortionRequested Output parameter: whether distortion is<br>
 	 * requested. **Constant** throughout the active, valid lifetime of a display<br>
 	 * config object.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientDoesViewerEyeSurfaceWantDistortion(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, OSVR_CBool*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientDoesViewerEyeSurfaceWantDistortion(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.ByteBuffer)} and {@link #osvrClientDoesViewerEyeSurfaceWantDistortion(com.sun.jna.Pointer, int, byte, int, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientDoesViewerEyeSurfaceWantDistortion(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.ByteBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientDoesViewerEyeSurfaceWantDistortion(Pointer disp, int viewer, byte eye, int surface, Pointer distortionRequested);
 	/**
-	 * @brief Determines if a surface seen by an eye of a viewer in a display<br>
+	 * Determines if a surface seen by an eye of a viewer in a display<br>
 	 * config requests some distortion to be performed.<br>
 	 * This simply reports true or false, and does not specify which kind of<br>
 	 * distortion implementations have been parameterized for this display. For<br>
@@ -716,7 +742,7 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] distortionRequested Output parameter: whether distortion is<br>
+	 * @param distortionRequested Output parameter: whether distortion is<br>
 	 * requested. **Constant** throughout the active, valid lifetime of a display<br>
 	 * config object.<br>
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
@@ -725,7 +751,7 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientDoesViewerEyeSurfaceWantDistortion(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, int surface, ByteBuffer distortionRequested);
 	/**
-	 * @brief Returns the priority/availability of radial distortion parameters for<br>
+	 * Returns the priority/availability of radial distortion parameters for<br>
 	 * a surface seen by an eye of a viewer in a display config.<br>
 	 * If osvrClientDoesViewerEyeSurfaceWantDistortion() reports false, then the<br>
 	 * display does not request distortion of any sort, and thus neither this nor<br>
@@ -735,7 +761,7 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] priority Output: the priority level. Negative values<br>
+	 * @param priority Output: the priority level. Negative values<br>
 	 * (canonically OSVR_DISTORTION_PRIORITY_UNAVAILABLE) indicate this technique<br>
 	 * not available, higher values indicate higher preference for the given<br>
 	 * technique based on the device's description. **Constant** throughout the<br>
@@ -743,12 +769,14 @@ public class OsvrDisplayLibrary implements Library {
 	 * @return OSVR_RETURN_FAILURE if invalid parameters were passed, in which case<br>
 	 * the output argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceRadialDistortionPriority(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, OSVR_DistortionPriority*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeSurfaceRadialDistortionPriority(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.IntBuffer)} and {@link #osvrClientGetViewerEyeSurfaceRadialDistortionPriority(com.sun.jna.Pointer, int, byte, int, com.sun.jna.ptr.IntByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyeSurfaceRadialDistortionPriority(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, java.nio.IntBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeSurfaceRadialDistortionPriority(Pointer disp, int viewer, byte eye, int surface, IntByReference priority);
 	/**
-	 * @brief Returns the priority/availability of radial distortion parameters for<br>
+	 * Returns the priority/availability of radial distortion parameters for<br>
 	 * a surface seen by an eye of a viewer in a display config.<br>
 	 * If osvrClientDoesViewerEyeSurfaceWantDistortion() reports false, then the<br>
 	 * display does not request distortion of any sort, and thus neither this nor<br>
@@ -758,7 +786,7 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] priority Output: the priority level. Negative values<br>
+	 * @param priority Output: the priority level. Negative values<br>
 	 * (canonically OSVR_DISTORTION_PRIORITY_UNAVAILABLE) indicate this technique<br>
 	 * not available, higher values indicate higher preference for the given<br>
 	 * technique based on the device's description. **Constant** throughout the<br>
@@ -769,7 +797,7 @@ public class OsvrDisplayLibrary implements Library {
 	 */
 	public static native byte osvrClientGetViewerEyeSurfaceRadialDistortionPriority(OsvrDisplayLibrary.OSVR_DisplayConfig disp, int viewer, byte eye, int surface, IntBuffer priority);
 	/**
-	 * @brief Returns the radial distortion parameters, if known/requested, for a<br>
+	 * Returns the radial distortion parameters, if known/requested, for a<br>
 	 * surface seen by an eye of a viewer in a display config.<br>
 	 * Will only succeed if osvrClientGetViewerEyeSurfaceRadialDistortionPriority()<br>
 	 * reports a non-negative priority.<br>
@@ -777,17 +805,19 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] params Output: the parameters for radial distortion<br>
+	 * @param params Output: the parameters for radial distortion<br>
 	 * @return OSVR_RETURN_FAILURE if this surface does not have these parameters<br>
 	 * described, or if invalid parameters were passed, in which case the output<br>
 	 * argument is unmodified.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrClientGetViewerEyeSurfaceRadialDistortion(OSVR_DisplayConfig, OSVR_ViewerCount, OSVR_EyeCount, OSVR_SurfaceCount, OSVR_RadialDistortionParameters*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrClientGetViewerEyeSurfaceRadialDistortion(osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, com.sun.jna.Pointer)} and {@link #osvrClientGetViewerEyeSurfaceRadialDistortion(com.sun.jna.Pointer, int, byte, int, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrClientGetViewerEyeSurfaceRadialDistortion(com.jme3.system.osvr.osvrdisplay.OsvrDisplayLibrary.OSVR_DisplayConfig, int, byte, int, com.sun.jna.Pointer)} 
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrClientGetViewerEyeSurfaceRadialDistortion(Pointer disp, int viewer, byte eye, int surface, Pointer params);
 	/**
-	 * @brief Returns the radial distortion parameters, if known/requested, for a<br>
+	 * Returns the radial distortion parameters, if known/requested, for a<br>
 	 * surface seen by an eye of a viewer in a display config.<br>
 	 * Will only succeed if osvrClientGetViewerEyeSurfaceRadialDistortionPriority()<br>
 	 * reports a non-negative priority.<br>
@@ -795,7 +825,7 @@ public class OsvrDisplayLibrary implements Library {
 	 * @param viewer Viewer ID<br>
 	 * @param eye Eye ID<br>
 	 * @param surface Surface ID<br>
-	 * @param[out] params Output: the parameters for radial distortion<br>
+	 * @param params Output: the parameters for radial distortion<br>
 	 * @return OSVR_RETURN_FAILURE if this surface does not have these parameters<br>
 	 * described, or if invalid parameters were passed, in which case the output<br>
 	 * argument is unmodified.<br>

jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OsvrMatrixConventionsLibrary.java

@@ -63,7 +63,7 @@ public class OsvrMatrixConventionsLibrary implements Library {
 	/** Original signature : <code>void osvrVec3SetZ(OSVR_Vec3*, double)</code> */
 	public static native void osvrVec3SetZ(OSVR_Vec3 v, double val);
 	/**
-	 * @brief Set a Vec3 to the zero vector<br>
+	 * Set a Vec3 to the zero vector<br>
 	 * Original signature : <code>void osvrVec3Zero(OSVR_Vec3*)</code>
 	 */
 	public static native void osvrVec3Zero(OSVR_Vec3 v);
@@ -84,89 +84,99 @@ public class OsvrMatrixConventionsLibrary implements Library {
 	/** Original signature : <code>void osvrQuatSetZ(OSVR_Quaternion*, double)</code> */
 	public static native void osvrQuatSetZ(OSVR_Quaternion q, double val);
 	/**
-	 * @brief Set a quaternion to the identity rotation<br>
+	 * Set a quaternion to the identity rotation<br>
 	 * Original signature : <code>void osvrQuatSetIdentity(OSVR_Quaternion*)</code>
 	 */
 	public static native void osvrQuatSetIdentity(OSVR_Quaternion q);
 	/**
-	 * @brief Set a pose to identity<br>
+	 * Set a pose to identity<br>
 	 * Original signature : <code>void osvrPose3SetIdentity(OSVR_Pose3*)</code>
 	 */
 	public static native void osvrPose3SetIdentity(OSVR_Pose3 pose);
 	/**
-	 * @brief Set a matrix of doubles based on a Pose3.<br>
+	 * Set a matrix of doubles based on a Pose3.<br>
 	 * @param pose The Pose3 to convert<br>
 	 * @param flags Memory ordering flag - see @ref MatrixFlags<br>
-	 * @param[out] mat an array of 16 doubles<br>
+	 * @param mat an array of 16 doubles<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrixd(const OSVR_Pose3*, OSVR_MatrixConventions, double*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrPose3ToMatrixd(osvrmatrixconventions.OSVR_Pose3, short, java.nio.DoubleBuffer)} and {@link #osvrPose3ToMatrixd(osvrmatrixconventions.OSVR_Pose3, short, com.sun.jna.ptr.DoubleByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrPose3ToMatrixd(com.jme3.system.osvr.osvrmatrixconventions.OSVR_Pose3, short, java.nio.DoubleBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrPose3ToMatrixd(OSVR_Pose3 pose, short flags, DoubleByReference mat);
 	/**
-	 * @brief Set a matrix of doubles based on a Pose3.<br>
+	 * Set a matrix of doubles based on a Pose3.<br>
 	 * @param pose The Pose3 to convert<br>
 	 * @param flags Memory ordering flag - see @ref MatrixFlags<br>
-	 * @param[out] mat an array of 16 doubles<br>
+	 * @param mat an array of 16 doubles<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrixd(const OSVR_Pose3*, OSVR_MatrixConventions, double*)</code>
 	 */
 	public static native byte osvrPose3ToMatrixd(OSVR_Pose3 pose, short flags, DoubleBuffer mat);
 	/**
-	 * @brief Set a matrix of floats based on a Pose3.<br>
+	 * Set a matrix of floats based on a Pose3.<br>
 	 * @param pose The Pose3 to convert<br>
 	 * @param flags Memory ordering flag - see @ref MatrixFlags<br>
-	 * @param[out] mat an array of 16 floats<br>
+	 * @param mat an array of 16 floats<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrixf(const OSVR_Pose3*, OSVR_MatrixConventions, float*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrPose3ToMatrixf(osvrmatrixconventions.OSVR_Pose3, short, java.nio.FloatBuffer)} and {@link #osvrPose3ToMatrixf(osvrmatrixconventions.OSVR_Pose3, short, com.sun.jna.ptr.FloatByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrPose3ToMatrixf(com.jme3.system.osvr.osvrmatrixconventions.OSVR_Pose3, short, java.nio.FloatBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrPose3ToMatrixf(OSVR_Pose3 pose, short flags, FloatByReference mat);
 	/**
-	 * @brief Set a matrix of floats based on a Pose3.<br>
+	 * Set a matrix of floats based on a Pose3.<br>
 	 * @param pose The Pose3 to convert<br>
 	 * @param flags Memory ordering flag - see @ref MatrixFlags<br>
-	 * @param[out] mat an array of 16 floats<br>
+	 * @param mat an array of 16 floats<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrixf(const OSVR_Pose3*, OSVR_MatrixConventions, float*)</code>
 	 */
 	public static native byte osvrPose3ToMatrixf(OSVR_Pose3 pose, short flags, FloatBuffer mat);
 	/**
-	 * @brief Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
+	 * Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
 	 * type)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrix(const OSVR_Pose3*, OSVR_MatrixConventions, double*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrPose3ToMatrix(osvrmatrixconventions.OSVR_Pose3, short, java.nio.DoubleBuffer)} and {@link #osvrPose3ToMatrix(osvrmatrixconventions.OSVR_Pose3, short, com.sun.jna.ptr.DoubleByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrPose3ToMatrix(com.jme3.system.osvr.osvrmatrixconventions.OSVR_Pose3, short, java.nio.DoubleBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrPose3ToMatrix(OSVR_Pose3 pose, short flags, DoubleByReference mat);
 	/**
-	 * @brief Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
+	 * Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
 	 * type)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrix(const OSVR_Pose3*, OSVR_MatrixConventions, double*)</code>
 	 */
 	public static native byte osvrPose3ToMatrix(OSVR_Pose3 pose, short flags, DoubleBuffer mat);
 	/**
-	 * @brief Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
+	 * Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
 	 * type)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrix(const OSVR_Pose3*, OSVR_MatrixConventions, float*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrPose3ToMatrix(osvrmatrixconventions.OSVR_Pose3, short, java.nio.FloatBuffer)} and {@link #osvrPose3ToMatrix(osvrmatrixconventions.OSVR_Pose3, short, com.sun.jna.ptr.FloatByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrPose3ToMatrix(com.jme3.system.osvr.osvrmatrixconventions.OSVR_Pose3, short, java.nio.FloatBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrPose3ToMatrix(OSVR_Pose3 pose, short flags, FloatByReference mat);
 	/**
-	 * @brief Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
+	 * Set a matrix based on a Pose3. (C++-only overload - detecting scalar<br>
 	 * type)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrix(const OSVR_Pose3*, OSVR_MatrixConventions, float*)</code>
 	 */
 	public static native byte osvrPose3ToMatrix(OSVR_Pose3 pose, short flags, FloatBuffer mat);
 	/**
-	 * @brief Set a matrix based on a Pose3. (C++-only overload - detects scalar<br>
+	 * Set a matrix based on a Pose3. (C++-only overload - detects scalar<br>
 	 * and takes array rather than pointer)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrix(const OSVR_Pose3*, OSVR_MatrixConventions, Scalar[OSVR_MATRIX_SIZE])</code><br>
-	 * @deprecated use the safer methods {@link #osvrPose3ToMatrix(osvrmatrixconventions.OSVR_Pose3, short, osvrmatrixconventions.OsvrMatrixConventionsLibrary.Scalar[])} and {@link #osvrPose3ToMatrix(osvrmatrixconventions.OSVR_Pose3, short, com.sun.jna.Pointer)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrPose3ToMatrix(com.jme3.system.osvr.osvrmatrixconventions.OSVR_Pose3, short, java.nio.DoubleBuffer)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrPose3ToMatrix(OSVR_Pose3 pose, short flags, Pointer mat);
 	/**
-	 * @brief Set a matrix based on a Pose3. (C++-only overload - detects scalar<br>
+	 * Set a matrix based on a Pose3. (C++-only overload - detects scalar<br>
 	 * and takes array rather than pointer)<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrPose3ToMatrix(const OSVR_Pose3*, OSVR_MatrixConventions, Scalar[OSVR_MATRIX_SIZE])</code>
 	 */

jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OsvrRenderManagerLibrary.java

@@ -28,12 +28,12 @@ public class OsvrRenderManagerLibrary implements Library {
 		public static final int OSVR_OPEN_STATUS_COMPLETE = 2;
 	};
 	/**
-	 * @todo OSVR_RenderTimingInfo<br>
+	 * todo OSVR_RenderTimingInfo.
 	 * Original signature : <code>OSVR_ReturnCode osvrDestroyRenderManager(OSVR_RenderManager)</code>
 	 */
 	public static native byte osvrDestroyRenderManager(Pointer renderManager);
 	/**
-	 * @todo Make this actually cache, for now it does not.<br>
+	 * todo Make this actually cache, for now it does not.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrRenderManagerGetNumRenderInfo(OSVR_RenderManager, OSVR_RenderParams, OSVR_RenderInfoCount*)</code>
 	 */
 	public static native byte osvrRenderManagerGetNumRenderInfo(Pointer renderManager, OSVR_RenderParams.ByValue renderParams, NativeSizeByReference numRenderInfoOut);

jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenResultsOpenGL.java

@@ -10,7 +10,6 @@ import java.util.List;
  */
 public class OSVR_OpenResultsOpenGL extends Structure {
 	/**
-	 * @see OSVR_OpenStatus<br>
 	 * C type : OSVR_OpenStatus
 	 */
 	public int status;

jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OsvrRenderManagerOpenGLLibrary.java

@@ -33,12 +33,12 @@ public class OsvrRenderManagerOpenGLLibrary implements Library {
 		public static final int OSVR_OPEN_STATUS_COMPLETE = 2;
 	};
 	/**
-	 * @todo OSVR_RenderTimingInfo<br>
+	 * todo OSVR_RenderTimingInfo<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrDestroyRenderManager(OSVR_RenderManager)</code>
 	 */
 	public static native byte osvrDestroyRenderManager(Pointer renderManager);
 	/**
-	 * @todo Make this actually cache, for now it does not.<br>
+	 * todo Make this actually cache, for now it does not.<br>
 	 * Original signature : <code>OSVR_ReturnCode osvrRenderManagerGetNumRenderInfo(OSVR_RenderManager, OSVR_RenderParams, OSVR_RenderInfoCount*)</code>
 	 */
 	public static native byte osvrRenderManagerGetNumRenderInfo(Pointer renderManager, OSVR_RenderParams.ByValue renderParams, NativeSizeByReference numRenderInfoOut);
@@ -121,7 +121,9 @@ public class OsvrRenderManagerOpenGLLibrary implements Library {
 	public static native byte OSVR_Projection_to_Unreal(FloatBuffer Unreal_out, com.jme3.system.osvr.osvrrendermanageropengl.OSVR_ProjectionMatrix.ByValue projection_in);
 	/**
 	 * Original signature : <code>OSVR_ReturnCode osvrCreateRenderManagerOpenGL(OSVR_ClientContext, const char[], OSVR_GraphicsLibraryOpenGL, OSVR_RenderManager*, OSVR_RenderManagerOpenGL*)</code><br>
-	 * @deprecated use the safer methods {@link #osvrCreateRenderManagerOpenGL(com.jme3.system.osvr.osvrrendermanageropengl.OsvrRenderManagerOpenGLLibrary.OSVR_ClientContext, byte[], com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue, com.sun.jna.ptr.PointerByReference, com.sun.jna.ptr.PointerByReference)} and {@link #osvrCreateRenderManagerOpenGL(com.sun.jna.Pointer, com.sun.jna.Pointer, com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue, com.sun.jna.ptr.PointerByReference, com.sun.jna.ptr.PointerByReference)} instead
+	 * @deprecated use the safer method
+         * {@link #osvrCreateRenderManagerOpenGL(com.jme3.system.osvr.osvrclientkit.OsvrClientKitLibrary.OSVR_ClientContext, byte[], com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue, com.sun.jna.ptr.PointerByReference, com.sun.jna.ptr.PointerByReference)}
+         * instead
 	 */
 	@Deprecated 
 	public static native byte osvrCreateRenderManagerOpenGL(Pointer clientContext, Pointer graphicsLibraryName, com.jme3.system.osvr.osvrrendermanageropengl.OSVR_GraphicsLibraryOpenGL.ByValue graphicsLibrary, PointerByReference renderManagerOut, PointerByReference renderManagerOpenGLOut);

jme3-vr/src/main/java/com/jme3/system/osvr/osvrtimevalue/OsvrTimeValueLibrary.java

@@ -19,12 +19,12 @@ public class OsvrTimeValueLibrary implements Library {
 	public static final int OSVR_TRUE = (int)(1);
 	public static final int OSVR_FALSE = (int)(0);
 	/**
-	 * @brief Gets the current time in the TimeValue. Parallel to gettimeofday.<br>
+	 * Gets the current time in the TimeValue. Parallel to gettimeofday.
 	 * Original signature : <code>void osvrTimeValueGetNow(OSVR_TimeValue*)</code>
 	 */
 	public static native void osvrTimeValueGetNow(OSVR_TimeValue dest);
 	/**
-	 * @brief Converts from a TimeValue struct to your system's struct timeval.<br>
+	 * Converts from a TimeValue struct to your system's struct timeval.
 	 * @param dest Pointer to an empty struct timeval for your platform.<br>
 	 * @param src A pointer to an OSVR_TimeValue you'd like to convert from.<br>
 	 * If either parameter is NULL, the function will return without doing<br>
@@ -33,7 +33,7 @@ public class OsvrTimeValueLibrary implements Library {
 	 */
 	public static native void osvrTimeValueToStructTimeval(OsvrTimeValueLibrary.timeval dest, OSVR_TimeValue src);
 	/**
-	 * @brief Converts from a TimeValue struct to your system's struct timeval.<br>
+	 * Converts from a TimeValue struct to your system's struct timeval.
 	 * @param dest An OSVR_TimeValue destination pointer.<br>
 	 * @param src Pointer to a struct timeval you'd like to convert from.<br>
 	 * The result is normalized.<br>
@@ -43,7 +43,7 @@ public class OsvrTimeValueLibrary implements Library {
 	 */
 	public static native void osvrStructTimevalToTimeValue(OSVR_TimeValue dest, OsvrTimeValueLibrary.timeval src);
 	/**
-	 * @brief "Normalizes" a time value so that the absolute number of microseconds<br>
+	 * "Normalizes" a time value so that the absolute number of microseconds
 	 * is less than 1,000,000, and that the sign of both components is the same.<br>
 	 * @param tv Address of a struct TimeValue to normalize in place.<br>
 	 * If the given pointer is NULL, this function returns without doing anything.<br>
@@ -51,7 +51,7 @@ public class OsvrTimeValueLibrary implements Library {
 	 */
 	public static native void osvrTimeValueNormalize(OSVR_TimeValue tv);
 	/**
-	 * @brief Sums two time values, replacing the first with the result.<br>
+	 * Sums two time values, replacing the first with the result.
 	 * @param tvA Destination and first source.<br>
 	 * @param tvB second source<br>
 	 * If a given pointer is NULL, this function returns without doing anything.<br>
@@ -60,7 +60,7 @@ public class OsvrTimeValueLibrary implements Library {
 	 */
 	public static native void osvrTimeValueSum(OSVR_TimeValue tvA, OSVR_TimeValue tvB);
 	/**
-	 * @brief Computes the difference between two time values, replacing the first<br>
+	 * Computes the difference between two time values, replacing the first
 	 * with the result.<br>
 	 * Effectively, `*tvA = *tvA - *tvB`<br>
 	 * @param tvA Destination and first source.<br>
@@ -71,7 +71,7 @@ public class OsvrTimeValueLibrary implements Library {
 	 */
 	public static native void osvrTimeValueDifference(OSVR_TimeValue tvA, OSVR_TimeValue tvB);
 	/**
-	 * @brief  Compares two time values (assumed to be normalized), returning<br>
+	 * Compares two time values (assumed to be normalized), returning
 	 * the same values as strcmp<br>
 	 * @return <0 if A is earlier than B, 0 if they are the same, and >0 if A<br>
 	 * is later than B.<br>
@@ -79,7 +79,7 @@ public class OsvrTimeValueLibrary implements Library {
 	 */
 	public static native int osvrTimeValueCmp(OSVR_TimeValue tvA, OSVR_TimeValue tvB);
 	/**
-	 * @brief Compute the difference between the two time values, returning the<br>
+	 * Compute the difference between the two time values, returning the
 	 * duration as a double-precision floating-point number of seconds.<br>
 	 * Effectively, `ret = *tvA - *tvB`<br>
 	 * @param tvA first source.<br>
@@ -89,7 +89,7 @@ public class OsvrTimeValueLibrary implements Library {
 	 */
 	public static native double osvrTimeValueDurationSeconds(OSVR_TimeValue tvA, OSVR_TimeValue tvB);
 	/**
-	 * @brief True if A is later than B<br>
+	 * True if A is later than B.
 	 * Original signature : <code>OSVR_CBool osvrTimeValueGreater(const OSVR_TimeValue*, const OSVR_TimeValue*)</code>
 	 */
 	public static native byte osvrTimeValueGreater(OSVR_TimeValue tvA, OSVR_TimeValue tvB);