diff options
author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 07:37:22 +0000 |
---|---|---|
committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 07:37:22 +0000 |
commit | 17489f3d8bde128865564a515f70a77c85e65896 (patch) | |
tree | eabc9093fcee15117fd50bfc4947b99f7c4df9c9 /native_client_sdk/src/gonacl_appengine | |
parent | 10e3d3ebdfacb1376875856f90c95a594342ccc4 (diff) | |
download | chromium_src-17489f3d8bde128865564a515f70a77c85e65896.zip chromium_src-17489f3d8bde128865564a515f70a77c85e65896.tar.gz chromium_src-17489f3d8bde128865564a515f70a77c85e65896.tar.bz2 |
[NaCl SDK] Update SmoothLife demo to the most recent version.
This has some performance optimzations, and adds some new functionality. It
also adds some function documentation.
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/58573003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/gonacl_appengine')
-rwxr-xr-x | native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh | 2 | ||||
-rw-r--r-- | native_client_sdk/src/gonacl_appengine/static/pnacl-demo-smoothlife/example.js | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh b/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh index 8e785cc..87ec1dc 100755 --- a/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh +++ b/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh @@ -12,7 +12,7 @@ cd ${SCRIPT_DIR} OUT_DIR=out SMOOTHLIFE_URL=https://github.com/binji/smoothnacl SMOOTHLIFE_DIR=${OUT_DIR}/smoothlife -SMOOTHLIFE_SHA=63f115f2393aa629aab1403948cbfb28acc54360 +SMOOTHLIFE_SHA=11f22815f48a7f3044ed72a673d0e05cae343481 if [ -z "${NACL_SDK_ROOT:-}" ]; then echo "-------------------------------------------------------------------" diff --git a/native_client_sdk/src/gonacl_appengine/static/pnacl-demo-smoothlife/example.js b/native_client_sdk/src/gonacl_appengine/static/pnacl-demo-smoothlife/example.js index 5171d33..f2f7563 100644 --- a/native_client_sdk/src/gonacl_appengine/static/pnacl-demo-smoothlife/example.js +++ b/native_client_sdk/src/gonacl_appengine/static/pnacl-demo-smoothlife/example.js @@ -132,6 +132,9 @@ function moduleDidLoad() { bar.max = 100; naclModule = $('nacl_module'); hideStatus(); + setSize(256); + setThreadCount(4); + setMaxScale(1); loadPreset(0); } @@ -220,6 +223,19 @@ function clear(color) { naclModule.postMessage({cmd: 'clear', color: color}); } +function setSize(size) { + naclModule.postMessage({cmd: 'setSize', size: size}); +} + +function setMaxScale(scale) { + naclModule.postMessage({cmd: 'setMaxScale', scale: scale}); +} + +function setThreadCount(threadCount) { + naclModule.postMessage({cmd: 'setThreadCount', threadCount: threadCount}); +} + + function setKernel(discRadius, ringRadius, blendRadius) { naclModule.postMessage({ cmd: 'setKernel', |