cleanup: Color

vtm/src/org/oscim/backend/canvas/Color.java

@@ -14,6 +14,73 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+package org.oscim.backend.canvas;
+
+import org.oscim.utils.FastMath;
+
+public class Color {
+
+	public static int fade(int color, double alpha) {
+		alpha = FastMath.clamp(alpha, 0, 1);
+
+		alpha *= (color >>> 24) & 0xff;
+		int c = (((int) alpha) & 0xff) << 24;
+
+		alpha /= 255;
+
+		c |= ((int) (alpha * ((color >>> 16) & 0xff))) << 16;
+		c |= ((int) (alpha * ((color >>> 8) & 0xff))) << 8;
+		c |= ((int) (alpha * (color & 0xff)));
+
+		return c;
+	}
+
+	public static int rainbow(float pos) {
+		float i = 255 * pos;
+		int r = (int) Math.round(Math.sin(0.024 * i + 0) * 127 + 128);
+		int g = (int) Math.round(Math.sin(0.024 * i + 2) * 127 + 128);
+		int b = (int) Math.round(Math.sin(0.024 * i + 4) * 127 + 128);
+		return 0xff000000 | (r << 16) | (g << 8) | b;
+	}
+
+	/**
+	 * Pack r, g, b bytes into one int.
+	 */
+	public static int get(int r, int g, int b) {
+		return 0xff << 24 | r << 16 | g << 8 | b;
+	}
+
+	/**
+	 * Pack premultiplied a, r, g, b bytes into one int.
+	 */
+	public static int get(int a, int r, int g, int b) {
+		return a << 24 | r << 16 | g << 8 | b;
+	}
+
+	/**
+	 * Pack r, g, b bytes into one int with premultiplied alpha a.
+	 */
+	public static int get(float a, int r, int g, int b) {
+		return fade(0xff << 24 | r << 16 | g << 8 | b, a);
+	}
+
+	public static float rToFloat(int color) {
+		return ((color >>> 16) & 0xff) / 255f;
+	}
+
+	public static float gToFloat(int color) {
+		return ((color >>> 8) & 0xff) / 255f;
+	}
+
+	public static float bToFloat(int color) {
+		return ((color) & 0xff) / 255f;
+	}
+
+	public static float aToFloat(int color) {
+		return ((color >>> 24) & 0xff) / 255f;
+	}
+
 	/*
 	 * Copyright (C) 2006 The Android Open Source Project
 	 * 
@@ -29,63 +96,19 @@
 	 * See the License for the specific language governing permissions and
 	 * limitations under the License.
 	 */
-package org.oscim.backend.canvas;
-
-import org.oscim.utils.FastMath;
-
-/**
- * The Class Color.
- */
-public class Color {
-
-	/** The Constant BLACK. */
 	public static final int BLACK = 0xFF000000;
-
-	/** The Constant DKGRAY. */
 	public static final int DKGRAY = 0xFF444444;
-
-	/** The Constant GRAY. */
 	public static final int GRAY = 0xFF888888;
-
-	/** The Constant LTGRAY. */
 	public static final int LTGRAY = 0xFFCCCCCC;
-
-	/** The Constant WHITE. */
 	public static final int WHITE = 0xFFFFFFFF;
-
-	/** The Constant RED. */
 	public static final int RED = 0xFFFF0000;
-
-	/** The Constant GREEN. */
 	public static final int GREEN = 0xFF00FF00;
-
-	/** The Constant BLUE. */
 	public static final int BLUE = 0xFF0000FF;
-
-	/** The Constant YELLOW. */
 	public static final int YELLOW = 0xFFFFFF00;
-
-	/** The Constant CYAN. */
 	public static final int CYAN = 0xFF00FFFF;
-
-	/** The Constant MAGENTA. */
 	public static final int MAGENTA = 0xFFFF00FF;
-
-	/** The Constant TRANSPARENT. */
 	public static final int TRANSPARENT = 0;
 
-	/**
-	 * Pack 8 bit r, g, b into one int.
-	 * 
-	 * @param r the r
-	 * @param g the g
-	 * @param b the b
-	 * @return the int
-	 */
-	public static int get(int r, int g, int b) {
-		return 0xff << 24 | r << 16 | g << 8 | b;
-	}
-
 	/**
 	 * Parse the color string, and return the corresponding color-int.
 	 * If the string cannot be parsed, throws an IllegalArgumentException
@@ -112,43 +135,4 @@ public class Color {
 		}
 		throw new IllegalArgumentException("Unknown color");
 	}
-
-	public static int fade(int color, double alpha) {
-		alpha = FastMath.clamp(alpha, 0, 1);
-
-		alpha *= (color >>> 24) & 0xff;
-		int c = (((int) alpha) & 0xff) << 24;
-
-		alpha /= 255;
-
-		c |= ((int) (alpha * ((color >>> 16) & 0xff))) << 16;
-		c |= ((int) (alpha * ((color >>> 8) & 0xff))) << 8;
-		c |= ((int) (alpha * (color & 0xff)));
-
-		return c;
-	}
-
-	public static float rToFloat(int color) {
-		return ((color >>> 16) & 0xff) / 255f;
-	}
-
-	public static float gToFloat(int color) {
-		return ((color >>> 8) & 0xff) / 255f;
-	}
-
-	public static float bToFloat(int color) {
-		return ((color) & 0xff) / 255f;
-	}
-
-	public static float aToFloat(int color) {
-		return ((color >>> 24) & 0xff) / 255f;
-	}
-
-	public static int rainbow(float pos) {
-		float i = 255 * pos;
-		int r = (int) Math.round(Math.sin(0.024 * i + 0) * 127 + 128);
-		int g = (int) Math.round(Math.sin(0.024 * i + 2) * 127 + 128);
-		int b = (int) Math.round(Math.sin(0.024 * i + 4) * 127 + 128);
-		return 0xff000000 | (r << 16) | (g << 8) | b;
-	}
 }