Normand Briere
2019-07-29 c6c3f0948bd31603547ef8ce47a7784a9a4d55c2
ObjEditor.java
....@@ -4,6 +4,7 @@
44
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -14,10 +15,15 @@
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
1617
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1721 //import javax.media.opengl.GLCanvas;
1822
1923 import //weka.core.
2024 matrix.Matrix;
25
+
26
+import grafeme.ui.*;
2127
2228 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2329 ActionListener, ChangeListener,
....@@ -31,6 +37,56 @@
3137 boolean timeline;
3238 boolean wasFullScreen;
3339
40
+ GroupEditor callee;
41
+ JFrame frame;
42
+
43
+ static ObjEditor theFrame;
44
+
45
+ cButton GetButton(String name, boolean border)
46
+ {
47
+ ImageIcon icon = GetIcon(name);
48
+ return new cButton(icon, border);
49
+ }
50
+
51
+ cToggleButton GetToggleButton(String name, boolean border)
52
+ {
53
+ ImageIcon icon = GetIcon(name);
54
+ return new cToggleButton(icon, border);
55
+ }
56
+
57
+ cCheckBox GetCheckBox(String name, boolean border)
58
+ {
59
+ ImageIcon icon = GetIcon(name);
60
+ return new cCheckBox(icon, border);
61
+ }
62
+
63
+ ImageIcon GetIcon(String name)
64
+ {
65
+ try
66
+ {
67
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68
+
69
+// if (image.getWidth() > 48 && image.getHeight() > 48)
70
+// {
71
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
72
+// Graphics2D g = resized.createGraphics();
73
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
76
+// g.dispose();
77
+//
78
+// image = resized;
79
+// }
80
+
81
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82
+ return icon;
83
+ }
84
+ catch (Exception e)
85
+ {
86
+ return null;
87
+ }
88
+ }
89
+
3490 // SCRIPT
3591
3692 transient JFrame textpanel = null;
....@@ -121,47 +177,54 @@
121177 void keyPressed(int key, int modifiers)
122178 {
123179 System.out.println("KEY PRESSED");
124
- CameraPane.theRenderer.keyPressed(key, modifiers);
180
+ Globals.theRenderer.keyPressed(key, modifiers);
125181 }
126182 */
127183
128184 static GridBagConstraints aConstraints;
129185 static GridBagConstraints aWindowConstraints;
130
- GroupEditor callee;
131
- JFrame frame;
186
+
132187 static int GRIDWIDTH = 100; // 4;
133188
134189 public void closeUI()
135190 {
136191 //new Exception().printStackTrace();
137
- System.out.println("this = " + this);
138
- System.out.println("objEditor = " + objEditor);
192
+// System.out.println("this = " + this);
193
+// System.out.println("objEditor = " + objEditor);
139194 //nameField.removeActionListener(this);
140
- objEditor.ctrlPanel.remove(nameField);
195
+// objEditor.ctrlPanel.remove(nameField);
141196
142
- if (!GroupEditor.allparams)
197
+ objEditor.ctrlPanel.remove(namePanel);
198
+
199
+ if (!allparams)
143200 return;
144201
145
- objEditor.ctrlPanel.remove(liveCB);
146
- objEditor.ctrlPanel.remove(hideCB);
147
- objEditor.ctrlPanel.remove(markCB);
148
-
149
- objEditor.ctrlPanel.remove(randomCB);
150
- objEditor.ctrlPanel.remove(speedupCB);
151
- objEditor.ctrlPanel.remove(rewindCB);
152
-
153
- objEditor.ctrlPanel.remove(resetButton);
154
- objEditor.ctrlPanel.remove(stepButton);
155
-// objEditor.ctrlPanel.remove(stepAllButton);
156
-// objEditor.ctrlPanel.remove(resetAllButton);
157
- objEditor.ctrlPanel.remove(link2masterCB);
158
- //objEditor.ctrlPanel.remove(flipVCB);
159
- //objEditor.ctrlPanel.remove(texresMenu);
160
- objEditor.ctrlPanel.remove(slowerButton);
161
- objEditor.ctrlPanel.remove(fasterButton);
162
- objEditor.ctrlPanel.remove(remarkButton);
202
+// objEditor.ctrlPanel.remove(liveCB);
203
+// objEditor.ctrlPanel.remove(hideCB);
204
+// objEditor.ctrlPanel.remove(markCB);
205
+//
206
+// objEditor.ctrlPanel.remove(randomCB);
207
+// objEditor.ctrlPanel.remove(speedupCB);
208
+// objEditor.ctrlPanel.remove(rewindCB);
209
+//
210
+// objEditor.ctrlPanel.remove(resetButton);
211
+// objEditor.ctrlPanel.remove(stepButton);
212
+//// objEditor.ctrlPanel.remove(stepAllButton);
213
+//// objEditor.ctrlPanel.remove(resetAllButton);
214
+// objEditor.ctrlPanel.remove(link2masterCB);
215
+// //objEditor.ctrlPanel.remove(flipVCB);
216
+// //objEditor.ctrlPanel.remove(texresMenu);
217
+// objEditor.ctrlPanel.remove(slowerButton);
218
+// objEditor.ctrlPanel.remove(fasterButton);
219
+// objEditor.ctrlPanel.remove(remarkButton);
163220
164
- Remove(normalpushField);
221
+ objEditor.ctrlPanel.remove(setupPanel);
222
+ objEditor.ctrlPanel.remove(setupPanel2);
223
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
224
+ objEditor.ctrlPanel.remove(pushPanel);
225
+ //objEditor.ctrlPanel.remove(fillPanel);
226
+
227
+ //Remove(normalpushField);
165228 }
166229
167230 public ObjEditor GetEditor()
....@@ -205,6 +268,12 @@
205268 client = inClient;
206269 copy = client;
207270
271
+ if (copy.versions == null)
272
+ {
273
+ copy.versions = new byte[100][];
274
+ copy.versionindex = -1;
275
+ }
276
+
208277 // "this" is not called: SetupUI2(objEditor);
209278 }
210279
....@@ -218,6 +287,12 @@
218287 client = inClient;
219288 copy = client;
220289
290
+ if (copy.versions == null)
291
+ {
292
+ copy.versions = new byte[100][];
293
+ copy.versionindex = -1;
294
+ }
295
+
221296 SetupUI2(callee.GetEditor());
222297 }
223298
....@@ -232,6 +307,7 @@
232307 //localCopy.parent = null;
233308
234309 frame = new JFrame();
310
+ frame.setUndecorated(false);
235311 objEditor = this;
236312 this.callee = callee;
237313
....@@ -249,6 +325,12 @@
249325 copy = localCopy;
250326 copy.editWindow = this;
251327
328
+ if (copy.versions == null)
329
+ {
330
+// copy.versions = new byte[100][];
331
+// copy.versionindex = -1;
332
+ }
333
+
252334 SetupMenu();
253335
254336 //SetupName(objEditor); // new
....@@ -262,28 +344,49 @@
262344 return frame.action(event, obj);
263345 }
264346
347
+ // Cannot work without static
348
+ static boolean allparams = true;
349
+
350
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
351
+
265352 void SetupMenu()
266353 {
267354 frame.setMenuBar(menuBar = new MenuBar());
268
- menuBar.add(windowMenu = new Menu("File"));
269
- windowMenu.add(loadItem = new MenuItem("Load..."));
270
- windowMenu.add("-");
271
- windowMenu.add(saveItem = new MenuItem("Save"));
272
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
355
+ menuBar.add(fileMenu = new Menu("File"));
356
+ fileMenu.add(newItem = new MenuItem("New"));
357
+ fileMenu.add(openItem = new MenuItem("Open..."));
358
+
359
+ //oe.menuBar.add(menu = new Menu("Include"));
360
+ Menu menu = new Menu("Import");
361
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
362
+ importOBJItem.addActionListener(this);
363
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
364
+ import3DSItem.addActionListener(this);
365
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
366
+ importVRMLX3DItem.addActionListener(this);
367
+ menu.add("-");
368
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
369
+ importGFDItem.addActionListener(this);
370
+ fileMenu.add(menu);
371
+ fileMenu.add("-");
372
+
373
+ fileMenu.add(saveItem = new MenuItem("Save"));
374
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
273375 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
274
- windowMenu.add("-");
275
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
276
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
277
- windowMenu.add("-");
376
+ fileMenu.add("-");
377
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
378
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
379
+ fileMenu.add("-");
278380 if (client.parent != null)
279381 {
280
- windowMenu.add(closeItem = new MenuItem("Close"));
382
+ fileMenu.add(closeItem = new MenuItem("Close"));
281383 } else
282384 {
283
- windowMenu.add(closeItem = new MenuItem("Exit"));
385
+ fileMenu.add(closeItem = new MenuItem("Exit"));
284386 }
285387
286
- loadItem.addActionListener(this);
388
+ newItem.addActionListener(this);
389
+ openItem.addActionListener(this);
287390 saveItem.addActionListener(this);
288391 saveAsItem.addActionListener(this);
289392 exportAsItem.addActionListener(this);
....@@ -291,82 +394,69 @@
291394 //povItem.addActionListener(this);
292395 closeItem.addActionListener(this);
293396
294
- menuBar.add(cameraMenu = new Menu("View"));
295
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
296
- //zBufferItem.addActionListener(this);
297
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
298
- //normalLensItem.addActionListener(this);
299
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300
- revertCameraItem.addActionListener(this);
301
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302
- toggleTimelineItem.addItemListener(this);
303
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304
- toggleFullScreenItem.addItemListener(this);
305
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306
- cameraMenu.add("-");
307
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308
- toggleTextureItem.addItemListener(this);
309
- toggleTextureItem.setState(CameraPane.textureon);
310
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311
- toggleLiveItem.addItemListener(this);
312
- toggleLiveItem.setState(CameraPane.isLIVE());
313
- cameraMenu.add(stepItem = new MenuItem("Step"));
314
- stepItem.addActionListener(this);
315
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316
-// toggleDLItem.addItemListener(this);
317
-// toggleDLItem.setState(false);
318
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319
- toggleRenderItem.addItemListener(this);
320
- toggleRenderItem.setState(!CameraPane.frozen);
321
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322
- toggleDebugItem.addItemListener(this);
323
- toggleDebugItem.setState(CameraPane.DEBUG);
324
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325
- toggleFrustumItem.addItemListener(this);
326
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328
- toggleFootContactItem.addItemListener(this);
329
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331
- toggleRandomItem.addItemListener(this);
332
- toggleRandomItem.setState(CameraPane.RANDOM);
333
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334
- toggleHandleItem.addItemListener(this);
335
- toggleHandleItem.setState(CameraPane.HANDLES);
336
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337
- togglePaintItem.addItemListener(this);
338
- togglePaintItem.setState(CameraPane.PAINTMODE);
339
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340
-// toggleRootItem.addItemListener(this);
341
-// toggleRootItem.setState(false);
342
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
343
-// animationItem.addItemListener(this);
344
-// animationItem.setState(CameraPane.ANIMATION);
345
- cameraMenu.add("-");
346
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
347
- editCameraItem.addActionListener(this);
348
-
349397 objectPanel = new JTabbedPane();
398
+
399
+ ChangeListener changeListener = new ChangeListener()
400
+ {
401
+ public void stateChanged(ChangeEvent changeEvent)
402
+ {
403
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
404
+// {
405
+// if (latestObject != null)
406
+// {
407
+// refreshContents(true);
408
+// SetMaterial(latestObject);
409
+// }
410
+//
411
+// materialFlushed = true;
412
+// }
413
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
414
+// {
415
+// if (listUI.size() == 0)
416
+// EditSelection(false);
417
+// }
418
+
419
+ refreshContents(false); // To refresh Info tab
420
+ }
421
+ };
422
+ objectPanel.addChangeListener(changeListener);
423
+
350424 toolbarPanel = new JPanel();
351425 toolbarPanel.setName("Toolbar");
352
- treePanel = new JPanel();
426
+
427
+ treePanel = new cGridBag();
353428 treePanel.setName("Tree");
354
- ctrlPanel = new JPanel(); // new GridBagLayout());
355
- ctrlPanel.setName("Edit");
356
- materialPanel = new JPanel();
357
- materialPanel.setName("Material");
429
+
430
+ editPanel = new cGridBag().setVertical(true);
431
+ //editPanel.setName("Edit");
432
+
433
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
434
+
435
+ editCommandsPanel = new cGridBag();
436
+ editPanel.add(editCommandsPanel);
437
+ editPanel.add(ctrlPanel);
438
+
439
+ toolboxPanel = new cGridBag().setVertical(true);
440
+ //toolboxPanel.setName("Toolbox");
441
+
442
+ materialPanel = new cGridBag().setVertical(true);
443
+ //materialPanel.setName("Material");
444
+
358445 /*JTextPane*/
359446 infoarea = createTextPane();
447
+ doc = infoarea.getStyledDocument();
448
+
360449 infoarea.setEditable(true);
361450 SetText();
451
+
362452 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363453 // infoarea.setOpaque(false);
364454 // //infoarea.setForeground(textcolor);
365
- infoarea.setLineWrap(true);
366
- infoarea.setWrapStyleWord(true);
455
+// TEXTAREA infoarea.setLineWrap(true);
456
+// TEXTAREA infoarea.setWrapStyleWord(true);
367457 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368
- infoPanel.setPreferredSize(new Dimension(50, 200));
369
- infoPanel.setName("Info");
458
+ infoPanel.setPreferredSize(new Dimension(1, 1));
459
+ //infoPanel.setName("Info");
370460 //infoPanel.setLayout(new BorderLayout());
371461 //infoPanel.add(createTextPane());
372462
....@@ -374,16 +464,23 @@
374464 mainPanel.setName("Main");
375465 mainPanel.setContinuousLayout(true);
376466 mainPanel.setOneTouchExpandable(true);
377
- mainPanel.setDividerLocation(1.0);
378467 mainPanel.setDividerSize(9);
379
- mainPanel.setResizeWeight(0);
380
-
468
+ mainPanel.setDividerLocation(0.5); //1.0);
469
+ mainPanel.setResizeWeight(0.5);
470
+
471
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
472
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
473
+ divider.setDividerSize(15);
474
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
475
+
476
+ mainPanel.setUI(new BasicSplitPaneUI());
477
+
381478 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382479 //mainPanel.setLayout(new GridBagLayout());
383480 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384
- treePanel.setLayout(new GridBagLayout());
385
- ctrlPanel.setLayout(new GridBagLayout());
386
- materialPanel.setLayout(new GridBagLayout());
481
+// treePanel.setLayout(new GridBagLayout());
482
+ //ctrlPanel.setLayout(new GridBagLayout());
483
+ //materialPanel.setLayout(new GridBagLayout());
387484
388485 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389486 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -422,7 +519,7 @@
422519 static String newline = "\n";
423520 protected static final String buttonString = "JButton";
424521 StyledDocument doc;
425
- JTextArea infoarea;
522
+ JTextPane infoarea;
426523
427524 void ClearInfo()
428525 {
....@@ -445,10 +542,10 @@
445542 e.printStackTrace();
446543 }
447544
448
- String selection = infoarea.getText();
449
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
450
- java.awt.datatransfer.Clipboard clipboard =
451
- Toolkit.getDefaultToolkit().getSystemClipboard();
545
+// String selection = infoarea.getText();
546
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
547
+// java.awt.datatransfer.Clipboard clipboard =
548
+// Toolkit.getDefaultToolkit().getSystemClipboard();
452549 //clipboard.setContents(data, data);
453550 }
454551
....@@ -471,13 +568,13 @@
471568 //SendInfo("Name:", "bold");
472569 if (sel.GetTextures() != null || debug)
473570 {
474
- si.SendInfo(sel.toString(), "bold");
571
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
475572 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
476573 if (sel.Size() > 0)
477574 {
478575 si.SendInfo("#children = " + sel.Size(), "regular");
479576 }
480
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
577
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
481578 if (debug)
482579 {
483580 try
....@@ -489,7 +586,10 @@
489586 }
490587
491588 if (full)
492
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
589
+ {
590
+ si.SendInfo(" BBox min: " + minima, "regular");
591
+ si.SendInfo(" BBox max: " + maxima, "regular");
592
+ }
493593
494594 if (sel.bRep != null)
495595 {
....@@ -516,7 +616,7 @@
516616 }
517617 if (sel.support != null)
518618 {
519
- si.SendInfo(" support: " + sel.support, "regular");
619
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
520620 }
521621 if (sel.scriptnode != null)
522622 {
....@@ -587,6 +687,9 @@
587687 {
588688 CameraPane.pointflow = (PointFlow) sel;
589689 }
690
+
691
+ si.SendInfo("_____________________", "regular");
692
+ si.SendInfo("", "regular");
590693 }
591694 }
592695
....@@ -602,68 +705,191 @@
602705 }
603706 }
604707
708
+//static GraphicsDevice device = GraphicsEnvironment
709
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
710
+
711
+ Rectangle keeprect;
712
+ cRadio radio;
713
+
714
+cButton keepButton;
715
+ cButton twoButton; // Full 3D
716
+ cButton sixButton;
717
+ cButton threeButton;
718
+ cButton sevenButton;
719
+ cButton fourButton; // full panel
720
+ cButton oneButton; // full XYZ
721
+ //cButton currentLayout;
722
+
723
+ boolean maximized;
724
+
725
+ cButton fullscreenLayout;
726
+
727
+ void Minimize()
728
+ {
729
+ frame.setState(Frame.ICONIFIED);
730
+ frame.validate();
731
+ }
732
+
733
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
734
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
735
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
736
+ void Maximize()
737
+ {
738
+ if (CameraPane.FULLSCREEN)
739
+ {
740
+ ToggleFullScreen();
741
+ }
742
+
743
+ if (maximized)
744
+ {
745
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
746
+ }
747
+ else
748
+ {
749
+ keeprect = frame.getBounds();
750
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
751
+// Dimension rect2 = frame.getToolkit().getScreenSize();
752
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
753
+// frame.setState(Frame.MAXIMIZED_BOTH);
754
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
755
+ }
756
+
757
+ maximized ^= true;
758
+
759
+ frame.validate();
760
+ }
761
+
762
+ cButton minButton;
763
+ cButton maxButton;
764
+ cButton fullButton;
765
+
605766 void ToggleFullScreen()
606767 {
607
- if (CameraPane.FULLSCREEN)
768
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769
+
770
+ cameraView.ToggleFullScreen();
771
+
772
+ if (!CameraPane.FULLSCREEN)
608773 {
609
- frame.getContentPane().remove(/*"Center",*/bigThree);
610
- framePanel.add(bigThree);
611
- frame.getContentPane().add(/*"Center",*/framePanel);
774
+ device.setFullScreenWindow(null);
775
+ frame.dispose();
776
+ frame.setUndecorated(false);
777
+ frame.validate();
778
+ frame.setVisible(true);
779
+
780
+ //frame.setVisible(false);
781
+// frame.removeNotify();
782
+// frame.setUndecorated(false);
783
+// frame.addNotify();
784
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
785
+
786
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
787
+// X framePanel.add(bigThree);
788
+// X frame.getContentPane().add(/*"Center",*/framePanel);
789
+ framePanel.setDividerLocation(46);
790
+
791
+ //frame.setVisible(true);
792
+ radio.layout = keepButton;
793
+ //theFrame = null;
794
+ keepButton = null;
795
+ radio.layout.doClick();
796
+
612797 } else
613798 {
614
- frame.getContentPane().remove(/*"Center",*/framePanel);
615
- framePanel.remove(bigThree);
616
- frame.getContentPane().add(/*"Center",*/bigThree);
799
+ keepButton = radio.layout;
800
+ //keeprect = frame.getBounds();
801
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
802
+// frame.getToolkit().getScreenSize().height);
803
+ //frame.setVisible(false);
804
+
805
+ frame.dispose();
806
+ frame.setUndecorated(true);
807
+ device.setFullScreenWindow(frame);
808
+ frame.validate();
809
+ frame.setVisible(true);
810
+// frame.removeNotify();
811
+// frame.setUndecorated(true);
812
+// frame.addNotify();
813
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
814
+// X framePanel.remove(bigThree);
815
+// X frame.getContentPane().add(/*"Center",*/bigThree);
816
+ framePanel.setDividerLocation(0);
817
+
818
+ radio.layout = fullscreenLayout;
819
+ radio.layout.doClick();
820
+ //frame.setVisible(true);
617821 }
618
- cameraView.ToggleFullScreen();
822
+ frame.validate();
619823 }
620824
621
- private JTextArea createTextPane()
825
+ private byte[] CompressCopy()
622826 {
623
- String[] initString =
624
- {
625
- "This is an editable JTextPane, ", //regular
626
- "another ", //italic
627
- "styled ", //bold
628
- "text ", //small
629
- "component, ", //large
630
- "which supports embedded components..." + newline,//regular
631
- " " + newline, //button
632
- "...and embedded icons..." + newline, //regular
633
- " ", //icon
634
- newline + "JTextPane is a subclass of JEditorPane that "
635
- + "uses a StyledEditorKit and StyledDocument, and provides "
636
- + "cover methods for interacting with those objects."
637
- };
827
+ boolean temp = CameraPane.SWITCH;
828
+ CameraPane.SWITCH = false;
829
+
830
+ copy.ExtractBigData(versiontable);
831
+ // if (copy == client)
832
+
833
+ byte[] versions[] = copy.versions;
834
+ copy.versions = null;
835
+
836
+ byte[] compress = Compress(copy);
837
+
838
+ copy.versions = versions;
839
+
840
+ copy.RestoreBigData(versiontable);
841
+
842
+ CameraPane.SWITCH = temp;
843
+
844
+ return compress;
845
+ }
638846
639
- String[] initStyles =
640
- {
641
- "regular", "italic", "bold", "small", "large",
642
- "regular", "button", "regular", "icon",
643
- "regular"
644
- };
847
+ private JTextPane createTextPane()
848
+ {
849
+// TEXTAREA String[] initString =
850
+// {
851
+// "This is an editable JTextPane, ", //regular
852
+// "another ", //italic
853
+// "styled ", //bold
854
+// "text ", //small
855
+// "component, ", //large
856
+// "which supports embedded components..." + newline,//regular
857
+// " " + newline, //button
858
+// "...and embedded icons..." + newline, //regular
859
+// " ", //icon
860
+// newline + "JTextPane is a subclass of JEditorPane that "
861
+// + "uses a StyledEditorKit and StyledDocument, and provides "
862
+// + "cover methods for interacting with those objects."
863
+// };
864
+//
865
+// String[] initStyles =
866
+// {
867
+// "regular", "italic", "bold", "small", "large",
868
+// "regular", "button", "regular", "icon",
869
+// "regular"
870
+// };
871
+//
872
+// JTextPane textPane = new JTextPane();
873
+// textPane.setEditable(true);
874
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
875
+// addStylesToDocument(doc);
876
+//
877
+// try
878
+// {
879
+// for (int j = 0; j < 2; j++)
880
+// {
881
+// for (int i = 0; i < initString.length; i++)
882
+// {
883
+// doc.insertString(doc.getLength(), initString[i],
884
+// doc.getStyle(initStyles[i]));
885
+// }
886
+// }
887
+// } catch (BadLocationException ble)
888
+// {
889
+// System.err.println("Couldn't insert initial text into text pane.");
890
+// }
645891
646
- JTextPane textPane = new JTextPane();
647
- textPane.setEditable(true);
648
- /*StyledDocument*/ doc = textPane.getStyledDocument();
649
- addStylesToDocument(doc);
650
-
651
- try
652
- {
653
- for (int j = 0; j < 2; j++)
654
- {
655
- for (int i = 0; i < initString.length; i++)
656
- {
657
- doc.insertString(doc.getLength(), initString[i],
658
- doc.getStyle(initStyles[i]));
659
- }
660
- }
661
- } catch (BadLocationException ble)
662
- {
663
- System.err.println("Couldn't insert initial text into text pane.");
664
- }
665
-
666
- return new JTextArea(); // textPane;
892
+ return new JTextPane(); // textPane;
667893 }
668894
669895 protected void addStylesToDocument(StyledDocument doc)
....@@ -716,7 +942,7 @@
716942 protected static ImageIcon createImageIcon(String path,
717943 String description)
718944 {
719
- java.net.URL imgURL = GrafreeD.class.getResource(path);
945
+ java.net.URL imgURL = Grafreed.class.getResource(path);
720946 if (imgURL != null)
721947 {
722948 return new ImageIcon(imgURL, description);
....@@ -748,6 +974,7 @@
748974 // NumberSlider vDivsField;
749975 // JCheckBox endcaps;
750976 JCheckBox liveCB;
977
+ JCheckBox selectableCB;
751978 JCheckBox hideCB;
752979 JCheckBox link2masterCB;
753980 JCheckBox markCB;
....@@ -755,7 +982,12 @@
755982 JCheckBox speedupCB;
756983 JCheckBox rewindCB;
757984 JCheckBox flipVCB;
985
+
986
+ cCheckBox toggleTextureCB;
987
+ cCheckBox toggleSwitchCB;
988
+
758989 JComboBox texresMenu;
990
+
759991 JButton resetButton;
760992 JButton stepButton;
761993 JButton stepAllButton;
....@@ -763,115 +995,87 @@
763995 JButton slowerButton;
764996 JButton fasterButton;
765997 JButton remarkButton;
998
+
999
+ cGridBag editPanel;
1000
+ cGridBag editCommandsPanel;
1001
+
1002
+ cGridBag namePanel;
1003
+ cGridBag setupPanel;
1004
+ cGridBag setupPanel2;
1005
+ cGridBag objectCommandsPanel;
1006
+ cGridBag pushPanel;
1007
+ cGridBag fillPanel;
7661008
767
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
1009
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
7681010 {
7691011 JCheckBox cb;
7701012
771
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772
- oe.aConstraints.gridwidth = 1; // 3;
773
-// oe.aConstraints.weightx = 1;
774
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775
- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1013
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
7761014 cb.addItemListener(this);
777
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778
- oe.aConstraints.gridwidth = 1;
779
- oe.aConstraints.gridx += 1;
7801015
7811016 return cb;
7821017 }
7831018
784
- cButton AddButton(ObjEditor oe, String label)
1019
+ cButton AddButton(cGridBag panel, String label)
7851020 {
7861021 cButton cb;
7871022
788
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789
- oe.aConstraints.gridwidth = 1;
790
-// oe.aConstraints.weightx = 1;
791
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792
- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
1023
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
7931024 cb.addActionListener(this);
794
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795
- oe.aConstraints.gridwidth = 1;
796
- oe.aConstraints.gridx += 1;
7971025
7981026 return cb;
7991027 }
8001028
801
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
1029
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
8021030 {
8031031 JComboBox combo;
8041032
805
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806
- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807
- oe.aConstraints.gridx += 1;
1033
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8081034 combo.addActionListener(this);
8091035
8101036 return combo;
8111037 }
8121038
813
- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
1039
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
8141040 {
815
- NumberSlider combo;
1041
+ cGridBag control = new cGridBag();
1042
+
1043
+ cNumberSlider combo;
8161044
8171045 JLabel jlabel = new JLabel(label);
818
-
819
- aConstraints.fill = GridBagConstraints.VERTICAL;
8201046 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821
- aConstraints.gridwidth = 1;
822
- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823
- aConstraints.gridx += 1;
824
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826
- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827
- aConstraints.gridx += 1;
828
- aConstraints.gridwidth = 1;
829
-
1047
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1048
+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8301049 combo.setFloat(current);
831
-
832
- combo.label = jlabel;
833
-
834
- combo.addChangeListener(this);
835
-
836
- return combo;
1050
+
1051
+ panel.add(control);
1052
+
1053
+ return control;
8371054 }
8381055
839
- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
1056
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
8401057 {
841
- NumberSlider combo;
1058
+ cGridBag control = new cGridBag();
1059
+
1060
+ cNumberSlider combo;
8421061
8431062 JLabel jlabel = new JLabel(label);
844
-
845
- aConstraints.fill = GridBagConstraints.VERTICAL;
8461063 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847
- aConstraints.gridwidth = 2;
848
- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849
- aConstraints.gridx += 1;
850
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852
- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853
- aConstraints.gridx += 1;
854
- aConstraints.gridwidth = 1;
855
-
1064
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1065
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8561066 combo.setInteger(current);
8571067
858
- combo.label = jlabel;
859
-
860
- combo.addChangeListener(this);
861
-
862
- return combo;
1068
+ panel.add(control);
1069
+
1070
+ return control;
8631071 }
8641072
865
- JTextArea AddText(JPanel ctrlPanel, String name)
1073
+ JTextArea AddText(cGridBag ctrlPanel, String name)
8661074 {
8671075 JTextArea text;
8681076
869
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871
- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1077
+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8721078 text.addCaretListener(this);
873
- aConstraints.gridx += 1;
874
- aConstraints.gridwidth = 1;
8751079
8761080 return text;
8771081 }
....@@ -901,9 +1105,16 @@
9011105 objEditor.ctrlPanel.remove(j);
9021106 }
9031107
1108
+ void Remove(cNumberSlider j)
1109
+ {
1110
+ j.removeChangeListener(this);
1111
+ //objEditor.ctrlPanel.remove(j.label);
1112
+ objEditor.ctrlPanel.remove(j);
1113
+ }
1114
+
9041115 /*
9051116 */
906
- void Return() // ObjEditor oe)
1117
+ void Return0() // ObjEditor oe)
9071118 {
9081119 aConstraints.gridy += 1;
9091120 aConstraints.gridx = 0;
....@@ -958,37 +1169,80 @@
9581169
9591170 void SetupUI2(ObjEditor oe)
9601171 {
961
-// oe.aConstraints.weightx = 0;
962
-// oe.aConstraints.weighty = 0;
963
-// oe.aConstraints.gridx = 0;
964
-// oe.aConstraints.gridy = 0;
965
- SetupName(oe);
1172
+ //SetupName(oe);
9661173
967
- if (!GroupEditor.allparams)
1174
+ namePanel = new cGridBag();
1175
+
1176
+ nameField = AddText(namePanel, copy.GetName());
1177
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1178
+ oe.ctrlPanel.add(namePanel);
1179
+
1180
+ oe.ctrlPanel.Return();
1181
+
1182
+ if (!allparams)
9681183 return;
9691184
970
- liveCB = AddCheckBox(oe, "Live", copy.live);
971
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
1185
+ setupPanel = new cGridBag().setVertical(false);
1186
+
1187
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188
+ liveCB.setToolTipText("Animate object");
1189
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+ selectableCB.setToolTipText("Make object selectable");
9731191 // Return();
974
- markCB = AddCheckBox(oe, "Mark", copy.marked);
975
- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976
- randomCB = AddCheckBox(oe, "Rand", copy.random);
977
- Return();
978
- resetButton = AddButton(oe, "Reset");
979
- stepButton = AddButton(oe, "Step");
1192
+
1193
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1194
+ hideCB.setToolTipText("Hide object");
1195
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196
+ markCB.setToolTipText("As animation target transform");
1197
+
1198
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1199
+
1200
+ setupPanel2 = new cGridBag().setVertical(false);
1201
+
1202
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1203
+ rewindCB.setToolTipText("Rewind animation");
1204
+
1205
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1206
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1207
+
1208
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1209
+ link2masterCB.setToolTipText("Attach to support");
1210
+
1211
+ if (Globals.ADVANCED)
1212
+ {
1213
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1214
+ speedupCB.setToolTipText("Option motion capture");
1215
+ }
1216
+
1217
+ oe.ctrlPanel.add(setupPanel);
1218
+ oe.ctrlPanel.Return();
1219
+ oe.ctrlPanel.add(setupPanel2);
1220
+ oe.ctrlPanel.Return();
1221
+
1222
+ objectCommandsPanel = new cGridBag().setVertical(false);
1223
+
1224
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1225
+ resetButton.setToolTipText("Jump to frame zero");
1226
+ stepButton = AddButton(objectCommandsPanel, "Step");
1227
+ stepButton.setToolTipText("Step one frame");
9801228 // resetAllButton = AddButton(oe, "Reset All");
9811229 // stepAllButton = AddButton(oe, "Step All");
982
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
9831230 // Return();
984
- slowerButton = AddButton(oe, "Slow");
985
- fasterButton = AddButton(oe, "Fast");
986
- remarkButton = AddButton(oe, "Rem");
1231
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1232
+ slowerButton.setToolTipText("Decrease animation speed");
1233
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1234
+ fasterButton.setToolTipText("Increase animation speed");
1235
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1236
+ remarkButton.setToolTipText("Set the current transform as the target");
9871237
988
- Return();
1238
+ oe.ctrlPanel.add(objectCommandsPanel);
1239
+ oe.ctrlPanel.Return();
9891240
990
- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991
- Return();
1241
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1242
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1243
+ //Return();
1244
+
1245
+ oe.ctrlPanel.Return();
9921246
9931247 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9941248 // ObjEditor.aConstraints.gridx += 1;
....@@ -1083,7 +1337,7 @@
10831337 oe.aConstraints.gridwidth = 1;
10841338 /**/
10851339 nameField = AddText(oe.ctrlPanel, copy.GetName());
1086
- Return();
1340
+ oe.ctrlPanel.Return();
10871341
10881342 //ctrlPanel.add(textureButton = new Button("Texture..."));
10891343 //textureButton.setEnabled(false);
....@@ -1185,11 +1439,25 @@
11851439 //JPanel worldPanel =
11861440 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11871441 //worldPanel.setName("World");
1188
- centralPanel = new JPanel(new BorderLayout());
1189
- timelinePanel = new JPanel(new BorderLayout());
1190
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1442
+ centralPanel = new cGridBag();
1443
+ centralPanel.preferredWidth = 20;
1444
+
1445
+ if (Globals.ADVANCED)
1446
+ {
1447
+ timelinePanel = new JPanel(new BorderLayout());
1448
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11911449
1450
+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1451
+ cameraPanel.setContinuousLayout(true);
1452
+ cameraPanel.setOneTouchExpandable(true);
1453
+// cameraPanel.setDividerLocation(0.9);
1454
+// cameraPanel.setDividerSize(9);
1455
+ cameraPanel.setResizeWeight(1.0);
1456
+
1457
+ }
1458
+
11921459 centralPanel.add(cameraView);
1460
+ centralPanel.setFocusable(true);
11931461 //frame.setJMenuBar(timelineMenubar);
11941462 //centralPanel.add(timelinePanel);
11951463
....@@ -1208,12 +1476,14 @@
12081476 //frontView.object = copy;
12091477 //sideView.object = copy;
12101478
1211
- XYZPanel = new JPanel();
1212
- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1479
+ XYZPanel = new cGridBag().setVertical(true);
1480
+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12131481
1214
- XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1215
- XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1216
- XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1482
+ XYZPanel.preferredWidth = 5;
1483
+ XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1484
+ XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1485
+ XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1486
+ //XYZPanel.setName("XYZ");
12171487
12181488 /*
12191489 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1251,11 +1521,23 @@
12511521 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12521522 //tmp.setName("Edit");
12531523 objectPanel.add(materialPanel);
1254
- JPanel north = new JPanel(new BorderLayout());
1255
- north.setName("Edit");
1256
- north.add(ctrlPanel, BorderLayout.NORTH);
1257
- objectPanel.add(north);
1258
- objectPanel.add(infoPanel);
1524
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1525
+// JPanel north = new JPanel(new BorderLayout());
1526
+// north.setName("Edit");
1527
+// north.add(ctrlPanel, BorderLayout.NORTH);
1528
+// objectPanel.add(north);
1529
+ objectPanel.add(editPanel);
1530
+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1531
+
1532
+ //if (Globals.ADVANCED)
1533
+ objectPanel.add(infoPanel);
1534
+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1535
+
1536
+ objectPanel.add(XYZPanel);
1537
+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1538
+
1539
+ objectPanel.add(toolboxPanel);
1540
+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
12591541
12601542 /*
12611543 aConstraints.gridx = 0;
....@@ -1264,7 +1546,7 @@
12641546 aConstraints.gridy += 1;
12651547 aConstraints.gridwidth = 1;
12661548 mainPanel.add(objectPanel, aConstraints);
1267
- */
1549
+ */
12681550
12691551 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12701552 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1275,16 +1557,23 @@
12751557 scrollpane.setWheelScrollingEnabled(true);
12761558 scrollpane.addMouseWheelListener(this); // Default not fast enough
12771559
1278
- /*JTabbedPane*/ scenePanel = new JTabbedPane();
1279
- scenePanel.add(scrollpane);
1560
+ /*JTabbedPane*/ scenePanel = new cGridBag();
1561
+ scenePanel.preferredWidth = 5;
1562
+
1563
+ JTabbedPane tabbedPane = new JTabbedPane();
1564
+ tabbedPane.add(scrollpane);
12801565
1281
- scenePanel.add(FSPane = new cFileSystemPane(this));
1282
-
1283
- optionsPanel = new JPanel(new GridBagLayout());
1566
+ optionsPanel = new cGridBag().setVertical(false);
12841567
12851568 optionsPanel.setName("Options");
1286
- scenePanel.add(optionsPanel);
1569
+
1570
+ AddOptions(optionsPanel); //, aConstraints);
1571
+
1572
+ tabbedPane.add(optionsPanel);
1573
+
1574
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
12871575
1576
+ scenePanel.add(tabbedPane);
12881577
12891578 /*
12901579 cTree jTree = new cTree(null);
....@@ -1318,6 +1607,7 @@
13181607 //bigPanel.setSize(new Dimension(10,10));
13191608 //bigPanel.add(ctrlPanel);
13201609 //bigPanel.add(gridPanel);
1610
+ /**
13211611 bigThree = new JPanel();
13221612 //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13231613 bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1341,7 +1631,13 @@
13411631 // aConstraints.gridheight = 3;
13421632 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13431633 bigThree.add(XYZPanel, aWindowConstraints);
1634
+ /**/
13441635
1636
+ bigThree = new cGridBag();
1637
+ bigThree.addComponent(centralPanel);
1638
+ bigThree.addComponent(scenePanel);
1639
+ //bigThree.addComponent(XYZPanel);
1640
+
13451641 // // SIDE EFFECT!!!
13461642 // aConstraints.gridx = 0;
13471643 // aConstraints.gridy = 0;
....@@ -1349,9 +1645,9 @@
13491645 // aConstraints.gridheight = 1;
13501646
13511647 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1352
- framePanel.setContinuousLayout(true);
1353
- framePanel.setOneTouchExpandable(true);
1354
- framePanel.setDividerLocation(0.8);
1648
+ framePanel.setContinuousLayout(false);
1649
+ framePanel.setOneTouchExpandable(false);
1650
+ //.setDividerLocation(0.8);
13551651 //framePanel.setDividerSize(15);
13561652 //framePanel.setResizeWeight(0.15);
13571653 framePanel.setName("Frame");
....@@ -1362,15 +1658,21 @@
13621658 //worldPane.add(bigPanel);
13631659 //worldPane.add(worldPanel);
13641660 /**/
1365
- frame.getContentPane().add(/*"Center",*/framePanel);
1661
+ //frame.getContentPane().add(/*"Center",*/framePanel);
1662
+ frame.add(/*"Center",*/framePanel);
13661663 //frame.getContentPane().add(/*"Center",*/ worldPane);
13671664
13681665 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13691666
1370
- frame.setSize(1024, 768);
1371
- frame.show();
1372
-
1667
+ frame.setSize(1280, 860);
1668
+
1669
+ cameraView.requestFocusInWindow();
1670
+
13731671 gridPanel.setDividerLocation(1.0);
1672
+
1673
+ frame.validate();
1674
+
1675
+ frame.setVisible(true);
13741676
13751677 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
13761678 frame.addWindowListener(new WindowAdapter()
....@@ -1383,6 +1685,10 @@
13831685 });
13841686 }
13851687
1688
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1689
+ {
1690
+ }
1691
+
13861692 JTree GetTree()
13871693 {
13881694 return objEditor.jTree;
....@@ -1394,260 +1700,161 @@
13941700 ctrlPanel.removeAll();
13951701 }
13961702
1397
- void SetupMaterial(JPanel ctrlPanel)
1703
+ void SetupMaterial(cGridBag panel)
13981704 {
1399
- aConstraints.weighty = 0;
1400
- //aConstraints.weightx = 1;
1401
- /*
1705
+ /*
14021706 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14031707 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405
- aConstraints.gridx += 1;
14061708 */
14071709
1408
- aConstraints.gridwidth = 1;
1409
- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410
- aConstraints.gridx += 1;
1411
- aConstraints.weighty = 0;
1412
- aConstraints.gridwidth = 1;
1710
+ cGridBag editBar = new cGridBag().setVertical(false);
1711
+
1712
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1713
+ createMaterialButton.setToolTipText("Create material");
14131714
14141715 /*
14151716 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416
- aConstraints.gridx += 1;
1417
- aConstraints.weighty = 0;
1418
- aConstraints.gridwidth = 1;
14191717 */
14201718
1421
- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422
- aConstraints.gridx += 1;
1719
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1720
+ clearMaterialButton.setToolTipText("Clear material");
1721
+
1722
+ if (Globals.ADVANCED)
1723
+ {
1724
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1725
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1726
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1727
+ }
14231728
1424
- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1425
-
1426
- aConstraints.gridx += 1;
1427
-
1428
- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1429
-
1430
- aConstraints.gridx += 1;
1431
-
1432
- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1433
-
1434
- aConstraints.gridx = 0;
1435
- aConstraints.gridy += 1;
1436
- aConstraints.weighty = 0;
1437
- aConstraints.gridwidth = 1;
1729
+ editBar.preferredHeight = 15;
1730
+
1731
+ panel.add(editBar);
1732
+
14381733 /**/
14391734 //aConstraints.weighty = 0;
14401735 ////aConstraints.weightx = 1;
14411736 //aConstraints.weighty = 1;
14421737 aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14431738 //aConstraints.gridx += 1;
1444
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1445
- aConstraints.weighty = 0;
1446
- aConstraints.gridx = 0;
1447
- aConstraints.gridy += 1;
1448
- aConstraints.gridwidth = 1;
1739
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14491740
1450
- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1451
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453
- aConstraints.gridx += 1;
1454
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455
- //aConstraints.weightx = 0;
1456
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1457
- aConstraints.gridx = 0;
1458
- aConstraints.gridy += 1;
1459
- aConstraints.gridwidth = 1;
1741
+ cGridBag colorSection = new cGridBag().setVertical(true);
1742
+
1743
+ cGridBag color = new cGridBag();
1744
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1745
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746
+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1747
+ //colorField.preferredWidth = 200;
1748
+ colorSection.add(color);
14601749
1461
- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1462
- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464
- aConstraints.gridx += 1;
1465
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467
- aConstraints.gridx = 0;
1468
- aConstraints.gridy += 1;
1469
- aConstraints.gridwidth = 1;
1750
+ cGridBag modulation = new cGridBag();
1751
+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1752
+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1754
+ colorSection.add(modulation);
14701755
1471
- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1472
- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474
- aConstraints.gridx += 1;
1475
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477
- aConstraints.gridx = 0;
1478
- aConstraints.gridy += 1;
1479
- aConstraints.gridwidth = 1;
1756
+ cGridBag texture = new cGridBag();
1757
+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1758
+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759
+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1760
+ colorSection.add(texture);
14801761
1481
- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1482
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484
- aConstraints.gridx += 1;
1485
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487
- aConstraints.gridx = 0;
1488
- aConstraints.gridy += 1;
1489
- aConstraints.gridwidth = 1;
1762
+ panel.add(new JSeparator());
1763
+
1764
+ panel.add(colorSection);
1765
+
1766
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1767
+
1768
+ cGridBag diffuseSection = new cGridBag().setVertical(true);
1769
+
1770
+ cGridBag diffuse = new cGridBag();
1771
+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1772
+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773
+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1774
+ diffuseSection.add(diffuse);
14901775
1491
- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1492
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494
- aConstraints.gridx += 1;
1495
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497
- aConstraints.gridx = 0;
1498
- aConstraints.gridy += 1;
1499
- aConstraints.gridwidth = 1;
1776
+ cGridBag diffuseness = new cGridBag();
1777
+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1778
+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1779
+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1780
+ diffuseSection.add(diffuseness);
15001781
1501
- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1502
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504
- aConstraints.gridx += 1;
1505
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506
- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1507
- aConstraints.gridx = 0;
1508
- aConstraints.gridy += 1;
1509
- aConstraints.gridwidth = 1;
1782
+ cGridBag selfshadow = new cGridBag();
1783
+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1784
+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785
+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1786
+ diffuseSection.add(selfshadow);
15101787
1511
- //aConstraints.weighty = 1;
1512
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1513
- //aConstraints.gridx += 1;
1514
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1515
- aConstraints.weighty = 0;
1516
- aConstraints.gridx = 0;
1517
- aConstraints.gridy += 1;
1518
- aConstraints.gridwidth = 1;
1788
+ cGridBag sheen = new cGridBag();
1789
+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1790
+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1791
+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1792
+ diffuseSection.add(sheen);
15191793
1520
- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1521
- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523
- aConstraints.gridx += 1;
1524
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525
- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1526
- aConstraints.gridx = 0;
1527
- aConstraints.gridy += 1;
1528
- aConstraints.gridwidth = 1;
1794
+ cGridBag subsurface = new cGridBag();
1795
+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1796
+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1797
+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1798
+ diffuseSection.add(subsurface);
15291799
1530
- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1531
- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533
- aConstraints.gridx += 1;
1534
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1536
- aConstraints.gridx = 0;
1537
- aConstraints.gridy += 1;
1538
- aConstraints.gridwidth = 1;
1800
+ cGridBag shadow = new cGridBag();
1801
+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1802
+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1803
+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1804
+ diffuseSection.add(shadow);
15391805
1540
- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1541
- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543
- aConstraints.gridx += 1;
1544
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545
- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546
- aConstraints.gridx = 0;
1547
- aConstraints.gridy += 1;
1548
- aConstraints.gridwidth = 1;
1806
+ cGridBag fakedepth = new cGridBag();
1807
+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1808
+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809
+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810
+ diffuseSection.add(fakedepth);
15491811
1550
- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1551
- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553
- aConstraints.gridx += 1;
1554
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555
- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1556
- aConstraints.gridx = 0;
1557
- aConstraints.gridy += 1;
1558
- aConstraints.gridwidth = 1;
1812
+ cGridBag shadowbias = new cGridBag();
1813
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1814
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816
+ diffuseSection.add(shadowbias);
15591817
1560
- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1561
- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563
- aConstraints.gridx += 1;
1564
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1566
- aConstraints.gridx = 0;
1567
- aConstraints.gridy += 1;
1568
- aConstraints.gridwidth = 1;
1818
+ panel.add(new JSeparator());
1819
+
1820
+ panel.add(diffuseSection);
1821
+
1822
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1823
+
1824
+ cGridBag specularSection = new cGridBag().setVertical(true);
15691825
1570
- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1571
- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573
- aConstraints.gridx += 1;
1574
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575
- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1576
- aConstraints.gridx = 0;
1577
- aConstraints.gridy += 1;
1578
- aConstraints.gridwidth = 1;
1826
+ cGridBag specular = new cGridBag();
1827
+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1828
+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1829
+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1830
+ specularSection.add(specular);
15791831
1580
- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1581
- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583
- aConstraints.gridx += 1;
1584
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585
- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1586
- aConstraints.gridx = 0;
1587
- aConstraints.gridy += 1;
1588
- aConstraints.gridwidth = 1;
1832
+ cGridBag lightarea = new cGridBag();
1833
+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1834
+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1835
+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1836
+ specularSection.add(lightarea);
15891837
1590
- //aConstraints.weighty = 1;
1591
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1592
- //aConstraints.gridx += 1;
1593
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1594
- aConstraints.weighty = 0;
1595
- aConstraints.gridx = 0;
1596
- aConstraints.gridy += 1;
1597
- aConstraints.gridwidth = 1;
1838
+ cGridBag shininess = new cGridBag();
1839
+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1840
+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1841
+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1842
+ specularSection.add(shininess);
15981843
1599
- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1600
- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602
- aConstraints.gridx += 1;
1603
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604
- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1605
- aConstraints.gridx = 0;
1606
- aConstraints.gridy += 1;
1607
- aConstraints.gridwidth = 1;
1844
+ cGridBag metalness = new cGridBag();
1845
+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1846
+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1847
+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1848
+ specularSection.add(metalness);
16081849
1609
- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1610
- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612
- aConstraints.gridx += 1;
1613
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614
- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1615
- aConstraints.gridx = 0;
1616
- aConstraints.gridy += 1;
1617
- aConstraints.gridwidth = 1;
1850
+ cGridBag velvet = new cGridBag();
1851
+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1852
+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1853
+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1854
+ specularSection.add(velvet);
16181855
1619
- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1620
- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622
- aConstraints.gridx += 1;
1623
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624
- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1625
- aConstraints.gridx = 0;
1626
- aConstraints.gridy += 1;
1627
- aConstraints.gridwidth = 1;
1628
-
1629
- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1630
- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632
- aConstraints.gridx += 1;
1633
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1635
- aConstraints.gridx = 0;
1636
- aConstraints.gridy += 1;
1637
- aConstraints.gridwidth = 1;
1638
-
1639
- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1640
- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
- aConstraints.gridx += 1;
1643
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1645
- aConstraints.gridx = 0;
1646
- aConstraints.gridy += 1;
1647
- aConstraints.gridwidth = 1;
1648
-
1649
- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1650
- Return();
1856
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1857
+ //Return();
16511858 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16521859 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16531860 // aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1658,130 +1865,105 @@
16581865 // aConstraints.gridy += 1;
16591866 // aConstraints.gridwidth = 1;
16601867
1661
- //aConstraints.weighty = 1;
1662
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1663
- //aConstraints.gridx += 1;
1664
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1665
- aConstraints.weighty = 0;
1666
- aConstraints.gridx = 0;
1667
- aConstraints.gridy += 1;
1668
- aConstraints.gridwidth = 1;
1868
+ cGridBag anisoU = new cGridBag();
1869
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1870
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1871
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1872
+ specularSection.add(anisoU);
16691873
1670
- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1671
- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673
- aConstraints.gridx += 1;
1674
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675
- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1676
- aConstraints.gridx = 0;
1677
- aConstraints.gridy += 1;
1678
- aConstraints.gridwidth = 1;
1874
+ cGridBag anisoV = new cGridBag();
1875
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1876
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1877
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1878
+ specularSection.add(anisoV);
16791879
1680
- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1681
- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
- aConstraints.gridx += 1;
1684
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1686
- aConstraints.gridx = 0;
1687
- aConstraints.gridy += 1;
1688
- aConstraints.gridwidth = 1;
16891880
1690
- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1691
- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
- aConstraints.gridx += 1;
1694
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1696
- aConstraints.gridx = 0;
1697
- aConstraints.gridy += 1;
1698
- aConstraints.gridwidth = 1;
1881
+ panel.add(new JSeparator());
1882
+
1883
+ panel.add(specularSection);
1884
+
1885
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1886
+
1887
+ //cGridBag globalSection = new cGridBag().setVertical(true);
16991888
1700
- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1701
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
- aConstraints.gridx += 1;
1704
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1706
- aConstraints.gridx = 0;
1707
- aConstraints.gridy += 1;
1708
- aConstraints.gridwidth = 1;
1709
- aConstraints.weighty = 0;
1889
+ cGridBag camera = new cGridBag();
1890
+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1891
+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1892
+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1893
+ colorSection.add(camera);
17101894
1711
- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1712
- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714
- aConstraints.gridx += 1;
1715
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716
- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1717
- aConstraints.gridx = 0;
1718
- aConstraints.gridy += 1;
1719
- aConstraints.gridwidth = 1;
1895
+ cGridBag ambient = new cGridBag();
1896
+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1897
+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1898
+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1899
+ colorSection.add(ambient);
17201900
1721
- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1722
- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724
- aConstraints.gridx += 1;
1725
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726
- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1727
- aConstraints.gridx = 0;
1728
- aConstraints.gridy += 1;
1729
- aConstraints.gridwidth = 1;
1901
+ cGridBag backlit = new cGridBag();
1902
+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1903
+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1904
+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1905
+ colorSection.add(backlit);
17301906
1731
- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1732
- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734
- aConstraints.gridx += 1;
1735
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736
- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1737
- aConstraints.gridx = 0;
1738
- aConstraints.gridy += 1;
1739
- aConstraints.gridwidth = 1;
1907
+ cGridBag opacity = new cGridBag();
1908
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1909
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1910
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1911
+ colorSection.add(opacity);
17401912
1741
- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1742
- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744
- aConstraints.gridx += 1;
1745
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746
- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1747
- aConstraints.gridx = 0;
1748
- aConstraints.gridy += 1;
1749
- aConstraints.gridwidth = 1;
1913
+ //panel.add(new JSeparator());
1914
+
1915
+ //panel.add(globalSection);
1916
+
1917
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1918
+
1919
+ cGridBag textureSection = new cGridBag().setVertical(true);
17501920
1751
- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1752
- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754
- aConstraints.gridx += 1;
1755
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756
- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1757
- aConstraints.gridx = 0;
1758
- aConstraints.gridy += 1;
1759
- aConstraints.gridwidth = 1;
1921
+ cGridBag bump = new cGridBag();
1922
+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1923
+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1924
+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1925
+ textureSection.add(bump);
17601926
1761
- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1762
- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764
- aConstraints.gridx += 1;
1765
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766
- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1767
- aConstraints.gridx = 0;
1768
- aConstraints.gridy += 1;
1769
- aConstraints.gridwidth = 1;
1927
+ cGridBag noise = new cGridBag();
1928
+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1929
+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1930
+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1931
+ textureSection.add(noise);
17701932
1771
- //aConstraints.weighty = 1;
1772
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773
- //aConstraints.gridx += 1;
1774
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775
- aConstraints.weighty = 0;
1933
+ cGridBag power = new cGridBag();
1934
+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1935
+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1936
+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1937
+ textureSection.add(power);
17761938
1777
- aConstraints.gridx = 0;
1778
- aConstraints.gridy = 0;
1779
- aConstraints.gridwidth = 1;
1939
+ cGridBag borderfade = new cGridBag();
1940
+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1941
+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1942
+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1943
+ textureSection.add(borderfade);
1944
+
1945
+ cGridBag fog = new cGridBag();
1946
+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1947
+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1948
+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1949
+ textureSection.add(fog);
1950
+
1951
+ cGridBag opacityPower = new cGridBag();
1952
+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1953
+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1954
+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1955
+ textureSection.add(opacityPower);
1956
+
1957
+ panel.add(new JSeparator());
1958
+
1959
+ panel.add(textureSection);
1960
+
1961
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17801962
17811963 SetMaterial(copy); // .GetMaterial());
17821964
1783
- colorField.addChangeListener(this);
1784
- modulationField.addChangeListener(this);
1965
+ //colorField.addChangeListener(this);
1966
+// modulationField.addChangeListener(this);
17851967 metalnessField.addChangeListener(this);
17861968 diffuseField.addChangeListener(this);
17871969 specularField.addChangeListener(this);
....@@ -1811,12 +1993,15 @@
18111993 opacityPowerField.addChangeListener(this);
18121994 /**/
18131995
1814
- resetSlidersButton.addActionListener(this);
18151996 clearMaterialButton.addActionListener(this);
18161997 createMaterialButton.addActionListener(this);
1817
-
1818
- propagateToggle.addItemListener(this);
1819
- multiplyToggle.addItemListener(this);
1998
+
1999
+ if (Globals.ADVANCED)
2000
+ {
2001
+ resetSlidersButton.addActionListener(this);
2002
+ propagateToggle.addItemListener(this);
2003
+ multiplyToggle.addItemListener(this);
2004
+ }
18202005 }
18212006
18222007 void DropFile(java.io.File[] files, boolean textures)
....@@ -1834,8 +2019,9 @@
18342019 // 3D models
18352020 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
18362021 {
1837
- lastConverter = new com.jmex.model.converters.MaxToJme();
1838
- LoadFile(filename, lastConverter);
2022
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2023
+ //LoadFile(filename, lastConverter);
2024
+ LoadObjFile(filename); // New 3ds loader
18392025 continue;
18402026 }
18412027 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -1987,7 +2173,7 @@
19872173
19882174 //? flashIt = false;
19892175 CameraPane pane = (CameraPane) cameraView;
1990
- pane.clickStart(location.x, location.y, 0);
2176
+ pane.clickStart(location.x, location.y, 0, 0);
19912177 pane.clickEnd(location.x, location.y, 0, true);
19922178
19932179 if (group.selection.size() == 1)
....@@ -2036,6 +2222,7 @@
20362222 e2.printStackTrace();
20372223 }
20382224 }
2225
+
20392226 LoadJMEThread loadThread;
20402227
20412228 class LoadJMEThread extends Thread
....@@ -2093,6 +2280,7 @@
20932280 //LoadFile0(filename, converter);
20942281 }
20952282 }
2283
+
20962284 LoadOBJThread loadObjThread;
20972285
20982286 class LoadOBJThread extends Thread
....@@ -2171,19 +2359,19 @@
21712359
21722360 void LoadObjFile(String fullname)
21732361 {
2174
- /*
2362
+ System.out.println("Loading " + fullname);
2363
+ /**/
21752364 //lastFilename = fullname;
21762365 if(loadObjThread == null)
21772366 {
2178
- loadObjThread = new LoadOBJThread();
2179
- loadObjThread.start();
2367
+ loadObjThread = new LoadOBJThread();
2368
+ loadObjThread.start();
21802369 }
21812370
21822371 loadObjThread.add(fullname);
2183
- */
2372
+ /**/
21842373
2185
- System.out.println("Loading " + fullname);
2186
- makeSomething(new FileObject(fullname, true), true);
2374
+ //makeSomething(new FileObject(fullname, true), true);
21872375 }
21882376
21892377 void LoadGFDFile(String fullname)
....@@ -2444,11 +2632,11 @@
24442632
24452633 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
24462634 {
2447
- if (GrafreeD.standAlone)
2635
+ if (Grafreed.standAlone)
24482636 {
24492637 /**/
24502638 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2451
- browser.show();
2639
+ browser.setVisible(true);
24522640 String filename = browser.getFile();
24532641 if (filename != null && filename.length() > 0)
24542642 {
....@@ -2559,6 +2747,7 @@
25592747 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
25602748 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
25612749 }
2750
+
25622751 //cJME.count++;
25632752 //cJME.count %= 12;
25642753 if (gc)
....@@ -2593,6 +2782,7 @@
25932782 }
25942783 if (input == null)
25952784 {
2785
+ new Exception().printStackTrace();
25962786 System.exit(0);
25972787 }
25982788
....@@ -2741,6 +2931,7 @@
27412931 }
27422932 }
27432933 }
2934
+
27442935 cFileSystemPane FSPane;
27452936
27462937 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2794,11 +2985,14 @@
27942985 }
27952986 }
27962987 }
2988
+
27972989 freezematerial = false;
27982990 }
27992991
28002992 void SetMaterial(Object3D object)
28012993 {
2994
+ latestObject = object;
2995
+
28022996 cMaterial mat = object.material;
28032997
28042998 if (mat == null)
....@@ -2807,7 +3001,8 @@
28073001 return;
28083002 }
28093003
2810
- multiplyToggle.setSelected(mat.multiply);
3004
+ if (multiplyToggle != null)
3005
+ multiplyToggle.setSelected(mat.multiply);
28113006
28123007 assert (object.projectedVertices != null);
28133008
....@@ -2909,12 +3104,17 @@
29093104 // }
29103105
29113106 /**/
2912
- if (deselect)
3107
+ if (deselect || child == null)
29133108 {
29143109 //group.deselectAll();
29153110 //freeze = true;
29163111 GetTree().clearSelection();
29173112 //freeze = false;
3113
+
3114
+ if (child == null)
3115
+ {
3116
+ return;
3117
+ }
29183118 }
29193119
29203120 //group.addSelectee(child);
....@@ -2983,7 +3183,7 @@
29833183 cameraView.ToggleDL();
29843184 cameraView.repaint();
29853185 return;
2986
- } else if (event.getSource() == toggleTextureItem)
3186
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29873187 {
29883188 cameraView.ToggleTexture();
29893189 // june 2013 copy.HardTouch();
....@@ -2996,7 +3196,8 @@
29963196 if (timeline)
29973197 {
29983198 centralPanel.remove(cameraView);
2999
- centralPanel.add(timelinePanel);
3199
+ cameraPanel.add(cameraView);
3200
+ centralPanel.add(cameraPanel);
30003201 frame.setJMenuBar(timelineMenubar);
30013202 wasFullScreen = CameraPane.FULLSCREEN;
30023203 if (!CameraPane.FULLSCREEN)
....@@ -3005,7 +3206,7 @@
30053206 }
30063207 else
30073208 {
3008
- centralPanel.remove(timelinePanel);
3209
+ centralPanel.remove(cameraPanel);
30093210 centralPanel.add(cameraView);
30103211 frame.setJMenuBar(null);
30113212 if (!wasFullScreen)
....@@ -3021,9 +3222,9 @@
30213222 frame.validate();
30223223
30233224 return;
3024
- } else if (event.getSource() == toggleRandomItem)
3225
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30253226 {
3026
- cameraView.ToggleRandom();
3227
+ cameraView.ToggleSwitch();
30273228 cameraView.repaint();
30283229 return;
30293230 } else if (event.getSource() == toggleHandleItem)
....@@ -3052,6 +3253,10 @@
30523253 {
30533254 copy.live ^= true;
30543255 return;
3256
+ } else if (event.getSource() == selectableCB)
3257
+ {
3258
+ copy.dontselect ^= true;
3259
+ return;
30553260 } else if (event.getSource() == hideCB)
30563261 {
30573262 copy.hide ^= true;
....@@ -3066,6 +3271,7 @@
30663271 if (event.getSource() == randomCB)
30673272 {
30683273 copy.random ^= true;
3274
+ objEditor.refreshContents();
30693275 return;
30703276 }
30713277 if (event.getSource() == speedupCB)
....@@ -3089,8 +3295,9 @@
30893295
30903296 public void actionPerformed(ActionEvent event)
30913297 {
3298
+ Object source = event.getSource();
30923299 // SCRIPT DIALOG
3093
- if (event.getSource() == okbutton)
3300
+ if (source == okbutton)
30943301 {
30953302 textpanel.setVisible(false);
30963303 textpanel.remove(textarea);
....@@ -3102,7 +3309,7 @@
31023309 textarea = null;
31033310 textpanel = null;
31043311 }
3105
- if (event.getSource() == cancelbutton)
3312
+ if (source == cancelbutton)
31063313 {
31073314 textpanel.setVisible(false);
31083315 textpanel.remove(textarea);
....@@ -3114,49 +3321,50 @@
31143321 //applySelf();
31153322 //client.refreshEditWindow();
31163323 //refreshContents();
3117
- if (event.getSource() == nameField)
3324
+ if (source == nameField)
31183325 {
31193326 //System.out.println("ObjEditor " + event);
31203327 applySelf0(true);
31213328 //parent.applySelf();
31223329 objEditor.refreshContents();
3123
- } else if (event.getSource() == resetButton)
3330
+ } else if (source == resetButton)
31243331 {
31253332 CameraPane.fullreset = true;
31263333 copy.Reset(); // ResetMeshes();
31273334 copy.Touch();
31283335 objEditor.refreshContents();
3129
- } else if (event.getSource() == stepItem)
3336
+ } else if (source == stepItem)
31303337 {
3131
- cameraView.ONESTEP = true;
3338
+ //cameraView.ONESTEP = true;
3339
+ Globals.ONESTEP = true;
31323340 cameraView.repaint();
31333341 return;
3134
- } else if (event.getSource() == stepButton)
3342
+ } else if (source == stepButton)
31353343 {
31363344 copy.Step();
31373345 copy.Touch();
31383346 objEditor.refreshContents();
3139
- } else if (event.getSource() == slowerButton)
3347
+ } else if (source == slowerButton)
31403348 {
31413349 copy.Slower();
31423350 copy.Touch();
31433351 objEditor.refreshContents();
3144
- } else if (event.getSource() == fasterButton)
3352
+ } else if (source == fasterButton)
31453353 {
31463354 copy.Faster();
31473355 copy.Touch();
31483356 objEditor.refreshContents();
3149
- } else if (event.getSource() == remarkButton)
3357
+ } else if (source == remarkButton)
31503358 {
31513359 copy.Remark();
31523360 copy.Touch();
31533361 objEditor.refreshContents();
3154
- } else if (event.getSource() == stepAllButton)
3362
+ } else if (source == stepAllButton)
31553363 {
31563364 copy.StepAll();
31573365 copy.Touch();
31583366 objEditor.refreshContents();
3159
- } else if (event.getSource() == resetAllButton)
3367
+ } else if (source == resetAllButton)
31603368 {
31613369 //CameraPane.fullreset = true;
31623370 copy.ResetAll(); // ResetMeshes();
....@@ -3189,53 +3397,79 @@
31893397 // Close();
31903398 // }
31913399 // else
3192
- if (event.getSource() == resetSlidersButton)
3400
+ if (source == resetSlidersButton)
31933401 {
31943402 ResetSliders();
3195
- } else if (event.getSource() == clearMaterialButton)
3403
+ } else if (source == clearMaterialButton)
31963404 {
31973405 ClearMaterial();
3198
- } else if (event.getSource() == createMaterialButton)
3406
+ } else if (source == createMaterialButton)
31993407 {
32003408 CreateMaterial();
3201
- } else if (event.getSource() == clearPanelButton)
3409
+ } else if (source == clearPanelButton)
32023410 {
32033411 copy.ClearUI();
32043412 refreshContents(true);
3205
- } /*
3206
- }
3207
-
3208
- public boolean action(Event event, Object arg)
3209
- {
3210
- */ else if (event.getSource() == closeItem)
3413
+ } else if (source == importGFDItem)
3414
+ {
3415
+ ImportGFD();
3416
+ } else
3417
+ if (source == importVRMLX3DItem)
3418
+ {
3419
+ ImportVRMLX3D();
3420
+ } else
3421
+ if (source == import3DSItem)
3422
+ {
3423
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3424
+ } else
3425
+ if (source == importOBJItem)
3426
+ {
3427
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3428
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3429
+ browser.setVisible(true);
3430
+ String filename = browser.getFile();
3431
+ if (filename != null && filename.length() > 0)
3432
+ {
3433
+ String fullname = browser.getDirectory() + filename;
3434
+ makeSomething(ReadOBJ(fullname), true);
3435
+ }
3436
+ } else
3437
+ if (source == closeItem)
32113438 {
32123439 Close();
32133440 //return true;
3214
- } else if (event.getSource() == loadItem)
3441
+ } else if (source == openItem)
32153442 {
3216
- load();
3443
+ Open();
32173444 //return true;
3218
- } else if (event.getSource() == saveItem)
3445
+ } else if (source == newItem)
3446
+ {
3447
+ New();
3448
+ } else if (source == saveItem)
32193449 {
32203450 save();
32213451 //return true;
3222
- } else if (event.getSource() == saveAsItem)
3452
+ } else if (source == saveAsItem)
32233453 {
32243454 saveAs();
32253455 //return true;
3226
- } else if (event.getSource() == reexportItem)
3456
+ } else if (source == reexportItem)
32273457 {
32283458 reexport();
32293459 //return true;
3230
- } else if (event.getSource() == exportAsItem)
3460
+ } else if (source == exportAsItem)
32313461 {
32323462 export();
32333463 //return true;
3234
- } else if (event.getSource() == povItem)
3464
+ } else if (source == povItem)
32353465 {
32363466 generatePOV();
32373467 //return true;
3238
- } else if (event.getSource() == zBufferItem)
3468
+ } else if (event.getSource() == archiveItem)
3469
+ {
3470
+ cTools.Archive(frame);
3471
+ return;
3472
+ } else if (source == zBufferItem)
32393473 {
32403474 try
32413475 {
....@@ -3257,21 +3491,8 @@
32573491 cameraView.repaint();
32583492 //return true;
32593493 }
3260
- */ else if (event.getSource() == editCameraItem)
3261
- {
3262
- cameraView.ProtectCamera();
3263
- cameraView.repaint();
3264
- return;
3265
- } else if (event.getSource() == revertCameraItem)
3266
- {
3267
- cameraView.RevertCamera();
3268
- cameraView.repaint();
3269
- return;
3270
-// } else if (event.getSource() == textureButton)
3271
-// {
3272
-// return; // true;
3273
- } else // combos...
3274
- if (event.getSource() == texresMenu)
3494
+ */ else // combos...
3495
+ if (source == texresMenu)
32753496 {
32763497 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32773498 copy.texres = texresMenu.getSelectedIndex();
....@@ -3283,27 +3504,424 @@
32833504 }
32843505 }
32853506
3286
- void ToggleAnimation()
3507
+ void New()
32873508 {
3288
- if (!CameraPane.ANIMATION)
3509
+ while (copy.Size() > 1)
32893510 {
3290
- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3511
+ copy.remove(1);
3512
+ }
3513
+
3514
+ ResetModel();
3515
+ objEditor.refreshContents();
3516
+ }
3517
+
3518
+ static public byte[] Compress(Object3D o)
3519
+ {
3520
+ try
3521
+ {
3522
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3523
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3524
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3525
+
3526
+ Object3D parent = o.parent;
3527
+ o.parent = null;
3528
+
3529
+ out.writeObject(o);
3530
+
3531
+ o.parent = parent;
3532
+
3533
+ out.flush();
3534
+
3535
+ baos //zstream
3536
+ .close();
3537
+ out.close();
3538
+
3539
+ byte[] bytes = baos.toByteArray();
3540
+
3541
+ System.out.println("save #bytes = " + bytes.length);
3542
+ return bytes;
3543
+ } catch (Exception e)
3544
+ {
3545
+ System.err.println(e);
3546
+ return null;
3547
+ }
3548
+ }
3549
+
3550
+ static public Object Uncompress(byte[] bytes)
3551
+ {
3552
+ System.out.println("restore #bytes = " + bytes.length);
3553
+ try
3554
+ {
3555
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3556
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3557
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3558
+ Object obj = in.readObject();
3559
+
3560
+ bais //istream
3561
+ .close();
3562
+ in.close();
3563
+
3564
+ return obj;
3565
+ } catch (Exception e)
3566
+ {
3567
+ System.err.println(e);
3568
+ return null;
3569
+ }
3570
+ }
3571
+
3572
+ static public Object clone(Object o)
3573
+ {
3574
+ try
3575
+ {
3576
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3577
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3578
+
3579
+ out.writeObject(o);
3580
+
3581
+ out.flush();
3582
+ out.close();
3583
+
3584
+ byte[] bytes = baos.toByteArray();
3585
+
3586
+ System.out.println("clone = " + bytes.length);
3587
+
3588
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3589
+ ObjectInputStream in = new ObjectInputStream(bais);
3590
+ Object obj = in.readObject();
3591
+ in.close();
3592
+
3593
+ return obj;
3594
+ } catch (Exception e)
3595
+ {
3596
+ System.err.println(e);
3597
+ return null;
3598
+ }
3599
+ }
3600
+
3601
+ cRadio GetCurrentTab()
3602
+ {
3603
+ cRadio ab;
3604
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3605
+ {
3606
+ ab = (cRadio)e.nextElement();
3607
+ if(ab.GetObject() == copy)
3608
+ {
3609
+ return ab;
3610
+ }
3611
+ }
3612
+
3613
+ return null;
3614
+ }
3615
+
3616
+
3617
+ public void Save()
3618
+ {
3619
+ //Save(true);
3620
+ Replace();
3621
+ }
3622
+
3623
+ private boolean Equal(byte[] compress, byte[] name)
3624
+ {
3625
+ if (compress.length != name.length)
3626
+ {
3627
+ return false;
3628
+ }
3629
+
3630
+ for (int i=compress.length; --i>=0;)
3631
+ {
3632
+ if (compress[i] != name[i])
3633
+ return false;
3634
+ }
3635
+
3636
+ return true;
3637
+ }
3638
+
3639
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3640
+
3641
+ public boolean Save(boolean user)
3642
+ {
3643
+ System.err.println("Save");
3644
+
3645
+ cRadio tab = GetCurrentTab();
3646
+
3647
+ byte[] compress = CompressCopy();
3648
+
3649
+ boolean thesame = false;
3650
+
3651
+ // Quick heuristic using length. Works only when stream is compressed.
3652
+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3653
+ {
3654
+ thesame = true;
3655
+ }
3656
+
3657
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3658
+ if (!thesame)
3659
+ {
3660
+ //tab.user[tab.versionindex] = user;
3661
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3662
+
3663
+ copy.versions[++copy.versionindex] = compress;
3664
+
3665
+ // if (increment)
3666
+ // tab.versionindex++;
3667
+ }
3668
+
3669
+ //copy.RestoreBigData(versiontable);
3670
+
3671
+ //assert(hashtable.isEmpty());
3672
+
3673
+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3674
+ {
3675
+ //tab.user[i] = false;
3676
+ copy.versions[i] = null;
3677
+ }
3678
+
3679
+ SetUndoStates();
3680
+
3681
+ // test save
3682
+ if (false)
3683
+ {
3684
+ try
3685
+ {
3686
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3687
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3688
+
3689
+ p.writeObject(copy);
3690
+
3691
+ p.flush();
3692
+
3693
+ ostream.close();
3694
+ } catch (Exception e)
3695
+ {
3696
+ e.printStackTrace();
3697
+ }
3698
+ }
3699
+
3700
+ return !thesame;
3701
+ }
3702
+
3703
+ void CopyChanged(Object3D obj)
3704
+ {
3705
+ SetUndoStates();
3706
+
3707
+ boolean temp = CameraPane.SWITCH;
3708
+ CameraPane.SWITCH = false;
3709
+
3710
+ copy.ExtractBigData(versiontable);
3711
+
3712
+ copy.clear();
3713
+
3714
+ for (int i=0; i<obj.Size(); i++)
3715
+ {
3716
+ copy.add(obj.get(i));
3717
+ }
3718
+
3719
+ copy.RestoreBigData(versiontable);
3720
+
3721
+ CameraPane.SWITCH = temp;
3722
+
3723
+ //assert(hashtable.isEmpty());
3724
+
3725
+ copy.Touch();
3726
+
3727
+ ResetModel();
3728
+ copy.HardTouch(); // recompile?
3729
+
3730
+ cRadio ab;
3731
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3732
+ {
3733
+ ab = (cRadio)e.nextElement();
3734
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3735
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3736
+ if (test != null)
3737
+ {
3738
+ test.editWindow = ab.object.editWindow;
3739
+ ab.object = test;
3740
+ }
3741
+ }
3742
+
3743
+ refreshContents();
3744
+ }
3745
+
3746
+ cButton undoButton;
3747
+ cButton restoreButton;
3748
+ cButton replaceButton;
3749
+ cButton redoButton;
3750
+
3751
+ boolean muteSlider;
3752
+
3753
+ int VersionCount()
3754
+ {
3755
+ int count = 0;
3756
+
3757
+ for (int i = copy.versions.length; --i >= 0;)
3758
+ {
3759
+ if (copy.versions[i] != null)
3760
+ count++;
3761
+ }
3762
+
3763
+ return count;
3764
+ }
3765
+
3766
+ void SetUndoStates()
3767
+ {
3768
+ cRadio tab = GetCurrentTab();
3769
+
3770
+ restoreButton.setEnabled(copy.versionindex != -1);
3771
+ replaceButton.setEnabled(copy.versionindex != -1);
3772
+
3773
+ undoButton.setEnabled(copy.versionindex > 0);
3774
+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3775
+
3776
+ muteSlider = true;
3777
+ versionSlider.setMaximum(VersionCount() - 1);
3778
+ versionSlider.setInteger(copy.versionindex);
3779
+ muteSlider = false;
3780
+ }
3781
+
3782
+ public boolean Undo()
3783
+ {
3784
+ // Option?
3785
+ Replace();
3786
+
3787
+ System.err.println("Undo");
3788
+
3789
+ cRadio tab = GetCurrentTab();
3790
+
3791
+ if (copy.versionindex == 0)
3792
+ {
3793
+ java.awt.Toolkit.getDefaultToolkit().beep();
3794
+ return false;
3795
+ }
3796
+
3797
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3798
+// {
3799
+// if (Save(false))
3800
+// tab.versionindex -= 1;
3801
+// else
3802
+// {
3803
+// if (tab.versionindex <= 0)
3804
+// return false;
3805
+// else
3806
+// tab.versionindex -= 1;
3807
+// }
3808
+// }
3809
+
3810
+ copy.versionindex -= 1;
3811
+
3812
+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3813
+
3814
+ return true;
3815
+ }
3816
+
3817
+ public boolean Restore()
3818
+ {
3819
+ System.err.println("Restore");
3820
+
3821
+ cRadio tab = GetCurrentTab();
3822
+
3823
+ if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3824
+ {
3825
+ java.awt.Toolkit.getDefaultToolkit().beep();
3826
+ return false;
3827
+ }
3828
+
3829
+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3830
+
3831
+ return true;
3832
+ }
3833
+
3834
+ public boolean Replace()
3835
+ {
3836
+ System.err.println("Replace");
3837
+
3838
+ cRadio tab = GetCurrentTab();
3839
+
3840
+ if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3841
+ {
3842
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3843
+ return false;
3844
+ }
3845
+
3846
+ copy.versions[copy.versionindex] = CompressCopy();
3847
+
3848
+ return true;
3849
+ }
3850
+
3851
+ public void Redo()
3852
+ {
3853
+ // Option?
3854
+ Replace();
3855
+
3856
+ cRadio tab = GetCurrentTab();
3857
+
3858
+ if (copy.versions[copy.versionindex + 1] == null)
3859
+ {
3860
+ java.awt.Toolkit.getDefaultToolkit().beep();
3861
+ return;
3862
+ }
3863
+
3864
+ copy.versionindex += 1;
3865
+
3866
+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3867
+
3868
+ //if (!tab.user[tab.versionindex])
3869
+ // tab.graphs[tab.versionindex] = null;
3870
+ }
3871
+
3872
+ void ImportGFD()
3873
+ {
3874
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
32913875 browser.show();
32923876 String filename = browser.getFile();
32933877 if (filename != null && filename.length() > 0)
32943878 {
3295
- CameraPane.filename = browser.getDirectory() + filename;
3879
+ String fullname = browser.getDirectory() + filename;
3880
+
3881
+ //Object3D readobj =
3882
+ objEditor.ReadGFD(fullname, objEditor);
3883
+ //makeSomething(readobj);
3884
+ }
3885
+ }
3886
+
3887
+ void ImportVRMLX3D()
3888
+ {
3889
+ if (Grafreed.standAlone)
3890
+ {
3891
+ /**/
3892
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3893
+ browser.show();
3894
+ String filename = browser.getFile();
3895
+ if (filename != null && filename.length() > 0)
3896
+ {
3897
+ String fullname = browser.getDirectory() + filename;
3898
+ LoadVRMLX3D(fullname);
3899
+ }
3900
+ /**/
3901
+ }
3902
+ }
3903
+
3904
+ void ToggleAnimation()
3905
+ {
3906
+ if (!Globals.ANIMATION)
3907
+ {
3908
+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3909
+ browser.setVisible(true);
3910
+ String filename = browser.getFile();
3911
+ if (filename != null && filename.length() > 0)
3912
+ {
3913
+ Globals.filename = browser.getDirectory() + filename;
32963914 //CameraPane.framecount = 0;
3297
- CameraPane.imagecount = 0;
3915
+ Globals.imagecount = 0;
32983916
3299
- CameraPane.ANIMATION ^= true;
3917
+ Globals.ANIMATION ^= true;
33003918
3301
- GrafreeD.wav.cursor = 0;
3302
- GrafreeD.wav.loop = 0;
3919
+ Grafreed.wav.cursor = 0;
3920
+ Grafreed.wav.loop = 0;
33033921 }
33043922 } else
33053923 {
3306
- CameraPane.ANIMATION ^= true;
3924
+ Globals.ANIMATION ^= true;
33073925 }
33083926 }
33093927
....@@ -3349,7 +3967,7 @@
33493967 void CreateMaterial()
33503968 {
33513969 //copy.ClearMaterial(); // PATCH
3352
- copy.CreateMaterialS(multiplyToggle.isSelected());
3970
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
33533971 if (copy.selection.size() > 0)
33543972 //SetMaterial(copy);
33553973 {
....@@ -3400,7 +4018,7 @@
34004018 assert false;
34014019 }
34024020
3403
- void EditSelection()
4021
+ void EditSelection(boolean newWindow)
34044022 {
34054023 }
34064024
....@@ -3408,11 +4026,11 @@
34084026 {
34094027 copy.ResetBlockLoop(); // temporary problem
34104028
3411
- boolean random = CameraPane.RANDOM;
3412
- CameraPane.RANDOM = false; // parse everything
4029
+ boolean random = CameraPane.SWITCH;
4030
+ CameraPane.SWITCH = false; // parse everything
34134031 copy.ResetDisplayList();
34144032 copy.HardTouch();
3415
- CameraPane.RANDOM = random;
4033
+ CameraPane.SWITCH = random;
34164034 }
34174035
34184036 // public void applySelf()
....@@ -3482,10 +4100,40 @@
34824100 current.fakedepth = (float) fakedepthField.getFloat();
34834101 current.shadowbias = (float) shadowbiasField.getFloat();
34844102
3485
- if (!NumberSlider.frozen)
4103
+ if (!cNumberSlider.frozen)
34864104 {
34874105 //System.out.println("Propagate = " + propagate);
34884106 copy.UpdateMaterial(anchor, current, propagate);
4107
+
4108
+ if (copy.material != null)
4109
+ {
4110
+ cMaterial mat = copy.material;
4111
+
4112
+ colorField.SetToolTipValue((mat.color));
4113
+ modulationField.SetToolTipValue((mat.modulation));
4114
+ metalnessField.SetToolTipValue((mat.metalness));
4115
+ diffuseField.SetToolTipValue((mat.diffuse));
4116
+ specularField.SetToolTipValue((mat.specular));
4117
+ shininessField.SetToolTipValue((mat.shininess));
4118
+ shiftField.SetToolTipValue((mat.shift));
4119
+ ambientField.SetToolTipValue((mat.ambient));
4120
+ lightareaField.SetToolTipValue((mat.lightarea));
4121
+ diffusenessField.SetToolTipValue((mat.factor));
4122
+ velvetField.SetToolTipValue((mat.velvet));
4123
+ sheenField.SetToolTipValue((mat.sheen));
4124
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4125
+ backlitField.SetToolTipValue((mat.bump));
4126
+ anisoField.SetToolTipValue((mat.aniso));
4127
+ anisoVField.SetToolTipValue((mat.anisoV));
4128
+ cameraField.SetToolTipValue((mat.cameralight));
4129
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4130
+ shadowField.SetToolTipValue((mat.shadow));
4131
+ textureField.SetToolTipValue((mat.texture));
4132
+ opacityField.SetToolTipValue((mat.opacity));
4133
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4134
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4135
+ }
4136
+
34894137 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34904138 {
34914139 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3514,9 +4162,25 @@
35144162 //copy.Touch();
35154163 }
35164164
4165
+ cNumberSlider versionSlider;
4166
+
35174167 public void stateChanged(ChangeEvent e)
35184168 {
35194169 // assert(false);
4170
+ if (e.getSource() == versionSlider)
4171
+ {
4172
+ if (muteSlider)
4173
+ return;
4174
+
4175
+ int version = versionSlider.getInteger();
4176
+
4177
+ if (copy.versions[version] != null)
4178
+ {
4179
+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4180
+ }
4181
+
4182
+ return;
4183
+ }
35204184
35214185 if (freezematerial)
35224186 {
....@@ -3530,6 +4194,7 @@
35304194 || e.getSource() == apertureField
35314195 || e.getSource() == shadowblurField)
35324196 {
4197
+ new Exception().printStackTrace();
35334198 System.exit(0);
35344199 cameraView.options1[0] = (float) focusField.getFloat() * 10;
35354200 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3600,7 +4265,7 @@
36004265 }
36014266
36024267 if (normalpushField != null)
3603
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4268
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
36044269 }
36054270
36064271 void SnapObject()
....@@ -3855,7 +4520,7 @@
38554520
38564521 radioPanel.revalidate();
38574522 radioPanel.repaint();
3858
- ctrlPanel.revalidate(); // ? new
4523
+ ctrlPanel.validate(); // ? new
38594524 ctrlPanel.repaint();
38604525 }
38614526 }
....@@ -3864,6 +4529,8 @@
38644529
38654530 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38664531 {
4532
+ if (Globals.REPLACEONMAKE) // && resetmodel)
4533
+ Save();
38674534 //Tween.set(thing, 0).target(1).start(tweenManager);
38684535 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38694536 // if (thing instanceof GenericJointDemo)
....@@ -3950,6 +4617,12 @@
39504617 {
39514618 ResetModel();
39524619 Select(thing.GetTreePath(), true, false); // unselect... false);
4620
+
4621
+ if (thing.Size() == 0)
4622
+ {
4623
+ //EditSelection(false);
4624
+ }
4625
+
39534626 refreshContents();
39544627 }
39554628
....@@ -4067,6 +4740,7 @@
40674740 }
40684741 }
40694742 }
4743
+
40704744 LoadGFDThread loadGFDThread;
40714745
40724746 void ReadGFD(String fullname, iCallBack cb)
....@@ -4086,8 +4760,10 @@
40864760
40874761 try
40884762 {
4763
+ // Try compressed version first.
40894764 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4090
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4765
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4766
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40914767
40924768 readobj = (Object3D) p.readObject();
40934769 istream.close();
....@@ -4095,7 +4771,22 @@
40954771 readobj.ResetDisplayList();
40964772 } catch (Exception e)
40974773 {
4098
- e.printStackTrace();
4774
+ if (!e.toString().contains("GZIP"))
4775
+ e.printStackTrace();
4776
+
4777
+ try
4778
+ {
4779
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4780
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4781
+
4782
+ readobj = (Object3D) p.readObject();
4783
+ istream.close();
4784
+
4785
+ readobj.ResetDisplayList();
4786
+ } catch (Exception e2)
4787
+ {
4788
+ e2.printStackTrace();
4789
+ }
40994790 }
41004791 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
41014792 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4141,6 +4832,12 @@
41414832
41424833 void LoadIt(Object obj)
41434834 {
4835
+ if (obj == null)
4836
+ {
4837
+ // Invalid file
4838
+ return;
4839
+ }
4840
+
41444841 System.out.println("Loaded " + obj);
41454842 //new Exception().printStackTrace();
41464843 Object3D readobj = (Object3D) obj;
....@@ -4150,6 +4847,8 @@
41504847
41514848 if (readobj != null)
41524849 {
4850
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4851
+ // Save();
41534852 try
41544853 {
41554854 //readobj.deepCopySelf(copy);
....@@ -4194,6 +4893,7 @@
41944893 }
41954894 } catch (ClassCastException e)
41964895 {
4896
+ e.printStackTrace();
41974897 assert (false);
41984898 Composite c = (Composite) copy;
41994899 c.children.clear();
....@@ -4204,15 +4904,26 @@
42044904 c.addChild(csg);
42054905 }
42064906
4907
+ copy.versions = readobj.versions;
4908
+ copy.versionindex = readobj.versionindex;
4909
+
4910
+ if (copy.versions == null)
4911
+ {
4912
+ copy.versions = new byte[100][];
4913
+ copy.versionindex = -1;
4914
+ }
4915
+
4916
+ //? SetUndoStates();
4917
+
42074918 ResetModel();
42084919 copy.HardTouch(); // recompile?
42094920 refreshContents();
42104921 }
42114922 }
42124923
4213
- void load() // throws ClassNotFoundException
4924
+ void Open() // throws ClassNotFoundException
42144925 {
4215
- if (GrafreeD.standAlone)
4926
+ if (Grafreed.standAlone)
42164927 {
42174928 FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
42184929 browser.show();
....@@ -4299,11 +5010,13 @@
42995010 try
43005011 {
43015012 FileOutputStream ostream = new FileOutputStream(lastname);
4302
- ObjectOutputStream p = new ObjectOutputStream(ostream);
5013
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5014
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43035015
43045016 p.writeObject(copy);
43055017 p.flush();
43065018
5019
+ zstream.close();
43075020 ostream.close();
43085021
43095022 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4311,19 +5024,23 @@
43115024 //ps.print(buffer.toString());
43125025 } catch (IOException e)
43135026 {
5027
+ e.printStackTrace();
43145028 }
43155029 }
5030
+
43165031 String lastname;
43175032
43185033 void saveAs()
43195034 {
4320
- if (GrafreeD.standAlone)
5035
+ if (Grafreed.standAlone)
43215036 {
43225037 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
43235038 browser.setVisible(true);
43245039 String filename = browser.getFile();
43255040 if (filename != null && filename.length() > 0)
43265041 {
5042
+ if (!filename.endsWith(".gfd"))
5043
+ filename += ".gfd";
43275044 lastname = browser.getDirectory() + filename;
43285045 save();
43295046 }
....@@ -4422,13 +5139,13 @@
44225139 try
44235140 {
44245141 FileOutputStream ostream = new FileOutputStream(filename);
4425
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4426
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
5142
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5143
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
44275144
44285145 Object3D objectparent = obj.parent;
44295146 obj.parent = null;
44305147
4431
- Object3D object = (Object3D) GrafreeD.clone(obj);
5148
+ Object3D object = (Object3D) Grafreed.clone(obj);
44325149
44335150 obj.parent = objectparent;
44345151
....@@ -4440,8 +5157,8 @@
44405157 p.writeObject(object);
44415158 p.flush();
44425159
5160
+ zstream.close();
44435161 ostream.close();
4444
- // zstream.close();
44455162
44465163 // group.selection.get(0).parent = parent;
44475164 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4462,7 +5179,7 @@
44625179 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44635180 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44645181 copy.generatePOV(buffer);
4465
- if (GrafreeD.standAlone)
5182
+ if (Grafreed.standAlone)
44665183 {
44675184 FileDialog browser = new FileDialog(frame, "Export POV", 1);
44685185 browser.show();
....@@ -4488,21 +5205,20 @@
44885205 Object3D client;
44895206 Object3D copy;
44905207 MenuBar menuBar;
4491
- Menu windowMenu;
4492
- MenuItem loadItem;
5208
+ Menu fileMenu;
5209
+ MenuItem newItem;
5210
+ MenuItem openItem;
44935211 MenuItem saveItem;
44945212 MenuItem saveAsItem;
44955213 MenuItem exportAsItem;
44965214 MenuItem reexportItem;
44975215 MenuItem povItem;
44985216 MenuItem closeItem;
4499
- Menu cameraMenu;
5217
+
45005218 CheckboxMenuItem zBufferItem;
45015219 //MenuItem normalLensItem;
4502
- MenuItem editCameraItem;
4503
- MenuItem revertCameraItem;
4504
- CheckboxMenuItem toggleLiveItem;
45055220 MenuItem stepItem;
5221
+ CheckboxMenuItem toggleLiveItem;
45065222 CheckboxMenuItem toggleFullScreenItem;
45075223 CheckboxMenuItem toggleTimelineItem;
45085224 CheckboxMenuItem toggleRenderItem;
....@@ -4511,28 +5227,43 @@
45115227 CheckboxMenuItem toggleFootContactItem;
45125228 CheckboxMenuItem toggleDLItem;
45135229 CheckboxMenuItem toggleTextureItem;
4514
- CheckboxMenuItem toggleRandomItem;
5230
+ CheckboxMenuItem toggleSwitchItem;
45155231 CheckboxMenuItem toggleRootItem;
45165232 CheckboxMenuItem animationItem;
5233
+ MenuItem archiveItem;
45175234 CheckboxMenuItem toggleHandleItem;
45185235 CheckboxMenuItem togglePaintItem;
45195236 JSplitPane mainPanel;
45205237 JScrollPane scrollpane;
5238
+
45215239 JPanel toolbarPanel;
4522
- JPanel treePanel;
5240
+
5241
+ cGridBag treePanel;
5242
+
45235243 JPanel radioPanel;
45245244 ButtonGroup buttonGroup;
4525
- JPanel ctrlPanel;
4526
- JPanel materialPanel;
5245
+
5246
+ cGridBag toolboxPanel;
5247
+ cGridBag materialPanel;
5248
+ cGridBag ctrlPanel;
5249
+
45275250 JScrollPane infoPanel;
4528
- JPanel optionsPanel;
5251
+
5252
+ cGridBag optionsPanel;
5253
+
45295254 JTabbedPane objectPanel;
4530
- JPanel XYZPanel;
5255
+ boolean materialFlushed;
5256
+ Object3D latestObject;
5257
+
5258
+ cGridBag XYZPanel;
5259
+
45315260 JSplitPane gridPanel;
45325261 JSplitPane bigPanel;
4533
- JPanel bigThree;
4534
- JTabbedPane scenePanel;
4535
- JPanel centralPanel;
5262
+
5263
+ cGridBag bigThree;
5264
+ cGridBag scenePanel;
5265
+ cGridBag centralPanel;
5266
+ JSplitPane cameraPanel;
45365267 JPanel timelinePanel;
45375268 JMenuBar timelineMenubar;
45385269 JSplitPane framePanel;
....@@ -4584,67 +5315,72 @@
45845315 // MATERIAL
45855316 JLabel materialLabel;
45865317 JLabel colorLabel;
4587
- NumberSlider colorField;
5318
+ cNumberSlider colorField;
45885319 JLabel modulationLabel;
4589
- NumberSlider modulationField;
5320
+ cNumberSlider modulationField;
45905321 JLabel metalnessLabel;
4591
- NumberSlider metalnessField;
5322
+ cNumberSlider metalnessField;
45925323 JLabel diffuseLabel;
4593
- NumberSlider diffuseField;
5324
+ cNumberSlider diffuseField;
45945325 JLabel specularLabel;
4595
- NumberSlider specularField;
5326
+ cNumberSlider specularField;
45965327 JLabel shininessLabel;
4597
- NumberSlider shininessField;
5328
+ cNumberSlider shininessField;
45985329 JLabel shiftLabel;
4599
- NumberSlider shiftField;
5330
+ cNumberSlider shiftField;
46005331 JLabel ambientLabel;
4601
- NumberSlider ambientField;
5332
+ cNumberSlider ambientField;
46025333 JLabel lightareaLabel;
4603
- NumberSlider lightareaField;
5334
+ cNumberSlider lightareaField;
46045335 JLabel diffusenessLabel;
4605
- NumberSlider diffusenessField;
5336
+ cNumberSlider diffusenessField;
46065337 JLabel velvetLabel;
4607
- NumberSlider velvetField;
5338
+ cNumberSlider velvetField;
46085339 JLabel sheenLabel;
4609
- NumberSlider sheenField;
5340
+ cNumberSlider sheenField;
46105341 JLabel subsurfaceLabel;
4611
- NumberSlider subsurfaceField;
5342
+ cNumberSlider subsurfaceField;
46125343 //JLabel bumpLabel;
46135344 //NumberSlider bumpField;
46145345 JLabel backlitLabel;
4615
- NumberSlider backlitField;
5346
+ cNumberSlider backlitField;
46165347 JLabel anisoLabel;
4617
- NumberSlider anisoField;
5348
+ cNumberSlider anisoField;
46185349 JLabel anisoVLabel;
4619
- NumberSlider anisoVField;
5350
+ cNumberSlider anisoVField;
46205351 JLabel cameraLabel;
4621
- NumberSlider cameraField;
5352
+ cNumberSlider cameraField;
46225353 JLabel selfshadowLabel;
4623
- NumberSlider selfshadowField;
5354
+ cNumberSlider selfshadowField;
46245355 JLabel shadowLabel;
4625
- NumberSlider shadowField;
5356
+ cNumberSlider shadowField;
46265357 JLabel textureLabel;
4627
- NumberSlider textureField;
5358
+ cNumberSlider textureField;
46285359 JLabel opacityLabel;
4629
- NumberSlider opacityField;
5360
+ cNumberSlider opacityField;
46305361 JLabel fakedepthLabel;
4631
- NumberSlider fakedepthField;
5362
+ cNumberSlider fakedepthField;
46325363 JLabel shadowbiasLabel;
4633
- NumberSlider shadowbiasField;
5364
+ cNumberSlider shadowbiasField;
46345365 JLabel bumpLabel;
4635
- NumberSlider bumpField;
5366
+ cNumberSlider bumpField;
46365367 JLabel noiseLabel;
4637
- NumberSlider noiseField;
5368
+ cNumberSlider noiseField;
46385369 JLabel powerLabel;
4639
- NumberSlider powerField;
5370
+ cNumberSlider powerField;
46405371 JLabel borderfadeLabel;
4641
- NumberSlider borderfadeField;
5372
+ cNumberSlider borderfadeField;
46425373 JLabel fogLabel;
4643
- NumberSlider fogField;
5374
+ cNumberSlider fogField;
46445375 JLabel opacityPowerLabel;
4645
- NumberSlider opacityPowerField;
4646
- JTree jTree;
5376
+ cNumberSlider opacityPowerField;
5377
+ cTree jTree;
46475378 //ObjectUI parent;
46485379
4649
- NumberSlider normalpushField;
5380
+ cNumberSlider normalpushField;
5381
+
5382
+ private MenuItem importGFDItem;
5383
+ private MenuItem importVRMLX3DItem;
5384
+ private MenuItem import3DSItem;
5385
+ private MenuItem importOBJItem;
46505386 }