Browse Source

Fixed fullscreen rendering...

… almost...
hutattedonmyarm 12 years ago
parent
commit
2cf784967c
3 changed files with 9 additions and 5 deletions
  1. 3
    2
      CubeControl/Frame.java
  2. 5
    3
      CubeControl/FullscreenWindow.java
  3. 1
    0
      CubeControl/Led3D.java

+ 3
- 2
CubeControl/Frame.java View File

36
 	private GraphicsConfiguration gConfig = SimpleUniverse
36
 	private GraphicsConfiguration gConfig = SimpleUniverse
37
 			.getPreferredConfiguration();
37
 			.getPreferredConfiguration();
38
 	private Canvas3D cubeCanvas = new Canvas3D(gConfig);
38
 	private Canvas3D cubeCanvas = new Canvas3D(gConfig);
39
-	private Led3D ledView = new Led3D(cubeCanvas);
39
+	public Led3D ledView = new Led3D(cubeCanvas);
40
 
40
 
41
 	// Anfang Attribute
41
 	// Anfang Attribute
42
 	private JButton editA = new JButton();
42
 	private JButton editA = new JButton();
545
 	
545
 	
546
 	public void enterFullscreen(ActionEvent evt) {
546
 	public void enterFullscreen(ActionEvent evt) {
547
 		ledView.enterFullscreen();
547
 		ledView.enterFullscreen();
548
-		FullscreenWindow fw = new FullscreenWindow(worker, cubeCanvas, ledView);
548
+		FullscreenWindow fw = new FullscreenWindow(worker, cubeCanvas, ledView, this);
549
+	
549
 	}
550
 	}
550
 	
551
 	
551
 	public void editA_ActionPerformed(ActionEvent evt) {
552
 	public void editA_ActionPerformed(ActionEvent evt) {

+ 5
- 3
CubeControl/FullscreenWindow.java View File

48
 	private Led3D led;
48
 	private Led3D led;
49
 	private int width;
49
 	private int width;
50
 	private int height;
50
 	private int height;
51
+	private Frame frame;
51
 	
52
 	
52
-	public FullscreenWindow (cubeWorker cw, Canvas3D cv, Led3D ledview) {
53
+	public FullscreenWindow (cubeWorker cw, Canvas3D cv, Led3D ledview, Frame f) {
53
 		//Basic layout stuff
54
 		//Basic layout stuff
54
 		this.setUndecorated(true);
55
 		this.setUndecorated(true);
55
 		Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
56
 		Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
63
 		height = d.height;
64
 		height = d.height;
64
 		canvas = cv;
65
 		canvas = cv;
65
 		led = ledview;
66
 		led = ledview;
67
+		frame = f;
66
 		exitButton = new JButton("Exit Fullscreen");
68
 		exitButton = new JButton("Exit Fullscreen");
67
 		exitButton.setBounds(width-150, height-25, 150, 25);
69
 		exitButton.setBounds(width-150, height-25, 150, 25);
68
 		exitButton.addActionListener(new ActionListener() {
70
 		exitButton.addActionListener(new ActionListener() {
69
 			public void actionPerformed(ActionEvent evt) {
71
 			public void actionPerformed(ActionEvent evt) {
70
 				dispose();
72
 				dispose();
71
-				led.leaveFullscreen();
73
+				frame.ledView.leaveFullscreen();
72
 			}
74
 			}
73
 		});
75
 		});
74
 		
76
 		
81
 		setVisible(true);
83
 		setVisible(true);
82
 	}
84
 	}
83
 
85
 
84
-}
86
+}

+ 1
- 0
CubeControl/Led3D.java View File

277
 		if(group.indexOfChild(fullscreenBackground) != -1) {
277
 		if(group.indexOfChild(fullscreenBackground) != -1) {
278
 			group.removeChild(fullscreenBackground);
278
 			group.removeChild(fullscreenBackground);
279
 		}
279
 		}
280
+		background = createBackground();
280
 		group.addChild(background);
281
 		group.addChild(background);
281
 		universe.addBranchGraph(group);
282
 		universe.addBranchGraph(group);
282
 		
283
 		

Loading…
Cancel
Save