summaryrefslogtreecommitdiffstats
path: root/o3d/samples/o3d-webgl
diff options
context:
space:
mode:
authorluchen@google.com <luchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 19:52:40 +0000
committerluchen@google.com <luchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 19:52:40 +0000
commit1750a95d56338a475b83c929b0b7eed861199db5 (patch)
treea2f68cbd73e848a47aece62cb1b3ff8218b75442 /o3d/samples/o3d-webgl
parent1f0f54f4442d001ef10f44781b9d2200ece3ad40 (diff)
downloadchromium_src-1750a95d56338a475b83c929b0b7eed861199db5.zip
chromium_src-1750a95d56338a475b83c929b0b7eed861199db5.tar.gz
chromium_src-1750a95d56338a475b83c929b0b7eed861199db5.tar.bz2
Adding wireframe light indicator to shadow map demo.
Review URL: http://codereview.chromium.org/2718003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3d-webgl')
-rw-r--r--o3d/samples/o3d-webgl/effect.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/o3d/samples/o3d-webgl/effect.js b/o3d/samples/o3d-webgl/effect.js
index b0386d7..4d10b72 100644
--- a/o3d/samples/o3d-webgl/effect.js
+++ b/o3d/samples/o3d-webgl/effect.js
@@ -430,10 +430,11 @@ o3d.Effect.prototype.getParameterInfo = function() {
var sasTypeName = sasTypes[name] || '';
var className = paramTypes[info.type] || '';
var numElements = 0; // TODO(petersont): Add array support.
- var semantic = semanticMap[name].semantic || o3d.Stream.UNKNOWN_SEMANTIC;
+ var semantic = (semanticMap[name] && semanticMap[name].semantic) ?
+ semanticMap[name].semantic : o3d.Stream.UNKNOWN_SEMANTIC;
- infoArray.push(new EffectParameterInfo(
- name, className, numElements, semantic, sasClassName));
+ infoArray.push(new o3d.EffectParameterInfo(
+ name, className, numElements, semantic, sasTypeName));
}
return infoArray;