Update library for protocol V2

Author: Thowaah

.gitignore

@@ -46,3 +46,4 @@ application.macosx
 
 examples/Augmenta_2D/settings.json
 *.json
+/bin/

README.md

@@ -1,67 +1,62 @@
-Augmenta for Processing
-=======================
+# Augmenta for Processing
 
-A [Processing][] Augmenta helper library and examples maintained by [Théoriz studio][]
+A [Processing][] helper library and examples maintained by [Théoriz studio][] that allows to use the [Augmenta][] tracking system.
 
-Install
--------
+## Install
 
 Open [Processing][] and install the OscP5 library
 
 ```
 Sketch -> Import Library... -> Add Library -> OscP5
 ```
 
-Then get AugmentaP5 library from here
+### Auto installation
 
-https://github.com/Lyptik/AugmentaP5/archive/master.zip (and rename to AugmentaP5)
+**Coming soon:** You can get the *Augmenta for Processing* library within the Processing editor, in Sketch>import a library...>add a library... search for "Augmenta for Processing" and add it to your Processing editor. This is the prefered way of installing it.
+
+### Manual installation
+
+You can also download it manually:
+
+get the library on github at this address: https://github.com/Theoriz/augmenta-for-processing/archive/refs/heads/master.zip and **rename it "Augmenta"**.
 
 or
 
 ```
-git clone https://github.com/Theoriz/AugmentaP5.git
+git clone https://github.com/Theoriz/augmenta-for-processing.git
 ```
 
-in the following directory
+Once you have downloaded the library and **renamed it "Augmenta"**, put it in the following directory
 
 - Mac OSX : /Users/Username/Documents/Processing/libraries
 - Windows : C:/My Documents/Processing/libraries
 - Linux   : /home/Username/sketchbook/libraries
 
-You should now have a folder named *AugmentaP5* in this directory.
-
-Do the same for the TUIO library downloadable here :
-
-http://prdownloads.sourceforge.net/reactivision/TUIO11_Processing-1.1.5.zip?download
+You should now have a folder named **Augmenta** in this directory.
 
 Then restart [Processing][]
 
-Use
----
+## Usage
+
 In [Processing][]
 
 ```
 Sketch -> Import Library... -> OscP5 (needed dependency)
-Sketch -> Import Library... -> AugmentaP5
+Sketch -> Import Library... -> Augmenta for Processing
 ```
 
-Examples
---------
+## Examples
 
 In [Processing][], start your example
 
 ```
-File -> Examples... -> Contributed Libraries -> AugmentaP5
+File -> Examples... -> Contributed Libraries -> Augmenta for Processing
 ```
 
 ### Basic example
 
 Receive and draw Augmenta data without any other library
 
-// TODO add screenshot (insert basic view)
-
-**Install TUIO library**  :  [TUIO11_Processing.zip](http://prdownloads.sourceforge.net/reactivision/TUIO11_Processing-1.1.5.zip?download)
-
 ### 2D and 3D examples
 
 Examples for receiving and drawing Augmenta data including a Syphon/Spout output (Mac/Windows only) and a basic UI
@@ -100,7 +95,7 @@ Documentation
 
 Data protocol is here : https://github.com/Theoriz/Augmenta/wiki
 
-Here is a presentation explaining how to use the API
+Here is a presentation explaining how to use the API with an older version of the library. Some methods/members names have changed but the main concepts remain the same.
 
 http://fr.slideshare.net/DavidAlexandreCHANEL/augmentap5-api-59334230
 
@@ -123,3 +118,4 @@ Thanks to the devs and beta testers whose contribution are vitals to the project
 [Théoriz studio]: http://www.theoriz.com/
 [OpenTSPS]: https://github.com/labatrockwell/openTSPS/
 [Eclipse]: http://www.eclipse.org/
+[Augmenta]: https://augmenta-tech.com

examples/Augmenta_2D/Augmenta_2D.pde

@@ -11,7 +11,7 @@
  *
  */
 
-import augmentaP5.*;
+import augmenta.*;
 import oscP5.*;
 
 boolean mode3D = false;
@@ -23,7 +23,8 @@ void setup() {
   setupSyphonSpout();
   setupAugmenta();
   setupGUI();
-  
+  // enable the resizable window
+  surface.setResizable(true);
   // Add your code here
 }
 
@@ -38,15 +39,15 @@ void draw() {
   canvas.background(0);
 
   // Draw a green disk under the first person entdered in the scene
-  AugmentaPerson oldest = auReceiver.getOldestPerson();
+  AugmentaObject oldest = auReceiver.getOldestObject();
   if (oldest != null){
     canvas.fill(0,255,0); // green disk
     canvas.noStroke(); // Without stroke
     canvas.ellipse(oldest.centroid.x*canvas.width, oldest.centroid.y*canvas.height, 25, 25); // 25 pixels diameter
   }
 
   // Draw a blue disk for every persons
-  AugmentaPerson[] people = auReceiver.getPeopleArray();
+  AugmentaObject[] people = auReceiver.getObjectsArray();
 
   for (int i=0; i<people.length; i++) {
 
@@ -79,14 +80,14 @@ void draw() {
 
 // You can also use these events functions which are triggered automatically
 
-void personEntered (AugmentaPerson p) {
+void objectEntered (AugmentaObject o) {
   //println("Person entered : "+ p.pid + " at ("+p.centroid.x+","+p.centroid.y+")");
 }
 
-void personUpdated (AugmentaPerson p) {
+void objectUpdated (AugmentaObject o) {
   //println("Person updated : "+ p.pid + " at ("+p.centroid.x+","+p.centroid.y+")");
 }
 
-void personWillLeave (AugmentaPerson p) {
+void objectWillLeave (AugmentaObject o) {
   //println("Person will leave : "+ p.pid + " at ("+p.centroid.x+","+p.centroid.y+")");
 }

examples/Augmenta_2D/Augmenta_functions.pde

@@ -29,7 +29,7 @@ int manualSceneY = 480; // default
 float originX;
 float originY;
 
-AugmentaP5 auReceiver;
+Augmenta auReceiver;
 int oscPort = 12000;  // OSC default reception port
 boolean drawDebugData = false;
 
@@ -46,7 +46,7 @@ void settings(){
 void setupAugmenta() {
 
   // Create the Augmenta receiver
-  auReceiver= new AugmentaP5(this, oscPort);
+  auReceiver= new Augmenta(this, oscPort);
   auReceiver.setTimeOut(30); // TODO : comment needed here !
   auReceiver.setGraphicsTarget(canvas);
   // You can set the interactive area (can be set with the mouse in this example)
@@ -98,7 +98,7 @@ void showGUI(boolean val) {
 }
 
 boolean changeSize(int a_width, int a_height) {
-  
+    System.out.println("Changing size");
     boolean hasChanged = false;
     int minSize = 200;
     int maxSize = 16000;
@@ -112,24 +112,24 @@ boolean changeSize(int a_width, int a_height) {
         canvas = createGraphics(a_width, a_height, P2D);
       }
 
-      // Change window size if needed
-      float ratio = (float)a_width/(float)a_height;
-      if (a_width >= displayWidth*0.9f || a_height >= displayHeight*0.9f) {
-        // Resize the window to fit in the screen with the correct ratio
-        if ( ratio > displayWidth/displayHeight ) {
-          a_width = (int)(displayWidth*0.8f);
-          a_height = (int)(a_width/ratio);
-        } else {
-          a_height = (int)(displayHeight*0.8f);
-          a_width = (int)(a_height*ratio);
-        }
-      }
+//      // Change window size if needed
+//      float ratio = (float)a_width/(float)a_height;
+//      if (a_width >= displayWidth*0.9f || a_height >= displayHeight*0.9f) {
+//        // Resize the window to fit in the screen with the correct ratio
+//        if ( ratio > displayWidth/displayHeight ) {
+//          a_width = (int)(displayWidth*0.8f);
+//          a_height = (int)(a_width/ratio);
+//        } else {
+//          a_height = (int)(displayHeight*0.8f);
+//          a_width = (int)(a_height*ratio);
+//        }
+//      }
 
       surface.setSize(a_width, a_height);
       auReceiver.setGraphicsTarget(canvas);
 
       hasChanged = true;
-
+      System.out.println("Size changed");
   } else if (a_width < minSize || a_height < minSize || a_width > maxSize || a_height > maxSize) {
      println("ERROR : Cannot set a window size of :" + a_width + "x" + a_height + " : smaller than " +  minSize + " or greater than " + maxSize); 
   }
@@ -147,7 +147,7 @@ boolean adjustSceneSize() {
   // Auto size
   if (autoSceneSize.getBooleanValue()) {
 
-    int[] sceneSize = auReceiver.getSceneSize();
+    int[] sceneSize = auReceiver.getResolution();
     newWidth = sceneSize[0];
     newHeight = sceneSize[1];
 
@@ -186,7 +186,7 @@ boolean adjustSceneSize() {
 // --------------------------------------
 void setUI() {
 
-  //Auto scene size + manual scene sihhze
+  //Auto scene size + manual scene size
   autoSceneSize = cp5.addToggle("changeAutoSceneSize")
      .setPosition(14, 35)
      .setSize(15, 15)
@@ -280,9 +280,7 @@ public void changeInputPort(String s) {
   }
   reconnectReceiver();
 }
-public void changeTuio(boolean b) {
-  reconnectReceiver();
-}
+
 public void reconnectReceiver(){
   if(portInput != null && auReceiver != null){ // Sanity check
     auReceiver.reconnect(oscPort);
@@ -314,15 +312,18 @@ void drawAugmenta() {
 
   // Draw debug data on top with [d] key
   if (drawDebugData) {
-    AugmentaPerson[] people = auReceiver.getPeopleArray();
-    for (int i=0; i<people.length; i++) {
-      people[i].draw();
+    AugmentaObject[] objects = auReceiver.getObjectsArray();
+    for (int i=0; i<objects.length; i++) {
+      System.out.println("Debug draw");
+      objects[i].draw();
     }
   }
 
   // Draw interactive area
   if (drawDebugData) {
-    auReceiver.interactiveArea.draw();
+    //String s = auReceiver.interactiveArea.area.x + "," + auReceiver.interactiveArea.area.y + "," + auReceiver.interactiveArea.area.width + "," + auReceiver.interactiveArea.area.height;
+    //System.out.println(s);
+    //auReceiver.interactiveArea.draw();
   } 
 }