summaryrefslogtreecommitdiff
path: root/shader-combo.html
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-01-26 02:26:23 -0500
committerjules <jules@okfoc.us>2014-01-26 02:26:23 -0500
commitb0b1b4cfbe3217b9f35343bdc35cdd058f4cf534 (patch)
treea7806b86b555b40a77e6f5fce28dcee66fb42275 /shader-combo.html
parent2d0d3f2bcf078d8ab0747061f2fc5cc3d626e6e3 (diff)
allow empty canvas w/ no url
Diffstat (limited to 'shader-combo.html')
-rw-r--r--shader-combo.html11
1 files changed, 7 insertions, 4 deletions
diff --git a/shader-combo.html b/shader-combo.html
index 6d402da..e61beee 100644
--- a/shader-combo.html
+++ b/shader-combo.html
@@ -3,7 +3,8 @@
<head>
<style type="text/css">
#url { width: 250px; }
-#width,#height,#framecount,#framedelay,#frameinterval,#background { width: 30px; }
+#width,#height,#framecount,#framedelay,#frameinterval,#background { width: 30px; text-align: right; }
+#background { text-align: left; }
#username { width: 55px; }
#shader-name { width: 75px; }
#shader-id { width: 40px; }
@@ -89,7 +90,7 @@ form { display: inline-block; }
</div>
<div id="controls">
- <input type="text" id="url" value="img/1376516658960-dumpfm-DoritoWitch-TimeFLyTrans0001.png">
+ <input type="text" id="url">
<input type="text" id="username" placeholder="username">
<input type="text" id="shader-name" placeholder="shader name">
<br>
@@ -100,6 +101,8 @@ form { display: inline-block; }
<button id="save-shader"><b>save shader</b></button>
<button id="pause">pause</button>
<button id="reset">reset</button>
+ <input type="text" id="width" placeholder="width" value="0">
+ <input type="text" id="height" placeholder="height" value="0">
<span class="status"></span>
<!--<button id="step-forward">&gt;&gt;</button>-->
<br>
@@ -154,7 +157,7 @@ form { display: inline-block; }
<script type="text/javascript">
var cc = cq(0,0).appendTo("#workspace")
-var w, h
+var w = 400, h = 266
var lastGif
var mousex, mousey
@@ -194,7 +197,7 @@ function init(){
frame_editor.init()
help.init()
load()
-
+
user.init()
help.init()
shader_gallery.init()