Browse Source

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

Conflicts:
	CubeControl/Led3D.java
unknown 12 years ago
parent
commit
03694c39f9
1 changed files with 6 additions and 3 deletions
  1. 6
    3
      CubeControl/Led3D.java

+ 6
- 3
CubeControl/Led3D.java View File

145
 				}
145
 				}
146
 			}
146
 			}
147
 			// 8 times, use x as y
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
 		// Add an ambient light
153
 		// Add an ambient light
188
 									// Clicked led found!
188
 									// Clicked led found!
189
 									System.out.println("Clicked LED found: " + x + " " + y + " " + z);
189
 									System.out.println("Clicked LED found: " + x + " " + y + " " + z);
190
 									parentFrame.toggleLED(x, y, z);
190
 									parentFrame.toggleLED(x, y, z);
191
+
191
 									x = 8;
192
 									x = 8;
192
 									y = 8;
193
 									y = 8;
193
 									z = 8;
194
 									z = 8;
197
 					}
198
 					}
198
 				} else {
199
 				} else {
199
 					System.out.println("Clicked, but not a sphere. Clicked object: " + p.getClass().getName());
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
 		} else {
206
 		} else {

Loading…
Cancel
Save