Skip to content

Commit

Permalink
included .obj files
Browse files Browse the repository at this point in the history
  • Loading branch information
jefdongus committed Mar 21, 2015
1 parent 36fee34 commit f1860b2
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 8 deletions.
7 changes: 7 additions & 0 deletions as2/background.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
v 1000 1000 -100
v -1000 1000 -100
v -1000 -1000 -100
v 1000 -1000 -100

f 1 2 3
f 3 4 1
12 changes: 12 additions & 0 deletions as2/fivetriangles.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
v 0 0 -4
v 0 1 -5
v -0.951 0.309 -5
v -0.588 -0.809 -5
v 0.588 -0.809 -5
v 0.951 0.309 -5

f 1 2 3
f 1 3 4
f 1 4 5
f 1 5 6
f 1 6 2
16 changes: 8 additions & 8 deletions as2/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ <h2>Polygons</h2>
ltp 1 1 0 1 1 1 0

mat .2 .2 .15 0.7 0.7 0.65 0.5 0.5 0.45 20 0 0 0
obj "images/obj/fivetriangles.obj"
obj "<a href="fivetriangles.obj">images/obj/fivetriangles.obj</a>"

mat 0 .2 .2 0 0 0 0 0 0 0 0 0 0
obj "images/obj/background.obj"</pre>
obj "<a href="background.obj">images/obj/background.obj</a>"</pre>
</div>
<a href="04.png"><img class="img" src="04.png" /></a>

Expand All @@ -125,10 +125,10 @@ <h2>Polygons with Phong Shading</h2>
ltp 1 1 0 1 1 1 0

mat .2 .2 .15 0.7 0.7 0.65 0.5 0.5 0.45 20 0 0 0
obj "images/obj/sixtriangles.obj"
obj "<a href="sixtriangles.obj">images/obj/sixtriangles.obj</a>"

mat .05 .2 .4 0 0 0 0 0 0 0 0 0 0
obj "images/obj/background.obj"</pre>
obj "<a href="background.obj">images/obj/background.obj</a>"</pre>
</div>
<a href="05.png"><img class="img" src="05.png" /></a>

Expand All @@ -152,7 +152,7 @@ <h2>Shadows</h2>
sph 0.2 0.2 -3 0.325

mat .15 0.05 0.05 0 0 0 0 0 0 0 0 0 0
obj "images/obj/background.obj"</pre>
obj "<a href="background.obj">images/obj/background.obj</a>"</pre>
</div>
<a href="06.png"><img class="img" src="06.png" /></a>

Expand Down Expand Up @@ -226,7 +226,7 @@ <h2>Point Lights</h2>
sph 0 -0.65 -2.5 0.5

mat 0.3 0.3 0.1 0 0 0 0 0 0 0 0 0 0
obj "images/obj/background.obj"</pre>
obj "<a href="background.obj">images/obj/background.obj</a>"</pre>
</div>
<a href="09.png"><img class="img" src="09.png" /></a>

Expand All @@ -248,7 +248,7 @@ <h2>Directional Lights</h2>
sph 0 -0.65 -4 0.5

mat 0.2 0.2 0.05 0 0 0 0 0 0 0 0 0 0
obj "images/obj/background.obj"</pre>
obj "<a href="background.obj">images/obj/background.obj</a>"</pre>
</div>
<a href="10.png"><img class="img" src="10.png" /></a>

Expand All @@ -272,7 +272,7 @@ <h2>Point Lights with Falloff</h2>
sph 0 -0.65 -2.5 0.5

mat 0.3 0.3 0.1 0 0 0 0 0 0 0 0 0 0
obj "images/obj/background.obj"</pre>
obj "<a href="background.obj">images/obj/background.obj</a>"</pre>
</div>
<a href="11.png"><img class="img" src="11.png" /></a>

Expand Down
22 changes: 22 additions & 0 deletions as2/sixtriangles.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
v 0 0 -4
v 0 1 -5
v -0.866 0.5 -5
v -0.866 -0.5 -5
v 0 -1 -5
v 0.866 -0.5 -5
v 0.866 0.5 -5

vn 0 0 1
vn 0 1 0.5
vn -0.866 0.5 0.5
vn -0.866 -0.5 0.5
vn 0 -1 0.5
vn 0.866 -0.5 0.5
vn 0.866 0.5 0.5

f 1//1 2//2 3//3
f 1//1 3//3 4//4
f 1//1 4//4 5//5
f 1//1 5//5 6//6
f 1//1 6//6 7//7
f 1//1 7//7 2//2
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ <h1>Jeffrey Dong</h1>
<h2>Assignments</h2>
<a href="as0">Assignment 0: Simple Program</a><br />
<a href="as1">Assignment 1: Shading</a>
<a href="as2">Assignment 2: Raytracer</a>

</div>
</body>
Expand Down

0 comments on commit f1860b2

Please sign in to comment.