AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[androidkit] Start implementing reusable samples

Browse Source 
Introduce a Sample interface for abstracting out various demos/samples.

Implement a simple image shader sample for starters.

Update the cube demo to map samples to sides.

Change-Id: I9c9c70fa05634404ced7bd30739f6e884546b91d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/413441
Reviewed-by: Jorge Betancourt <jmbetancourt@google.com>
This commit is contained in:
Florin Malita 2021-05-27 23:08:11 -04:00 committed by Florin Malita
parent 4abf558c9f
commit 8c8abd8f9f
4 changed files with 89 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform_tools/android/apps/AndroidKit/src/main/java/org/skia/androidkit/Paint.java
View File

@ -22,6 +22,11 @@ public class Paint {
return this;
}
public Paint setColor(float r, float g, float b, float a) {
nSetColor(mNativeInstance, r, g, b, a);
return this;
}
public Paint setShader(Shader shader) {
nSetShader(mNativeInstance, shader != null ? shader.getNativeInstance() : 0);
return this;

51
platform_tools/android/apps/androidkitdemo/src/main/java/org/skia/androidkitdemo1/CubeActivity.java
View File

@ -27,17 +27,33 @@ import org.skia.androidkit.Surface;
import org.skia.androidkit.TileMode;
import org.skia.androidkit.util.SurfaceRenderer;
import org.skia.androidkitdemo1.samples.ImageShaderSample;
import org.skia.androidkitdemo1.samples.Sample;
import static java.lang.Math.tan;
// TODO: remove after all sides are migrated to something more interesting.
class SolidColorSample implements Sample {
private Paint mPaint = new Paint();
public SolidColorSample(float r, float g, float b, float a) {
mPaint.setColor(r, g, b, a);
}
public void render(Canvas canvas, long t, float left, float top, float right, float bottom) {
canvas.drawRect(left, top, right, bottom, mPaint);
}
}
class Face {
private float rotX;
private float rotY;
public Paint paint;
public Sample sample;
Face(float rotX, float rotY, Paint paint) {
Face(float rotX, float rotY, Sample sample) {
this.rotX = rotX;
this.rotY = rotY;
this.paint = paint;
this.sample = sample;
}
Matrix asMatrix(float scale) {
@ -142,24 +158,14 @@ class CubeRenderer extends SurfaceRenderer implements GestureDetector.OnGestureL
private Face[] faces;
public CubeRenderer(Resources res) {
Paint brickPaint = new Paint();
try {
Image image = Image.fromStream(res.openRawResource(R.raw.brickwork_texture));
Shader shader =
image.makeShader(TileMode.REPEAT, TileMode.REPEAT,
new SamplingOptions(SamplingOptions.FilterMode.LINEAR));
brickPaint.setShader(shader);
} catch (Exception e) {}
final float rot = (float) Math.PI;
faces = new Face[] {
new Face(0, -rot/2, brickPaint),
new Face(0, 0 , new Paint().setColor(new Color(1, 0, 0, 1))),
new Face(0, rot , new Paint().setColor(new Color(0, 1, 0, 1))),
new Face(rot/2, 0 , new Paint().setColor(new Color(0, 0, 1, 1))),
new Face(-rot/2, 0, new Paint().setColor(new Color(1, 1, 0, 1))),
new Face(0, rot/2 , new Paint().setColor(new Color(0, 1, 1, 1))),
new Face(0, -rot/2, new ImageShaderSample(res, R.raw.brickwork_texture)),
new Face(0, 0 , new SolidColorSample(1, 0, 0, 1)),
new Face(0, rot , new SolidColorSample(0, 1, 0, 1)),
new Face(rot/2, 0 , new SolidColorSample(0, 0, 1, 1)),
new Face(-rot/2, 0, new SolidColorSample(1, 1, 0, 1)),
new Face(0, rot/2 , new SolidColorSample(0, 1, 1, 1)),
};
}
@ -212,8 +218,11 @@ class CubeRenderer extends SurfaceRenderer implements GestureDetector.OnGestureL
canvas.concat(f.asMatrix(mCubeSideLength/2));
if (front(canvas.getLocalToDevice())) {
canvas.drawRect(-mCubeSideLength/2, -mCubeSideLength/2,
mCubeSideLength/2, mCubeSideLength/2, f.paint);
f.sample.render(canvas, ms,
-mCubeSideLength/2,
-mCubeSideLength/2,
mCubeSideLength/2,
mCubeSideLength/2);
}
canvas.restore();
}

37
platform_tools/android/apps/androidkitdemo/src/main/java/org/skia/androidkitdemo1/samples/ImageShaderSample.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright 2021 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
package org.skia.androidkitdemo1.samples;
import android.content.res.Resources;
import org.skia.androidkit.Canvas;
import org.skia.androidkit.Image;
import org.skia.androidkit.Paint;
import org.skia.androidkit.SamplingOptions;
import org.skia.androidkit.Shader;
import org.skia.androidkit.TileMode;
import org.skia.androidkitdemo1.samples.Sample;
public class ImageShaderSample implements Sample {
private Paint mPaint = new Paint();
public ImageShaderSample(Resources res, int resId) {
try {
Image image = Image.fromStream(res.openRawResource(resId));
Shader shader =
image.makeShader(TileMode.REPEAT, TileMode.REPEAT,
new SamplingOptions(SamplingOptions.FilterMode.LINEAR));
mPaint.setShader(shader);
} catch (Exception e) {}
}
public void render(Canvas canvas, long t, float left, float top, float right, float bottom) {
canvas.drawRect(left, top, right, bottom, mPaint);
}
}

17
platform_tools/android/apps/androidkitdemo/src/main/java/org/skia/androidkitdemo1/samples/Sample.java Normal file
View File

@ -0,0 +1,17 @@
/*
* Copyright 2021 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
package org.skia.androidkitdemo1.samples;
import org.skia.androidkit.Canvas;
public interface Sample {
/**
* Renders a Sample frame t (ms) into the destination rect [L T R B].
*/
public void render(Canvas canvas, long t, float left, float top, float right, float bottom);
}