↔️ rename Box face options: frontFace, rearFace

desandro · desandro · commit caa88e18bdec · 2019-02-13T15:11:40.000-05:00
diff --git a/demo/boxes/boxes.js b/demo/boxes/boxes.js
@@ -41,12 +41,12 @@ function addBox( options ) {
   var boxOptions = {
     addTo: model,
     stroke: false,
-    top: yellow,
-    back: gold,
-    left: orange,
-    right: orange,
-    front: garnet,
-    bottom: eggplant,
+    topFace: yellow,
+    rearFace: gold,
+    leftFace: orange,
+    rightFace: orange,
+    frontFace: garnet,
+    bottomFace: eggplant,
   };
   Zdog.extend( boxOptions, options );
 
@@ -55,32 +55,32 @@ function addBox( options ) {
 
 // top
 addBox({
-  bottom: false,
+  bottomFace: false,
   translate: { y: -1 },
 });
 // bottom
 addBox({
-  top: false,
+  topFace: false,
   translate: { y: 1 },
 });
 // front
 addBox({
-  back: false,
+  rearFace: false,
   translate: { z: 1 },
 });
 // back
 addBox({
-  front: false,
+  frontFace: false,
   translate: { z: -1 },
 });
 // left
 addBox({
-  right: false,
+  rightFace: false,
   translate: { x: -1 },
 });
 // right
 addBox({
-  left: false,
+  leftFace: false,
   translate: { x: 1 },
 });
 
diff --git a/demo/solids/solids.js b/demo/solids/solids.js
@@ -230,12 +230,12 @@ var cube = new Zdog.Box({
   height: 2,
   depth: 2,
   translate: { x: 4, y: 0 },
-  top: yellow,
-  front: gold,
-  left: orange,
-  right: orange,
-  back: garnet,
-  bottom: eggplant,
+  topFace: yellow,
+  frontFace: gold,
+  leftFace: orange,
+  rightFace: orange,
+  rearFace: garnet,
+  bottomFace: eggplant,
   stroke: false,
 });
 
diff --git a/js/box.js b/js/box.js
@@ -23,12 +23,12 @@ var boxDefaults = utils.extend( {
   width: 1,
   height: 1,
   depth: 1,
-  front: true,
-  back: true,
-  left: true,
-  right: true,
-  top: true,
-  bottom: true,
+  frontFace: true,
+  rearFace: true,
+  leftFace: true,
+  rightFace: true,
+  topFace: true,
+  bottomFace: true,
 }, Shape.defaults );
 // default fill
 boxDefaults.fill = true;
@@ -44,36 +44,36 @@ Box.prototype.create = function( options ) {
 };
 
 Box.prototype.updatePath = function() {
-  this.setFace( 'front', {
+  this.setFace( 'frontFace', {
     width: this.width,
     height: this.height,
     translate: { z: this.depth/2 },
   });
-  this.setFace( 'back', {
+  this.setFace( 'rearFace', {
     width: this.width,
     height: this.height,
     translate: { z: -this.depth/2 },
     rotate: { y: TAU/2 },
   });
-  this.setFace( 'left', {
+  this.setFace( 'leftFace', {
     width: this.depth,
     height: this.height,
     translate: { x: -this.width/2 },
     rotate: { y: -TAU/4 },
   });
-  this.setFace( 'right', {
+  this.setFace( 'rightFace', {
     width: this.depth,
     height: this.height,
     translate: { x: this.width/2 },
     rotate: { y: TAU/4 },
   });
-  this.setFace( 'top', {
+  this.setFace( 'topFace', {
     width: this.width,
     height: this.depth,
     translate: { y: -this.height/2 },
     rotate: { x: -TAU/4 },
   });
-  this.setFace( 'bottom', {
+  this.setFace( 'bottomFace', {
     width: this.width,
     height: this.depth,
     translate: { y: this.height/2 },
@@ -84,11 +84,12 @@ Box.prototype.updatePath = function() {
 
 Box.prototype.setFace = function( faceName, options ) {
   var property = this[ faceName ];
-  var face = this[ faceName + 'Face' ];
+  var rectProperty = faceName + 'Rect';
+  var rect = this[ rectProperty ];
   // remove if false
   if ( !property ) {
-    if ( face ) {
-      this.removeChild( face );
+    if ( rect ) {
+      this.removeChild( rect );
     }
     return;
   }
@@ -102,15 +103,15 @@ Box.prototype.setFace = function( faceName, options ) {
     front: this.front,
     visible: this.visible,
   });
-  if ( face ) {
+  if ( rect ) {
     // update previous
-    face.setOptions( options );
+    rect.setOptions( options );
   } else {
     // create new
-    face = this[ faceName + 'Face' ] = new Rect( options );
+    rect = this[ rectProperty ] = new Rect( options );
   }
-  face.updatePath();
-  this.addChild( face );
+  rect.updatePath();
+  this.addChild( rect );
 };
 
 return Box;
