#fuckjs

travisby · Oct 30, 2013 · 3f169e4 · 3f169e4
1 parent 41420b6
commit 3f169e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/index.html b/index.html
@@ -58,6 +58,7 @@
             gl_FragColor = lightColor;
         }
     </script>
+    <script type="text/javascript" src="js/Color.js"></script>
     <script type="text/javascript" src="webgl-utils/shapes/Shape.js"></script>
     <script type="text/javascript" src="webgl-utils/Light.js"></script>
     <script type="text/javascript" src="webgl-utils/Material.js"></script>
@@ -74,7 +75,7 @@
     <script type="text/javascript" src="webgl-utils/shapes/CubeColors.js"></script>
     <script type="text/javascript" src="js/Face.js"></script>
     <script type="text/javascript" src="js/Cubie.js"></script>
-    <script type="text/javascript" src="js/Color.js"></script>
+
     <script type="text/javascript" src="js/utils.js"></script>
 
     <script type="text/javascript" src="webgl-utils/Scene.js"></script>

diff --git a/webgl-utils/shapes/CubeColors.js b/webgl-utils/shapes/CubeColors.js
@@ -5,13 +5,15 @@ const CUBE_RIGHT    = 3;
 const CUBE_BACK     = 4;
 const CUBE_BOTTOM   = 5;
 
-var CubeColors = function() {
-    this.colors = [];
-    this.reset();
+function CubeColors() {
 }
 
 CubeColors.prototype.FACE_CONSTANTS = [CUBE_FRONT, CUBE_LEFT, CUBE_TOP, CUBE_RIGHT, CUBE_BACK, CUBE_BOTTOM];
 
+CubeColors.prototype.set = function(face, color) {
+    this.colors[face] = color;
+}
+CubeColors.prototype.colors = [NOCOLOR, NOCOLOR, NOCOLOR, NOCOLOR, NOCOLOR, NOCOLOR];
 CubeColors.prototype.getColors = function() {
     var myColors = [];
     for (var i = 0; i < this.FACE_CONSTANTS.length; i++) {
@@ -20,9 +22,6 @@ CubeColors.prototype.getColors = function() {
     return myColors;
 }
 
-CubeColors.prototype.set = function(face, color) {
-    this.colors[face] = color;
-}
 
 CubeColors.prototype.reset = function() {
     this.colors = [];