repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen
[SugarCubes.git]
/
_Mappings.pde
diff --git
a/_Mappings.pde
b/_Mappings.pde
index 6b9b98c76ecc29670df3537bb2b32fff54dcf3c7..12449cd66e325628cce1f65abcc048a55d961053 100644
(file)
--- a/
_Mappings.pde
+++ b/
_Mappings.pde
@@
-222,7
+222,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);
}
@@
-434,4
+434,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
+}