Leaning Tower of Pisa- An Duong

INSTRUCTIONS.md

@@ -0,0 +1,85 @@
+# CIS 566 Homework 2: Implicit Surfaces
+
+## Objective
+- Gain experience with signed distance functions
+- Experiment with animation curves
+
+## Base Code
+
+Please feel free to use this code as a base (https://www.shadertoy.com/view/fsdXzM)
+
+The code we have provided for this assignment features the following:
+- A square that spans the range [-1, 1] in X and Y that is rendered with a
+shader that does not apply a projection matrix to it, thus rendering it as the
+entirety of your screen
+- TypeScript code just like the code in homework 1 to set up a WebGL framework
+- Code that passes certain camera attributes (listed in the next section),
+the screen dimensions, and a time counter to the shader program.
+
+## Assignment Requirements
+- __(10 points)__ Modify the provided `flat-frag.glsl` to cast rays from a
+virtual camera. We have set up uniform variables in your shader that take in
+the eye position, reference point position, and up vector of the `Camera` in
+the provided TypeScript code, along with a uniform that stores the screen width
+and height. Using these uniform variables, and only these uniform variables,
+you must write a function that uses the NDC coordinates of the current fragment
+(i.e. its fs_Pos value) and projects a ray from that pixel. Refer to the [slides
+on ray casting](https://docs.google.com/presentation/d/e/2PACX-1vSN5ntJISgdOXOSNyoHimSVKblnPnL-Nywd6aRPI-XPucX9CeqzIEGTjFTwvmjYUgCglTqgvyP1CpxZ/pub?start=false&loop=false&delayms=60000&slide=id.g27215b64c6_0_107)
+from CIS 560 for reference on how to cast a ray without an explicit
+view-projection matrix. You'll have to compute your camera's Right vector based
+on the provided Up vector, Eye point, and Ref point. You can test your ray
+casting function by converting your ray directions to colors using the formula
+`color = 0.5 * (dir + vec3(1.0, 1.0, 1.0))`. If your screen looks like the
+following image, your rays are being cast correctly:
+![](rayDir.png)
+- __(70 points)__ Create a scene using raymarched signed distance functions.
+The subject of your scene should be based on some reference image, such as a
+shot from a movie or a piece of artwork. Your scene should incorporate the
+following elements:
+  - The SDF combination operation Smooth Blend.
+  - Basic Lambertian reflection using a hard-coded light source and SDF surface normals.
+  - Animation of at least one element of the scene, with at least two Toolbox Functions
+  used to control the animation(s).
+  - Hard-edged shadows cast by shapes in the scene onto one another using a shadow-feeler ray.
+
+For the next assignment you will build upon this scene with procedural textures and more
+advanced lighting and reflection models, so don't worry if your scene looks a bit drab
+given the requirements listed above.
+
+- __(10 points)__ Following the specifications listed
+[here](https://github.com/pjcozzi/Articles/blob/master/CIS565/GitHubRepo/README.md),
+create your own README.md, renaming this file to INSTRUCTIONS.md. Don't worry
+about discussing runtime optimization for this project. Make sure your
+README contains the following information:
+  - Your name and PennKey
+  - Citation of any external resources you found helpful when implementing this
+  assignment.
+  - A link to your live github.io demo (refer to the pinned Piazza post on
+    how to make a live demo through github.io)
+  - An explanation of the techniques you used to model and animate your scene.
+
+## Useful Links
+- [IQ's Article on SDFs](http://www.iquilezles.org/www/articles/distfunctions/distfunctions.htm)
+- [IQ's Article on Smooth Blending](http://www.iquilezles.org/www/articles/smin/smin.htm)
+- [IQ's Article on Useful Functions](http://www.iquilezles.org/www/articles/functions/functions.htm)
+- [Breakdown of Rendering an SDF Scene](http://www.iquilezles.org/www/material/nvscene2008/rwwtt.pdf)
+
+
+## Submission
+Commit and push to Github, then submit a link to your commit on Canvas. Remember
+to make your own README!
+
+## Inspiration
+- [Alien Corridor](https://www.shadertoy.com/view/4slyRs)
+- [The Evolution of Motion](https://www.shadertoy.com/view/XlfGzH)
+- [Fractal Land](https://www.shadertoy.com/view/XsBXWt)
+- [Voxel Edges](https://www.shadertoy.com/view/4dfGzs)
+- [Snail](https://www.shadertoy.com/view/ld3Gz2)
+- [Cubescape](https://www.shadertoy.com/view/Msl3Rr)
+- [Journey Tribute](https://www.shadertoy.com/view/ldlcRf)
+- [Stormy Landscape](https://www.shadertoy.com/view/4ts3z2)
+<<<<<<< HEAD
+- [Generators](https://www.shadertoy.com/view/Xtf3Rn)
+=======
+- [Generators](https://www.shadertoy.com/view/Xtf3Rn)
+>>>>>>> d6d1f4369c6f85aa7c0591fc6ca457dd133f45f7

README.md

@@ -1,81 +1,22 @@
-# CIS 566 Homework 2: Implicit Surfaces
+# Leaning Tower of Pisa - SDF Recreation
 
-## Objective
-- Gain experience with signed distance functions
-- Experiment with animation curves
+By An Duong
 
-## Base Code
+Pennkey: onlyname
 
-Please feel free to use this code as a base (https://www.shadertoy.com/view/fsdXzM)
+## Overview
+* **Leaning Tower of Pisa Recreation**
+<img src="Pisa1.png" width="800"/>
 
-The code we have provided for this assignment features the following:
-- A square that spans the range [-1, 1] in X and Y that is rendered with a
-shader that does not apply a projection matrix to it, thus rendering it as the
-entirety of your screen
-- TypeScript code just like the code in homework 1 to set up a WebGL framework
-- Code that passes certain camera attributes (listed in the next section),
-the screen dimensions, and a time counter to the shader program.
+* **Inspiration**
+<img src="pisa-leaning-tower1.jpg" width="800"/>
 
-## Assignment Requirements
-- __(10 points)__ Modify the provided `flat-frag.glsl` to cast rays from a
-virtual camera. We have set up uniform variables in your shader that take in
-the eye position, reference point position, and up vector of the `Camera` in
-the provided TypeScript code, along with a uniform that stores the screen width
-and height. Using these uniform variables, and only these uniform variables,
-you must write a function that uses the NDC coordinates of the current fragment
-(i.e. its fs_Pos value) and projects a ray from that pixel. Refer to the [slides
-on ray casting](https://docs.google.com/presentation/d/e/2PACX-1vSN5ntJISgdOXOSNyoHimSVKblnPnL-Nywd6aRPI-XPucX9CeqzIEGTjFTwvmjYUgCglTqgvyP1CpxZ/pub?start=false&loop=false&delayms=60000&slide=id.g27215b64c6_0_107)
-from CIS 560 for reference on how to cast a ray without an explicit
-view-projection matrix. You'll have to compute your camera's Right vector based
-on the provided Up vector, Eye point, and Ref point. You can test your ray
-casting function by converting your ray directions to colors using the formula
-`color = 0.5 * (dir + vec3(1.0, 1.0, 1.0))`. If your screen looks like the
-following image, your rays are being cast correctly:
-![](rayDir.png)
-- __(70 points)__ Create a scene using raymarched signed distance functions.
-The subject of your scene should be based on some reference image, such as a
-shot from a movie or a piece of artwork. Your scene should incorporate the
-following elements:
-  - The SDF combination operation Smooth Blend.
-  - Basic Lambertian reflection using a hard-coded light source and SDF surface normals.
-  - Animation of at least one element of the scene, with at least two Toolbox Functions
-  used to control the animation(s).
-  - Hard-edged shadows cast by shapes in the scene onto one another using a shadow-feeler ray.
+[Live Demo](https://onlyname1.github.io/hw02-raymarching-sdfs/)
 
-For the next assignment you will build upon this scene with procedural textures and more
-advanced lighting and reflection models, so don't worry if your scene looks a bit drab
-given the requirements listed above.
+## Implementation
+The Tower of Pisa was recreated using a fragment shader that rendered the scene through raymarched signed distance functions. The scene also includes basic Lambertian reflection, hard shadows implemented via raymarched shadow feeler rays, as well as basic materials. The tower is made up of the smooth blend and union of SDF cylinders. The floors of the tower were created using the repetition of a singular floor through the SDF limited modullo function. The tower leans over time via a sine function. The crowds of people were also created by repeating an SDF cylinder over an area. The crowds jump up and down by offsetting their position with a triangle wave function dependent on time and a specific person's position.
 
-- __(10 points)__ Following the specifications listed
-[here](https://github.com/pjcozzi/Articles/blob/master/CIS565/GitHubRepo/README.md),
-create your own README.md, renaming this file to INSTRUCTIONS.md. Don't worry
-about discussing runtime optimization for this project. Make sure your
-README contains the following information:
-  - Your name and PennKey
-  - Citation of any external resources you found helpful when implementing this
-  assignment.
-  - A link to your live github.io demo (refer to the pinned Piazza post on
-    how to make a live demo through github.io)
-  - An explanation of the techniques you used to model and animate your scene.
+## Citations
+[Useful SDF Transformations](http://jamie-wong.com/2016/07/15/ray-marching-signed-distance-functions/#rotation-and-translation)
 
-## Useful Links
-- [IQ's Article on SDFs](http://www.iquilezles.org/www/articles/distfunctions/distfunctions.htm)
-- [IQ's Article on Smooth Blending](http://www.iquilezles.org/www/articles/smin/smin.htm)
-- [IQ's Article on Useful Functions](http://www.iquilezles.org/www/articles/functions/functions.htm)
-- [Breakdown of Rendering an SDF Scene](http://www.iquilezles.org/www/material/nvscene2008/rwwtt.pdf)
-
-
-## Submission
-Commit and push to Github, then submit a link to your commit on Canvas. Remember
-to make your own README!
-
-## Inspiration
-- [Alien Corridor](https://www.shadertoy.com/view/4slyRs)
-- [The Evolution of Motion](https://www.shadertoy.com/view/XlfGzH)
-- [Fractal Land](https://www.shadertoy.com/view/XsBXWt)
-- [Voxel Edges](https://www.shadertoy.com/view/4dfGzs)
-- [Snail](https://www.shadertoy.com/view/ld3Gz2)
-- [Cubescape](https://www.shadertoy.com/view/Msl3Rr)
-- [Journey Tribute](https://www.shadertoy.com/view/ldlcRf)
-- [Stormy Landscape](https://www.shadertoy.com/view/4ts3z2)
-- [Generators](https://www.shadertoy.com/view/Xtf3Rn)
+[SDF Functions](https://www.iquilezles.org/www/articles/distfunctions/distfunctions.htm)

src/main.ts

@@ -1,6 +1,4 @@
 import {vec2, vec3} from 'gl-matrix';
-// import * as Stats from 'stats-js';
-// import * as DAT from 'dat-gui';
 import Square from './geometry/Square';
 import OpenGLRenderer from './rendering/gl/OpenGLRenderer';
 import Camera from './Camera';