diff options
author | amarinichev@chromium.org <amarinichev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 17:31:56 +0000 |
---|---|---|
committer | amarinichev@chromium.org <amarinichev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 17:31:56 +0000 |
commit | 51fc9c8c30459fd973564037001298ff69042e3d (patch) | |
tree | 1d9691120da8d9da456c66223bfd34049396731e /o3d/samples/beachdemo/beachdemo.js | |
parent | e2d3bb8bb85d702cb0725639cd8eeada34ea21fa (diff) | |
download | chromium_src-51fc9c8c30459fd973564037001298ff69042e3d.zip chromium_src-51fc9c8c30459fd973564037001298ff69042e3d.tar.gz chromium_src-51fc9c8c30459fd973564037001298ff69042e3d.tar.bz2 |
Added setLanguage functions to canvas, fps and particles. Added beachdemo-glsl and its shaders.
Review URL: http://codereview.chromium.org/1894001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/beachdemo/beachdemo.js')
-rw-r--r-- | o3d/samples/beachdemo/beachdemo.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/o3d/samples/beachdemo/beachdemo.js b/o3d/samples/beachdemo/beachdemo.js index 8e313d1..3c3cac0 100644 --- a/o3d/samples/beachdemo/beachdemo.js +++ b/o3d/samples/beachdemo/beachdemo.js @@ -1950,7 +1950,6 @@ function loadShaders() { 'diffuse_bump_specular', 'imageshader', 'just_color', - 'particleshader', 'proxy', 'simpleshader', 'skydomeshader', |