summaryrefslogtreecommitdiff
path: root/shader-combo.html
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-02-02 02:25:07 -0500
committerjules <jules@okfoc.us>2014-02-02 02:25:07 -0500
commitff36ed287ec8747fe25e429bc5fa11961274bbd3 (patch)
treecae45435286369ed6f658729eca0c09a80a5effe /shader-combo.html
parent76a4f773a56eaf59953f2f7ebe027d8b0a4b3ee7 (diff)
add examples from json
Diffstat (limited to 'shader-combo.html')
-rw-r--r--shader-combo.html21
1 files changed, 1 insertions, 20 deletions
diff --git a/shader-combo.html b/shader-combo.html
index 312f52f..399d2e7 100644
--- a/shader-combo.html
+++ b/shader-combo.html
@@ -179,6 +179,7 @@ a { color: #00f; }
<script type="text/javascript" src="js/api/gallery.js"></script>
<script type="text/javascript" src="js/api/get.js"></script>
<script type="text/javascript" src="js/api/set.js"></script>
+<script type="text/javascript" src="shaders.json"></script>
<script type="text/html" id="shader-gallery-template">
<span><img src="{thumbnail_url}"></span>
@@ -274,26 +275,6 @@ function init(){
requestAnimationFrame(animate)
}
-
-</script>
-<script type="text/javascript-shader" data-name="basic">
-// The most basic shaders determine pixel color and nothing else.
-// This shader makes the image red.
-
-r = r
-g = 0
-b = 0
-a = 255
</script>
-<script type="text/javascript-shader" data-name="basic">
-// The most basic shaders determine pixel color and nothing else.
-// This shader makes the image red.
-
-r = r
-g = 0
-b = 0
-a = 255
-</script>
-
</body>
</html>