repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new HeronLX packaging for LXParameter stuff
[SugarCubes.git]
/
_Mappings.pde
diff --git
a/_Mappings.pde
b/_Mappings.pde
index 3331827526e83bd9a13b8beb256fc068905354ff..314a88d19786f6425694037adde50f44cd26be36 100644
(file)
--- a/
_Mappings.pde
+++ b/
_Mappings.pde
@@
-149,22
+149,22
@@
scubes.add(new StaggeredTower(//tower 10
83.75+39+43-124.5, // x
0, // y
-47.5-43, // z
83.75+39+43-124.5, // x
0, // y
-47.5-43, // z
- 0, 4, new Cube.Wiring[]{ WRR, WFL, W
RR, WFL
}) );
+ 0, 4, new Cube.Wiring[]{ WRR, WFL, W
FL, WRR
}) );
scubes.add(new StaggeredTower(//tower 11
83.75, // x
0, // y
-47.5, // z
scubes.add(new StaggeredTower(//tower 11
83.75, // x
0, // y
-47.5, // z
- 0, 4, new Cube.Wiring[]{ WFL, WRR, W
FL, WRR
}) );
+ 0, 4, new Cube.Wiring[]{ WFL, WRR, W
RR, WFL
}) );
scubes.add(new StaggeredTower(//tower 12
83.75+39, // x
0, // y
-47.5, // z
scubes.add(new StaggeredTower(//tower 12
83.75+39, // x
0, // y
-47.5, // z
- 0, 4, new Cube.Wiring[]{ WRR, WFL, W
RR, WFL
}) );
+ 0, 4, new Cube.Wiring[]{ WRR, WFL, W
FL, WRR
}) );
scubes.add(new StaggeredTower(//tower 13
83.75+39+43, // x
0, // y
-47.5-43, // z
scubes.add(new StaggeredTower(//tower 13
83.75+39+43, // x
0, // y
-47.5-43, // z
- 0, 4, new Cube.Wiring[]{ W
RR, WFL, WRR, WFL
}) );
+ 0, 4, new Cube.Wiring[]{ W
FL, WRR, WFL, WRR
}) );
// scubes.add(new StaggeredTower(// Single cube on top of tower 4
// 42, // x
// scubes.add(new StaggeredTower(// Single cube on top of tower 4
// 42, // x
@@
-210,7
+210,7
@@
for (StaggeredTower st : scubes) {
tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, w));
}
towerList.add(new Tower(tower));
tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, w));
}
towerList.add(new Tower(tower));
- }
+ }
return new Model(towerList, cubes, bassBox, speakers);
}
return new Model(towerList, cubes, bassBox, speakers);
}
@@
-422,4
+422,4
@@
class ChannelMapping {
objectIndices[i] = (i < rawObjectIndices.length) ? rawObjectIndices[i] : NO_OBJECT;
}
}
objectIndices[i] = (i < rawObjectIndices.length) ? rawObjectIndices[i] : NO_OBJECT;
}
}
-}
\ No newline at end of file
+}