Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ADT/Layoutlib: implement sweep gradient." into eclair

Browse Source
This commit is contained in:
Xavier Ducrohet
2010-01-20 09:43:46 -08:00
committed by Android (Google) Code Review
parent 5615ca1979 3330927bdd
commit b44051eee0
3 changed files with 140 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
tools/layoutlib/bridge/src/android/graphics/GradientShader.java
View File

@@ -120,50 +120,58 @@ public abstract class GradientShader extends Shader {
*/ */
protected int getGradientColor(float pos) { protected int getGradientColor(float pos) {
if (pos < 0.f) { if (pos < 0.f) {
switch (mTileMode) { if (mTileMode != null) {
case CLAMP: switch (mTileMode) {
pos = 0.f; case CLAMP:
break; pos = 0.f;
case REPEAT: break;
// remove the integer part to stay in the [0,1] range case REPEAT:
// careful: this is a negative value, so use ceil instead of floor // remove the integer part to stay in the [0,1] range
pos = pos - (float)Math.ceil(pos); // careful: this is a negative value, so use ceil instead of floor
break; pos = pos - (float)Math.ceil(pos);
case MIRROR: break;
// get the integer and the decimal part case MIRROR:
// careful: this is a negative value, so use ceil instead of floor // get the integer and the decimal part
int intPart = (int)Math.ceil(pos); // careful: this is a negative value, so use ceil instead of floor
pos = pos - intPart; int intPart = (int)Math.ceil(pos);
// 0 -> -1 : mirrored order pos = pos - intPart;
// -1 -> -2: normal order // 0 -> -1 : mirrored order
// etc.. // -1 -> -2: normal order
// this means if the intpart is even we invert // etc..
if ((intPart % 2) == 0) { // this means if the intpart is even we invert
pos = 1.f - pos; if ((intPart % 2) == 0) {
} pos = 1.f - pos;
break; }
break;
}
} else {
pos = 0.0f;
} }
} else if (pos > 1f) { } else if (pos > 1f) {
switch (mTileMode) { if (mTileMode != null) {
case CLAMP: switch (mTileMode) {
pos = 1.f; case CLAMP:
break; pos = 1.f;
case REPEAT: break;
// remove the integer part to stay in the [0,1] range case REPEAT:
pos = pos - (float)Math.floor(pos); // remove the integer part to stay in the [0,1] range
break; pos = pos - (float)Math.floor(pos);
case MIRROR: break;
// get the integer and the decimal part case MIRROR:
int intPart = (int)Math.floor(pos); // get the integer and the decimal part
pos = pos - intPart; int intPart = (int)Math.floor(pos);
// 0 -> 1 : normal order pos = pos - intPart;
// 1 -> 2: mirrored // 0 -> 1 : normal order
// etc.. // 1 -> 2: mirrored
// this means if the intpart is odd we invert // etc..
if ((intPart % 2) == 1) { // this means if the intpart is odd we invert
pos = 1.f - pos; if ((intPart % 2) == 1) {
} pos = 1.f - pos;
break; }
break;
}
} else {
pos = 1.0f;
} }
} }

8
tools/layoutlib/bridge/src/android/graphics/RadialGradient.java
View File

@@ -78,11 +78,11 @@ public class RadialGradient extends GradientShader {
} }
public java.awt.PaintContext createContext( public java.awt.PaintContext createContext(
java.awt.image.ColorModel colorModel, java.awt.image.ColorModel colorModel,
java.awt.Rectangle deviceBounds, java.awt.Rectangle deviceBounds,
java.awt.geom.Rectangle2D userBounds, java.awt.geom.Rectangle2D userBounds,
java.awt.geom.AffineTransform xform, java.awt.geom.AffineTransform xform,
java.awt.RenderingHints hints) { java.awt.RenderingHints hints) {
precomputeGradientColors(); precomputeGradientColors();
return new RadialGradientPaintContext(colorModel); return new RadialGradientPaintContext(colorModel);
} }

100
tools/layoutlib/bridge/src/android/graphics/SweepGradient.java
View File

@@ -16,9 +16,9 @@
package android.graphics; package android.graphics;
import java.awt.Paint; public class SweepGradient extends GradientShader {
public class SweepGradient extends Shader { private SweepGradientPaint mPaint;
/** /**
* A subclass of Shader that draws a sweep gradient around a center point. * A subclass of Shader that draws a sweep gradient around a center point.
@@ -36,15 +36,9 @@ public class SweepGradient extends Shader {
*/ */
public SweepGradient(float cx, float cy, public SweepGradient(float cx, float cy,
int colors[], float positions[]) { int colors[], float positions[]) {
if (colors.length < 2) { super(colors, positions);
throw new IllegalArgumentException("needs >= 2 number of colors");
}
if (positions != null && colors.length != positions.length) {
throw new IllegalArgumentException(
"color and position arrays must be of equal length");
}
// FIXME Implement shader mPaint = new SweepGradientPaint(cx, cy, mColors, mPositions);
} }
/** /**
@@ -56,13 +50,91 @@ public class SweepGradient extends Shader {
* @param color1 The color to use at the end of the sweep * @param color1 The color to use at the end of the sweep
*/ */
public SweepGradient(float cx, float cy, int color0, int color1) { public SweepGradient(float cx, float cy, int color0, int color1) {
// FIXME Implement shader this(cx, cy, new int[] { color0, color1}, null /*positions*/);
} }
@Override @Override
Paint getJavaPaint() { java.awt.Paint getJavaPaint() {
// TODO Auto-generated method stub return mPaint;
return null;
} }
private static class SweepGradientPaint extends GradientPaint {
private final float mCx;
private final float mCy;
public SweepGradientPaint(float cx, float cy, int[] colors, float[] positions) {
super(colors, positions, null /*tileMode*/);
mCx = cx;
mCy = cy;
}
public java.awt.PaintContext createContext(
java.awt.image.ColorModel colorModel,
java.awt.Rectangle deviceBounds,
java.awt.geom.Rectangle2D userBounds,
java.awt.geom.AffineTransform xform,
java.awt.RenderingHints hints) {
precomputeGradientColors();
return new SweepGradientPaintContext(colorModel);
}
private class SweepGradientPaintContext implements java.awt.PaintContext {
private final java.awt.image.ColorModel mColorModel;
public SweepGradientPaintContext(java.awt.image.ColorModel colorModel) {
mColorModel = colorModel;
}
public void dispose() {
}
public java.awt.image.ColorModel getColorModel() {
return mColorModel;
}
public java.awt.image.Raster getRaster(int x, int y, int w, int h) {
java.awt.image.BufferedImage image = new java.awt.image.BufferedImage(w, h,
java.awt.image.BufferedImage.TYPE_INT_ARGB);
int[] data = new int[w*h];
// compute angle from each point to the center, and figure out the distance from
// it.
int index = 0;
for (int iy = 0 ; iy < h ; iy++) {
for (int ix = 0 ; ix < w ; ix++) {
float dx = x + ix - mCx;
float dy = y + iy - mCy;
float angle;
if (dx == 0) {
angle = (float) (dy < 0 ? 3 * Math.PI / 2 : Math.PI / 2);
} else if (dy == 0) {
angle = (float) (dx < 0 ? Math.PI : 0);
} else {
angle = (float) Math.atan(dy / dx);
if (dx > 0) {
if (dy < 0) {
angle += Math.PI * 2;
}
} else {
angle += Math.PI;
}
}
// convert to 0-1. value and get color
data[index++] = getGradientColor((float) (angle / (2 * Math.PI)));
}
}
image.setRGB(0 /*startX*/, 0 /*startY*/, w, h, data, 0 /*offset*/, w /*scansize*/);
return image.getRaster();
}
}
}
} }