Browse Source

Prettier fullscreen and nicer default-view in fullscreenmode (now all LEDs are displayed)

Max Nuding 12 years ago
parent
commit
627387d131
2 changed files with 8 additions and 8 deletions
  1. 6
    6
      CubeControl/Frame.java
  2. 2
    2
      CubeControl/Led3D.java

+ 6
- 6
CubeControl/Frame.java View File

598
 				setSize(700, 700);
598
 				setSize(700, 700);
599
 				int w = Toolkit.getDefaultToolkit().getScreenSize().width;
599
 				int w = Toolkit.getDefaultToolkit().getScreenSize().width;
600
 				int h = Toolkit.getDefaultToolkit().getScreenSize().height;
600
 				int h = Toolkit.getDefaultToolkit().getScreenSize().height;
601
-				setSize(w - 5, h - 30);
601
+				setSize(w - 0, h - 0);
602
 				playAnimationFullscreen.setVisible(true);
602
 				playAnimationFullscreen.setVisible(true);
603
 				toggleLegsButtonFullscreen.setVisible(true);
603
 				toggleLegsButtonFullscreen.setVisible(true);
604
-				cubeCanvas.setBounds(0, 0, w - 5, h - 80);
604
+				cubeCanvas.setBounds(0, 0, w - 0, h - 35);
605
 			}
605
 			}
606
 		});
606
 		});
607
 	
607
 	
608
 		exitButton = new JButton("Exit Fullscreen");
608
 		exitButton = new JButton("Exit Fullscreen");
609
-		exitButton.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-150, Toolkit.getDefaultToolkit().getScreenSize().height-80, 150, 25);
609
+		exitButton.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-150, Toolkit.getDefaultToolkit().getScreenSize().height-30, 150, 25);
610
 		cp.add(exitButton);
610
 		cp.add(exitButton);
611
 		exitButton.addActionListener(new ActionListener() {
611
 		exitButton.addActionListener(new ActionListener() {
612
 			public void actionPerformed(ActionEvent evt) {
612
 			public void actionPerformed(ActionEvent evt) {
636
 		});
636
 		});
637
 	
637
 	
638
 		playAnimationFullscreen.setText("Play");
638
 		playAnimationFullscreen.setText("Play");
639
-		playAnimationFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-310, Toolkit.getDefaultToolkit().getScreenSize().height-80, 150, 25);
639
+		playAnimationFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-310, Toolkit.getDefaultToolkit().getScreenSize().height-30, 150, 25);
640
 		playAnimationFullscreen.setVisible(false);
640
 		playAnimationFullscreen.setVisible(false);
641
 		cp.add(playAnimationFullscreen);
641
 		cp.add(playAnimationFullscreen);
642
 		playAnimationFullscreen.addActionListener(new ActionListener() {
642
 		playAnimationFullscreen.addActionListener(new ActionListener() {
645
 			}
645
 			}
646
 		});
646
 		});
647
 
647
 
648
-		toggleLegsButtonFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-470, Toolkit.getDefaultToolkit().getScreenSize().height-80, 150, 25);
648
+		toggleLegsButtonFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-470, Toolkit.getDefaultToolkit().getScreenSize().height-30, 150, 25);
649
 		toggleLegsButtonFullscreen.setText("Hide legs");
649
 		toggleLegsButtonFullscreen.setText("Hide legs");
650
 		toggleLegsButtonFullscreen.setVisible(false);
650
 		toggleLegsButtonFullscreen.setVisible(false);
651
 		cp.add(toggleLegsButtonFullscreen);
651
 		cp.add(toggleLegsButtonFullscreen);
992
 		}
992
 		}
993
 		return s;
993
 		return s;
994
 	}
994
 	}
995
-}
995
+}

+ 2
- 2
CubeControl/Led3D.java View File

100
 
100
 
101
 		fullScreenMat = new Matrix4d();
101
 		fullScreenMat = new Matrix4d();
102
 		fullScreenMat.setRow(0, 0.7597, -0.0204, 0.64926, 0.68);
102
 		fullScreenMat.setRow(0, 0.7597, -0.0204, 0.64926, 0.68);
103
-		fullScreenMat.setRow(1, -0.08, -0.995, 0.061, 0.7);
103
+		fullScreenMat.setRow(1, -0.08, -0.995, 0.061, 0.44);
104
 		fullScreenMat.setRow(2, 0.64473, -0.09786, -0.758, -22.88);
104
 		fullScreenMat.setRow(2, 0.64473, -0.09786, -0.758, -22.88);
105
 		fullScreenMat.setRow(3, 0.0, 0.0, 0.0, 1.0);
105
 		fullScreenMat.setRow(3, 0.0, 0.0, 0.0, 1.0);
106
 
106
 
314
 		
314
 		
315
 		if(inFullscreen){
315
 		if(inFullscreen){
316
 			mat.setRow(0, 0.7597, -0.0204, 0.64926, 0.68);
316
 			mat.setRow(0, 0.7597, -0.0204, 0.64926, 0.68);
317
-			mat.setRow(1, -0.08, -0.995, 0.061, 0.7);
317
+			mat.setRow(1, -0.08, -0.995, 0.061, 0.44);
318
 			mat.setRow(2, 0.64473, -0.09786, -0.758, -22.88);
318
 			mat.setRow(2, 0.64473, -0.09786, -0.758, -22.88);
319
 			mat.setRow(3, 0.0, 0.0, 0.0, 1.0);	
319
 			mat.setRow(3, 0.0, 0.0, 0.0, 1.0);	
320
 		} else {
320
 		} else {

Loading…
Cancel
Save