Browse Source

Fixed makefile for Windows, minor changes to frame.java

Max Nuding 13 years ago
parent
commit
19059b4f8c
2 changed files with 7 additions and 18 deletions
  1. 4
    14
      Cube Control/frame.java
  2. 3
    4
      Cube Control/makefile

+ 4
- 14
Cube Control/frame.java View File

55
   private Vector3d lookVect = new Vector3d(1.0, 1.0, 0.0);
55
   private Vector3d lookVect = new Vector3d(1.0, 1.0, 0.0);
56
 
56
 
57
   Led3D(Canvas3D canv) {
57
   Led3D(Canvas3D canv) {
58
-  
59
-    //Material
60
-
61
 
58
 
62
-  
63
-  
64
     canvas = canv;
59
     canvas = canv;
65
     group = new BranchGroup();
60
     group = new BranchGroup();
66
     // Position viewer, so we are looking at object
61
     // Position viewer, so we are looking at object
109
       for (int y = 0; y < 8; y++) {
104
       for (int y = 0; y < 8; y++) {
110
         for (int z = 0; z < 8; z++) {
105
         for (int z = 0; z < 8; z++) {
111
           leds[x][y][z] = new Sphere(0.05f);
106
           leds[x][y][z] = new Sphere(0.05f);
107
+          Appearance a = new Appearance();
108
+          a.setMaterial(whiteMat);
109
+          leds[x][y][z].setAppearance(a);
112
           if ((x == 7) && (y == 7) && (z == 7)) {
110
           if ((x == 7) && (y == 7) && (z == 7)) {
113
-            Appearance a = new Appearance();
114
-            a.setMaterial(redMat);
115
-            //a.setColoringAttributes(colorRed);
116
-            leds[x][y][z].setAppearance(a);
117
-          } else {
118
-            Appearance a = new Appearance();
119
-            a.setMaterial(whiteMat);
120
-            //a.setColoringAttributes(colorRed);
121
-            leds[x][y][z].setAppearance(a);
111
+           a.setMaterial(redMat);
122
           }
112
           }
123
           TransformGroup tg = new TransformGroup();
113
           TransformGroup tg = new TransformGroup();
124
           tg.setCapability(TransformGroup.ALLOW_CHILDREN_EXTEND);
114
           tg.setCapability(TransformGroup.ALLOW_CHILDREN_EXTEND);

+ 3
- 4
Cube Control/makefile View File

1
 JAVAC = javac
1
 JAVAC = javac
2
 CC = gcc
2
 CC = gcc
3
-TARGET = unix
4
-#TARGET = win
3
+#TARGET = unix
4
+TARGET = win
5
 
5
 
6
 # Java files to be compiled
6
 # Java files to be compiled
7
 ifeq ($(TARGET),win)
7
 ifeq ($(TARGET),win)
10
 JAVAFILES = *.java
10
 JAVAFILES = *.java
11
 endif
11
 endif
12
 
12
 
13
-# Windows doesn't like *.class, so we have to maintain a list of all classes :(
14
 ifeq ($(TARGET),win)
13
 ifeq ($(TARGET),win)
15
-INJAR = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class frame$$23.class frame$$24.class AFrame.class Animation.class AnimationUtility.class HelperUtility.class LEDoff.png LEDon.png serialHelper.exe
14
+INJAR = *.class *.png serialHelper.exe
16
 else
15
 else
17
 INJAR = *.class *.png serialHelper
16
 INJAR = *.class *.png serialHelper
18
 endif
17
 endif

Loading…
Cancel
Save