Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/core/SkShadowShader.cpp

Issue 2246463004: Added distance attenuation and diffuse shading to PointLights (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Made req changes- made light intensity a light attribute Created 4 years, 4 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
« src/core/SkLights.cpp ('K') | « src/core/SkLights.cpp ('k') | src/utils/SkShadowPaintFilterCanvas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkShadowShader.cpp
diff --git a/src/core/SkShadowShader.cpp b/src/core/SkShadowShader.cpp
index 804258321a80f9ab0bd20b7ffa995878ab079b17..2267fa6f1196d5839f384509e79271e7ac2e104c 100644
--- a/src/core/SkShadowShader.cpp
+++ b/src/core/SkShadowShader.cpp
@@ -117,7 +117,16 @@ public:
fAmbientColor += lights->light(i).color();
} else if (fNumDirLights < SkShadowShader::kMaxNonAmbientLights) {
fLightColor[fNumDirLights] = lights->light(i).color();
- fLightDir[fNumDirLights] = lights->light(i).dir();
+ if (lights->light(i).type() == SkLights::Light::kPoint_LightType) {
+ fLightDir[fNumDirLights] = lights->light(i).pos();
jvanverth1 2016/08/17 19:59:02 fLightDirOrPos?
vjiaoblack 2016/08/18 14:52:19 Done.
+ fLightIntensity[fNumDirLights] = lights->light(i).intensity();
+ } else {
+ fLightDir[fNumDirLights] = lights->light(i).dir();
+ fLightIntensity[fNumDirLights] = 0.0f;
+ }
+ fIsPointLight[fNumDirLights] =
+ lights->light(i).type() == SkLights::Light::kPoint_LightType;
+
SkImage_Base* shadowMap = ((SkImage_Base*)lights->light(i).getShadowMap());
// gets deleted when the ShadowFP is destroyed, and frees the GrTexture*
@@ -155,16 +164,23 @@ public:
int32_t numLights = args.fFp.cast<ShadowFP>().fNumDirLights;
SkASSERT(numLights <= SkShadowShader::kMaxNonAmbientLights);
+ bool isPointLight[SkShadowShader::kMaxNonAmbientLights];
jvanverth1 2016/08/17 19:59:02 I'm wondering if it might be worthwhile to change
vjiaoblack 2016/08/18 14:52:19 Done.
+ for (int i = 0; i < SkShadowShader::kMaxNonAmbientLights; i++) {
+ isPointLight[i] = args.fFp.cast<ShadowFP>().fIsPointLight[i];
+ }
+
const char* lightDirUniName[SkShadowShader::kMaxNonAmbientLights] = {nullptr};
+ const char* isPointLightUniName[SkShadowShader::kMaxNonAmbientLights] = {nullptr};
const char* lightColorUniName[SkShadowShader::kMaxNonAmbientLights] = {nullptr};
+ const char* lightIntensityUniName[SkShadowShader::kMaxNonAmbientLights] = {nullptr};
- const char* depthMapWidthUniName[SkShadowShader::kMaxNonAmbientLights]
- = {nullptr};
- const char* depthMapHeightUniName[SkShadowShader::kMaxNonAmbientLights]
- = {nullptr};
+ const char* depthMapWidthUniName[SkShadowShader::kMaxNonAmbientLights] = {nullptr};
+ const char* depthMapHeightUniName[SkShadowShader::kMaxNonAmbientLights] = {nullptr};
SkString lightDirUniNameBase("lightDir");
SkString lightColorUniNameBase("lightColor");
+ SkString lightIntensityUniNameBase("lightIntensity");
+ SkString isPointLightUniNameBase("isPointLight");
SkString depthMapWidthUniNameBase("dmapWidth");
SkString depthMapHeightUniNameBase("dmapHeight");
@@ -174,6 +190,10 @@ public:
lightDirUniNameStr.appendf("%d", i);
SkString lightColorUniNameStr(lightColorUniNameBase);
lightColorUniNameStr.appendf("%d", i);
+ SkString lightIntensityUniNameStr(lightIntensityUniNameBase);
+ lightIntensityUniNameStr.appendf("%d", i);
+ SkString isPointLightUniNameStr(isPointLightUniNameBase);
+ isPointLightUniNameStr.appendf("%d", i);
SkString depthMapWidthUniNameStr(depthMapWidthUniNameBase);
depthMapWidthUniNameStr.appendf("%d", i);
@@ -185,11 +205,22 @@ public:
kDefault_GrSLPrecision,
lightDirUniNameStr.c_str(),
&lightDirUniName[i]);
+ fIsPointLightUni[i] = uniformHandler->addUniform(kFragment_GrShaderFlag,
+ kFloat_GrSLType,
+ kDefault_GrSLPrecision,
+ isPointLightUniNameStr.c_str(),
+ &isPointLightUniName[i]);
fLightColorUni[i] = uniformHandler->addUniform(kFragment_GrShaderFlag,
kVec3f_GrSLType,
kDefault_GrSLPrecision,
lightColorUniNameStr.c_str(),
&lightColorUniName[i]);
+ fLightIntensityUni[i] =
+ uniformHandler->addUniform(kFragment_GrShaderFlag,
+ kFloat_GrSLType,
+ kDefault_GrSLPrecision,
+ lightIntensityUniNameStr.c_str(),
+ &lightIntensityUniName[i]);
fDepthMapWidthUni[i] = uniformHandler->addUniform(kFragment_GrShaderFlag,
kInt_GrSLType,
@@ -203,7 +234,6 @@ public:
&depthMapHeightUniName[i]);
}
-
const char* widthUniName = nullptr;
const char* heightUniName = nullptr;
@@ -216,7 +246,6 @@ public:
kDefault_GrSLPrecision,
"height", &heightUniName);
-
SkString povDepth("povDepth");
this->emitChild(0, nullptr, &povDepth, args);
@@ -225,15 +254,19 @@ public:
SkString depthMaps[SkShadowShader::kMaxNonAmbientLights];
+ // Multiply by 255 to transform from sampler coordinates to world
+ // coordinates (since 1 channel is 0xFF)
+ fragBuilder->codeAppendf("vec3 worldCor = vec3(vMatrixCoord_0_1_Stage0 * "
+ "vec2(%s, %s), %s.b * 255);\n",
+ widthUniName, heightUniName, povDepth.c_str());
+
for (int i = 0; i < numLights; i++) {
SkString povCoord("povCoord");
povCoord.appendf("%d", i);
// vMatrixCoord_0_1_Stage0 is the texture sampler coordinates.
// povDepth.b * 255 scales it to 0 - 255, bringing it to world space,
- // and the / 400 brings it back to a sampler coordinate, 0 - 1
- // The 400 comes from the shadowmaps GM.
- // TODO use real shadowmaps size
+ // and the / vec2(width, height) brings it back to a sampler coordinate
SkString offset("offset");
offset.appendf("%d", i);
@@ -243,9 +276,23 @@ public:
SkString scaleOffsetVec("scaleOffsetVec");
scaleOffsetVec.appendf("%d", i);
- fragBuilder->codeAppendf("vec2 %s = vec2(%s) * povDepth.b * 255 / 400;\n",
- offset.c_str(), lightDirUniName[i]);
-
+ fragBuilder->codeAppendf("vec2 %s;", offset.c_str());
+
+ if (isPointLight[i]) {
+ fragBuilder->codeAppendf("vec3 fragToLight%d = %s - worldCor;\n",
+ i, lightDirUniName[i]);
+ fragBuilder->codeAppendf("float distsq%d = dot(fragToLight%d, fragToLight%d);"
+ "fragToLight%d = normalize(fragToLight%d);",
+ i, i, i, i, i);
+ fragBuilder->codeAppendf("%s = -vec2(%s.x - worldCor.x, worldCor.y - %s.y)*"
+ "(povDepth.b) / vec2(%s, %s);\n",
jvanverth1 2016/08/17 19:59:02 I don't like these divides, but can live with it f
vjiaoblack 2016/08/18 14:52:19 Done.
+ offset.c_str(), lightDirUniName[i],
+ lightDirUniName[i], widthUniName, heightUniName);
+ } else {
+ fragBuilder->codeAppendf("%s = vec2(%s) * povDepth.b * 255 / vec2(%s, %s);\n",
+ offset.c_str(), lightDirUniName[i],
+ widthUniName, heightUniName);
+ }
fragBuilder->codeAppendf("vec2 %s = (vec2(%s, %s) / vec2(%s, %s));\n",
scaleVec.c_str(),
widthUniName, heightUniName,
@@ -254,13 +301,11 @@ public:
fragBuilder->codeAppendf("vec2 %s = 1 - %s;\n",
scaleOffsetVec.c_str(), scaleVec.c_str());
-
fragBuilder->codeAppendf("vec2 %s = (vMatrixCoord_0_1_Stage0 + "
- "vec2(%s.x, 0 - %s.y)) "
- " * %s + vec2(0,1) * %s;\n",
-
- povCoord.c_str(), offset.c_str(), offset.c_str(),
- scaleVec.c_str(), scaleOffsetVec.c_str());
+ "vec2(%s.x, 0 - %s.y)) "
jvanverth1 2016/08/17 19:59:02 Indent
vjiaoblack 2016/08/18 14:52:19 Done.
+ " * %s + vec2(0,1) * %s;\n",
+ povCoord.c_str(), offset.c_str(), offset.c_str(),
+ scaleVec.c_str(), scaleOffsetVec.c_str());
fragBuilder->appendTextureLookup(&depthMaps[i], args.fTexSamplers[i],
povCoord.c_str(),
@@ -274,20 +319,28 @@ public:
fragBuilder->codeAppendf("vec4 resultDiffuseColor = %s;", diffuseColor.c_str());
- // Essentially,
// diffColor * (ambientLightTot + foreachDirLight(lightColor * (N . L)))
SkString totalLightColor("totalLightColor");
fragBuilder->codeAppendf("vec3 %s = vec3(0);", totalLightColor.c_str());
for (int i = 0; i < numLights; i++) {
- fragBuilder->codeAppendf("if (%s.b >= %s.b) {",
- povDepth.c_str(), depthMaps[i].c_str());
- // Note that dot(vec3(0,0,1), %s) == %s.z * %s
- fragBuilder->codeAppendf("%s += %s.z * %s;",
- totalLightColor.c_str(),
- lightDirUniName[i],
- lightColorUniName[i]);
- fragBuilder->codeAppendf("}");
+ if (!isPointLight[i]) {
+ fragBuilder->codeAppendf("if (%s.b >= %s.b) {",
+ povDepth.c_str(), depthMaps[i].c_str());
+ // Note that dot(vec3(0,0,1), %s) == %s.z * %s
+ fragBuilder->codeAppendf("%s += %s.z * %s;",
+ totalLightColor.c_str(),
+ lightDirUniName[i],
+ lightColorUniName[i]);
+ fragBuilder->codeAppendf("}");
+ } else {
+ // fragToLight%d.z is equal to the fragToLight dot the surface normal.
+ fragBuilder->codeAppendf("%s += fragToLight%d.z * %s / (1 + distsq%d / (%s * %s));",
jvanverth1 2016/08/17 19:59:02 Greater than 100 char line.
vjiaoblack 2016/08/18 14:52:19 Done.
+ totalLightColor.c_str(), i,
+ lightColorUniName[i], i,
+ lightIntensityUniName[i],
+ lightIntensityUniName[i]);
+ }
}
fragBuilder->codeAppendf("%s += %s;",
@@ -304,6 +357,11 @@ public:
GrProcessorKeyBuilder* b) {
const ShadowFP& shadowFP = proc.cast<ShadowFP>();
b->add32(shadowFP.fNumDirLights);
+ int isPL = 0;
+ for (int i = 0; i < SkShadowShader::kMaxNonAmbientLights; i++) {
+ isPL = isPL | ((shadowFP.fIsPointLight[i] ? 1 : 0) << i);
+ }
+ b->add32(isPL);
}
protected:
@@ -313,17 +371,29 @@ public:
fNumDirLights = shadowFP.numLights();
for (int i = 0; i < fNumDirLights; i++) {
+ bool isPoint = shadowFP.isPointLight(i);
+ SkScalar isPointf = isPoint ? 1.0f : 0.0f;
+ pdman.set1f(fIsPointLightUni[i], isPointf);
+ fIsPointLight[i] = isPoint;
+
const SkVector3& lightDir = shadowFP.lightDir(i);
if (lightDir != fLightDir[i]) {
pdman.set3fv(fLightDirUni[i], 1, &lightDir.fX);
fLightDir[i] = lightDir;
}
+
const SkColor3f& lightColor = shadowFP.lightColor(i);
if (lightColor != fLightColor[i]) {
pdman.set3fv(fLightColorUni[i], 1, &lightColor.fX);
fLightColor[i] = lightColor;
}
+ SkScalar lightIntensity = shadowFP.lightIntensity(i);
+ if (lightIntensity != fLightIntensity[i]) {
+ pdman.set1f(fLightIntensityUni[i], lightIntensity);
+ fLightIntensity[i] = lightIntensity;
+ }
+
int depthMapWidth = shadowFP.depthMapWidth(i);
if (depthMapWidth != fDepthMapWidth[i]) {
pdman.set1i(fDepthMapWidthUni[i], depthMapWidth);
@@ -355,6 +425,10 @@ public:
}
private:
+ bool fIsPointLight[SkShadowShader::kMaxNonAmbientLights];
+ GrGLSLProgramDataManager::UniformHandle
+ fIsPointLightUni[SkShadowShader::kMaxNonAmbientLights];
+
SkVector3 fLightDir[SkShadowShader::kMaxNonAmbientLights];
GrGLSLProgramDataManager::UniformHandle
fLightDirUni[SkShadowShader::kMaxNonAmbientLights];
@@ -363,6 +437,10 @@ public:
GrGLSLProgramDataManager::UniformHandle
fLightColorUni[SkShadowShader::kMaxNonAmbientLights];
+ SkScalar fLightIntensity[SkShadowShader::kMaxNonAmbientLights];
+ GrGLSLProgramDataManager::UniformHandle
+ fLightIntensityUni[SkShadowShader::kMaxNonAmbientLights];
+
int fDepthMapWidth[SkShadowShader::kMaxNonAmbientLights];
GrGLSLProgramDataManager::UniformHandle
fDepthMapWidthUni[SkShadowShader::kMaxNonAmbientLights];
@@ -393,6 +471,10 @@ public:
}
int32_t numLights() const { return fNumDirLights; }
const SkColor3f& ambientColor() const { return fAmbientColor; }
+ const bool& isPointLight(int i) const {
+ SkASSERT(i < fNumDirLights);
+ return fIsPointLight[i];
+ }
const SkVector3& lightDir(int i) const {
SkASSERT(i < fNumDirLights);
return fLightDir[i];
@@ -401,6 +483,10 @@ public:
SkASSERT(i < fNumDirLights);
return fLightColor[i];
}
+ SkScalar lightIntensity(int i) const {
+ SkASSERT(i < fNumDirLights);
+ return fLightIntensity[i];
+ }
int depthMapWidth(int i) const {
SkASSERT(i < fNumDirLights);
@@ -428,7 +514,9 @@ private:
for (int i = 0; i < fNumDirLights; i++) {
if (fLightDir[i] != shadowFP.fLightDir[i] ||
- fLightColor[i] != shadowFP.fLightColor[i]) {
+ fLightColor[i] != shadowFP.fLightColor[i] ||
+ fLightIntensity[i] != shadowFP.fLightIntensity[i] ||
+ fIsPointLight[i] != shadowFP.fIsPointLight[i]) {
return false;
}
@@ -443,8 +531,10 @@ private:
int fNumDirLights;
+ bool fIsPointLight[SkShadowShader::kMaxNonAmbientLights];
SkVector3 fLightDir[SkShadowShader::kMaxNonAmbientLights];
SkColor3f fLightColor[SkShadowShader::kMaxNonAmbientLights];
+ SkScalar fLightIntensity[SkShadowShader::kMaxNonAmbientLights];
GrTextureAccess fDepthMapAccess[SkShadowShader::kMaxNonAmbientLights];
sk_sp<GrTexture> fTexture[SkShadowShader::kMaxNonAmbientLights];
@@ -561,11 +651,19 @@ void SkShadowShaderImpl::ShadowShaderContext::shadeSpan(int x, int y,
accum.fX += light.color().fX * SkColorGetR(diffColor);
accum.fY += light.color().fY * SkColorGetG(diffColor);
accum.fZ += light.color().fZ * SkColorGetB(diffColor);
- } else {
+ } else if (SkLights::Light::kDirectional_LightType == light.type()) {
// scaling by fZ accounts for lighting direction
- accum.fX += light.color().makeScale(light.dir().fZ).fX * SkColorGetR(diffColor);
- accum.fY += light.color().makeScale(light.dir().fZ).fY * SkColorGetG(diffColor);
- accum.fZ += light.color().makeScale(light.dir().fZ).fZ * SkColorGetB(diffColor);
+ accum.fX += light.color().makeScale(light.dir().fZ).fX *
+ SkColorGetR(diffColor);
+ accum.fY += light.color().makeScale(light.dir().fZ).fY *
+ SkColorGetG(diffColor);
+ accum.fZ += light.color().makeScale(light.dir().fZ).fZ *
+ SkColorGetB(diffColor);
+ } else {
+ // TODO: do point lights for raster, currently treated like ambient
+ accum.fX += light.color().fX * SkColorGetR(diffColor);
+ accum.fY += light.color().fY * SkColorGetG(diffColor);
+ accum.fZ += light.color().fZ * SkColorGetB(diffColor);
}
}
« src/core/SkLights.cpp ('K') | « src/core/SkLights.cpp ('k') | src/utils/SkShadowPaintFilterCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698