update lib in processing.org name rule

Author: Jianbin Qi

examples/AndroidCamera/CameraColor/CameraColor.pde

@@ -1,11 +1,11 @@
 import com.onlylemi.processing.android.capture.*;
 
-PAndroidCamera ac;
+AndroidCamera ac;
 
 void setup() {
   size(720, 480);
 
-  ac = new PAndroidCamera(width, height, 20);
+  ac = new AndroidCamera(width, height, 20);
   ac.start();
 }
 

examples/AndroidCamera/CameraImage/CameraImage.pde

@@ -1,11 +1,11 @@
 import com.onlylemi.processing.android.capture.*;
 
-PAndroidCamera ac;
+AndroidCamera ac;
 PImage img;
 
 void setup() {
   size(720, 480);
-  ac = new PAndroidCamera(width, height, 30);
+  ac = new AndroidCamera(width, height, 30);
   ac.start();
 }
 

examples/AndroidCamera/CameraMask/CameraMask.pde

@@ -1,6 +1,6 @@
 import com.onlylemi.processing.android.capture.*;
 
-PAndroidCamera ac;
+AndroidCamera ac;
 PImage img;
 PImage mask;
 
@@ -10,7 +10,7 @@ void setup(){
   background(0);
   imageMode(CENTER);
 
-  ac = new PAndroidCamera(width, height, 30);
+  ac = new AndroidCamera(width, height, 30);
   ac.start();
 
   mask = loadImage("mask.png");

examples/AndroidCamera/CameraMusic/CameraMusic.pde

@@ -1,6 +1,6 @@
 import com.onlylemi.processing.android.capture.*;
 
-PAndroidCamera ac;
+AndroidCamera ac;
 PImage img;
 PImage mask;
 
@@ -11,7 +11,7 @@ void setup(){
   imageMode(CENTER);
   initAudio();
 
-  ac = new PAndroidCamera(width, height, 30);
+  ac = new AndroidCamera(width, height, 30);
   ac.start();
 
   mask = loadImage("mask.png");

examples/AndroidCamera/CameraPixel/CameraPixel.pde

@@ -1,7 +1,7 @@
 import com.onlylemi.processing.android.capture.*;
 import peasy.PeasyCam;
 
-PAndroidCamera ac;
+AndroidCamera ac;
 PImage img;
 PeasyCam cam;
 
@@ -10,7 +10,7 @@ void setup() {
 
   cam = new PeasyCam(this, 500);
 
-  ac = new PAndroidCamera(width, height, 20);
+  ac = new AndroidCamera(width, height, 20);
   ac.start();
 }
 

examples/AndroidSensor/AccSensor/AccSensor.pde

@@ -1,13 +1,13 @@
 import com.onlylemi.processing.android.capture.*;
 
-PAndroidSensor as;
+AndroidSensor as;
 
 void setup() {
 	size(720, 480);
 
 	background(0);
 
-	as = new PAndroidSensor(0);
+	as = new AndroidSensor(0);
 	as.start();
 }
 

examples/AndroidSensor/SensorData/SensorData.pde

@@ -1,13 +1,13 @@
 import com.onlylemi.processing.android.capture.*;
 
-PAndroidSensor as;
+AndroidSensor as;
 
 void setup() {
 	size(720, 480);
 
 	background(0);
 
-	as = new PAndroidSensor(0);
+	as = new AndroidSensor(0);
 	as.start();
 }
 
@@ -17,35 +17,35 @@ void draw() {
 
 	textSize(15);
 
-	text(PSensorType.TYPE_ACCELEROMETER + " : ", 60, 50);
+	text(SensorType.TYPE_ACCELEROMETER + " : ", 60, 50);
 	text("X : " + as.getAccelerometerSensorValues()[0], 250, 50);
 	text("Y : " + as.getAccelerometerSensorValues()[1], 400, 50);
 	text("Z : " + as.getAccelerometerSensorValues()[2], 550, 50);
 
-	text(PSensorType.TYPE_ORIENTATION + " : ", 60, 100);
+	text(SensorType.TYPE_ORIENTATION + " : ", 60, 100);
 	text("X : " + as.getOrientationSensorValues()[0], 250, 100);
 	text("Y : " + as.getOrientationSensorValues()[1], 400, 100);
 	text("Z : " + as.getOrientationSensorValues()[2], 550, 100);
 
-	text(PSensorType.TYPE_MAGNETIC_FIELD + " : ", 60, 150);
+	text(SensorType.TYPE_MAGNETIC_FIELD + " : ", 60, 150);
 	text("X : " + as.getMagneticFieldSensorValues()[0], 250, 150);
 	text("Y : " + as.getMagneticFieldSensorValues()[1], 400, 150);
 	text("Z : " + as.getMagneticFieldSensorValues()[2], 550, 150);
 
-	text(PSensorType.TYPE_GYROSCOPE + " : ", 60, 200);
+	text(SensorType.TYPE_GYROSCOPE + " : ", 60, 200);
 	text("X : " + as.getGyroscopeSensorValues()[0], 250, 200);
 	text("Y : " + as.getGyroscopeSensorValues()[1], 400, 200);
 	text("Z : " + as.getGyroscopeSensorValues()[2], 550, 200);
 
-	text(PSensorType.TYPE_LIGHT + " : ", 60, 250);
-	text("level : " + as.getLightSensorValues(), 250, 250);
+	text(SensorType.TYPE_LIGHT + " : ", 60, 250);
+	text("leSensorTypevel : " + as.getLightSensorValues(), 250, 250);
 
-	text(PSensorType.TYPE_PROXIMITY + " : ", 60, 300);
+	text(SensorType.TYPE_PROXIMITY + " : ", 60, 300);
 	text("distance : " + as.getProximitySensorValues(), 250, 300);
 
-	text(PSensorType.TYPE_PRESSURE + " : ", 60, 350);
+	text(SensorType.TYPE_PRESSURE + " : ", 60, 350);
 	text("pressure : " + as.getPressureSensorValues(), 250, 350);
 
-	text(PSensorType.TYPE_TEMPERATURE + " : ", 60, 400);
+	text(SensorType.TYPE_TEMPERATURE + " : ", 60, 400);
 	text("temperature : " + as.getTemperatureSensorValues(), 250, 400);
 }

library.properties

@@ -1,10 +1,10 @@
 # UTF-8 supported.
 
 # The name of your library as you want it formatted
-name = Processing Android Capture
+name = AndroidCapture for Processing
 
 # List of authors. Links can be provided using the syntax [author name](url)
-authorList = [onlylemi](https://github.com/onlylemi/processing-android-capture)
+authorList = [Jianbin Qi](https://github.com/onlylemi/)
 
 # A web page for your library, NOT a direct link to where to download it
 url = https://github.com/onlylemi/processing-android-capture
@@ -16,14 +16,14 @@ url = https://github.com/onlylemi/processing-android-capture
 #   "Sound"         "Utilities"     "Typography"        "Video & Vision"  
 # 
 # If a value other than those listed is used, your library will listed as "Other."
-category = Hardware
+category = Data
 
 # A short sentence (or fragment) to summarize the library's function. This will be
 # shown from inside the PDE when the library is being installed. Avoid repeating
 # the name of your library here. Also, avoid saying anything redundant like
 # mentioning that its a library. This should start with a capitalized letter, and
 # end with a period.
-sentence = This lib tries to transfer data between Processing and Android.
+sentence = This lib tries to transfer data(Android Camera & Android Sensor) between Processing and Android.
 
 # Additional information suitable for the Processing website. The value of
 # 'sentence' always will be prepended, so you should start by writing the
@@ -39,7 +39,7 @@ paragraph =
 # is used to compare different versions of the same library, and
 # check if an update is available. You should think of it as a
 # counter, counting the total number of releases you've had.
-version = 101  # This must be parsable as an int
+version = 2  # This must be parsable as an int
 
 # The version as the user will see it. If blank, the version attribute will be used here
-prettyVersion = beta1.0  # This is treated as a String 
+prettyVersion = 2.0  # This is treated as a String 

library/AndroidCaptureForProcessing.jar

@@ -11,10 +11,12 @@
 
 /**
  * processing android camera
+ * <p>
+ * https://github.com/onlylemi/processing-android-capture
  *
  * @author onlylemi
  */
-public class PAndroidCamera implements Runnable {
+public class AndroidCamera implements Runnable {
 
     private ServerSocket ss = null;
     private BufferedImage image;
@@ -30,13 +32,13 @@ public class PAndroidCamera implements Runnable {
     private boolean flag;
 
     /**
-     * new a PAndroidCamera obj
+     * new a AndroidCamera obj
      *
      * @param width          the width of image
      * @param height         the height of image
      * @param imageFrameRate the frame rate of getting image
      */
-    public PAndroidCamera(int width, int height, long imageFrameRate) {
+    public AndroidCamera(int width, int height, long imageFrameRate) {
         this.width = width;
         this.height = height;
         this.imageFrameRate = imageFrameRate;

library/processing-android-capture.jar

@@ -10,10 +10,12 @@
 
 /**
  * processing android sensor
+ * <p>
+ * https://github.com/onlylemi/processing-android-capture
  *
  * @author onlylemi
  */
-public class PAndroidSensor implements Runnable, PSensor {
+public class AndroidSensor implements Runnable, Sensor {
 
     private byte[] byteBuffer = new byte[1024];
     private ServerSocket ss = null;
@@ -28,11 +30,11 @@ public class PAndroidSensor implements Runnable, PSensor {
     private Thread thread;
 
     /**
-     * new a PAndroidSensor obj
+     * new a AndroidSensor obj
      *
      * @param rate the rate of getting data
      */
-    public PAndroidSensor(long rate) {
+    public AndroidSensor(long rate) {
         this.rate = rate;
 
         flag = true;
@@ -107,7 +109,7 @@ public void pause() {
     /**
      * the sensors data of android client
      *
-     * @return
+     * @return snesors data
      */
     public String getData() {
         return data;
@@ -117,14 +119,15 @@ public String getData() {
      * parser json data
      *
      * @param data
+     * @param sensor
      * @return
      */
     private float[] parserSensorJson(String data, String sensor) {
         float[] values = new float[3];
 
         if (!"".equals(data)) {
             JSONObject jo = JSONObject.parse(data);
-            JSONArray ja = jo.getJSONArray(PSensorType.ANDROID_SENSOR);
+            JSONArray ja = jo.getJSONArray(SensorType.ANDROID_SENSOR);
 
             for (int i = 0; i < ja.size(); i++) {
                 if (!ja.getJSONObject(i).isNull(sensor)) {
@@ -143,42 +146,42 @@ private float[] parserSensorJson(String data, String sensor) {
 
     @Override
     public float[] getAccelerometerSensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_ACCELEROMETER);
+        return parserSensorJson(data, SensorType.TYPE_ACCELEROMETER);
     }
 
     @Override
     public float getLightSensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_LIGHT)[0];
+        return parserSensorJson(data, SensorType.TYPE_LIGHT)[0];
     }
 
     @Override
     public float[] getOrientationSensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_ORIENTATION);
+        return parserSensorJson(data, SensorType.TYPE_ORIENTATION);
     }
 
     @Override
     public float getProximitySensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_PROXIMITY)[0];
+        return parserSensorJson(data, SensorType.TYPE_PROXIMITY)[0];
     }
 
     @Override
     public float getTemperatureSensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_TEMPERATURE)[0];
+        return parserSensorJson(data, SensorType.TYPE_TEMPERATURE)[0];
     }
 
     @Override
     public float getPressureSensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_PRESSURE)[0];
+        return parserSensorJson(data, SensorType.TYPE_PRESSURE)[0];
     }
 
     @Override
     public float[] getGyroscopeSensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_PRESSURE);
+        return parserSensorJson(data, SensorType.TYPE_PRESSURE);
     }
 
     @Override
     public float[] getMagneticFieldSensorValues() {
-        return parserSensorJson(data, PSensorType.TYPE_MAGNETIC_FIELD);
+        return parserSensorJson(data, SensorType.TYPE_MAGNETIC_FIELD);
     }
 
     @Override

reference/javadoc.zip

@@ -2,16 +2,20 @@
 
 /**
  * a interface about getting sensor data
+ * <p>
+ * https://github.com/onlylemi/processing-android-capture
  *
  * @author onlylemi
  */
-public interface PSensor {
+public interface Sensor {
 
     /**
      * @return All values are in SI units (m/s^2)
+     * <ul>
      * <li>values[0]: Acceleration minus Gx on the x-axis</li>
      * <li>values[1]: Acceleration minus Gy on the y-axis</li>
      * <li>values[2]: Acceleration minus Gz on the z-axis</li>
+     * </ul>
      */
     float[] getAccelerometerSensorValues();
 
@@ -22,11 +26,13 @@ public interface PSensor {
 
     /**
      * @return All values are angles in degrees.
+     * <ul>
      * <li>values[0]: Azimuth, angle between the magnetic north direction and the y-axis, around the z-axis (0 to
      * 359). 0=North, 90=East, 180=South, 270=West</li>
      * <li>values[1]: Pitch, rotation around x-axis (-180 to 180), with positive values when the z-axis moves toward
      * the y-axis.</li>
      * <li>values[2]: Roll, rotation around the y-axis (-90 to 90) increasing as the device moves clockwise.</li>
+     * </ul>
      */
     float[] getOrientationSensorValues();
 
@@ -52,9 +58,11 @@ public interface PSensor {
      * a device positioned on the origin would report positive rotation if the device appeared to be rotating counter
      * clockwise. Note that this is the standard mathematical definition of positive rotation and does not agree with
      * the definition of roll given earlier.
+     * <ul>
      * <li>values[0]: Angular speed around the x-axis</li>
      * <li>values[1]: Angular speed around the y-axis</li>
      * <li>values[2]: Angular speed around the z-axis</li>
+     * </ul>
      */
     float[] getGyroscopeSensorValues();
 
@@ -66,8 +74,8 @@ public interface PSensor {
     /**
      * get sensor values
      *
-     * @param sensor
-     * @return
+     * @param sensor type
+     * @return sensor name
      */
     float[] getSensorValues(String sensor);