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

Merge "Add support for skew()" into honeycomb

Browse Source
This commit is contained in:
Romain Guy
2011-01-18 11:17:20 -08:00
committed by Android (Google) Code Review
parent 3aa959b9ce 807daf7df6
commit 89108d5c31
10 changed files with 117 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/GLES20Canvas.java
View File

@@ -374,16 +374,18 @@ class GLES20Canvas extends HardwareCanvas {
@Override
public void translate(float dx, float dy) {
nTranslate(mRenderer, dx, dy);
if (dx != 0.0f || dy != 0.0f) nTranslate(mRenderer, dx, dy);
}
private native void nTranslate(int renderer, float dx, float dy);
@Override
public void skew(float sx, float sy) {
throw new UnsupportedOperationException();
nSkew(mRenderer, sx, sy);
}
private native void nSkew(int renderer, float sx, float sy);
@Override
public void rotate(float degrees) {
nRotate(mRenderer, degrees);

6
core/jni/android_view_GLES20Canvas.cpp
View File

@@ -213,6 +213,11 @@ static void android_view_GLES20Canvas_scale(JNIEnv* env, jobject canvas,
renderer->scale(sx, sy);
}
static void android_view_GLES20Canvas_skew(JNIEnv* env, jobject canvas,
OpenGLRenderer* renderer, jfloat sx, jfloat sy) {
renderer->skew(sx, sy);
}
static void android_view_GLES20Canvas_setMatrix(JNIEnv* env, jobject canvas,
OpenGLRenderer* renderer, SkMatrix* matrix) {
renderer->setMatrix(matrix);
@@ -550,6 +555,7 @@ static JNINativeMethod gMethods[] = {
{ "nTranslate", "(IFF)V", (void*) android_view_GLES20Canvas_translate },
{ "nRotate", "(IF)V", (void*) android_view_GLES20Canvas_rotate },
{ "nScale", "(IFF)V", (void*) android_view_GLES20Canvas_scale },
{ "nSkew", "(IFF)V", (void*) android_view_GLES20Canvas_skew },
{ "nSetMatrix", "(II)V", (void*) android_view_GLES20Canvas_setMatrix },
{ "nGetMatrix", "(I)I", (void*) android_view_GLES20Canvas_getNativeMatrix },

10
libs/hwui/DisplayListRenderer.cpp
View File

@@ -268,6 +268,10 @@ void DisplayList::replay(OpenGLRenderer& renderer, uint32_t level) {
renderer.scale(getFloat(), getFloat());
}
break;
case Skew: {
renderer.skew(getFloat(), getFloat());
}
break;
case SetMatrix: {
renderer.setMatrix(getMatrix());
}
@@ -508,6 +512,12 @@ void DisplayListRenderer::scale(float sx, float sy) {
OpenGLRenderer::scale(sx, sy);
}
void DisplayListRenderer::skew(float sx, float sy) {
addOp(DisplayList::Skew);
addPoint(sx, sy);
OpenGLRenderer::skew(sx, sy);
}
void DisplayListRenderer::setMatrix(SkMatrix* matrix) {
addOp(DisplayList::SetMatrix);
addMatrix(matrix);

2
libs/hwui/DisplayListRenderer.h
View File

@@ -98,6 +98,7 @@ public:
Translate,
Rotate,
Scale,
Skew,
SetMatrix,
ConcatMatrix,
ClipRect,
@@ -250,6 +251,7 @@ public:
void translate(float dx, float dy);
void rotate(float degrees);
void scale(float sx, float sy);
void skew(float sx, float sy);
void setMatrix(SkMatrix* matrix);
void concatMatrix(SkMatrix* matrix);

18
libs/hwui/Matrix.cpp
View File

@@ -178,6 +178,24 @@ void Matrix4::loadScale(float sx, float sy, float sz) {
data[kScaleZ] = sz;
}
void Matrix4::loadSkew(float sx, float sy) {
loadIdentity();
data[kScaleX] = 1.0f;
data[kSkewX] = sx;
data[kTranslateX] = 0.0f;
data[kSkewY] = sy;
data[kScaleY] = 1.0f;
data[kTranslateY] = 0.0f;
data[kPerspective0] = 0.0f;
data[kPerspective1] = 0.0f;
data[kPerspective2] = 1.0f;
mSimpleMatrix = false;
}
void Matrix4::loadRotate(float angle, float x, float y, float z) {
data[kPerspective0] = 0.0f;
data[kPerspective1] = 0.0f;

7
libs/hwui/Matrix.h
View File

@@ -72,6 +72,7 @@ public:
void loadTranslate(float x, float y, float z);
void loadScale(float sx, float sy, float sz);
void loadSkew(float sx, float sy);
void loadRotate(float angle, float x, float y, float z);
void loadMultiply(const Matrix4& u, const Matrix4& v);
@@ -97,6 +98,12 @@ public:
multiply(u);
}
void skew(float sx, float sy) {
Matrix4 u;
u.loadSkew(sx, sy);
multiply(u);
}
void rotate(float angle, float x, float y, float z) {
Matrix4 u;
u.loadRotate(angle, x, y, z);

4
libs/hwui/OpenGLRenderer.cpp
View File

@@ -766,6 +766,10 @@ void OpenGLRenderer::scale(float sx, float sy) {
mSnapshot->transform->scale(sx, sy, 1.0f);
}
void OpenGLRenderer::skew(float sx, float sy) {
mSnapshot->transform->skew(sx, sy);
}
void OpenGLRenderer::setMatrix(SkMatrix* matrix) {
mSnapshot->transform->load(*matrix);
}

1
libs/hwui/OpenGLRenderer.h
View File

@@ -84,6 +84,7 @@ public:
virtual void translate(float dx, float dy);
virtual void rotate(float degrees);
virtual void scale(float sx, float sy);
virtual void skew(float sx, float sy);
const float* getMatrix() const;
void getMatrix(SkMatrix* matrix);

9
tests/HwAccelerationTest/AndroidManifest.xml
View File

@@ -166,6 +166,15 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="BitmapsSkewActivity"
android:label="_BitmapsSkew">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="BitmapsAlphaActivity"

56
tests/HwAccelerationTest/src/com/android/test/hwui/BitmapsSkewActivity.java Normal file
View File

@@ -0,0 +1,56 @@
/*
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.test.hwui;
import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.os.Bundle;
import android.view.View;
@SuppressWarnings({"UnusedDeclaration"})
public class BitmapsSkewActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final BitmapsView view = new BitmapsView(this);
setContentView(view);
}
static class BitmapsView extends View {
private Paint mBitmapPaint;
private final Bitmap mBitmap1;
BitmapsView(Context c) {
super(c);
mBitmap1 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset1);
}
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
canvas.translate(120.0f, 50.0f);
canvas.skew(0.2f, 0.3f);
canvas.drawBitmap(mBitmap1, 0.0f, 0.0f, mBitmapPaint);
}
}
}