merge

1 files changed, 7 insertions, 2 deletions

diff --git a/index.html b/index.html
index bd9c1bd..2cdb580 100644
--- a/index.html
+++ b/index.html
@@ -14,6 +14,9 @@
     	<span id="square_el" class="tool">square</span><br>
       <span id="circle_el" class="tool">circle</span><br>
       <span id="text_el" class="tool">text</span><br>
+      <span id="select_el" class="tool">select</span><br>
+      <span id="fill_el" class="tool">fill</span><br>
+      <br>
       <span id="clear_el" class="tool">clear</span><br>
       <span id="grid_el" class="tool">grid</span><br>
 			<br>
@@ -51,14 +54,14 @@
 
   </div>
 
-
   <input type="text" id="cursor_input">
 
 </body>
 <script type="text/javascript-shader" id="demo_shader">
   lex.bg = hue((x+y*y+t/10)/20)
   lex.fg = (x+y)%16
-  lex.char = (y%2) ? ":" : "%" 
+  lex.char = (y%2) ? ":" : "%"
+  lex.opacity = 1
 </script>
 <script src="js/util.js"></script>
 <script src="js/color.js"></script>
@@ -66,6 +69,7 @@
 
 <script src="js/lex.js"></script>
 <script src="js/matrix.js"></script>
+<script src="js/blit.js"></script>
 <script src="js/tool.js"></script>
 <script src="js/shader.js"></script>
 <script src="js/draw.js"></script>
@@ -75,5 +79,6 @@
 <script src="js/ui/keys.js"></script>
 <script src="js/ui/controls.js"></script>
 <script src="js/ui/palette.js"></script>
+<script src="js/ui/selection.js"></script>
 
 <script src="js/app.js"></script>