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

Correctly name the lightRadius

Browse Source 
b/18282208

Change-Id: I5b6edcb37b710464c6ff0f5c05583bb7da720ff3
This commit is contained in:
ztenghui
2015-02-20 10:53:22 -08:00
parent 576f722175
commit 62aa44c5ee
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/Caches.cpp
View File

@@ -405,7 +405,7 @@ TextureVertex* Caches::getRegionMesh() {
///////////////////////////////////////////////////////////////////////////////
void Caches::initTempProperties() {
propertyLightDiameter = -1.0f;
propertyLightRadius = -1.0f;
propertyLightPosY = -1.0f;
propertyLightPosZ = -1.0f;
propertyAmbientRatio = -1.0f;
@@ -419,9 +419,9 @@ void Caches::setTempProperty(const char* name, const char* value) {
propertyAmbientRatio = fmin(fmax(atof(value), 0.0), 10.0);
ALOGD("ambientRatio = %.2f", propertyAmbientRatio);
return;
} else if (!strcmp(name, "lightDiameter")) {
propertyLightDiameter = fmin(fmax(atof(value), 0.0), 3000.0);
ALOGD("lightDiameter = %.2f", propertyLightDiameter);
} else if (!strcmp(name, "lightRadius")) {
propertyLightRadius = fmin(fmax(atof(value), 0.0), 3000.0);
ALOGD("lightRadius = %.2f", propertyLightRadius);
return;
} else if (!strcmp(name, "lightPosY")) {
propertyLightPosY = fmin(fmax(atof(value), 0.0), 3000.0);

2
libs/hwui/Caches.h
View File

@@ -214,7 +214,7 @@ public:
void initTempProperties();
void setTempProperty(const char* name, const char* value);
float propertyLightDiameter;
float propertyLightRadius;
float propertyLightPosY;
float propertyLightPosZ;
float propertyAmbientRatio;

4
libs/hwui/ShadowTessellator.cpp
View File

@@ -87,8 +87,8 @@ void ShadowTessellator::tessellateSpotShadow(bool isCasterOpaque,
reverseReceiverTransform.loadInverse(receiverTransform);
reverseReceiverTransform.mapPoint3d(adjustedLightCenter);
if (CC_UNLIKELY(caches.propertyLightDiameter > 0)) {
lightRadius = caches.propertyLightDiameter;
if (CC_UNLIKELY(caches.propertyLightRadius > 0)) {
lightRadius = caches.propertyLightRadius;
}
// Now light and caster are both in local space, we will check whether