Merge branch 'changes' into develop

Georg Fischer 2013-07-23 23:28:42 +02:00
commit a55e8f2ba2

@ -9,6 +9,7 @@
<article class="content"> <article class="content">
<h1 class="headline">glitch images</h1> <h1 class="headline">glitch images</h1>
<p>drag an image into the browser window to modify it. this script corrupts some bytes in a jpg image. because of the way <a href="https://en.wikipedia.org/wiki/JPEG">jpg</a> encoding works, the corrupted file still shows something. inspired by <a href="http://github.com/soulwire">soulwire</a>s <a href="http://blog.soulwire.co.uk/laboratory/flash/as3-bitmapdata-glitch-generator">experiment</a> in flash. this experiment was created by <a href="http://fishnation.de/">georg</a>. you can follow him on <a href="https://twitter.com/snorpey">twitter</a> or explore the source code on <a href="https://github.com/snorpey/jpg-glitch">github</a>.</p> <p>drag an image into the browser window to modify it. this script corrupts some bytes in a jpg image. because of the way <a href="https://en.wikipedia.org/wiki/JPEG">jpg</a> encoding works, the corrupted file still shows something. inspired by <a href="http://github.com/soulwire">soulwire</a>s <a href="http://blog.soulwire.co.uk/laboratory/flash/as3-bitmapdata-glitch-generator">experiment</a> in flash. this experiment was created by <a href="http://fishnation.de/">georg</a>. you can follow him on <a href="https://twitter.com/snorpey">twitter</a> or explore the source code on <a href="https://github.com/snorpey/jpg-glitch">github</a>.</p>
<p>if you like this one, you can check out some of his other javascript experiments <a href="http://snorpey.github.io/experiments/">gitub</a>.</p>
</article> </article>
<div class="content" id="controls"> <div class="content" id="controls">
<div class="control-wrapper"> <div class="control-wrapper">
@ -35,4 +36,4 @@
<canvas id="canvas"></canvas> <canvas id="canvas"></canvas>
<script src="scripts/lib/require-2.1.4.js" data-main="scripts/src/main"></script> <script src="scripts/lib/require-2.1.4.js" data-main="scripts/src/main"></script>
</body> </body>
</html> </html>