Skip to content

Commit

Permalink
Flip the layer order on 8x8x8 cubes, and fix the web UI for them
Browse files Browse the repository at this point in the history
  • Loading branch information
abryant committed Jun 5, 2018
1 parent d766fe9 commit 0720399
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
12 changes: 8 additions & 4 deletions server/static/cube-api.js
Expand Up @@ -99,15 +99,15 @@ function listenToCube() {
}
function makeCube() {
var SPACING = 4;
var SIZE = 4;
var SIZE = 8;
var offset = SPACING * (SIZE - 1) / 2.0;
var cube = new THREE.Group();
leds = [];
for (var i = 0; i < 4; i++) {
for (var i = 0; i < SIZE; i++) {
var layer = [];
for (var j = 0; j < 4; j++) {
for (var j = 0; j < SIZE; j++) {
var line = [];
for (var k = 0; k < 4; k++) {
for (var k = 0; k < SIZE; k++) {
var geometry = new THREE.BoxGeometry(1, 1, 1);
var material = new THREE.MeshBasicMaterial({color: 0x00ff00});
line.push(material);
Expand All @@ -125,6 +125,10 @@ function makeCube() {
}
leds = leds.concat(layer);
}
// The layers are reversed for 8x8x8 cubes.
if (SIZE == 8) {
leds.reverse();
}
return cube;
}
var renderScene;
Expand Down
6 changes: 5 additions & 1 deletion visuals/cube.py
Expand Up @@ -87,7 +87,9 @@ def get_colours(self):
9 10 11 12
8 7 6 5
1 2 3 4
The second layer reverses this ordering
The second layer reverses this ordering.
For 8x8x8 cubes, the layer ordering is reversed.
"""
result = []
for layer_index, layer in enumerate(self.grid):
Expand All @@ -100,6 +102,8 @@ def get_colours(self):
if (layer_index % 2) == 0:
layer_result.reverse()
result += layer_result
if self.size == 8:
result.reverse()
return result

def set(self, pos, colour):
Expand Down

0 comments on commit 0720399

Please sign in to comment.