submission

README.md

@@ -1,123 +1,18 @@
 
 # Project 5: Shaders
 
-## Project Instructions
+Shaders Implemented: 
 
-Implement at least 75 points worth of shaders from the following list. We reserve the right to grant only partial credit for shaders that do not meet our standards, as well as extra credit for shaders that we find to be particularly impressive.
-
-Some of these shading effects were covered in lecture -- some were not. If you wish to implement the more complex effects, you will have to perform some extra research. Of course, we encourage such academic curiosity which is why we’ve included these advanced shaders in the first place!
-
-Document each shader you implement in your README with at least a sentence or two of explanation. Well-commented code will earn you many brownie (and probably sanity) points.
-
-If you use shadertoy or any materials as reference, please properly credit your sources in the README and on top of the shader file. Failing to do so will result in plagiarism and will significantly reduce your points.
-
-Examples: [https://cis700-procedural-graphics.github.io/Project5-Shaders/](https://cis700-procedural-graphics.github.io/Project5-Shaders/)
-
-### 15 points each: Instagram-like filters
-
-- Tone mapping:
-    - Linear (+5 points)
-    - Reinhard (+5 points)
-    - Filmic (+5 points)
-- Gaussian blur (no double counting with Bloom)
-- Iridescence
-- Pointilism
-- Vignette
-- Fish-eye bulge
-
-### 25 points each: 
-- Bloom
-- Noise Warp
+- Pointillism
+    - Computed a noise value based on position and drew a black pixel if the noise was above a certain threshold. 
 - Hatching
-- Lit Sphere ([paper](http://www.ppsloan.org/publications/LitSphere.pdf))
-
-### 37.5 points each:
-- K-means color compression (unless you are extremely clever, the k-means clusterer has to be CPU side)
-- Dithering
-- Edge detection with Sobel filtering
-- Uncharted 2 customizable filmic curve, following John Hable’s presetantion. 
-    - Without Linear, Reinhard, filmic (+10 points)
-    - With all of linear, Reinhard, filmic (+10 points)
-    - Customizable via GUI (+17.5 points)
-    - Controlling Exposure (4 points)
-    - Side by side comparison between linear, Reinhard, filmic, and Uncharted2 (13.5 points). 
-
-### 5 points - Interactivity
-Implement a dropdown GUI to select different shader effects from your list.
-
-### ??? points
-Propose your own shading effects!
-
-### For the overachievers:
-Weave all your shading effects into one aesthetically-coherent scene, perhaps by incorporating some of your previous assignments!
-
-
-## Getting Started
-
-### main.js
-
-`main.js` is responsible for setting up the scene with the Mario mesh, initializing GUI and camera, etc.
-
-### Adding Shaders
-
-To add a shader, you'll want to add a file to the `src/shaders` or `src/post` folder. As examples, we've provided two shaders `lambert.js` and `grayscale.js`. Here, I will give a brief overview of how these work and how everything hooks together.
-
-**shaders/lambert.js**
-
-IMPORTANT: I make my lambert shader available by exporting it in `shaders/index.js`. 
-
-```javascript
-export {default as Lambert} from './Lambert'
-```
-
-Each shader should export a function that takes in the `renderer`, `scene`, and `camera`. That function should return a `Shader` Object.
-
-`Shader.initGUI` is a function that will be called to initialize the GUI for that shader. in `lambert.js`, you can see that it's here that I set up all the parameters that will affect my shader.
-
-`Shader.material` should be a `THREE.ShaderMaterial`. This should be pretty similar to what you've seen in previous projects. `Shader.material.vertexShader` and `Shader.material.fragmentShader` are the vertex and fragment shaders used.
-
-At the bottom, I have the following snippet of code. All it does is bind the Mario texture once it's loaded.
-
-```javascript
-textureLoaded.then(function(texture) {
-    Shader.material.uniforms.texture.value = texture;
-});
-```
-
-So when you change the Shader parameter in the GUI, `Shader.initGUI(gui)` will be called to initialize the GUI, and then the Mario mesh will have `Shader.material` applied to it.
-
-**post/grayscale.js**
-
-GUI parameters here are initialized the same way they are for the other shaders.
-
-Post process shaders should use the THREE.js `EffectComposer`. To set up the grayscale filter, I first create a new composer: `var composer = new EffectComposer(renderer);`. Then I add a a render pass as the first pass: `composer.addPass(new EffectComposer.RenderPass(scene, camera));`. This will set up the composer to render the scene as normal into a buffer. I add my filter to operate on that buffer: `composer.addPass(GrayscaleShader);`, and mark it as the final pass that will write to the screen `GrayscaleShader.renderToScreen = true;`
-
-GrayscaleShader is a `EffectComposer.ShaderPass` which basically takes the same arguments as `THREE.ShaderMaterial`. Note, that one uniform that will have to include is `tDiffuse`. This is the texture sampler which the EffectComposer will automatically bind the previously rendered pass to. If you look at `glsl/grayscale-frag.glsl`, this is the texture we read from to get the previous pixel color: `vec4 col = texture2D(tDiffuse, f_uv);`.
-
-IMPORTANT: You initially define your shader passes like so:
-
-```javascript
-var GrayscaleShader = new EffectComposer.ShaderPass({
-    uniforms: {
-        tDiffuse: {
-            type: 't',
-            value: null
-        },
-        u_amount: {
-            type: 'f',
-            value: options.amount
-        }
-    },
-    vertexShader: require('../glsl/pass-vert.glsl'),
-    fragmentShader: require('../glsl/grayscale-frag.glsl')
-});
-```
-
-BUT, if you want to modify the uniforms, you need to do so like so: `GrayscaleShader.material.uniforms.u_amount.value = val;`. Note the extra `.material` property.
-
-## Deploy
-
-1. Create a `gh-pages` branch on GitHub
-2. Do `npm run build`
-3. Commit and add all your changes.
-4. Do `npm run deploy`
+    - Used a sine function to create a hatching texture. Used a noise function to add in some speckles as well.
+- Monochromatic Shading
+    - I shaded the geometry similarly to the toon shader, but I mapped values to a monochromatic pallate.   
+- Geometric Shading
+    - I used multioctave noise to offset the UV coordinates in an interesting way. The result was not what I expected, but it looks pretty cool.
+- Screen Print Shader
+    - Used a noise function that has a lot of repeated patterns to create a texture that looks like a screen print. 
+
+![Alt text](references/monochrome.png?raw=true)
+*Mario obj with monochromatic toon shader and hatching effect*

src/glsl/hatch-frag.glsl

@@ -0,0 +1,36 @@
+
+uniform sampler2D tDiffuse;
+uniform float u_amount;
+varying vec2 f_uv;
+varying vec3 fPos;
+
+float noise(float x, float y){
+	float value1 = fract(sin(dot(vec2(x, y) ,vec2(1027.9898, 29381.233))) * 333019.5453);
+
+	return dot(value1, 14958832.22); 
+}
+
+float hatch(float x, float y) {
+	return sin(300.0 * (x+y) );
+}
+
+void main() {
+	float noiseValue = noise(fPos.x , fPos.y); 
+	float hatching = hatch(fPos.x, fPos.y); 
+
+	if (noiseValue < 0.5) {
+		gl_FragColor = vec4(0.0,0.0,0.0,1.0);
+	} else if (hatching > 0.7) {
+		gl_FragColor = vec4(0.294, 0.290, 0.282,1.0);
+	} else {
+	    vec4 col = texture2D(tDiffuse, f_uv);
+	    col.rgb = vec3(0.811, 0.666, 0.466) * (0.2) + col.rgb * (1.0 - 0.2);
+	    gl_FragColor = col;	
+	}
+    // vec4 col = texture2D(tDiffuse, f_uv);
+    // float gray = dot(col.rgb, vec3(0.299, 0.587, 0.114));
+
+    // col.rgb = vec3(gray, gray, gray) * (u_amount) + col.rgb * (1.0 - u_amount);
+
+    // gl_FragColor = col;
+}   

src/glsl/inclass-frag.glsl

@@ -0,0 +1,18 @@
+
+uniform sampler2D tDiffuse;
+uniform float u_amount;
+varying vec2 f_uv;
+
+// tDiffuse is a special uniform sampler that THREE.js will bind the previously rendered frame to
+
+void main() {
+    vec4 col = texture2D(tDiffuse, f_uv);
+
+    float gray = dot(col.rgb, vec3(0.299, 0.587, 0.114));
+
+    col.rgb = vec3(gray ,0.5,0.5) * u_amount + col.rgb * (1.0 - u_amount); 
+
+    // col.rgb = vec3(gray, gray, gray) * (u_amount) + col.rgb * (1.0 - u_amount);
+
+    gl_FragColor = col;
+}   

src/glsl/noise-frag.glsl

@@ -0,0 +1,25 @@
+
+uniform sampler2D texture;
+uniform int u_useTexture;
+uniform vec3 u_albedo;
+uniform vec3 u_ambient;
+uniform vec3 u_lightPos;
+uniform vec3 u_lightCol;
+uniform float u_lightIntensity;
+
+varying vec3 f_position;
+varying vec3 f_normal;
+varying vec2 f_uv;
+
+void main() {
+    vec4 color = vec4(u_albedo, 1.0);
+
+    if (u_useTexture == 1) {
+        color = texture2D(texture, f_uv);
+    }
+
+    float d = clamp(dot(f_normal, normalize(u_lightPos - f_position)), 0.0, 1.0);
+
+    gl_FragColor = vec4(d * color.rgb * u_lightCol * u_lightIntensity + u_ambient, 1.0);
+    // gl_FragColor = vec4(0.5, 0.5, 0.0, 1.0);
+}