Commit d7be6289 authored by amandaghassaei's avatar amandaghassaei

eod

parent 39c7c884
...@@ -633,7 +633,7 @@ ...@@ -633,7 +633,7 @@
<br/> <br/>
Built by <a href="http://www.amandaghassaei.com/" target="_blank">Amanda Ghassaei</a> as a final project for <a href="http://courses.csail.mit.edu/6.849/spring17/" target="_blank">Geometric Folding Algorithms</a>. Built by <a href="http://www.amandaghassaei.com/" target="_blank">Amanda Ghassaei</a> as a final project for <a href="http://courses.csail.mit.edu/6.849/spring17/" target="_blank">Geometric Folding Algorithms</a>.
Code available on <a href="https://github.com/amandaghassaei/OrigamiSimulator" target="_blank">Github</a>. If you have interesting crease patterns that would Code available on <a href="https://github.com/amandaghassaei/OrigamiSimulator" target="_blank">Github</a>. If you have interesting crease patterns that would
make good demo files, please send them to me (Amanda) so I can add them to the <b>File>Demos</b> menu. My email address is on my website. Thanks! make good demo files, please send them to me (Amanda) so I can add them to the <b>Examples</b> menu. My email address is on my website. Thanks!
</p> </p>
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
......
...@@ -96,7 +96,7 @@ function init3DUI(globals) { ...@@ -96,7 +96,7 @@ function init3DUI(globals) {
function checkForIntersections(e, objects){ function checkForIntersections(e, objects){
var _highlightedObj = null; var _highlightedObj = null;
var intersections = raycaster.intersectObject(objects, true); var intersections = raycaster.intersectObjects(objects, false);
if (intersections.length>0){ if (intersections.length>0){
var face = intersections[0].face; var face = intersections[0].face;
var position = intersections[0].point; var position = intersections[0].point;
......
...@@ -87,7 +87,7 @@ function initModel(globals){ ...@@ -87,7 +87,7 @@ function initModel(globals){
} }
function getMesh(){ function getMesh(){
return object3D; return [object3D, object3D2];
} }
function getVertices(){ function getVertices(){
return vertices; return vertices;
...@@ -173,6 +173,8 @@ function initModel(globals){ ...@@ -173,6 +173,8 @@ function initModel(globals){
geometry.attributes.position.needsUpdate = true; geometry.attributes.position.needsUpdate = true;
if (globals.colorMode == "axialStrain") geometry.attributes.color.needsUpdate = true; if (globals.colorMode == "axialStrain") geometry.attributes.color.needsUpdate = true;
geometry.computeVertexNormals(); geometry.computeVertexNormals();
// geometry.computeBoundingBox();
// geometry.computeBoundingSphere();
} }
var inited = false; var inited = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment