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

Improve Sample3D a bit.

Browse Source 
Draw all the faces at the same animation time to prevent fast movement
from causing strange frames when all the faces are drawn at different
times (and orientations). Change a few names to make things a bit more
understadable.

Change-Id: I932c22f9f996e5fe1509723d5d426f188bf8ddef
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/518637
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Ben Wagner <bungeman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Ben Wagner 2022-03-09 12:01:32 -05:00 committed by SkCQ
parent 9cd8456afe
commit c76bfbeb78
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
samplecode/Sample3D.cpp
View File

@ -118,7 +118,7 @@ struct Face {
}
};
static bool front(const SkM44& m) {
static bool isFrontFacing(const SkM44& m) {
SkM44 m2(SkM44::kUninitialized_Constructor);
if (!m.invert(&m2)) {
m2.setIdentity();
@ -264,8 +264,7 @@ public:
return this->Sample3DView::onChar(uni);
}
virtual void drawContent(
SkCanvas* canvas, SkColor, int index, bool drawFront, const SkM44& localToWorld) = 0;
virtual void drawFace(SkCanvas*, SkColor, int face, bool front, const SkM44& localToWorld) = 0;
void onDrawContent(SkCanvas* canvas) override {
if (!canvas->recordingContext() && !(fFlags & kCanRunOnCPU)) {
@ -277,21 +276,21 @@ public:
this->concatCamera(canvas, {0, 0, 400, 400}, 200);
for (bool drawFront : {false, true}) {
SkM44 m = fRotateAnimator.rotation() * fRotation;
for (bool front : {false, true}) {
int index = 0;
for (auto f : faces) {
SkAutoCanvasRestore acr(canvas, true);
SkM44 trans = SkM44::Translate(200, 200, 0); // center of the rotation
SkM44 m = fRotateAnimator.rotation() * fRotation * f.asM44(200);
canvas->concat(trans);
// "World" space - content is centered at the origin, in device scale (+-200)
SkM44 localToWorld = m * inv(trans);
SkM44 localToWorld = m * f.asM44(200) * inv(trans);
canvas->concat(localToWorld);
this->drawContent(canvas, f.fColor, index++, drawFront, localToWorld);
this->drawFace(canvas, f.fColor, index++, front, localToWorld);
}
}
@ -409,12 +408,9 @@ public:
fEffect = effect;
}
void drawContent(SkCanvas* canvas,
SkColor color,
int index,
bool drawFront,
const SkM44& localToWorld) override {
if (!drawFront || !front(canvas->getLocalToDevice())) {
void drawFace(SkCanvas* canvas, SkColor color, int face, bool front,
const SkM44& localToWorld) override {
if (!front || !isFrontFacing(canvas->getLocalToDevice())) {
return;
}
@ -462,9 +458,8 @@ public:
}
}
void drawContent(
SkCanvas* canvas, SkColor color, int index, bool drawFront, const SkM44&) override {
if (!drawFront || !front(canvas->getLocalToDevice())) {
void drawFace(SkCanvas* canvas, SkColor color, int face, bool front, const SkM44&) override {
if (!front || !isFrontFacing(canvas->getLocalToDevice())) {
return;
}
@ -472,7 +467,7 @@ public:
paint.setColor(color);
SkRect r = {0, 0, 400, 400};
canvas->drawRect(r, paint);
fAnim[index]->render(canvas, &r);
fAnim[face]->render(canvas, &r);
}
bool onAnimate(double nanos) override {