Ellen Duong

.gitignore

@@ -1,2 +1,3 @@
+.idea/
 node_modules
 npm-debug.log

README.md

@@ -3,18 +3,8 @@
 ## Goal
 In this assignment, you will be implementing SDF operators on various primitives and use a ray marcher to render them. Ray marching is a technique for rendering implicit surfaces where the ray-primitive intersection equation cannot be solved analytically.
 
-**Warning**: this assignment diverges significantly from marching cubes, so switching options midway can be costly for  your time and effort.
-
-## Base code framework
-
-We have provided a preview scene, and a toggle for the ray marcher rendering. When you correctly implement the ray marcher, the image should match the preview scene containing the simple geometry. Your ray marching calculation should be performed in the fragment shader.
-
 ### Ray Marcher (25 pts)
-
-The ray marcher should generate a ray direction, and march through the scene using the distances computed from sphere tracing.
-
-**Note**: Your scene won't be rendered until you have implemented the SDFs for primitives below. 
-
+The ray marcher generates a ray and marchs through the scene using the distances computed from sphere tracing.
 - Generate Rays (15 pts): for each fragment inside the fragment shader, compute a ray direction for the ray marcher
 - Sphere Tracing (10 pts): compute the nearest distance from the scene SDFs and update the ray marching's step size.
 
@@ -28,6 +18,9 @@ These are simple primitives with well-defined SDFs. We encourage trying other SD
   - Cylinder (3pts)
 
 ##### Useful Operators (15pts)
+Implemented operaters, but not actually using them anywhere.
+
+
 To create constructive geometry, and interesting shapes (such as holes, bumps, etc.), implement the following operators to combine your primitive SDFs.
   - Intersection (2pts)
   - Subtraction (3pts)
@@ -47,26 +40,8 @@ Implement a simple Lambert material. Additional materials can earn extra points.
 ##### Animate the scene (5pts)
 Use time as an input to some of your functions to animate your scene!
 
-## Extra credits (Up to 30 pts)
-- Implement SDF for [Mandelbulb](https://www.shadertoy.com/view/XsXXWS) (10pts)
-  - You need to implement naive raymarching (not sphere tracing) to get this to work 
-- Lighting effects 
-  - Soft shadowing using secondary rays (5pts)
-  - Ambient occlusion (10pts)
-- Additional materials besides Lambert. (5pts each)
-- Additional SDFs besides the listed primitive. (5pts each)
-
 ## Resources
 http://graphics.cs.williams.edu/courses/cs371/f14/reading/implicit.pdf
-
-## Submission
-- Update `README.md` to contain a solid description of your project
-- Publish your project to gh-pages. `npm run deploy`. It should now be visible at http://username.github.io/repo-name
-- Create a [pull request](https://help.github.com/articles/creating-a-pull-request/) to this repository, and in the comment, include a link to your published project.
-- Submit the link to your pull request on Canvas.
-
-## Deploy
-- `npm run build`
-- Add and commit all changes
-- `npm run deploy`
-- If you're having problems with assets not linking correctly, make sure you wrap you're filepaths in `require()`. This will make the bundler package and your static assets as well. So, instead of `loadTexture('./images/thing.bmp')`, do `loadTexture(require('./images/thing.bmp'))`.
+https://threejs.org/docs/api/renderers/webgl/WebGLProgram.html
+http://www.iquilezles.org/www/articles/distfunctions/distfunctions.htm
+461 Slides, TY Adam.