summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-01-21 01:18:36 -0500
committerjules <jules@okfoc.us>2014-01-21 01:18:36 -0500
commitced1db8df6c73f7bd0a4debd3f20b5570b99e7b4 (patch)
treeac3caa637cb7538cb8e1ee6316cc07a10b1d4dba /js
parentc55b90c1ed47028a5e6ce0aff2284fb7cb5ed554 (diff)
shader loader demo
Diffstat (limited to 'js')
-rw-r--r--js/api/get.js6
-rw-r--r--js/render.js5
2 files changed, 9 insertions, 2 deletions
diff --git a/js/api/get.js b/js/api/get.js
index ec269b0..ae06dbd 100644
--- a/js/api/get.js
+++ b/js/api/get.js
@@ -31,6 +31,10 @@ ShaderAPI.range = function(limit, offset, cb){
// latest - get the latest N shaders
// limit: number of shaders to fetch
ShaderAPI.latest = function(limit, cb){
+ if (! cb) {
+ cb = limit
+ limit = ShaderAPI.limit
+ }
ShaderAPI.fetch({
f: "range",
limit: limit || ShaderAPI.limit
@@ -66,7 +70,7 @@ ShaderAPI.username = function(username, cb){
}
// list_users - list all users
-ShaderAPI.list_users = function(list_users, cb){
+ShaderAPI.list_users = function(cb){
ShaderAPI.fetch({
f: "list_users"
}, cb)
diff --git a/js/render.js b/js/render.js
index 9d3ab04..fdb0125 100644
--- a/js/render.js
+++ b/js/render.js
@@ -93,11 +93,14 @@ function animate(t){
draw(t)
// timing = +(new Date()) - timing
fps = avg(fps, 1000/step_t, 4)
- status(~~(fps) + " fps")
+ // status(~~(fps) + " fps")
}
+
function draw(t) {
t -= start_t
t -= pause_t
frame = giveFrame(t)
shade(frame, t)
}
+
+function status(s){ $("#status").html(s); console.log(s) }