Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
OrigamiSimulator
Commits
cc71ef5b
Commit
cc71ef5b
authored
Mar 27, 2017
by
amandaghassaei
Browse files
moving stuff around
parent
d7e8fa08
Changes
6
Hide whitespace changes
Inline
Side-by-side
index.html
View file @
cc71ef5b
...
...
@@ -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>
...
...
js/GLBoilerplate.js
→
js/
dynamic/
GLBoilerplate.js
View file @
cc71ef5b
File moved
js/GPUMath.js
→
js/
dynamic/
GPUMath.js
View file @
cc71ef5b
File moved
js/dynamicModel.js
→
js/
dynamic/
dynamicModel.js
View file @
cc71ef5b
File moved
js/main.js
View file @
cc71ef5b
...
...
@@ -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);
...
...
js/node.js
View file @
cc71ef5b
...
...
@@ -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
();
});
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment