Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/xythobuz/LED-Cube

Conflicts:
	CubeControl/Led3D.java
  • Loading branch information...
commit 03694c39f94a29c0e6012dc85c9bcb91951fb993 2 parents 10eaadf + 39ff793
unknown authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 CubeControl/Led3D.java
View
9 CubeControl/Led3D.java 100755 → 100644
@@ -145,9 +145,9 @@ public Led3D(Canvas3D canv, Frame f) {
}
}
// 8 times, use x as y
- drawLedFeetHorizontal(-3.5, (double) x-4, 3.5, 7.0f, 0.02f, 90);
- drawLedFeetHorizontal(2.5, (double) x-4, 3.5, 7.0f, 0.02f, 90);
- drawLedFeetHorizontal(-1.5, (double) x-4, 3.5, 7.0f, 0.02f, 90);
+ for(int i = 0; i > -8; i--){
+ drawLedFeetHorizontal(i+3, (double) x-4, -0.5, 7.0f, 0.02f, 90);
+ }
}
// Add an ambient light
@@ -188,6 +188,7 @@ public void mouseClicked(MouseEvent e) {
// Clicked led found!
System.out.println("Clicked LED found: " + x + " " + y + " " + z);
parentFrame.toggleLED(x, y, z);
+
x = 8;
y = 8;
z = 8;
@@ -197,7 +198,9 @@ public void mouseClicked(MouseEvent e) {
}
} else {
System.out.println("Clicked, but not a sphere. Clicked object: " + p.getClass().getName());
+ if(p.getClass().getName().equals("com.sun.j3d.utils.geometry.Cylinder")){
+ }
}
}
} else {
Please sign in to comment.
Something went wrong with that request. Please try again.