Commit cc71ef5b authored by amandaghassaei's avatar amandaghassaei
Browse files

moving stuff around

parent d7e8fa08
......@@ -274,8 +274,8 @@
<script type="text/javascript" src="dependencies/path-data-polyfill.js"></script>
<script type="text/javascript" src="dependencies/earcut.js"></script>
<script type="text/javascript" src="js/GLBoilerplate.js"></script>
<script type="text/javascript" src="js/GPUMath.js"></script>
<script type="text/javascript" src="js/dynamic/GLBoilerplate.js"></script>
<script type="text/javascript" src="js/dynamic/GPUMath.js"></script>
<script type="text/javascript" src="js/controls.js"></script>
<script type="text/javascript" src="js/threeView.js"></script>
<script type="text/javascript" src="js/globals.js"></script>
......@@ -283,7 +283,7 @@
<script type="text/javascript" src="js/beam.js"></script>
<script type="text/javascript" src="js/crease.js"></script>
<script type="text/javascript" src="js/model.js"></script>
<script type="text/javascript" src="js/dynamicModel.js"></script>
<script type="text/javascript" src="js/dynamic/dynamicModel.js"></script>
<script type="text/javascript" src="js/pattern.js"></script>
<script type="text/javascript" src="js/main.js"></script>
......
......@@ -67,6 +67,7 @@ $(function() {
intersection.sub(globals.threeView.getModelOffset());
highlightedObj.moveManually(intersection);
globals.nodePositionHasChanged = true;
globals.threeView.render();
}
}
......@@ -118,7 +119,7 @@ $(function() {
globals = initGlobals();
globals.model = initModel(globals);
globals.dynamicModel = initDynamicModel(globals);
// globals.dynamicModel = initDynamicModel(globals);
globals.pattern = initPattern(globals);
globals.threeView.render();
// globals.threeView.sceneAdd(raycasterPlane);
......
......@@ -49,6 +49,9 @@ Node.prototype.isFixed = function(){
Node.prototype.moveManually = function(position){
this.object3D.position.set(position.x, position.y, position.z);
_.each(this.beams, function(beam){
beam.render();
});
};
......
Supports Markdown
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