Permalink
Browse files

Merge branch 'master' of /Volumes/Untitled/domeTransmitter

  • Loading branch information...
2 parents 6b73bac + 5ecc1c4 commit 4683443a41c1ee588a35cebd7a4c69a28847dd25 @potatono potatono committed May 27, 2012
Showing with 17 additions and 6 deletions.
  1. +17 −6 WiiController.pde
  2. BIN data/anim-heart/frame1.png
  3. BIN data/anim-heart/frame10.png
  4. BIN data/anim-heart/frame11.png
  5. BIN data/anim-heart/frame12.png
  6. BIN data/anim-heart/frame13.png
  7. BIN data/anim-heart/frame14.png
  8. BIN data/anim-heart/frame15.png
  9. BIN data/anim-heart/frame16.png
  10. BIN data/anim-heart/frame17.png
  11. BIN data/anim-heart/frame18.png
  12. BIN data/anim-heart/frame19.png
  13. BIN data/anim-heart/frame2.png
  14. BIN data/anim-heart/frame20.png
  15. BIN data/anim-heart/frame21.png
  16. BIN data/anim-heart/frame22.png
  17. BIN data/anim-heart/frame23.png
  18. BIN data/anim-heart/frame24.png
  19. BIN data/anim-heart/frame25.png
  20. BIN data/anim-heart/frame26.png
  21. BIN data/anim-heart/frame27.png
  22. BIN data/anim-heart/frame28.png
  23. BIN data/anim-heart/frame29.png
  24. BIN data/anim-heart/frame3.png
  25. BIN data/anim-heart/frame30.png
  26. BIN data/anim-heart/frame31.png
  27. BIN data/anim-heart/frame32.png
  28. BIN data/anim-heart/frame33.png
  29. BIN data/anim-heart/frame34.png
  30. BIN data/anim-heart/frame35.png
  31. BIN data/anim-heart/frame36.png
  32. BIN data/anim-heart/frame37.png
  33. BIN data/anim-heart/frame38.png
  34. BIN data/anim-heart/frame39.png
  35. BIN data/anim-heart/frame4.png
  36. BIN data/anim-heart/frame40.png
  37. BIN data/anim-heart/frame41.png
  38. BIN data/anim-heart/frame42.png
  39. BIN data/anim-heart/frame43.png
  40. BIN data/anim-heart/frame44.png
  41. BIN data/anim-heart/frame45.png
  42. BIN data/anim-heart/frame46.png
  43. BIN data/anim-heart/frame47.png
  44. BIN data/anim-heart/frame48.png
  45. BIN data/anim-heart/frame49.png
  46. BIN data/anim-heart/frame5.png
  47. BIN data/anim-heart/frame50.png
  48. BIN data/anim-heart/frame51.png
  49. BIN data/anim-heart/frame52.png
  50. BIN data/anim-heart/frame53.png
  51. BIN data/anim-heart/frame54.png
  52. BIN data/anim-heart/frame55.png
  53. BIN data/anim-heart/frame56.png
  54. BIN data/anim-heart/frame57.png
  55. BIN data/anim-heart/frame58.png
  56. BIN data/anim-heart/frame59.png
  57. BIN data/anim-heart/frame6.png
  58. BIN data/anim-heart/frame60.png
  59. BIN data/anim-heart/frame61.png
  60. BIN data/anim-heart/frame62.png
  61. BIN data/anim-heart/frame63.png
  62. BIN data/anim-heart/frame64.png
  63. BIN data/anim-heart/frame65.png
  64. BIN data/anim-heart/frame66.png
  65. BIN data/anim-heart/frame67.png
  66. BIN data/anim-heart/frame68.png
  67. BIN data/anim-heart/frame69.png
  68. BIN data/anim-heart/frame7.png
  69. BIN data/anim-heart/frame70.png
  70. BIN data/anim-heart/frame71.png
  71. BIN data/anim-heart/frame72.png
  72. BIN data/anim-heart/frame73.png
  73. BIN data/anim-heart/frame74.png
  74. BIN data/anim-heart/frame75.png
  75. BIN data/anim-heart/frame76.png
  76. BIN data/anim-heart/frame77.png
  77. BIN data/anim-heart/frame78.png
  78. BIN data/anim-heart/frame79.png
  79. BIN data/anim-heart/frame8.png
  80. BIN data/anim-heart/frame80.png
  81. BIN data/anim-heart/frame81.png
  82. BIN data/anim-heart/frame82.png
  83. BIN data/anim-heart/frame83.png
  84. BIN data/anim-heart/frame84.png
  85. BIN data/anim-heart/frame85.png
  86. BIN data/anim-heart/frame86.png
  87. BIN data/anim-heart/frame87.png
  88. BIN data/anim-heart/frame88.png
  89. BIN data/anim-heart/frame89.png
  90. BIN data/anim-heart/frame9.png
  91. BIN data/anim-heart/frame90.png
  92. BIN data/anim-heart/frame91.png
  93. BIN data/anim-heart/frame92.png
  94. BIN data/anim-heart/frame93.png
  95. BIN data/anim-heart/frame94.png
  96. BIN data/anim-heart/frame95.png
  97. BIN data/anim-heart/frame96.png
  98. BIN data/anim-heart/frame97.png
  99. BIN data/anim-heart/frame98.png
  100. BIN data/anim-heart/frame99.png
View
@@ -101,14 +101,25 @@ class WiiController {
osc.plug(this,"wiiosc_buttonHome", "/wii/keys/home");// i
osc.plug(this,"wiiosc_buttonOne", "/wii/keys/one");// i
osc.plug(this,"wiiosc_buttonTwo", "/wii/keys/two");// i
-// osc.plug(this,"wiiosc_accX", "/wii/acc/x");// i
-// osc.plug(this,"wiiosc_accY", "/wii/acc/y");// i
-// osc.plug(this,"wiiosc_accZ", "/wii/acc/z");// i
+ osc.plug(this,"wiiosc_accX", "/wii/acc/x");// i
+ osc.plug(this,"wiiosc_accY", "/wii/acc/y");// i
+ osc.plug(this,"wiiosc_accZ", "/wii/acc/z");// i
}
- void accX(int id, float value) { acc.x = value;}
- void accY(int id, float value) { acc.y = value;}
- void accZ(int id, float value) { acc.z = value;}
+ void wiiosc_accX(int id, float value) {
+ acc.x = 10*value-5;
+ }
+
+ void wiiosc_accY(int id, float value) {
+ acc.z = 10*value-5;
+ }
+
+ void wiiosc_accZ(int id, float value) {
+ acc.z = 10*value-5;
+
+ pitch = (float) Math.atan2(acc.y, acc.z)*(180/3.14);
+ roll = (float) Math.atan2(acc.x, acc.z)*(180/3.14);
+ }
void connected(int theValue) {
isConnected = (theValue==0) ? false:true;
View
0 data/anim-heart/frame1.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame10.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame11.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame12.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame13.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame14.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame15.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame16.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame17.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame18.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame19.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame2.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame20.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame21.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame22.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame23.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame24.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame25.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame26.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame27.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame28.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame29.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame3.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame30.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame31.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 data/anim-heart/frame32.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame33.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame34.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame35.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame36.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame37.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame38.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame39.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame4.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame40.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame41.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame42.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame43.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame44.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame45.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame46.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame47.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame48.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame49.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame5.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame50.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame51.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame52.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame53.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame54.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame55.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame56.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame57.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame58.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame59.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame6.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame60.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame61.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame62.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame63.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame64.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame65.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame66.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame67.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame68.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame69.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame7.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame70.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame71.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame72.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame73.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame74.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame75.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame76.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame77.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame78.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame79.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame8.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame80.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame81.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame82.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame83.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame84.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame85.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame86.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame87.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame88.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame89.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame9.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame90.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame91.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame92.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame93.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame94.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame95.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame96.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame97.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame98.png 100755 → 100644
Diff not rendered.
View
0 data/anim-heart/frame99.png 100755 → 100644
Diff not rendered.

0 comments on commit 4683443

Please sign in to comment.