samplecode/SampleLighting.cpp - Issue 2063793002: API change to allow for NormalSource selection at the user level.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: samplecode/SampleLighting.cpp

Issue 2063793002: API change to allow for NormalSource selection at the user level. (Closed) Base URL: https://skia.googlesource.com/skia@dvonbeck-normal-factor-out

Patch Set: Small rebase and comment fix Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: samplecode/SampleLighting.cpp

diff --git a/samplecode/SampleLighting.cpp b/samplecode/SampleLighting.cpp

index a27aa9de41b117667e030ff9c6cdd61c13e6de5a..2791c5e717e5098d3e0e51d35dc511699f09aa2a 100755

--- a/samplecode/SampleLighting.cpp

+++ b/samplecode/SampleLighting.cpp

@@ -64,9 +64,11 @@ protected:

sk_sp<SkLights> lights(create_lights(fLightAngle, fColorFactor));

SkPaint paint;

- paint.setShader(SkLightingShader::Make(fDiffuseBitmap, fNormalBitmap,

- std::move(lights), SkVector::Make(1.0f, 0.0f),

- nullptr, nullptr));

+ auto normalSource = SkLightingShader::NormalMapSource::Make(fNormalBitmap,

+ SkVector::Make(1.0f, 0.0f),

+ nullptr);

+ paint.setShader(SkLightingShader::Make(fDiffuseBitmap, std::move(lights), nullptr,

+ normalSource));

egdaniel 2016/06/16 13:15:08 move?

dvonbeck 2016/06/16 23:21:56 Done.

paint.setColor(SK_ColorBLACK);

SkRect r = SkRect::MakeWH((SkScalar)fDiffuseBitmap.width(),

« gm/lightingshader.cpp ('K') | « gm/lightingshader.cpp ('k') | samplecode/SampleLitAtlas.cpp » ('j') | src/core/SkLightingShader.h » ('J')