Merge pull request #8 from arnebp/master

Release-v.0.9.77

Author: arnebp

CHANGELOG.md

@@ -1,13 +1,20 @@
 # Change Log #
 ---
 
+Version 0.9.77 (2016-05-17)
+---
+- Moving all data types from 64-bit to 32-bit floating point precision
+- Fixing bug affecting all listener callbacks
+- Adapting to EyeTribe API changes, deprecating obsolete *GazeManager* method calls 
+- Updated Gson to 2.5
+
 Version 0.9.60 (2015-11-18)
 ---
 - Extensive rewrite of core classes
 - Changed project structure to support Gradle
-- Added support for methods of async nature in GazeManager
-- Added support for debug mode via GazeManagerCore.IS\_DEBUG\_MODE
-- Added calibration evaluation class CalibUtils
+- Added support for methods of async nature in *GazeManager*
+- Added support for debug mode via *GazeManagerCore.IS\_DEBUG\_MODE*
+- Added calibration evaluation class *CalibUtils*
 - Added JavaFX calibration example 
 - Added Unit Tests
 
@@ -29,14 +36,14 @@ Version 0.9.49 (2014-12-09)
 - Refactored internal blocking queues
 - More consistent stacktrace output on callback errors
 - Unified constructors and operators for all data types
-- Added utility methods to GazeData class
+- Added utility methods to *GazeData* class
 - Updated Gson to 2.3
 
 Version Version 0.9.35 (2014-05-20)
 ---
 
 -    Updated license
--    Fixed bug related to ICalibrationResultListener
+-    Fixed bug related to *ICalibrationResultListener*
 
 Version 0.9.34 (2014-05-09)
 ---
@@ -48,7 +55,7 @@ Version 0.9.34 (2014-05-09)
 Version 0.9.33 (2014-04-15)
 ---
 
--    Added support for listening to EyeTribe Server conneciton state (IConnectionStateListener)
+-    Added support for listening to EyeTribe Server conneciton state (*IConnectionStateListener*)
 -    Minor API timestamp change
 -    Minor refactoring and formatting
 -    Generel bug fixing and optimization
@@ -57,7 +64,7 @@ Version 0.9.27 (2014-02-12)
 ---
 
 - Fixed tab/space formatting
-- New methods to GazeUtils
+- New methods to *GazeUtils*
 - Minor internal refactoring
 
 Version 0.9.26 (2014-01-30)

README.md

@@ -2,41 +2,43 @@
 
 Java SDK for the EyeTribe Dev Kit
 ====
+<p>
+
 
 This is the Java library implementation for the [EyeTribe Dev Kit](https://theeyetribe.com/products/). This reference implementation provides a Java interface for communicating with the EyeTribe Server through the open [EyeTribe API](http://dev.theeyetribe.com/api/). The library allow developers to get started quickly and focus their efforts on creating truly immersive and innovative apps using our eye tracking technology. 
 
+
 Download
 ----
-Download the [latest JAR](https://github.com/EyeTribe/tet-java-client/releases) or grab via Gradle through [JCenter](https://bintray.com/eyetribe/maven/eyetribe-java):
+Download the [latest JAR](https://search.maven.org/remote_content?g=com.theeyetribe.client&a=client&v=LATEST) or grab via Gradle:
 
-    buildscript {
-	    repositories {
-	    	jcenter()
-	    }
-    }
+    compile 'com.theeyetribe:clientsdk:0.9.77'
 
-    dependencies {
-    	compile 'com.theeyetribe:eyetribe-java:0.9.60'
-    }
+or Maven:
 
+    <dependency>
+      <groupId>com.theeyetribe</groupId>
+      <artifactId>clientsdk</artifactId>
+      <version>0.9.77</version>
+    </dependency>
 
 Documentation
 ----
-Find documentation of this library at [EyeTribe Java SDK Doc](http://eyetribe.github.io/tet-java-client). The EyeTribe API reference is found at [Eye Tribe Developer Website](http://dev.theeyetribe.com/api/).
+Find documentation of this library at [EyeTribe Java SDK Doc](http://eyetribe.github.io/tet-java-client). The EyeTribe API reference is found at our [Developer Website](http://dev.theeyetribe.com/api/).
 
 
 Samples
 ----
 An essential part of using the [EyeTribe Dev Kit](https://theeyetribe.com/products/) is 'calibrating the system'. Doing so involves creating a UI that  supports this library and guides the user through a series of mandatory steps.
 
-![Steps of the JavaFX calibration samples](jfx_sample.png)
+![Steps of the JavaFX calibration samples](http://theeyetribe.com/github/javafx_sample.png)
 
-This library holds a sample implementation of a Calibration UI using [JavaFX](docs.oracle.com/javase/8/javafx/get-started-tutorial/jfx-overview.htm). Find source code for this under [./javafx-sample](https://github.com/EyeTribe/tet-java-client/tree/master/javafx-sample) or download the prebuilt [EyeTribeJavaFx](https://github.com/EyeTribe/tet-java-client/releases). This sample runs on all platforms supported by the [EyeTribe Dev Kit](https://theeyetribe.com/products/) that have Java 8 version 65 or higher installed.
+This library holds a sample implementation of a Calibration UI using [JavaFX](docs.oracle.com/javase/8/javafx/get-started-tutorial/jfx-overview.htm). Find this under [/javafx-sample](https://github.com/EyeTribe/tet-java-client/tree/master/javafx-sample). This sample runs on all platforms supported by the [EyeTribe Dev Kit](https://theeyetribe.com/products/) that have Java 8 installed.
 
 
 Building (optional)
 ----
-A prebuilt version of the library is available under [releases](https://github.com/EyeTribe/tet-java-client/releases). The EyeTribe Java SDK is backwards compatible to Java 6. Should you wish to build it yourself, please follow the below instructions:
+You can use the prebuilt version of this library though Maven. Should you wish to build it yourselfIn case you prefer to build it yourself, 
 
 Prerequisites:
 
@@ -58,9 +60,9 @@ If you choose to build yourself and are using [Proguard](http://proguard.sourcef
 
     -keepattributes Signature, *Annotation*
     -keep class sun.misc.Unsafe { *; }
-    -keep class com.theeyetribe.clientsdk.response.* { *; }
-    -keep class com.theeyetribe.clientsdk.request.* { *; }
-    -keep class com.theeyetribe.clientsdk.data.* { *; }
+    -keep class com.theeyetribe.client.response.* { *; }
+    -keep class com.theeyetribe.client.request.* { *; }
+    -keep class com.theeyetribe.client.data.* { *; }
     -dontwarn java.lang.invoke.*
     -dontwarn com.google.**
 

build.gradle

@@ -2,13 +2,13 @@
 
 buildscript {
     repositories {
-        mavenCentral()
         jcenter()
     }
 
     dependencies {
-        classpath 'me.tatarka:gradle-retrolambda:3.2.3'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'com.google.code.findbugs:jsr305:3.0.1'
     }
 }
 
@@ -19,5 +19,5 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.9'
+    gradleVersion = '2.13'
 }

eyetribe.properties

@@ -1,2 +1,2 @@
-currentVersion=0.9.60
-releaseDate=2015-11-18
+currentVersion=0.9.77
+releaseDate=2016-05-17

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip

javafx-sample/build.gradle

@@ -5,20 +5,17 @@ dependencies {
     compile 'com.google.guava:guava:19.0'
     compile 'org.controlsfx:controlsfx:8.40.10'
     compile 'com.google.code.findbugs:jsr305:3.0.1'
-    compile 'com.theeyetribe:eyetribe-java:0.9.60'
+    compile 'com.theeyetribe:eyetribe-java:0.9.77'
 }
 
 jar {
     archivesBaseName = 'EyeTribeJavaFx'
 
-    //we include everything from 'libs' folder
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-
     //but exclude javafx classes
     exclude('javafx/**', 'netscape/**', 'com/sun/**')
 
-    //exclude dupes from 'javafx-sample' module
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    //we include everything from 'libs' folder
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 }
 
 javafx {

javafx-sample/src/main/java/com/theeyetribe/javafx/Main.java

@@ -124,8 +124,8 @@ private Scene loadScene(SceneController current, String newScene) throws Excepti
         root.setOnMousePressed(new EventHandler<MouseEvent>() {
             @Override
             public void handle(MouseEvent event) {
-                dragDelta.x = event.getSceneX();
-                dragDelta.y = event.getSceneY();
+                dragDelta.x = (float)event.getSceneX();
+                dragDelta.y = (float)event.getSceneY();
             }
         });
         root.setOnMouseDragged(new EventHandler<MouseEvent>() {

javafx-sample/src/main/java/com/theeyetribe/javafx/scenes/SceneCalibrationController.java

@@ -236,6 +236,7 @@ public void resampleCalibration(List<Point2D> anchors)
             mCalibrationSequence.play();
         }
     }
+
     public void resetCalibration()
     {
         stopCalibration();

javafx-sample/src/main/java/com/theeyetribe/javafx/scenes/SceneMainController.java

@@ -98,8 +98,7 @@ public void onGazeUpdate(GazeData gazeData)
             }
 
             double angle = GazeFrameCache.getInstance().getLastEyesAngle();
-            double scale = null != GazeFrameCache.getInstance().getLastUserPosition() ? GazeFrameCache.getInstance().getLastUserPosition().z : 1d;
-            scale *= 1.5d;
+            double scale = 1 - GazeFrameCache.getInstance().getLastUserPosition().z;
 
             if (null != GazeFrameCache.getInstance().getLastLeftEye())
             {

javafx-sample/src/main/java/com/theeyetribe/javafx/utils/GazeFrameCache.java

@@ -34,8 +34,8 @@ public class GazeFrameCache
     public final static int DEFAULT_CACHE_TIME_FRAME_MILLIS = 500;
     private final static int NO_TRACKING_MASK = GazeData.STATE_TRACKING_FAIL | GazeData.STATE_TRACKING_LOST;
 
-    private double mMinEyesDistance = 0.1f;
-    private double mMaxEyesDistance = 0.3f;
+    private float mMinEyesDistance = 0.1f;
+    private float mMaxEyesDistance = 0.4f;
 
     protected GazeDataDeque mFrames;
 
@@ -58,8 +58,8 @@ public class GazeFrameCache
     protected boolean mShouldUpdate;
 
     //internals
-    private Point2D mLastEyesVecHalf = new Point2D(.2,0d);
-    private double mLastEyeDistance = mMaxEyesDistance - mMinEyesDistance / mMaxEyesDistance;
+    private Point2D mLastEyesVecHalf = new Point2D(.2f,0f);
+    private float mLastEyeDistance = (mMaxEyesDistance - mMinEyesDistance) / mMaxEyesDistance;
 
     public static GazeFrameCache getInstance()
     {
@@ -75,6 +75,11 @@ private GazeFrameCache(int timeLimit)
     {
         mFrames = new GazeDataDeque(timeLimit);
         mValidFramePredicate = new ValidFrame();
+
+        //init user distance values
+        mLastEyesVecHalf = new Point2D(.2f, 0f);
+        mLastEyeDistance = 1f - ((mMinEyesDistance + ((mMaxEyesDistance - mMinEyesDistance) * .5f)) / mMaxEyesDistance);
+        mLastUserPosition = new Point3D(GazeManager.getInstance().getScreenResolutionWidth() >> 1, GazeManager.getInstance().getScreenResolutionHeight() >> 1, mLastEyeDistance);
     }
 
     public void setTimeLimit(int timeLimit)
@@ -88,7 +93,7 @@ public synchronized void update(@Nonnull GazeData frame)
         if(mFrames.contains(frame))
             return;
 
-        //set delta based on contineous stream and not valid frames only
+        //set delta based on continuous stream and not valid frames only
         long now = System.currentTimeMillis();
         mFrameDelta = now - mFrameTimeStamp;
         mFrameTimeStamp = now;
@@ -102,7 +107,7 @@ public synchronized void update(@Nonnull GazeData frame)
         Point2D gazeCoords = null;
         Point2D gazeCoordsSmooth = null;
         Point2D userPos = null;
-        double userDist = 0d;
+        double userDist = 0f;
         Point2D eyeDistVecHalf = null;
         GazeData gd;
         Iterable<GazeData> valid = Iterables.filter(mFrames, mValidFramePredicate);
@@ -158,12 +163,12 @@ else if (null == userPos && right == null && !gd.rightEye.pupilCenterCoordinates
 
             //update 'depth' measure
             if (userDist < mMinEyesDistance)
-                mMinEyesDistance = userDist;
+                mMinEyesDistance = (float)userDist;
 
             if (userDist > mMaxEyesDistance)
-                mMaxEyesDistance = userDist;
+                mMaxEyesDistance = (float)userDist;
 
-            mLastEyeDistance = userDist / mMaxEyesDistance;
+            mLastEyeDistance = 1f - ((float)userDist / mMaxEyesDistance);
 
             //update user position
             mLastUserPosition = new Point3D(userPos.x, userPos.y, mLastEyeDistance);