From 6f037807505b82d2ecb15a8b2b5047a758660500 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 8 Jun 2015 17:57:23 -0700
Subject: [PATCH] organization
---
.../parts/{edgeVoxPart.stl => OctaEdgeVoxPart.stl} | Bin
...oxPartLowPoly.stl => OctaEdgeVoxPartLowPoly.stl} | Bin
.../{trianglePart.stl => OctaFaceTrianglePart.stl} | Bin
js/main.js | 7 +++----
4 files changed, 3 insertions(+), 4 deletions(-)
rename assets/stls/parts/{edgeVoxPart.stl => OctaEdgeVoxPart.stl} (100%)
rename assets/stls/parts/{edgeVoxPartLowPoly.stl => OctaEdgeVoxPartLowPoly.stl} (100%)
rename assets/stls/parts/{trianglePart.stl => OctaFaceTrianglePart.stl} (100%)
diff --git a/assets/stls/parts/edgeVoxPart.stl b/assets/stls/parts/OctaEdgeVoxPart.stl
similarity index 100%
rename from assets/stls/parts/edgeVoxPart.stl
rename to assets/stls/parts/OctaEdgeVoxPart.stl
diff --git a/assets/stls/parts/edgeVoxPartLowPoly.stl b/assets/stls/parts/OctaEdgeVoxPartLowPoly.stl
similarity index 100%
rename from assets/stls/parts/edgeVoxPartLowPoly.stl
rename to assets/stls/parts/OctaEdgeVoxPartLowPoly.stl
diff --git a/assets/stls/parts/trianglePart.stl b/assets/stls/parts/OctaFaceTrianglePart.stl
similarity index 100%
rename from assets/stls/parts/trianglePart.stl
rename to assets/stls/parts/OctaFaceTrianglePart.stl
diff --git a/js/main.js b/js/main.js
index 353360c4..05d40afc 100644
--- a/js/main.js
+++ b/js/main.js
@@ -98,10 +98,9 @@ require.config({
sendMenu: 'menus/SendMenuView',
//stls
- bin: 'bin',
- octaFaceTrianglePartSTL: '../assets/stls/parts/trianglePart.stl',
- octaEdgeVoxPartSTL: '../assets/stls/parts/edgeVoxPart.stl',
- octaEdgeVoxPartLowPolySTL: '../assets/stls/parts/edgeVoxPartLowPoly.stl'
+ octaFaceTrianglePartSTL: '../assets/stls/parts/OctaFaceTrianglePart.stl',
+ octaEdgeVoxPartSTL: '../assets/stls/parts/OctaEdgeVoxPart.stl',
+ octaEdgeVoxPartLowPolySTL: '../assets/stls/parts/OctaEdgeVoxPartLowPoly.stl'
},
--
GitLab