Navigation Menu

Skip to content

Commit

Permalink
text tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jwagner committed Jan 20, 2016
1 parent 9918862 commit b2f8543
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
6 changes: 6 additions & 0 deletions Gruntfile.js
Expand Up @@ -71,6 +71,12 @@ grunt.initConfig({
},
jade: {
main: {
options: {
data: {
'pkg': '<%= pkg %>',
fileRev: function(s){ return s; }
}
},
files: [
{expand: true, dest:'public/', cwd: 'templates/', src:'**/*.jade', filter: 'isFile', ext: '.html'}
]
Expand Down
2 changes: 1 addition & 1 deletion src/image-processing.js
Expand Up @@ -184,7 +184,7 @@ export function adjust(out, image, brightness, contrast, saturation, vibrance, b
: (pmax - pmin) / (1e-5 + Math.max(0, 2 - pmax - pmin));
let vbias = 0.8;
let pweight = clamp(((1 - (1.5 * psat)) + ((1 + (Math.abs(plum - 0.5) * 2)) * (1 - vbias))) / (1 + (1 - vbias)), 0, 1);
let saturationVibrance = saturation + vibrance*pweight*2;
let saturationVibrance = saturation + vibrance*pweight;


//let s = Math.max(Math.abs(r-l)*2, Math.abs(g-l), Math.abs(b-l)),
Expand Down
5 changes: 5 additions & 0 deletions style/main.scss
Expand Up @@ -132,6 +132,11 @@ canvas {
cursor: pointer;
}

.help-dependency {
display: inline-block;
padding: 4px;
}

.app-content {
display: flex;
flex: 1;
Expand Down
21 changes: 20 additions & 1 deletion templates/index.jade
Expand Up @@ -3,7 +3,7 @@ html(lang="en")
head
meta(charset="utf-8")
meta(http-equiv="X-UA-Compatible" content="IE=edge")
link(href='//fonts.googleapis.com/css?family=Open+Sans:300,400', rel='stylesheet', type='text/css')
link(href='//fonts.googleapis.com/css?family=Open+Sans:300,400,700', rel='stylesheet', type='text/css')
link(rel='stylesheet', href='app.css')
meta(name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no")
link(rel="favicon" href="logo-256.png")
Expand Down Expand Up @@ -115,6 +115,7 @@ html(lang="en")
.button.editor-action Close

.help.dialog(style='display:none')
h2 Film Emulator
p
| This is a little toy made by <a href="http://29a.ch/">Jonas Wagner</a>.
| You can read a bit more about it in this <a href="http://29a.ch/2015/06/07/javascript-film-emulation/">blog post</a>. You can find its source code on <a href='https://github.com/jwagner/analog-film-emulator/'>github</a>.
Expand All @@ -124,9 +125,11 @@ html(lang="en")
| by
| <a href="http://blog.patdavid.net/2013/09/film-emulation-presets-in-gmic-gimp.html">Patrick David</a>.


p
| The vibrance slider is based on the velvia operation in <a href="https://www.darktable.org/">darktable</a>.


h3 FAQ

p.faq-question
Expand All @@ -142,6 +145,22 @@ html(lang="en")
| If you need support for higher bit depths or RAW please have a look at
| the <a href="http://gmic.eu/film_emulation/">gmic plugin</a> for the gimp.

h3 Changelog
h3 2016-01-20
p Changed vibrance algorithm to something inspired by <a href="https://www.darktable.org/2011/10/different-kind-of-saturation/">darktables velvia</a>.

h3 Open Source Libraries used
p
| This software was built using the following open source components.
| I want to thank all of their authors for making my life easier, and projects like this possible.

ul
- each dependency in Object.keys(pkg.devDependencies).concat(Object.keys(pkg.dependencies)).sort()
li.help-dependency
a(href='https://www.npmjs.com/package/' + dependency rel='nofollow')
= dependency


|<strong>Disclamer</strong>: The trademarked names which may appear in the names of the film emulation CLUT (color lookup table) are there for informational purposes only. They serve only to inform the user which film stock the given CLUT is designed to approximate. As there is no way to convey this information other than by using the trademarked name, we believe this constitutes fair use. Neither the publisher nor the authors are affiliated with or endorsed by the companies that own the trademarks.
.action
.button.editor-action Close
Expand Down

0 comments on commit b2f8543

Please sign in to comment.