From cc71ef5bca3098985643f311eab78cfa6600275d Mon Sep 17 00:00:00 2001 From: amandaghassaei <amandaghassaei@gmail.com> Date: Mon, 27 Mar 2017 22:49:32 -0400 Subject: [PATCH] moving stuff around --- index.html | 6 +++--- js/{ => dynamic}/GLBoilerplate.js | 0 js/{ => dynamic}/GPUMath.js | 0 js/{ => dynamic}/dynamicModel.js | 0 js/main.js | 3 ++- js/node.js | 3 +++ 6 files changed, 8 insertions(+), 4 deletions(-) rename js/{ => dynamic}/GLBoilerplate.js (100%) rename js/{ => dynamic}/GPUMath.js (100%) rename js/{ => dynamic}/dynamicModel.js (100%) diff --git a/index.html b/index.html index a434c63..4423152 100644 --- a/index.html +++ b/index.html @@ -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> diff --git a/js/GLBoilerplate.js b/js/dynamic/GLBoilerplate.js similarity index 100% rename from js/GLBoilerplate.js rename to js/dynamic/GLBoilerplate.js diff --git a/js/GPUMath.js b/js/dynamic/GPUMath.js similarity index 100% rename from js/GPUMath.js rename to js/dynamic/GPUMath.js diff --git a/js/dynamicModel.js b/js/dynamic/dynamicModel.js similarity index 100% rename from js/dynamicModel.js rename to js/dynamic/dynamicModel.js diff --git a/js/main.js b/js/main.js index 867d4cc..3e3d265 100644 --- a/js/main.js +++ b/js/main.js @@ -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); diff --git a/js/node.js b/js/node.js index 0a4d01e..c98eece 100644 --- a/js/node.js +++ b/js/node.js @@ -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(); + }); }; -- GitLab