Browse Source

Fixed 3D on Mac

Thomas Buck 12 years ago
parent
commit
b5bc6f9bbc

+ 2
- 4
Cube Control/Led3D.java View File

@@ -113,13 +113,11 @@ public class Led3D {
113 113
     for (int x = 0; x < 8; x++) {
114 114
       for (int y = 0; y < 8; y++) {
115 115
         for (int z = 0; z < 8; z++) {
116
-          leds[x][y][z] = new Sphere(0.05f);
117
-
118 116
           Appearance a = new Appearance();
119 117
           a.setMaterial(whiteMat);
120 118
 		  a.setColoringAttributes(whiteColor);
121
-          leds[x][y][z].setAppearance(a);
122
-		  leds[x][y][z].getShape().setCapability(Shape3D.ALLOW_APPEARANCE_WRITE);
119
+		  
120
+		  leds[x][y][z] = new Sphere(0.05f, Sphere.ENABLE_APPEARANCE_MODIFY, a);
123 121
 
124 122
           TransformGroup tg = new TransformGroup();
125 123
           tg.setCapability(TransformGroup.ALLOW_CHILDREN_EXTEND);

+ 1
- 1
Cube Control/doc/AFrame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:06 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:14 CET 2011 -->
6 6
 <TITLE>
7 7
 AFrame
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/Animation.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:06 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:14 CET 2011 -->
6 6
 <TITLE>
7 7
 Animation
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/AnimationUtility.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:06 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:14 CET 2011 -->
6 6
 <TITLE>
7 7
 AnimationUtility
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/HelperUtility.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:15 CET 2011 -->
6 6
 <TITLE>
7 7
 HelperUtility
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/Led3D.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:15 CET 2011 -->
6 6
 <TITLE>
7 7
 Led3D
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/allclasses-frame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:09 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 All Classes
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/allclasses-noframe.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:09 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 All Classes
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/constant-values.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 Constant Field Values
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/cubeWorker.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:06 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:14 CET 2011 -->
6 6
 <TITLE>
7 7
 cubeWorker
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/deprecated-list.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:09 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 Deprecated List
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/frame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:07 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:14 CET 2011 -->
6 6
 <TITLE>
7 7
 Frame
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/help-doc.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:09 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 API Help
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/index-all.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:09 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 Index
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/index.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc on Mon Dec 05 16:14:09 CET 2011-->
5
+<!-- Generated by javadoc on Mon Dec 05 16:25:16 CET 2011-->
6 6
 <TITLE>
7 7
 Generated Documentation (Untitled)
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/layerEditFrame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:15 CET 2011 -->
6 6
 <TITLE>
7 7
 layerEditFrame
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/overview-tree.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 Class Hierarchy
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/package-frame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:15 CET 2011 -->
6 6
 <TITLE>
7 7
 &lt;Unnamed&gt;
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/package-summary.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:15 CET 2011 -->
6 6
 <TITLE>
7 7
 
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/package-tree.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:15 CET 2011 -->
6 6
 <TITLE>
7 7
  Class Hierarchy
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/serialized-form.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:14:08 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 16:25:16 CET 2011 -->
6 6
 <TITLE>
7 7
 Serialized Form
8 8
 </TITLE>

+ 3
- 11
Cube Control/frame.java View File

@@ -175,13 +175,6 @@ public class Frame extends JFrame implements ListSelectionListener {
175 175
     cp.setLayout(null);
176 176
     // Anfang Komponenten
177 177
 
178
-  // ledView init
179
-  short[] dat = new short[64];
180
-  for (int i = 0; i < dat.length; i++) {
181
-    dat[i] = 0xFF;
182
-  }
183
-  ledView.setData(dat);
184
-
185 178
     //----- 3D-----
186 179
     //-------------
187 180
     cubeCanvas.setBounds(8, 8, 250, 250);
@@ -770,9 +763,8 @@ public class Frame extends JFrame implements ListSelectionListener {
770 763
   Led3D l = f.get3D();
771 764
   java.util.Scanner sc = new java.util.Scanner(System.in);
772 765
 
773
-  System.out.println("## Cube Control Debug Console ##");
774
-  System.out.println("Enter a Command ('h' for help)\n");
775
-  
766
+  System.out.println("#### Cube Control Debug Console ####");
767
+  System.out.println("## Enter a Command ('h' for help) ##");
776 768
   System.out.print("$> ");
777 769
 
778 770
   do {
@@ -816,4 +808,4 @@ public class Frame extends JFrame implements ListSelectionListener {
816 808
     }
817 809
   } while (true);
818 810
   }
819
-}
811
+}

Loading…
Cancel
Save