diff --git a/README.md b/README.md index ee8931b..0fc1b37 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -![](https://github.com/evanw/webgl-filter/raw/master/filters.png) - # WebGL Filter ### [View Live Demo](http://evanw.github.com/webgl-filter/) @@ -9,3 +7,7 @@ This is an image editor written using WebGL that allows you to transform your im # Running While you can just open `www/index.html`, you won't be able to save because of the security protection on `file://` URLs. Instead, run `cd www && python -m SimpleHTTPServer` and visit `http://localhost:8000`. + +# Screenshot + +![](https://github.com/evanw/webgl-filter/raw/master/screenshot.png) diff --git a/filters.png b/filters.png deleted file mode 100644 index ef07349..0000000 Binary files a/filters.png and /dev/null differ diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..f3d7ac4 Binary files /dev/null and b/screenshot.png differ diff --git a/www/samples/Bryce.jpg b/www/samples/Bryce.jpg deleted file mode 100644 index 4ae087d..0000000 Binary files a/www/samples/Bryce.jpg and /dev/null differ diff --git a/www/samples/Copenhagen.jpg b/www/samples/Copenhagen.jpg deleted file mode 100644 index 1b3ae45..0000000 Binary files a/www/samples/Copenhagen.jpg and /dev/null differ diff --git a/www/samples/Flowers.jpg b/www/samples/Flowers.jpg deleted file mode 100644 index fa8fbc1..0000000 Binary files a/www/samples/Flowers.jpg and /dev/null differ diff --git a/www/samples/Wolf.jpg b/www/samples/Wolf.jpg deleted file mode 100644 index 38c6863..0000000 Binary files a/www/samples/Wolf.jpg and /dev/null differ diff --git a/www/samples/cat.jpg b/www/samples/cat.jpg new file mode 100644 index 0000000..c704af2 Binary files /dev/null and b/www/samples/cat.jpg differ diff --git a/www/samples/face.jpg b/www/samples/face.jpg new file mode 100644 index 0000000..053ddd6 Binary files /dev/null and b/www/samples/face.jpg differ diff --git a/www/samples/greyhound.jpg b/www/samples/greyhound.jpg new file mode 100644 index 0000000..6a589a9 Binary files /dev/null and b/www/samples/greyhound.jpg differ diff --git a/www/samples/leaf.jpg b/www/samples/leaf.jpg new file mode 100644 index 0000000..baee3c3 Binary files /dev/null and b/www/samples/leaf.jpg differ diff --git a/www/samples/image.jpg b/www/samples/mountain.jpg similarity index 100% rename from www/samples/image.jpg rename to www/samples/mountain.jpg diff --git a/www/samples/orange.jpg b/www/samples/orange.jpg deleted file mode 100644 index 7a56cfc..0000000 Binary files a/www/samples/orange.jpg and /dev/null differ diff --git a/www/samples/perspective.jpg b/www/samples/perspective.jpg new file mode 100644 index 0000000..959b687 Binary files /dev/null and b/www/samples/perspective.jpg differ diff --git a/www/samples/smoke.jpg b/www/samples/smoke.jpg new file mode 100644 index 0000000..b84cf39 Binary files /dev/null and b/www/samples/smoke.jpg differ diff --git a/www/samples/sunset.jpg b/www/samples/sunset.jpg new file mode 100644 index 0000000..696c5e3 Binary files /dev/null and b/www/samples/sunset.jpg differ diff --git a/www/script.js b/www/script.js index e68aa32..f812806 100644 --- a/www/script.js +++ b/www/script.js @@ -189,14 +189,25 @@ $(window).load(function() { // Hook up toolbar buttons $('#load').click(function() { - $('#dialog').html('
Pick one of the sample images below or upload an image of your own:

' + - '' + - '' + - '' + - '' + - '' + - '' + - '
' + + $('#dialog').html('
Pick one of the sample images below or upload an image of your own:
' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
Flickr image credits in order: ' + + 'matthigh, ' + + 'delosj, ' + + 'stuckincustoms, ' + + 'pasma, ' + + 'delosj, ' + + 'seriousbri, ' + + 'melisande-origami, and ' + + 'stuckincustoms' + + '
' + '
Upload File...
' + '
Cancel
'); showDialog(); @@ -227,7 +238,7 @@ $(window).load(function() { }); // Start loading the first image - loadImage('samples/image.jpg'); + loadImage('samples/mountain.jpg'); }); //////////////////////////////////////////////////////////////////////////////// diff --git a/www/style.css b/www/style.css index d0fa765..e9b37e2 100644 --- a/www/style.css +++ b/www/style.css @@ -225,8 +225,8 @@ body { position: absolute; left: 50%; top: 0; - width: 500px; - margin-left: -250px; + width: 650px; + margin-left: -325px; padding: 20px; background: #32302D; border: 1px solid black; @@ -239,6 +239,16 @@ body { line-height: 16px; } +#dialog .contents .images { + padding: 15px 0 8px 0; +} + +#dialog .contents .credits, #dialog .contents .credits a { + font-style: italic; + font-size: 10px; + color: #777; +} + #dialog .contents img { margin: 0 7px 7px 0; border: 1px solid black;