Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Conflicts:
	CubeControl/Led3D.java
  • Loading branch information...
commit 03694c39f94a29c0e6012dc85c9bcb91951fb993 2 parents 10eaadf + 39ff793
authored March 28, 2012

Showing 1 changed file with 6 additions and 3 deletions. Show diff stats Hide diff stats

  1. 9  CubeControl/Led3D.java
9  CubeControl/Led3D.java 100755 → 100644
@@ -145,9 +145,9 @@ public Led3D(Canvas3D canv, Frame f) {
145 145
 				}
146 146
 			}
147 147
 			// 8 times, use x as y
148  
-			drawLedFeetHorizontal(-3.5, (double) x-4, 3.5, 7.0f, 0.02f, 90);
149  
-			drawLedFeetHorizontal(2.5, (double) x-4, 3.5, 7.0f, 0.02f, 90);
150  
-			drawLedFeetHorizontal(-1.5, (double) x-4, 3.5, 7.0f, 0.02f, 90);
  148
+				for(int i = 0; i > -8; i--){
  149
+					drawLedFeetHorizontal(i+3, (double) x-4, -0.5, 7.0f, 0.02f, 90);
  150
+				}
151 151
 		}
152 152
 
153 153
 		// Add an ambient light
@@ -188,6 +188,7 @@ public void mouseClicked(MouseEvent e) {
188 188
 									// Clicked led found!
189 189
 									System.out.println("Clicked LED found: " + x + " " + y + " " + z);
190 190
 									parentFrame.toggleLED(x, y, z);
  191
+
191 192
 									x = 8;
192 193
 									y = 8;
193 194
 									z = 8;
@@ -197,7 +198,9 @@ public void mouseClicked(MouseEvent e) {
197 198
 					}
198 199
 				} else {
199 200
 					System.out.println("Clicked, but not a sphere. Clicked object: " + p.getClass().getName());
  201
+					if(p.getClass().getName().equals("com.sun.j3d.utils.geometry.Cylinder")){
200 202
 
  203
+					}
201 204
 				}
202 205
 			}
203 206
 		} else {

0 notes on commit 03694c3

Please sign in to comment.
Something went wrong with that request. Please try again.