Normand Briere
2019-08-15 24a2a946b35279605e645349bd6b82e9e60aac88
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.*;
....@@ -13,6 +14,9 @@
1314 import javax.swing.plaf.metal.MetalLookAndFeel;
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
17
+
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
1620
1721 //import javax.media.opengl.GLCanvas;
1822
....@@ -30,11 +34,99 @@
3034 iSendInfo
3135 //KeyListener
3236 {
37
+ public cToggleButton pinButton;
3338 boolean timeline;
3439 boolean wasFullScreen;
3540
3641 GroupEditor callee;
3742 JFrame frame;
43
+
44
+ static ObjEditor theFrame;
45
+
46
+ public cGridBag GetSeparator()
47
+ {
48
+ cGridBag separator = new cGridBag();
49
+ separator.add(new JSeparator());
50
+ separator.preferredHeight = 5;
51
+ return separator;
52
+ }
53
+
54
+ cButton GetButton(String name, boolean border)
55
+ {
56
+ ImageIcon icon = GetIcon(name);
57
+ return new cButton(icon, border);
58
+ }
59
+
60
+ cLabel GetLabel(String name, boolean border)
61
+ {
62
+ //ImageIcon icon = GetIcon(name);
63
+ return new cLabel(GetImage(name), border);
64
+ }
65
+
66
+ cToggleButton GetToggleButton(String name, boolean border)
67
+ {
68
+ ImageIcon icon = GetIcon(name);
69
+ return new cToggleButton(icon, border);
70
+ }
71
+
72
+ cCheckBox GetCheckBox(String name, boolean border)
73
+ {
74
+ ImageIcon icon = GetIcon(name);
75
+ return new cCheckBox(icon, border);
76
+ }
77
+
78
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79
+
80
+ ImageIcon GetIcon(String name)
81
+ {
82
+ javax.swing.ImageIcon iconCache = icons.get(name);
83
+ if (iconCache != null)
84
+ {
85
+ return iconCache;
86
+ }
87
+
88
+ try
89
+ {
90
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
91
+
92
+// if (image.getWidth() > 48 && image.getHeight() > 48)
93
+// {
94
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
95
+// Graphics2D g = resized.createGraphics();
96
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
97
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
98
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
99
+// g.dispose();
100
+//
101
+// image = resized;
102
+// }
103
+
104
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
105
+
106
+ icons.put(name, icon);
107
+
108
+ return icon;
109
+ }
110
+ catch (Exception e)
111
+ {
112
+ //icons.put(name, null);
113
+ return null;
114
+ }
115
+ }
116
+
117
+ BufferedImage GetImage(String name)
118
+ {
119
+ try
120
+ {
121
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
122
+
123
+ return image;
124
+ }
125
+ catch (Exception e)
126
+ {
127
+ return null;
128
+ }
129
+ }
38130
39131 // SCRIPT
40132
....@@ -138,34 +230,42 @@
138230 public void closeUI()
139231 {
140232 //new Exception().printStackTrace();
141
- System.out.println("this = " + this);
142
- System.out.println("objEditor = " + objEditor);
233
+// System.out.println("this = " + this);
234
+// System.out.println("objEditor = " + objEditor);
143235 //nameField.removeActionListener(this);
144
- objEditor.ctrlPanel.remove(nameField);
236
+// objEditor.ctrlPanel.remove(nameField);
145237
146
- if (!GroupEditor.allparams)
238
+ objEditor.ctrlPanel.remove(namePanel);
239
+
240
+ if (!allparams)
147241 return;
148242
149
- objEditor.ctrlPanel.remove(liveCB);
150
- objEditor.ctrlPanel.remove(hideCB);
151
- objEditor.ctrlPanel.remove(markCB);
152
-
153
- objEditor.ctrlPanel.remove(randomCB);
154
- objEditor.ctrlPanel.remove(speedupCB);
155
- objEditor.ctrlPanel.remove(rewindCB);
156
-
157
- objEditor.ctrlPanel.remove(resetButton);
158
- objEditor.ctrlPanel.remove(stepButton);
159
-// objEditor.ctrlPanel.remove(stepAllButton);
160
-// objEditor.ctrlPanel.remove(resetAllButton);
161
- objEditor.ctrlPanel.remove(link2masterCB);
162
- //objEditor.ctrlPanel.remove(flipVCB);
163
- //objEditor.ctrlPanel.remove(texresMenu);
164
- objEditor.ctrlPanel.remove(slowerButton);
165
- objEditor.ctrlPanel.remove(fasterButton);
166
- objEditor.ctrlPanel.remove(remarkButton);
243
+// objEditor.ctrlPanel.remove(liveCB);
244
+// objEditor.ctrlPanel.remove(hideCB);
245
+// objEditor.ctrlPanel.remove(markCB);
246
+//
247
+// objEditor.ctrlPanel.remove(randomCB);
248
+// objEditor.ctrlPanel.remove(speedupCB);
249
+// objEditor.ctrlPanel.remove(rewindCB);
250
+//
251
+// objEditor.ctrlPanel.remove(resetButton);
252
+// objEditor.ctrlPanel.remove(stepButton);
253
+//// objEditor.ctrlPanel.remove(stepAllButton);
254
+//// objEditor.ctrlPanel.remove(resetAllButton);
255
+// objEditor.ctrlPanel.remove(link2masterCB);
256
+// //objEditor.ctrlPanel.remove(flipVCB);
257
+// //objEditor.ctrlPanel.remove(texresMenu);
258
+// objEditor.ctrlPanel.remove(slowerButton);
259
+// objEditor.ctrlPanel.remove(fasterButton);
260
+// objEditor.ctrlPanel.remove(remarkButton);
167261
168
- Remove(normalpushField);
262
+ objEditor.ctrlPanel.remove(setupPanel);
263
+ objEditor.ctrlPanel.remove(setupPanel2);
264
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
265
+ objEditor.ctrlPanel.remove(pushPanel);
266
+ //objEditor.ctrlPanel.remove(fillPanel);
267
+
268
+ //Remove(normalpushField);
169269 }
170270
171271 public ObjEditor GetEditor()
....@@ -209,6 +309,14 @@
209309 client = inClient;
210310 copy = client;
211311
312
+// if (copy.versionlist == null)
313
+// {
314
+// copy.versionlist = new Object3D[100];
315
+// copy.versionindex = -1;
316
+//
317
+// callee.Save(true);
318
+// }
319
+
212320 // "this" is not called: SetupUI2(objEditor);
213321 }
214322
....@@ -222,6 +330,14 @@
222330 client = inClient;
223331 copy = client;
224332
333
+ if (copy.versionlist == null)
334
+ {
335
+ copy.versionlist = new Object3D[100];
336
+ copy.versionindex = -1;
337
+
338
+// Save(true);
339
+ }
340
+
225341 SetupUI2(callee.GetEditor());
226342 }
227343
....@@ -236,6 +352,7 @@
236352 //localCopy.parent = null;
237353
238354 frame = new JFrame();
355
+ frame.setUndecorated(false);
239356 objEditor = this;
240357 this.callee = callee;
241358
....@@ -253,6 +370,14 @@
253370 copy = localCopy;
254371 copy.editWindow = this;
255372
373
+// if (copy.versionlist == null)
374
+// {
375
+// copy.versionlist = new Object3D[100];
376
+// copy.versionindex = -1;
377
+//
378
+// Save(true);
379
+// }
380
+
256381 SetupMenu();
257382
258383 //SetupName(objEditor); // new
....@@ -266,28 +391,49 @@
266391 return frame.action(event, obj);
267392 }
268393
394
+ // Cannot work without static
395
+ static boolean allparams = true;
396
+
397
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398
+
269399 void SetupMenu()
270400 {
271401 frame.setMenuBar(menuBar = new MenuBar());
272
- menuBar.add(windowMenu = new Menu("File"));
273
- windowMenu.add(loadItem = new MenuItem("Load..."));
274
- windowMenu.add("-");
275
- windowMenu.add(saveItem = new MenuItem("Save"));
276
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
402
+ menuBar.add(fileMenu = new Menu("File"));
403
+ fileMenu.add(newItem = new MenuItem("New"));
404
+ fileMenu.add(openItem = new MenuItem("Open..."));
405
+
406
+ //oe.menuBar.add(menu = new Menu("Include"));
407
+ Menu menu = new Menu("Import");
408
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
409
+ importOBJItem.addActionListener(this);
410
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
411
+ import3DSItem.addActionListener(this);
412
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
413
+ importVRMLX3DItem.addActionListener(this);
414
+ menu.add("-");
415
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
416
+ importGFDItem.addActionListener(this);
417
+ fileMenu.add(menu);
418
+ fileMenu.add("-");
419
+
420
+ fileMenu.add(saveItem = new MenuItem("Save"));
421
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277422 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278
- windowMenu.add("-");
279
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281
- windowMenu.add("-");
423
+ fileMenu.add("-");
424
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
425
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
426
+ fileMenu.add("-");
282427 if (client.parent != null)
283428 {
284
- windowMenu.add(closeItem = new MenuItem("Close"));
429
+ fileMenu.add(closeItem = new MenuItem("Close"));
285430 } else
286431 {
287
- windowMenu.add(closeItem = new MenuItem("Exit"));
432
+ fileMenu.add(closeItem = new MenuItem("Exit"));
288433 }
289434
290
- loadItem.addActionListener(this);
435
+ newItem.addActionListener(this);
436
+ openItem.addActionListener(this);
291437 saveItem.addActionListener(this);
292438 saveAsItem.addActionListener(this);
293439 exportAsItem.addActionListener(this);
....@@ -295,82 +441,103 @@
295441 //povItem.addActionListener(this);
296442 closeItem.addActionListener(this);
297443
298
- menuBar.add(cameraMenu = new Menu("View"));
299
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300
- //zBufferItem.addActionListener(this);
301
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302
- //normalLensItem.addActionListener(this);
303
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304
- revertCameraItem.addActionListener(this);
305
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306
- toggleTimelineItem.addItemListener(this);
307
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308
- toggleFullScreenItem.addItemListener(this);
309
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310
- cameraMenu.add("-");
311
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312
- toggleTextureItem.addItemListener(this);
313
- toggleTextureItem.setState(CameraPane.textureon);
314
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315
- toggleLiveItem.addItemListener(this);
316
- toggleLiveItem.setState(Globals.isLIVE());
317
- cameraMenu.add(stepItem = new MenuItem("Step"));
318
- stepItem.addActionListener(this);
319
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320
-// toggleDLItem.addItemListener(this);
321
-// toggleDLItem.setState(false);
322
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323
- toggleRenderItem.addItemListener(this);
324
- toggleRenderItem.setState(!CameraPane.frozen);
325
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326
- toggleDebugItem.addItemListener(this);
327
- toggleDebugItem.setState(CameraPane.DEBUG);
328
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329
- toggleFrustumItem.addItemListener(this);
330
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332
- toggleFootContactItem.addItemListener(this);
333
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335
- toggleRandomItem.addItemListener(this);
336
- toggleRandomItem.setState(CameraPane.RANDOM);
337
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338
- toggleHandleItem.addItemListener(this);
339
- toggleHandleItem.setState(CameraPane.HANDLES);
340
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341
- togglePaintItem.addItemListener(this);
342
- togglePaintItem.setState(CameraPane.PAINTMODE);
343
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344
-// toggleRootItem.addItemListener(this);
345
-// toggleRootItem.setState(false);
346
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347
-// animationItem.addItemListener(this);
348
-// animationItem.setState(CameraPane.ANIMATION);
349
- cameraMenu.add("-");
350
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351
- editCameraItem.addActionListener(this);
352
-
353444 objectPanel = new JTabbedPane();
445
+
446
+ ChangeListener changeListener = new ChangeListener()
447
+ {
448
+ //String name;
449
+
450
+ public void stateChanged(ChangeEvent changeEvent)
451
+ {
452
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
453
+// {
454
+// if (latestObject != null)
455
+// {
456
+// refreshContents(true);
457
+// SetMaterial(latestObject);
458
+// }
459
+//
460
+// materialFlushed = true;
461
+// }
462
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
463
+// {
464
+// if (listUI.size() == 0)
465
+// EditSelection(false);
466
+// }
467
+
468
+// if (objectPanel.getSelectedIndex() == 4)
469
+// {
470
+// name = copy.skyboxname;
471
+//
472
+// if (name == null)
473
+// {
474
+// name = "";
475
+// }
476
+//
477
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
478
+// copy.skyboxext = "jpg";
479
+// }
480
+// else
481
+// {
482
+// if (name != null)
483
+// {
484
+// if (name.equals(""))
485
+// {
486
+// copy.skyboxname = null;
487
+// copy.skyboxext = null;
488
+// }
489
+// else
490
+// {
491
+// copy.skyboxname = name;
492
+// }
493
+// }
494
+// }
495
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
496
+
497
+// refreshContents(false); // To refresh Info tab
498
+ cameraView.repaint();
499
+ }
500
+ };
501
+ objectPanel.addChangeListener(changeListener);
502
+
354503 toolbarPanel = new JPanel();
355504 toolbarPanel.setName("Toolbar");
356
- treePanel = new JPanel();
505
+
506
+ treePanel = new cGridBag();
357507 treePanel.setName("Tree");
358
- ctrlPanel = new cGridBag(); // new GridBagLayout());
359
- ctrlPanel.setName("Edit");
360
- materialPanel = new cGridBag().setVertical(true);
361
- materialPanel.setName("Material");
508
+
509
+ editPanel = new cGridBag().setVertical(true);
510
+ //editPanel.setName("Edit");
511
+
512
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
513
+
514
+ editCommandsPanel = new cGridBag();
515
+ editPanel.add(editCommandsPanel);
516
+ editPanel.add(ctrlPanel);
517
+
518
+ toolboxPanel = new cGridBag().setVertical(true);
519
+ //toolboxPanel.setName("Toolbox");
520
+
521
+ skyboxPanel = new cGridBag().setVertical(true);
522
+
523
+ materialPanel = new cGridBag().setVertical(false);
524
+ //materialPanel.setName("Material");
525
+
362526 /*JTextPane*/
363527 infoarea = createTextPane();
528
+ doc = infoarea.getStyledDocument();
529
+
364530 infoarea.setEditable(true);
365531 SetText();
532
+
366533 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367534 // infoarea.setOpaque(false);
368535 // //infoarea.setForeground(textcolor);
369
- infoarea.setLineWrap(true);
370
- infoarea.setWrapStyleWord(true);
536
+// TEXTAREA infoarea.setLineWrap(true);
537
+// TEXTAREA infoarea.setWrapStyleWord(true);
371538 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372
- infoPanel.setPreferredSize(new Dimension(50, 200));
373
- infoPanel.setName("Info");
539
+ infoPanel.setPreferredSize(new Dimension(1, 1));
540
+ //infoPanel.setName("Info");
374541 //infoPanel.setLayout(new BorderLayout());
375542 //infoPanel.add(createTextPane());
376543
....@@ -378,15 +545,22 @@
378545 mainPanel.setName("Main");
379546 mainPanel.setContinuousLayout(true);
380547 mainPanel.setOneTouchExpandable(true);
381
- mainPanel.setDividerLocation(1.0);
382548 mainPanel.setDividerSize(9);
383
- mainPanel.setResizeWeight(0);
384
-
549
+ mainPanel.setDividerLocation(0.5); //1.0);
550
+ mainPanel.setResizeWeight(0.5);
551
+
552
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
553
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
554
+ divider.setDividerSize(15);
555
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
556
+
557
+ mainPanel.setUI(new BasicSplitPaneUI());
558
+
385559 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386560 //mainPanel.setLayout(new GridBagLayout());
387561 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388
- treePanel.setLayout(new GridBagLayout());
389
- ctrlPanel.setLayout(new GridBagLayout());
562
+// treePanel.setLayout(new GridBagLayout());
563
+ //ctrlPanel.setLayout(new GridBagLayout());
390564 //materialPanel.setLayout(new GridBagLayout());
391565
392566 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
....@@ -426,7 +600,7 @@
426600 static String newline = "\n";
427601 protected static final String buttonString = "JButton";
428602 StyledDocument doc;
429
- JTextArea infoarea;
603
+ JTextPane infoarea;
430604
431605 void ClearInfo()
432606 {
....@@ -449,10 +623,10 @@
449623 e.printStackTrace();
450624 }
451625
452
- String selection = infoarea.getText();
453
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454
- java.awt.datatransfer.Clipboard clipboard =
455
- Toolkit.getDefaultToolkit().getSystemClipboard();
626
+// String selection = infoarea.getText();
627
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
628
+// java.awt.datatransfer.Clipboard clipboard =
629
+// Toolkit.getDefaultToolkit().getSystemClipboard();
456630 //clipboard.setContents(data, data);
457631 }
458632
....@@ -475,13 +649,13 @@
475649 //SendInfo("Name:", "bold");
476650 if (sel.GetTextures() != null || debug)
477651 {
478
- si.SendInfo(sel.toString(), "bold");
652
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479653 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480654 if (sel.Size() > 0)
481655 {
482656 si.SendInfo("#children = " + sel.Size(), "regular");
483657 }
484
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
658
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485659 if (debug)
486660 {
487661 try
....@@ -493,7 +667,10 @@
493667 }
494668
495669 if (full)
496
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
670
+ {
671
+ si.SendInfo(" BBox min: " + minima, "regular");
672
+ si.SendInfo(" BBox max: " + maxima, "regular");
673
+ }
497674
498675 if (sel.bRep != null)
499676 {
....@@ -520,7 +697,7 @@
520697 }
521698 if (sel.support != null)
522699 {
523
- si.SendInfo(" support: " + sel.support, "regular");
700
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524701 }
525702 if (sel.scriptnode != null)
526703 {
....@@ -591,6 +768,9 @@
591768 {
592769 CameraPane.pointflow = (PointFlow) sel;
593770 }
771
+
772
+ si.SendInfo("_____________________", "regular");
773
+ si.SendInfo("", "regular");
594774 }
595775 }
596776
....@@ -606,68 +786,205 @@
606786 }
607787 }
608788
789
+//static GraphicsDevice device = GraphicsEnvironment
790
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
791
+
792
+ Rectangle keeprect;
793
+ cRadio radio;
794
+
795
+cButton keepButton;
796
+ cButton twoButton; // Full 3D
797
+ cButton sixButton;
798
+ cButton threeButton;
799
+ cButton sevenButton;
800
+ cButton fourButton; // full panel
801
+ cButton oneButton; // full XYZ
802
+ //cButton currentLayout;
803
+
804
+ boolean maximized;
805
+
806
+ cButton fullscreenLayout;
807
+ cButton expandedLayout;
808
+
809
+ void Minimize()
810
+ {
811
+ frame.setState(Frame.ICONIFIED);
812
+ frame.validate();
813
+ }
814
+
815
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
816
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
817
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
818
+ void Maximize()
819
+ {
820
+ if (CameraPane.FULLSCREEN)
821
+ {
822
+ ToggleFullScreen();
823
+ }
824
+
825
+ if (maximized)
826
+ {
827
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
828
+ }
829
+ else
830
+ {
831
+ keeprect = frame.getBounds();
832
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
833
+// Dimension rect2 = frame.getToolkit().getScreenSize();
834
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
835
+// frame.setState(Frame.MAXIMIZED_BOTH);
836
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
837
+ }
838
+
839
+ maximized ^= true;
840
+
841
+ frame.validate();
842
+ }
843
+
844
+ cButton minButton;
845
+ cButton maxButton;
846
+ cButton fullButton;
847
+ cButton collapseButton;
848
+ cButton maximize3DButton;
849
+
609850 void ToggleFullScreen()
610851 {
611
- if (CameraPane.FULLSCREEN)
852
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
853
+
854
+ cameraView.ToggleFullScreen();
855
+
856
+ if (!CameraPane.FULLSCREEN)
612857 {
613
- frame.getContentPane().remove(/*"Center",*/bigThree);
614
- framePanel.add(bigThree);
615
- frame.getContentPane().add(/*"Center",*/framePanel);
858
+ device.setFullScreenWindow(null);
859
+ frame.dispose();
860
+ frame.setUndecorated(false);
861
+ frame.validate();
862
+ frame.setVisible(true);
863
+
864
+ //frame.setVisible(false);
865
+// frame.removeNotify();
866
+// frame.setUndecorated(false);
867
+// frame.addNotify();
868
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
869
+
870
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
871
+// X framePanel.add(bigThree);
872
+// X frame.getContentPane().add(/*"Center",*/framePanel);
873
+// framePanel.setDividerLocation(46); // icons are 24x24
874
+
875
+ //frame.setVisible(true);
876
+// radio.layout = keepButton;
877
+ //theFrame = null;
878
+ keepButton = null;
879
+// radio.layout.doClick();
880
+
616881 } else
617882 {
618
- frame.getContentPane().remove(/*"Center",*/framePanel);
619
- framePanel.remove(bigThree);
620
- frame.getContentPane().add(/*"Center",*/bigThree);
883
+ keepButton = radio.layout;
884
+ //keeprect = frame.getBounds();
885
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
886
+// frame.getToolkit().getScreenSize().height);
887
+ //frame.setVisible(false);
888
+
889
+ frame.dispose();
890
+ frame.setUndecorated(true);
891
+ device.setFullScreenWindow(frame);
892
+ frame.validate();
893
+ frame.setVisible(true);
894
+// frame.removeNotify();
895
+// frame.setUndecorated(true);
896
+// frame.addNotify();
897
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
898
+// X framePanel.remove(bigThree);
899
+// X frame.getContentPane().add(/*"Center",*/bigThree);
900
+// framePanel.setDividerLocation(0);
901
+
902
+// radio.layout = fullscreenLayout;
903
+// radio.layout.doClick();
904
+ //frame.setVisible(true);
621905 }
622
- cameraView.ToggleFullScreen();
906
+ frame.validate();
907
+
908
+ cameraView.requestFocusInWindow();
623909 }
624910
625
- private JTextArea createTextPane()
911
+ void CollapseToolbar()
912
+ {
913
+ framePanel.setDividerLocation(0);
914
+ //frame.validate();
915
+
916
+ cameraView.requestFocusInWindow();
917
+ }
918
+
919
+ private Object3D Duplicate(Object3D object)
626920 {
627
- String[] initString =
628
- {
629
- "This is an editable JTextPane, ", //regular
630
- "another ", //italic
631
- "styled ", //bold
632
- "text ", //small
633
- "component, ", //large
634
- "which supports embedded components..." + newline,//regular
635
- " " + newline, //button
636
- "...and embedded icons..." + newline, //regular
637
- " ", //icon
638
- newline + "JTextPane is a subclass of JEditorPane that "
639
- + "uses a StyledEditorKit and StyledDocument, and provides "
640
- + "cover methods for interacting with those objects."
641
- };
921
+ boolean temp = CameraPane.SWITCH;
922
+ CameraPane.SWITCH = false;
923
+
924
+ object.ExtractBigData(versiontable);
925
+ // if (copy == client)
926
+
927
+ Object3D versions[] = object.versionlist;
928
+ object.versionlist = null;
929
+
930
+ //byte[] compress = Compress(copy);
931
+ Object3D compress = (Object3D)Grafreed.clone(object);
932
+
933
+ object.versionlist = versions;
934
+
935
+ object.RestoreBigData(versiontable);
936
+
937
+ CameraPane.SWITCH = temp;
938
+
939
+ return compress;
940
+ }
642941
643
- String[] initStyles =
644
- {
645
- "regular", "italic", "bold", "small", "large",
646
- "regular", "button", "regular", "icon",
647
- "regular"
648
- };
942
+ private JTextPane createTextPane()
943
+ {
944
+// TEXTAREA String[] initString =
945
+// {
946
+// "This is an editable JTextPane, ", //regular
947
+// "another ", //italic
948
+// "styled ", //bold
949
+// "text ", //small
950
+// "component, ", //large
951
+// "which supports embedded components..." + newline,//regular
952
+// " " + newline, //button
953
+// "...and embedded icons..." + newline, //regular
954
+// " ", //icon
955
+// newline + "JTextPane is a subclass of JEditorPane that "
956
+// + "uses a StyledEditorKit and StyledDocument, and provides "
957
+// + "cover methods for interacting with those objects."
958
+// };
959
+//
960
+// String[] initStyles =
961
+// {
962
+// "regular", "italic", "bold", "small", "large",
963
+// "regular", "button", "regular", "icon",
964
+// "regular"
965
+// };
966
+//
967
+// JTextPane textPane = new JTextPane();
968
+// textPane.setEditable(true);
969
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
970
+// addStylesToDocument(doc);
971
+//
972
+// try
973
+// {
974
+// for (int j = 0; j < 2; j++)
975
+// {
976
+// for (int i = 0; i < initString.length; i++)
977
+// {
978
+// doc.insertString(doc.getLength(), initString[i],
979
+// doc.getStyle(initStyles[i]));
980
+// }
981
+// }
982
+// } catch (BadLocationException ble)
983
+// {
984
+// System.err.println("Couldn't insert initial text into text pane.");
985
+// }
649986
650
- JTextPane textPane = new JTextPane();
651
- textPane.setEditable(true);
652
- /*StyledDocument*/ doc = textPane.getStyledDocument();
653
- addStylesToDocument(doc);
654
-
655
- try
656
- {
657
- for (int j = 0; j < 2; j++)
658
- {
659
- for (int i = 0; i < initString.length; i++)
660
- {
661
- doc.insertString(doc.getLength(), initString[i],
662
- doc.getStyle(initStyles[i]));
663
- }
664
- }
665
- } catch (BadLocationException ble)
666
- {
667
- System.err.println("Couldn't insert initial text into text pane.");
668
- }
669
-
670
- return new JTextArea(); // textPane;
987
+ return new JTextPane(); // textPane;
671988 }
672989
673990 protected void addStylesToDocument(StyledDocument doc)
....@@ -720,7 +1037,7 @@
7201037 protected static ImageIcon createImageIcon(String path,
7211038 String description)
7221039 {
723
- java.net.URL imgURL = GrafreeD.class.getResource(path);
1040
+ java.net.URL imgURL = Grafreed.class.getResource(path);
7241041 if (imgURL != null)
7251042 {
7261043 return new ImageIcon(imgURL, description);
....@@ -743,6 +1060,7 @@
7431060 {
7441061 SetupMaterial(materialPanel);
7451062 }
1063
+
7461064 //SetupName();
7471065 //SetupViews();
7481066 }
....@@ -752,6 +1070,7 @@
7521070 // NumberSlider vDivsField;
7531071 // JCheckBox endcaps;
7541072 JCheckBox liveCB;
1073
+ JCheckBox selectableCB;
7551074 JCheckBox hideCB;
7561075 JCheckBox link2masterCB;
7571076 JCheckBox markCB;
....@@ -759,7 +1078,12 @@
7591078 JCheckBox speedupCB;
7601079 JCheckBox rewindCB;
7611080 JCheckBox flipVCB;
1081
+
1082
+ cCheckBox toggleTextureCB;
1083
+ cCheckBox toggleSwitchCB;
1084
+
7621085 JComboBox texresMenu;
1086
+
7631087 JButton resetButton;
7641088 JButton stepButton;
7651089 JButton stepAllButton;
....@@ -767,54 +1091,48 @@
7671091 JButton slowerButton;
7681092 JButton fasterButton;
7691093 JButton remarkButton;
1094
+
1095
+ cGridBag editPanel;
1096
+ cGridBag editCommandsPanel;
1097
+
1098
+ cGridBag namePanel;
1099
+ cGridBag setupPanel;
1100
+ cGridBag setupPanel2;
1101
+ cGridBag objectCommandsPanel;
1102
+ cGridBag pushPanel;
1103
+ cGridBag fillPanel;
7701104
771
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
1105
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
7721106 {
7731107 JCheckBox cb;
7741108
775
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776
- oe.aConstraints.gridwidth = 1; // 3;
777
-// oe.aConstraints.weightx = 1;
778
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779
- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1109
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
7801110 cb.addItemListener(this);
781
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782
- oe.aConstraints.gridwidth = 1;
783
- oe.aConstraints.gridx += 1;
7841111
7851112 return cb;
7861113 }
7871114
788
- cButton AddButton(ObjEditor oe, String label)
1115
+ cButton AddButton(cGridBag panel, String label)
7891116 {
7901117 cButton cb;
7911118
792
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793
- oe.aConstraints.gridwidth = 1;
794
-// oe.aConstraints.weightx = 1;
795
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796
- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
1119
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
7971120 cb.addActionListener(this);
798
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799
- oe.aConstraints.gridwidth = 1;
800
- oe.aConstraints.gridx += 1;
8011121
8021122 return cb;
8031123 }
8041124
805
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
1125
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
8061126 {
8071127 JComboBox combo;
8081128
809
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810
- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811
- oe.aConstraints.gridx += 1;
1129
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8121130 combo.addActionListener(this);
8131131
8141132 return combo;
8151133 }
8161134
817
- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
1135
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
8181136 {
8191137 cGridBag control = new cGridBag();
8201138
....@@ -826,12 +1144,12 @@
8261144 control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8271145 combo.setFloat(current);
8281146
829
- ctrlPanel.add(control);
1147
+ panel.add(control);
8301148
831
- return combo;
1149
+ return control;
8321150 }
8331151
834
- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
1152
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
8351153 {
8361154 cGridBag control = new cGridBag();
8371155
....@@ -839,25 +1157,21 @@
8391157
8401158 JLabel jlabel = new JLabel(label);
8411159 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842
- ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
- ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1160
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1161
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8441162 combo.setInteger(current);
8451163
846
- ctrlPanel.add(control);
1164
+ panel.add(control);
8471165
848
- return combo;
1166
+ return control;
8491167 }
8501168
8511169 JTextArea AddText(cGridBag ctrlPanel, String name)
8521170 {
8531171 JTextArea text;
8541172
855
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
8571173 ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8581174 text.addCaretListener(this);
859
- aConstraints.gridx += 1;
860
- aConstraints.gridwidth = 1;
8611175
8621176 return text;
8631177 }
....@@ -896,7 +1210,7 @@
8961210
8971211 /*
8981212 */
899
- void Return() // ObjEditor oe)
1213
+ void Return0() // ObjEditor oe)
9001214 {
9011215 aConstraints.gridy += 1;
9021216 aConstraints.gridx = 0;
....@@ -951,37 +1265,92 @@
9511265
9521266 void SetupUI2(ObjEditor oe)
9531267 {
954
-// oe.aConstraints.weightx = 0;
955
-// oe.aConstraints.weighty = 0;
956
-// oe.aConstraints.gridx = 0;
957
-// oe.aConstraints.gridy = 0;
958
- SetupName(oe);
1268
+ //SetupName(oe);
9591269
960
- if (!GroupEditor.allparams)
1270
+ namePanel = new cGridBag();
1271
+
1272
+ //if (copy.pinned)
1273
+ {
1274
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1275
+ pinButton.setSelected(copy.pinned);
1276
+ cGridBag t = new cGridBag();
1277
+ t.preferredWidth = 2;
1278
+ t.add(pinButton);
1279
+ namePanel.add(t);
1280
+
1281
+ pinButton.addItemListener(this);
1282
+ }
1283
+
1284
+ nameField = AddText(namePanel, copy.GetName());
1285
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1286
+ oe.ctrlPanel.add(namePanel);
1287
+
1288
+ oe.ctrlPanel.Return();
1289
+
1290
+ if (!allparams)
9611291 return;
9621292
963
- liveCB = AddCheckBox(oe, "Live", copy.live);
964
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
1293
+ setupPanel = new cGridBag().setVertical(false);
1294
+
1295
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1296
+ liveCB.setToolTipText("Animate object");
1297
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1298
+ selectableCB.setToolTipText("Make object selectable");
9661299 // Return();
967
- markCB = AddCheckBox(oe, "Mark", copy.marked);
968
- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969
- randomCB = AddCheckBox(oe, "Rand", copy.random);
970
- Return();
971
- resetButton = AddButton(oe, "Reset");
972
- stepButton = AddButton(oe, "Step");
1300
+
1301
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1302
+ hideCB.setToolTipText("Hide object");
1303
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304
+ markCB.setToolTipText("As animation target transform");
1305
+
1306
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1307
+
1308
+ setupPanel2 = new cGridBag().setVertical(false);
1309
+
1310
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1311
+ rewindCB.setToolTipText("Rewind animation");
1312
+
1313
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1314
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1315
+
1316
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1317
+ link2masterCB.setToolTipText("Attach to support");
1318
+
1319
+ if (Globals.ADVANCED)
1320
+ {
1321
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1322
+ speedupCB.setToolTipText("Option motion capture");
1323
+ }
1324
+
1325
+ oe.ctrlPanel.add(setupPanel);
1326
+ oe.ctrlPanel.Return();
1327
+ oe.ctrlPanel.add(setupPanel2);
1328
+ oe.ctrlPanel.Return();
1329
+
1330
+ objectCommandsPanel = new cGridBag().setVertical(false);
1331
+
1332
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1333
+ resetButton.setToolTipText("Jump to frame zero");
1334
+ stepButton = AddButton(objectCommandsPanel, "Step");
1335
+ stepButton.setToolTipText("Step one frame");
9731336 // resetAllButton = AddButton(oe, "Reset All");
9741337 // stepAllButton = AddButton(oe, "Step All");
975
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
9761338 // Return();
977
- slowerButton = AddButton(oe, "Slow");
978
- fasterButton = AddButton(oe, "Fast");
979
- remarkButton = AddButton(oe, "Rem");
1339
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1340
+ slowerButton.setToolTipText("Decrease animation speed");
1341
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1342
+ fasterButton.setToolTipText("Increase animation speed");
1343
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1344
+ remarkButton.setToolTipText("Set the current transform as the target");
9801345
981
- Return();
1346
+ oe.ctrlPanel.add(objectCommandsPanel);
1347
+ oe.ctrlPanel.Return();
9821348
983
- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
- Return();
1349
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1350
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1351
+ //Return();
1352
+
1353
+ oe.ctrlPanel.Return();
9851354
9861355 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9871356 // ObjEditor.aConstraints.gridx += 1;
....@@ -1076,7 +1445,7 @@
10761445 oe.aConstraints.gridwidth = 1;
10771446 /**/
10781447 nameField = AddText(oe.ctrlPanel, copy.GetName());
1079
- Return();
1448
+ oe.ctrlPanel.Return();
10801449
10811450 //ctrlPanel.add(textureButton = new Button("Texture..."));
10821451 //textureButton.setEnabled(false);
....@@ -1180,8 +1549,11 @@
11801549 //worldPanel.setName("World");
11811550 centralPanel = new cGridBag();
11821551 centralPanel.preferredWidth = 20;
1183
- timelinePanel = new JPanel(new BorderLayout());
1184
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1552
+
1553
+ if (Globals.ADVANCED)
1554
+ {
1555
+ timelinePanel = new JPanel(new BorderLayout());
1556
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11851557
11861558 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11871559 cameraPanel.setContinuousLayout(true);
....@@ -1190,7 +1562,10 @@
11901562 // cameraPanel.setDividerSize(9);
11911563 cameraPanel.setResizeWeight(1.0);
11921564
1565
+ }
1566
+
11931567 centralPanel.add(cameraView);
1568
+ centralPanel.setFocusable(true);
11941569 //frame.setJMenuBar(timelineMenubar);
11951570 //centralPanel.add(timelinePanel);
11961571
....@@ -1216,6 +1591,7 @@
12161591 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
12171592 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
12181593 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1594
+ //XYZPanel.setName("XYZ");
12191595
12201596 /*
12211597 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1253,12 +1629,29 @@
12531629 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12541630 //tmp.setName("Edit");
12551631 objectPanel.add(materialPanel);
1256
- JPanel north = new JPanel(new BorderLayout());
1257
- north.setName("Edit");
1258
- north.add(ctrlPanel, BorderLayout.NORTH);
1259
- objectPanel.add(north);
1260
- objectPanel.add(infoPanel);
1632
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633
+ objectPanel.setToolTipTextAt(0, "Material");
1634
+
1635
+ objectPanel.add(toolboxPanel);
1636
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
12611638
1639
+ objectPanel.add(skyboxPanel);
1640
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1642
+
1643
+// JPanel north = new JPanel(new BorderLayout());
1644
+// north.setName("Edit");
1645
+// north.add(ctrlPanel, BorderLayout.NORTH);
1646
+// objectPanel.add(north);
1647
+ objectPanel.add(editPanel);
1648
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1649
+ objectPanel.setToolTipTextAt(3, "Edit controls");
1650
+
1651
+ objectPanel.add(XYZPanel);
1652
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1654
+
12621655 /*
12631656 aConstraints.gridx = 0;
12641657 aConstraints.gridwidth = 1;
....@@ -1266,7 +1659,7 @@
12661659 aConstraints.gridy += 1;
12671660 aConstraints.gridwidth = 1;
12681661 mainPanel.add(objectPanel, aConstraints);
1269
- */
1662
+ */
12701663
12711664 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12721665 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1278,14 +1671,12 @@
12781671 scrollpane.addMouseWheelListener(this); // Default not fast enough
12791672
12801673 /*JTabbedPane*/ scenePanel = new cGridBag();
1281
- scenePanel.preferredWidth = 7;
1674
+ scenePanel.preferredWidth = 5;
12821675
12831676 JTabbedPane tabbedPane = new JTabbedPane();
12841677 tabbedPane.add(scrollpane);
12851678
1286
- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287
-
1288
- optionsPanel = new cGridBag().setVertical(true);
1679
+ optionsPanel = new cGridBag().setVertical(false);
12891680
12901681 optionsPanel.setName("Options");
12911682
....@@ -1293,8 +1684,15 @@
12931684
12941685 tabbedPane.add(optionsPanel);
12951686
1687
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1688
+
12961689 scenePanel.add(tabbedPane);
12971690
1691
+ //if (Globals.ADVANCED)
1692
+// tabbedPane.add(infoPanel);
1693
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694
+// tabbedPane.setToolTipTextAt(3, "Information");
1695
+
12981696 /*
12991697 cTree jTree = new cTree(null);
13001698 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1356,7 +1754,7 @@
13561754 bigThree = new cGridBag();
13571755 bigThree.addComponent(scenePanel);
13581756 bigThree.addComponent(centralPanel);
1359
- bigThree.addComponent(XYZPanel);
1757
+ //bigThree.addComponent(XYZPanel);
13601758
13611759 // // SIDE EFFECT!!!
13621760 // aConstraints.gridx = 0;
....@@ -1365,16 +1763,33 @@
13651763 // aConstraints.gridheight = 1;
13661764
13671765 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368
- framePanel.setContinuousLayout(true);
1369
- framePanel.setOneTouchExpandable(true);
1370
- framePanel.setDividerLocation(0.8);
1766
+
1767
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1768
+ new java.beans.PropertyChangeListener()
1769
+ {
1770
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1771
+ {
1772
+ if ((Integer)pce.getOldValue() == 1)
1773
+ {
1774
+ if (radio.layout != expandedLayout)
1775
+ {
1776
+ radio.layout = expandedLayout;
1777
+ radio.layout.doClick();
1778
+ }
1779
+ }
1780
+ }
1781
+ });
1782
+
1783
+ framePanel.setContinuousLayout(false);
1784
+ framePanel.setOneTouchExpandable(false);
1785
+ //.setDividerLocation(0.8);
13711786 //framePanel.setDividerSize(15);
13721787 //framePanel.setResizeWeight(0.15);
13731788 framePanel.setName("Frame");
13741789
13751790 frame.getContentPane().setLayout(new BorderLayout());
13761791 /**/
1377
- JTabbedPane worldPane = new JTabbedPane();
1792
+ //JTabbedPane worldPane = new JTabbedPane();
13781793 //worldPane.add(bigPanel);
13791794 //worldPane.add(worldPanel);
13801795 /**/
....@@ -1384,15 +1799,19 @@
13841799
13851800 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13861801
1387
- frame.setSize(1024, 768);
1388
- frame.show();
1389
-
1802
+ frame.setSize(1280, 860);
1803
+
1804
+ cameraView.requestFocusInWindow();
1805
+
13901806 gridPanel.setDividerLocation(1.0);
1807
+
1808
+ frame.validate();
1809
+
1810
+ frame.setVisible(true);
13911811
13921812 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
13931813 frame.addWindowListener(new WindowAdapter()
13941814 {
1395
-
13961815 public void windowClosing(WindowEvent e)
13971816 {
13981817 Close();
....@@ -1415,27 +1834,426 @@
14151834 ctrlPanel.removeAll();
14161835 }
14171836
1418
- void SetupMaterial(cGridBag ctrlPanel)
1837
+ void SetupMaterial(cGridBag materialpanel)
14191838 {
1420
- /*
1839
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1840
+
1841
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1842
+ skin.setToolTipText("Skin");
1843
+ skin.addMouseListener(new MouseAdapter()
1844
+ {
1845
+ public void mouseClicked(MouseEvent e)
1846
+ {
1847
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1848
+ cMaterial material = object.material;
1849
+
1850
+ // Skin
1851
+ colorField.setFloat(material.color);
1852
+ saturationField.setFloat(material.modulation);
1853
+ subsurfaceField.setFloat(material.subsurface);
1854
+ selfshadowField.setFloat(material.diffuseness);
1855
+ diffusenessField.setFloat(material.factor);
1856
+ shininessField.setFloat(material.shininess);
1857
+ shadowbiasField.setFloat(material.shadowbias);
1858
+ diffuseField.setFloat(material.diffuse);
1859
+ specularField.setFloat(material.specular);
1860
+
1861
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1862
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1863
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1864
+
1865
+ materialtouched = true;
1866
+ applySelf();
1867
+ }
1868
+ });
1869
+ presetpanel.add(skin);
1870
+
1871
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1872
+ lambert.setToolTipText("Diffuse");
1873
+ lambert.addMouseListener(new MouseAdapter()
1874
+ {
1875
+ public void mouseClicked(MouseEvent e)
1876
+ {
1877
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1878
+ cMaterial material = object.material;
1879
+
1880
+ diffusenessField.setFloat(material.factor);
1881
+ selfshadowField.setFloat(material.diffuseness);
1882
+
1883
+ materialtouched = true;
1884
+ applySelf();
1885
+ }
1886
+ });
1887
+ presetpanel.add(lambert);
1888
+
1889
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1890
+ diffuse2.setToolTipText("Diffuse2");
1891
+ diffuse2.addMouseListener(new MouseAdapter()
1892
+ {
1893
+ public void mouseClicked(MouseEvent e)
1894
+ {
1895
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1896
+ cMaterial material = object.material;
1897
+
1898
+ diffusenessField.setFloat(material.factor);
1899
+ selfshadowField.setFloat(material.diffuseness);
1900
+
1901
+ materialtouched = true;
1902
+ applySelf();
1903
+ }
1904
+ });
1905
+ presetpanel.add(diffuse2);
1906
+
1907
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1908
+ diffusemoon.setToolTipText("Moon");
1909
+ diffusemoon.addMouseListener(new MouseAdapter()
1910
+ {
1911
+ public void mouseClicked(MouseEvent e)
1912
+ {
1913
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
1914
+ cMaterial material = object.material;
1915
+
1916
+ diffusenessField.setFloat(material.factor);
1917
+ selfshadowField.setFloat(material.diffuseness);
1918
+
1919
+ materialtouched = true;
1920
+ applySelf();
1921
+ }
1922
+ });
1923
+ presetpanel.add(diffusemoon);
1924
+
1925
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1926
+ diffusemoon2.setToolTipText("Moon2");
1927
+ diffusemoon2.addMouseListener(new MouseAdapter()
1928
+ {
1929
+ public void mouseClicked(MouseEvent e)
1930
+ {
1931
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
1932
+ cMaterial material = object.material;
1933
+
1934
+ diffusenessField.setFloat(material.factor);
1935
+ selfshadowField.setFloat(material.diffuseness);
1936
+
1937
+ materialtouched = true;
1938
+ applySelf();
1939
+ }
1940
+ });
1941
+ presetpanel.add(diffusemoon2);
1942
+
1943
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1944
+ diffusemoon3.setToolTipText("Moon3");
1945
+ diffusemoon3.addMouseListener(new MouseAdapter()
1946
+ {
1947
+ public void mouseClicked(MouseEvent e)
1948
+ {
1949
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
1950
+ cMaterial material = object.material;
1951
+
1952
+ diffusenessField.setFloat(material.factor);
1953
+ selfshadowField.setFloat(material.diffuseness);
1954
+
1955
+ materialtouched = true;
1956
+ applySelf();
1957
+ }
1958
+ });
1959
+ presetpanel.add(diffusemoon3);
1960
+
1961
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1962
+ diffusesheen.setToolTipText("Sheen");
1963
+ diffusesheen.addMouseListener(new MouseAdapter()
1964
+ {
1965
+ public void mouseClicked(MouseEvent e)
1966
+ {
1967
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
1968
+ cMaterial material = object.material;
1969
+
1970
+ sheenField.setFloat(material.sheen);
1971
+
1972
+ materialtouched = true;
1973
+ applySelf();
1974
+ }
1975
+ });
1976
+ presetpanel.add(diffusesheen);
1977
+
1978
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1979
+ rough.setToolTipText("Rough metal");
1980
+ rough.addMouseListener(new MouseAdapter()
1981
+ {
1982
+ public void mouseClicked(MouseEvent e)
1983
+ {
1984
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
1985
+ cMaterial material = object.material;
1986
+
1987
+ shininessField.setFloat(material.shininess);
1988
+ velvetField.setFloat(material.velvet);
1989
+
1990
+ materialtouched = true;
1991
+ applySelf();
1992
+ }
1993
+ });
1994
+ presetpanel.add(rough);
1995
+
1996
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1997
+ rough2.setToolTipText("Medium metal");
1998
+ rough2.addMouseListener(new MouseAdapter()
1999
+ {
2000
+ public void mouseClicked(MouseEvent e)
2001
+ {
2002
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2003
+ cMaterial material = object.material;
2004
+
2005
+ shininessField.setFloat(material.shininess);
2006
+ lightareaField.setFloat(material.lightarea);
2007
+
2008
+ materialtouched = true;
2009
+ applySelf();
2010
+ }
2011
+ });
2012
+ presetpanel.add(rough2);
2013
+
2014
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2015
+ shini0.setToolTipText("Shiny");
2016
+ shini0.addMouseListener(new MouseAdapter()
2017
+ {
2018
+ public void mouseClicked(MouseEvent e)
2019
+ {
2020
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2021
+ cMaterial material = object.material;
2022
+
2023
+ shininessField.setFloat(material.shininess);
2024
+ lightareaField.setFloat(material.lightarea);
2025
+
2026
+ materialtouched = true;
2027
+ applySelf();
2028
+ }
2029
+ });
2030
+ presetpanel.add(shini0);
2031
+
2032
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2033
+ shini1.setToolTipText("Shiny2");
2034
+ shini1.addMouseListener(new MouseAdapter()
2035
+ {
2036
+ public void mouseClicked(MouseEvent e)
2037
+ {
2038
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2039
+ cMaterial material = object.material;
2040
+
2041
+ shininessField.setFloat(material.shininess);
2042
+ lightareaField.setFloat(material.lightarea);
2043
+
2044
+ materialtouched = true;
2045
+ applySelf();
2046
+ }
2047
+ });
2048
+ presetpanel.add(shini1);
2049
+
2050
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2051
+ shini2.setToolTipText("Shiny3");
2052
+ shini2.addMouseListener(new MouseAdapter()
2053
+ {
2054
+ public void mouseClicked(MouseEvent e)
2055
+ {
2056
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2057
+ cMaterial material = object.material;
2058
+
2059
+ shininessField.setFloat(material.shininess);
2060
+ lightareaField.setFloat(material.lightarea);
2061
+
2062
+ materialtouched = true;
2063
+ applySelf();
2064
+ }
2065
+ });
2066
+ presetpanel.add(shini2);
2067
+
2068
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2069
+ aniso.setToolTipText("AnisoU");
2070
+ aniso.addMouseListener(new MouseAdapter()
2071
+ {
2072
+ public void mouseClicked(MouseEvent e)
2073
+ {
2074
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2075
+ cMaterial material = object.material;
2076
+
2077
+ anisoField.setFloat(material.aniso);
2078
+ anisoVField.setFloat(material.anisoV);
2079
+
2080
+ materialtouched = true;
2081
+ applySelf();
2082
+ }
2083
+ });
2084
+ presetpanel.add(aniso);
2085
+
2086
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2087
+ aniso2.setToolTipText("AnisoV");
2088
+ aniso2.addMouseListener(new MouseAdapter()
2089
+ {
2090
+ public void mouseClicked(MouseEvent e)
2091
+ {
2092
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2093
+ cMaterial material = object.material;
2094
+
2095
+ anisoField.setFloat(material.aniso);
2096
+ anisoVField.setFloat(material.anisoV);
2097
+
2098
+ materialtouched = true;
2099
+ applySelf();
2100
+ }
2101
+ });
2102
+ presetpanel.add(aniso2);
2103
+
2104
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2105
+ aniso3.setToolTipText("AnisoUV");
2106
+ aniso3.addMouseListener(new MouseAdapter()
2107
+ {
2108
+ public void mouseClicked(MouseEvent e)
2109
+ {
2110
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2111
+ cMaterial material = object.material;
2112
+
2113
+ anisoField.setFloat(material.aniso);
2114
+ anisoVField.setFloat(material.anisoV);
2115
+
2116
+ materialtouched = true;
2117
+ applySelf();
2118
+ }
2119
+ });
2120
+ presetpanel.add(aniso3);
2121
+
2122
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2123
+ velvet0.setToolTipText("Velvet");
2124
+ velvet0.addMouseListener(new MouseAdapter()
2125
+ {
2126
+ public void mouseClicked(MouseEvent e)
2127
+ {
2128
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2129
+ cMaterial material = object.material;
2130
+
2131
+ diffusenessField.setFloat(material.factor);
2132
+ selfshadowField.setFloat(material.diffuseness);
2133
+ sheenField.setFloat(material.sheen);
2134
+ shininessField.setFloat(material.shininess);
2135
+ velvetField.setFloat(material.velvet);
2136
+ shiftField.setFloat(material.shift);
2137
+
2138
+ materialtouched = true;
2139
+ applySelf();
2140
+ }
2141
+ });
2142
+ presetpanel.add(velvet0);
2143
+
2144
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2145
+ bump0.setToolTipText("Bump texture");
2146
+ bump0.addMouseListener(new MouseAdapter()
2147
+ {
2148
+ public void mouseClicked(MouseEvent e)
2149
+ {
2150
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2151
+ cMaterial material = object.material;
2152
+
2153
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2154
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2155
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2156
+
2157
+ materialtouched = true;
2158
+ applySelf();
2159
+ }
2160
+ });
2161
+ presetpanel.add(bump0);
2162
+
2163
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2164
+ halo.setToolTipText("Halo");
2165
+ halo.addMouseListener(new MouseAdapter()
2166
+ {
2167
+ public void mouseClicked(MouseEvent e)
2168
+ {
2169
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2170
+ cMaterial material = object.material;
2171
+
2172
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2173
+
2174
+ materialtouched = true;
2175
+ applySelf();
2176
+ }
2177
+ });
2178
+ presetpanel.add(halo);
2179
+
2180
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2181
+ candle.setToolTipText("Candle");
2182
+ candle.addMouseListener(new MouseAdapter()
2183
+ {
2184
+ public void mouseClicked(MouseEvent e)
2185
+ {
2186
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2187
+ cMaterial material = object.material;
2188
+
2189
+ subsurfaceField.setFloat(material.subsurface);
2190
+ shadowbiasField.setFloat(material.shadowbias);
2191
+ ambientField.setFloat(material.ambient);
2192
+ specularField.setFloat(material.specular);
2193
+ lightareaField.setFloat(material.lightarea);
2194
+ shininessField.setFloat(material.shininess);
2195
+
2196
+ materialtouched = true;
2197
+ applySelf();
2198
+ }
2199
+ });
2200
+ presetpanel.add(candle);
2201
+
2202
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2203
+ shadowShader.setToolTipText("Shadow");
2204
+ shadowShader.addMouseListener(new MouseAdapter()
2205
+ {
2206
+ public void mouseClicked(MouseEvent e)
2207
+ {
2208
+ diffuseField.setFloat(0.001);
2209
+ ambientField.setFloat(0.001);
2210
+ cameraField.setFloat(0.001);
2211
+ specularField.setFloat(0.001);
2212
+ fakedepthField.setFloat(0.001);
2213
+ opacityField.setFloat(0.6);
2214
+
2215
+ materialtouched = true;
2216
+ applySelf();
2217
+ }
2218
+ });
2219
+ presetpanel.add(shadowShader);
2220
+
2221
+ cGridBag panel = new cGridBag().setVertical(true);
2222
+
2223
+ presetpanel.preferredWidth = 1;
2224
+
2225
+ materialpanel.add(presetpanel);
2226
+ materialpanel.add(panel);
2227
+
2228
+ panel.preferredWidth = 8;
2229
+
2230
+ /*
14212231 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14222232 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1423
- */
2233
+ */
14242234
14252235 cGridBag editBar = new cGridBag().setVertical(false);
14262236
1427
- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
2237
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2238
+ createMaterialButton.setToolTipText("Create material");
14282239
14292240 /*
14302241 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14312242 */
14322243
1433
- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434
- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1435
- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436
- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2244
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2245
+ clearMaterialButton.setToolTipText("Clear material");
2246
+
2247
+ if (Globals.ADVANCED)
2248
+ {
2249
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2250
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2251
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2252
+ }
14372253
1438
- ctrlPanel.add(editBar);
2254
+ editBar.preferredHeight = 15;
2255
+
2256
+ panel.add(editBar);
14392257
14402258 /**/
14412259 //aConstraints.weighty = 0;
....@@ -1445,59 +2263,57 @@
14452263 //aConstraints.gridx += 1;
14462264 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14472265
1448
- JPanel colorPanel = new JPanel(new BorderLayout());
1449
- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450
-
14512266 cGridBag colorSection = new cGridBag().setVertical(true);
1452
-
1453
- colorPanel.add(colorSection);
2267
+
2268
+ cGridBag huepanel = new cGridBag();
2269
+ cGridBag huelabel = new cGridBag();
2270
+ skin = GetLabel("icons/hue.png", false);
2271
+ skin.fit = true;
2272
+ huelabel.add(skin);
2273
+ huelabel.preferredWidth = 20;
2274
+ huepanel.add(new cGridBag()); // Label
2275
+ huepanel.add(huelabel); // Field/slider
2276
+
2277
+ huepanel.preferredHeight = 7;
2278
+
2279
+ colorSection.add(huepanel);
14542280
14552281 cGridBag color = new cGridBag();
1456
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2282
+
2283
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2284
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2285
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2286
+
2287
+ //colorField.preferredWidth = 200;
14592288 colorSection.add(color);
14602289
14612290 cGridBag modulation = new cGridBag();
14622291 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
14632292 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1464
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2293
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
14652294 colorSection.add(modulation);
14662295
2296
+ cGridBag opacity = new cGridBag();
2297
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2298
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2299
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2300
+ colorSection.add(opacity);
2301
+
2302
+ colorSection.add(GetSeparator());
2303
+
14672304 cGridBag texture = new cGridBag();
14682305 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
14692306 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
14702307 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
14712308 colorSection.add(texture);
14722309
1473
- cGridBag anisoU = new cGridBag();
1474
- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476
- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477
- colorSection.add(anisoU);
1478
-
1479
- cGridBag anisoV = new cGridBag();
1480
- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482
- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483
- colorSection.add(anisoV);
1484
-
1485
- cGridBag shadowbias = new cGridBag();
1486
- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488
- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489
- colorSection.add(shadowbias);
1490
-
1491
- ctrlPanel.add(colorPanel);
2310
+ panel.add(GetSeparator());
2311
+
2312
+ panel.add(colorSection);
14922313
14932314 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14942315
1495
- JPanel diffusePanel = new JPanel(new BorderLayout());
1496
- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497
-
14982316 cGridBag diffuseSection = new cGridBag().setVertical(true);
1499
-
1500
- diffusePanel.add(diffuseSection);
15012317
15022318 cGridBag diffuse = new cGridBag();
15032319 diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
....@@ -1541,16 +2357,19 @@
15412357 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15422358 diffuseSection.add(fakedepth);
15432359
1544
- ctrlPanel.add(diffusePanel);
2360
+ cGridBag shadowbias = new cGridBag();
2361
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
2362
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2363
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2364
+ diffuseSection.add(shadowbias);
2365
+
2366
+ panel.add(GetSeparator());
2367
+
2368
+ panel.add(diffuseSection);
15452369
15462370 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
15472371
1548
- JPanel specularPanel = new JPanel(new BorderLayout());
1549
- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550
-
15512372 cGridBag specularSection = new cGridBag().setVertical(true);
1552
-
1553
- specularPanel.add(specularSection);
15542373
15552374 cGridBag specular = new cGridBag();
15562375 specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
....@@ -1582,7 +2401,7 @@
15822401 velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15832402 specularSection.add(velvet);
15842403
1585
- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
2404
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
15862405 //Return();
15872406 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
15882407 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
....@@ -1594,52 +2413,52 @@
15942413 // aConstraints.gridy += 1;
15952414 // aConstraints.gridwidth = 1;
15962415
2416
+ cGridBag anisoU = new cGridBag();
2417
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
2418
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2419
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2420
+ specularSection.add(anisoU);
15972421
1598
- ctrlPanel.add(specularPanel);
2422
+ cGridBag anisoV = new cGridBag();
2423
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
2424
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2425
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2426
+ specularSection.add(anisoV);
2427
+
2428
+
2429
+ panel.add(GetSeparator());
2430
+
2431
+ panel.add(specularSection);
15992432
16002433 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16012434
1602
- JPanel globalPanel = new JPanel(new BorderLayout());
1603
- globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604
-
1605
- cGridBag globalSection = new cGridBag().setVertical(true);
1606
-
1607
- globalPanel.add(globalSection);
2435
+ //cGridBag globalSection = new cGridBag().setVertical(true);
16082436
16092437 cGridBag camera = new cGridBag();
16102438 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
16112439 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16122440 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613
- globalSection.add(camera);
2441
+ colorSection.add(camera);
16142442
16152443 cGridBag ambient = new cGridBag();
16162444 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
16172445 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16182446 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619
- globalSection.add(ambient);
2447
+ colorSection.add(ambient);
16202448
16212449 cGridBag backlit = new cGridBag();
16222450 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
16232451 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16242452 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625
- globalSection.add(backlit);
2453
+ colorSection.add(backlit);
16262454
1627
- cGridBag opacity = new cGridBag();
1628
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631
- globalSection.add(opacity);
1632
-
1633
- ctrlPanel.add(globalPanel);
2455
+ //panel.add(new JSeparator());
2456
+
2457
+ //panel.add(globalSection);
16342458
16352459 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16362460
1637
- JPanel texturePanel = new JPanel(new BorderLayout());
1638
- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639
-
16402461 cGridBag textureSection = new cGridBag().setVertical(true);
1641
-
1642
- texturePanel.add(textureSection);
16432462
16442463 cGridBag bump = new cGridBag();
16452464 bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
....@@ -1677,7 +2496,9 @@
16772496 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
16782497 textureSection.add(opacityPower);
16792498
1680
- ctrlPanel.add(texturePanel);
2499
+ panel.add(GetSeparator());
2500
+
2501
+ panel.add(textureSection);
16812502
16822503 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16832504
....@@ -1714,12 +2535,15 @@
17142535 opacityPowerField.addChangeListener(this);
17152536 /**/
17162537
1717
- resetSlidersButton.addActionListener(this);
17182538 clearMaterialButton.addActionListener(this);
17192539 createMaterialButton.addActionListener(this);
1720
-
1721
- propagateToggle.addItemListener(this);
1722
- multiplyToggle.addItemListener(this);
2540
+
2541
+ if (Globals.ADVANCED)
2542
+ {
2543
+ resetSlidersButton.addActionListener(this);
2544
+ propagateToggle.addItemListener(this);
2545
+ multiplyToggle.addItemListener(this);
2546
+ }
17232547 }
17242548
17252549 void DropFile(java.io.File[] files, boolean textures)
....@@ -1737,8 +2561,9 @@
17372561 // 3D models
17382562 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
17392563 {
1740
- lastConverter = new com.jmex.model.converters.MaxToJme();
1741
- LoadFile(filename, lastConverter);
2564
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2565
+ //LoadFile(filename, lastConverter);
2566
+ LoadObjFile(filename); // New 3ds loader
17422567 continue;
17432568 }
17442569 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -1890,7 +2715,7 @@
18902715
18912716 //? flashIt = false;
18922717 CameraPane pane = (CameraPane) cameraView;
1893
- pane.clickStart(location.x, location.y, 0);
2718
+ pane.clickStart(location.x, location.y, 0, 0);
18942719 pane.clickEnd(location.x, location.y, 0, true);
18952720
18962721 if (group.selection.size() == 1)
....@@ -1939,6 +2764,7 @@
19392764 e2.printStackTrace();
19402765 }
19412766 }
2767
+
19422768 LoadJMEThread loadThread;
19432769
19442770 class LoadJMEThread extends Thread
....@@ -1996,6 +2822,7 @@
19962822 //LoadFile0(filename, converter);
19972823 }
19982824 }
2825
+
19992826 LoadOBJThread loadObjThread;
20002827
20012828 class LoadOBJThread extends Thread
....@@ -2074,19 +2901,19 @@
20742901
20752902 void LoadObjFile(String fullname)
20762903 {
2077
- /*
2904
+ System.out.println("Loading " + fullname);
2905
+ /**/
20782906 //lastFilename = fullname;
20792907 if(loadObjThread == null)
20802908 {
2081
- loadObjThread = new LoadOBJThread();
2082
- loadObjThread.start();
2909
+ loadObjThread = new LoadOBJThread();
2910
+ loadObjThread.start();
20832911 }
20842912
20852913 loadObjThread.add(fullname);
2086
- */
2914
+ /**/
20872915
2088
- System.out.println("Loading " + fullname);
2089
- makeSomething(new FileObject(fullname, true), true);
2916
+ //makeSomething(new FileObject(fullname, true), true);
20902917 }
20912918
20922919 void LoadGFDFile(String fullname)
....@@ -2347,11 +3174,11 @@
23473174
23483175 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23493176 {
2350
- if (GrafreeD.standAlone)
3177
+ if (Grafreed.standAlone)
23513178 {
23523179 /**/
23533180 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2354
- browser.show();
3181
+ browser.setVisible(true);
23553182 String filename = browser.getFile();
23563183 if (filename != null && filename.length() > 0)
23573184 {
....@@ -2462,6 +3289,7 @@
24623289 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
24633290 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
24643291 }
3292
+
24653293 //cJME.count++;
24663294 //cJME.count %= 12;
24673295 if (gc)
....@@ -2496,6 +3324,7 @@
24963324 }
24973325 if (input == null)
24983326 {
3327
+ new Exception().printStackTrace();
24993328 System.exit(0);
25003329 }
25013330
....@@ -2644,6 +3473,7 @@
26443473 }
26453474 }
26463475 }
3476
+
26473477 cFileSystemPane FSPane;
26483478
26493479 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2653,7 +3483,7 @@
26533483
26543484 freezematerial = true;
26553485 colorField.setFloat(mat.color);
2656
- modulationField.setFloat(mat.modulation);
3486
+ saturationField.setFloat(mat.modulation);
26573487 metalnessField.setFloat(mat.metalness);
26583488 diffuseField.setFloat(mat.diffuse);
26593489 specularField.setFloat(mat.specular);
....@@ -2697,11 +3527,14 @@
26973527 }
26983528 }
26993529 }
3530
+
27003531 freezematerial = false;
27013532 }
27023533
27033534 void SetMaterial(Object3D object)
27043535 {
3536
+ latestObject = object;
3537
+
27053538 cMaterial mat = object.material;
27063539
27073540 if (mat == null)
....@@ -2710,7 +3543,8 @@
27103543 return;
27113544 }
27123545
2713
- multiplyToggle.setSelected(mat.multiply);
3546
+ if (multiplyToggle != null)
3547
+ multiplyToggle.setSelected(mat.multiply);
27143548
27153549 assert (object.projectedVertices != null);
27163550
....@@ -2812,12 +3646,17 @@
28123646 // }
28133647
28143648 /**/
2815
- if (deselect)
3649
+ if (deselect || child == null)
28163650 {
28173651 //group.deselectAll();
28183652 //freeze = true;
28193653 GetTree().clearSelection();
28203654 //freeze = false;
3655
+
3656
+ if (child == null)
3657
+ {
3658
+ return;
3659
+ }
28213660 }
28223661
28233662 //group.addSelectee(child);
....@@ -2851,6 +3690,17 @@
28513690 public void itemStateChanged(ItemEvent event)
28523691 {
28533692 // System.out.println("Propagate = " + propagate);
3693
+ if (event.getSource() == pinButton)
3694
+ {
3695
+ copy.pinned ^= true;
3696
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3697
+ {
3698
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3699
+ copy.CloseUI();
3700
+ //copy.editWindow.refreshContents();
3701
+ }
3702
+ }
3703
+ else
28543704 if (event.getSource() == propagateToggle)
28553705 {
28563706 propagate ^= true;
....@@ -2886,7 +3736,7 @@
28863736 cameraView.ToggleDL();
28873737 cameraView.repaint();
28883738 return;
2889
- } else if (event.getSource() == toggleTextureItem)
3739
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28903740 {
28913741 cameraView.ToggleTexture();
28923742 // june 2013 copy.HardTouch();
....@@ -2925,9 +3775,9 @@
29253775 frame.validate();
29263776
29273777 return;
2928
- } else if (event.getSource() == toggleRandomItem)
3778
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29293779 {
2930
- cameraView.ToggleRandom();
3780
+ cameraView.ToggleSwitch();
29313781 cameraView.repaint();
29323782 return;
29333783 } else if (event.getSource() == toggleHandleItem)
....@@ -2955,12 +3805,17 @@
29553805 } else if (event.getSource() == liveCB)
29563806 {
29573807 copy.live ^= true;
3808
+ objEditor.refreshContents(true); // To show item colors
3809
+ return;
3810
+ } else if (event.getSource() == selectableCB)
3811
+ {
3812
+ copy.dontselect ^= true;
29583813 return;
29593814 } else if (event.getSource() == hideCB)
29603815 {
29613816 copy.hide ^= true;
29623817 copy.Touch(); // display list issue
2963
- objEditor.refreshContents();
3818
+ objEditor.refreshContents(true); // To show item colors
29643819 return;
29653820 } else if (event.getSource() == link2masterCB)
29663821 {
....@@ -2970,6 +3825,7 @@
29703825 if (event.getSource() == randomCB)
29713826 {
29723827 copy.random ^= true;
3828
+ objEditor.refreshContents();
29733829 return;
29743830 }
29753831 if (event.getSource() == speedupCB)
....@@ -2993,8 +3849,9 @@
29933849
29943850 public void actionPerformed(ActionEvent event)
29953851 {
3852
+ Object source = event.getSource();
29963853 // SCRIPT DIALOG
2997
- if (event.getSource() == okbutton)
3854
+ if (source == okbutton)
29983855 {
29993856 textpanel.setVisible(false);
30003857 textpanel.remove(textarea);
....@@ -3006,7 +3863,7 @@
30063863 textarea = null;
30073864 textpanel = null;
30083865 }
3009
- if (event.getSource() == cancelbutton)
3866
+ if (source == cancelbutton)
30103867 {
30113868 textpanel.setVisible(false);
30123869 textpanel.remove(textarea);
....@@ -3018,50 +3875,50 @@
30183875 //applySelf();
30193876 //client.refreshEditWindow();
30203877 //refreshContents();
3021
- if (event.getSource() == nameField)
3878
+ if (source == nameField)
30223879 {
30233880 //System.out.println("ObjEditor " + event);
30243881 applySelf0(true);
30253882 //parent.applySelf();
30263883 objEditor.refreshContents();
3027
- } else if (event.getSource() == resetButton)
3884
+ } else if (source == resetButton)
30283885 {
30293886 CameraPane.fullreset = true;
30303887 copy.Reset(); // ResetMeshes();
30313888 copy.Touch();
30323889 objEditor.refreshContents();
3033
- } else if (event.getSource() == stepItem)
3890
+ } else if (source == stepItem)
30343891 {
30353892 //cameraView.ONESTEP = true;
30363893 Globals.ONESTEP = true;
30373894 cameraView.repaint();
30383895 return;
3039
- } else if (event.getSource() == stepButton)
3896
+ } else if (source == stepButton)
30403897 {
30413898 copy.Step();
30423899 copy.Touch();
30433900 objEditor.refreshContents();
3044
- } else if (event.getSource() == slowerButton)
3901
+ } else if (source == slowerButton)
30453902 {
30463903 copy.Slower();
30473904 copy.Touch();
30483905 objEditor.refreshContents();
3049
- } else if (event.getSource() == fasterButton)
3906
+ } else if (source == fasterButton)
30503907 {
30513908 copy.Faster();
30523909 copy.Touch();
30533910 objEditor.refreshContents();
3054
- } else if (event.getSource() == remarkButton)
3911
+ } else if (source == remarkButton)
30553912 {
30563913 copy.Remark();
30573914 copy.Touch();
30583915 objEditor.refreshContents();
3059
- } else if (event.getSource() == stepAllButton)
3916
+ } else if (source == stepAllButton)
30603917 {
30613918 copy.StepAll();
30623919 copy.Touch();
30633920 objEditor.refreshContents();
3064
- } else if (event.getSource() == resetAllButton)
3921
+ } else if (source == resetAllButton)
30653922 {
30663923 //CameraPane.fullreset = true;
30673924 copy.ResetAll(); // ResetMeshes();
....@@ -3094,53 +3951,79 @@
30943951 // Close();
30953952 // }
30963953 // else
3097
- if (event.getSource() == resetSlidersButton)
3954
+ if (source == resetSlidersButton)
30983955 {
30993956 ResetSliders();
3100
- } else if (event.getSource() == clearMaterialButton)
3957
+ } else if (source == clearMaterialButton)
31013958 {
31023959 ClearMaterial();
3103
- } else if (event.getSource() == createMaterialButton)
3960
+ } else if (source == createMaterialButton)
31043961 {
31053962 CreateMaterial();
3106
- } else if (event.getSource() == clearPanelButton)
3963
+ } else if (source == clearPanelButton)
31073964 {
31083965 copy.ClearUI();
31093966 refreshContents(true);
3110
- } /*
3111
- }
3112
-
3113
- public boolean action(Event event, Object arg)
3114
- {
3115
- */ else if (event.getSource() == closeItem)
3967
+ } else if (source == importGFDItem)
3968
+ {
3969
+ ImportGFD();
3970
+ } else
3971
+ if (source == importVRMLX3DItem)
3972
+ {
3973
+ ImportVRMLX3D();
3974
+ } else
3975
+ if (source == import3DSItem)
3976
+ {
3977
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3978
+ } else
3979
+ if (source == importOBJItem)
3980
+ {
3981
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3982
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3983
+ browser.setVisible(true);
3984
+ String filename = browser.getFile();
3985
+ if (filename != null && filename.length() > 0)
3986
+ {
3987
+ String fullname = browser.getDirectory() + filename;
3988
+ makeSomething(ReadOBJ(fullname), true);
3989
+ }
3990
+ } else
3991
+ if (source == closeItem)
31163992 {
31173993 Close();
31183994 //return true;
3119
- } else if (event.getSource() == loadItem)
3995
+ } else if (source == openItem)
31203996 {
3121
- load();
3997
+ Open();
31223998 //return true;
3123
- } else if (event.getSource() == saveItem)
3999
+ } else if (source == newItem)
4000
+ {
4001
+ New();
4002
+ } else if (source == saveItem)
31244003 {
31254004 save();
31264005 //return true;
3127
- } else if (event.getSource() == saveAsItem)
4006
+ } else if (source == saveAsItem)
31284007 {
31294008 saveAs();
31304009 //return true;
3131
- } else if (event.getSource() == reexportItem)
4010
+ } else if (source == reexportItem)
31324011 {
31334012 reexport();
31344013 //return true;
3135
- } else if (event.getSource() == exportAsItem)
4014
+ } else if (source == exportAsItem)
31364015 {
31374016 export();
31384017 //return true;
3139
- } else if (event.getSource() == povItem)
4018
+ } else if (source == povItem)
31404019 {
31414020 generatePOV();
31424021 //return true;
3143
- } else if (event.getSource() == zBufferItem)
4022
+ } else if (event.getSource() == archiveItem)
4023
+ {
4024
+ cTools.Archive(frame);
4025
+ return;
4026
+ } else if (source == zBufferItem)
31444027 {
31454028 try
31464029 {
....@@ -3162,21 +4045,8 @@
31624045 cameraView.repaint();
31634046 //return true;
31644047 }
3165
- */ else if (event.getSource() == editCameraItem)
3166
- {
3167
- cameraView.ProtectCamera();
3168
- cameraView.repaint();
3169
- return;
3170
- } else if (event.getSource() == revertCameraItem)
3171
- {
3172
- cameraView.RevertCamera();
3173
- cameraView.repaint();
3174
- return;
3175
-// } else if (event.getSource() == textureButton)
3176
-// {
3177
-// return; // true;
3178
- } else // combos...
3179
- if (event.getSource() == texresMenu)
4048
+ */ else // combos...
4049
+ if (source == texresMenu)
31804050 {
31814051 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
31824052 copy.texres = texresMenu.getSelectedIndex();
....@@ -3188,12 +4058,477 @@
31884058 }
31894059 }
31904060
4061
+ void New()
4062
+ {
4063
+ while (copy.Size() > 1)
4064
+ {
4065
+ copy.remove(1);
4066
+ }
4067
+
4068
+ ResetModel();
4069
+ objEditor.refreshContents();
4070
+ }
4071
+
4072
+ static public byte[] Compress(Object3D o)
4073
+ {
4074
+ // Slower to actually compress.
4075
+ try
4076
+ {
4077
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
4078
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
4079
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
4080
+
4081
+ Object3D parent = o.parent;
4082
+ o.parent = null;
4083
+
4084
+ out.writeObject(o);
4085
+
4086
+ o.parent = parent;
4087
+
4088
+ out.flush();
4089
+
4090
+ baos //zstream
4091
+ .close();
4092
+ out.close();
4093
+
4094
+ byte[] bytes = baos.toByteArray();
4095
+
4096
+ System.out.println("save #bytes = " + bytes.length);
4097
+ return bytes;
4098
+ } catch (Exception e)
4099
+ {
4100
+ System.err.println(e);
4101
+ return null;
4102
+ }
4103
+ }
4104
+
4105
+ static public Object Uncompress(byte[] bytes)
4106
+ {
4107
+ System.out.println("restore #bytes = " + bytes.length);
4108
+ try
4109
+ {
4110
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
4111
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
4112
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
4113
+ Object obj = in.readObject();
4114
+
4115
+ bais //istream
4116
+ .close();
4117
+ in.close();
4118
+
4119
+ return obj;
4120
+ } catch (Exception e)
4121
+ {
4122
+ System.err.println(e);
4123
+ return null;
4124
+ }
4125
+ }
4126
+
4127
+ static public Object clone(Object o)
4128
+ {
4129
+ try
4130
+ {
4131
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
4132
+ ObjectOutputStream out = new ObjectOutputStream(baos);
4133
+
4134
+ out.writeObject(o);
4135
+
4136
+ out.flush();
4137
+ out.close();
4138
+
4139
+ byte[] bytes = baos.toByteArray();
4140
+
4141
+ System.out.println("clone = " + bytes.length);
4142
+
4143
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
4144
+ ObjectInputStream in = new ObjectInputStream(bais);
4145
+ Object obj = in.readObject();
4146
+ in.close();
4147
+
4148
+ return obj;
4149
+ } catch (Exception e)
4150
+ {
4151
+ System.err.println(e);
4152
+ return null;
4153
+ }
4154
+ }
4155
+
4156
+ cRadio GetCurrentTab()
4157
+ {
4158
+ cRadio ab;
4159
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4160
+ {
4161
+ ab = (cRadio)e.nextElement();
4162
+ if(ab.GetObject() == copy)
4163
+ {
4164
+ return ab;
4165
+ }
4166
+ }
4167
+
4168
+ return null;
4169
+ }
4170
+
4171
+
4172
+ public void Save()
4173
+ {
4174
+ //Save(true);
4175
+ Replace();
4176
+ SetVersionStates();
4177
+ }
4178
+
4179
+ private boolean Equal(byte[] compress, byte[] name)
4180
+ {
4181
+ if (compress.length != name.length)
4182
+ {
4183
+ return false;
4184
+ }
4185
+
4186
+ for (int i=compress.length; --i>=0;)
4187
+ {
4188
+ if (compress[i] != name[i])
4189
+ return false;
4190
+ }
4191
+
4192
+ return true;
4193
+ }
4194
+
4195
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196
+
4197
+ void DeleteVersion()
4198
+ {
4199
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4200
+ {
4201
+ copy.versionlist[i] = copy.versionlist[i+1];
4202
+ }
4203
+
4204
+ CopyChanged();
4205
+
4206
+ SetVersionStates();
4207
+ }
4208
+
4209
+ public boolean Save(boolean user)
4210
+ {
4211
+ System.err.println("Save");
4212
+ Replace();
4213
+
4214
+ //cRadio tab = GetCurrentTab();
4215
+
4216
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4217
+
4218
+ boolean thesame = false;
4219
+
4220
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4221
+// {
4222
+// thesame = true;
4223
+// }
4224
+
4225
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
4226
+ if (!thesame)
4227
+ {
4228
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4229
+ {
4230
+ copy.versionlist[i] = copy.versionlist[i-1];
4231
+ }
4232
+
4233
+ //tab.user[tab.versionindex] = user;
4234
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
4235
+
4236
+ copy.versionlist[++copy.versionindex] = compress;
4237
+
4238
+ // if (increment)
4239
+ // tab.versionindex++;
4240
+ }
4241
+
4242
+ //copy.RestoreBigData(versiontable);
4243
+
4244
+ //assert(hashtable.isEmpty());
4245
+
4246
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4247
+// {
4248
+// //tab.user[i] = false;
4249
+// copy.versionlist[i] = null;
4250
+// }
4251
+
4252
+ SetVersionStates();
4253
+
4254
+ // test save
4255
+ if (false)
4256
+ {
4257
+ try
4258
+ {
4259
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
4260
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
4261
+
4262
+ p.writeObject(copy);
4263
+
4264
+ p.flush();
4265
+
4266
+ ostream.close();
4267
+ } catch (Exception e)
4268
+ {
4269
+ e.printStackTrace();
4270
+ }
4271
+ }
4272
+
4273
+ return !thesame;
4274
+ }
4275
+
4276
+ boolean flashIt = true;
4277
+
4278
+ void RefreshSelection()
4279
+ {
4280
+ Object3D selection = new Object3D();
4281
+
4282
+ for (int i = 0; i < copy.selection.size(); i++)
4283
+ {
4284
+ Object3D elem = copy.selection.elementAt(i);
4285
+
4286
+ Object3D obj = copy.GetObject(elem.GetUUID());
4287
+
4288
+ if (obj == null)
4289
+ {
4290
+ copy.selection.remove(i--);
4291
+ }
4292
+ else
4293
+ {
4294
+ selection.add(obj);
4295
+ copy.selection.setElementAt(obj, i);
4296
+ }
4297
+ }
4298
+
4299
+ flashIt = false;
4300
+ GetTree().clearSelection();
4301
+ for (int i = 0; i < selection.size(); i++)
4302
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4303
+ flashIt = true;
4304
+
4305
+ //refreshContents(false);
4306
+ }
4307
+
4308
+ void CopyChanged()
4309
+ {
4310
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4311
+
4312
+ SetVersionStates();
4313
+
4314
+ boolean temp = CameraPane.SWITCH;
4315
+ CameraPane.SWITCH = false;
4316
+
4317
+ copy.ExtractBigData(versiontable);
4318
+
4319
+ copy.clear();
4320
+
4321
+ copy.skyboxname = obj.skyboxname;
4322
+ copy.skyboxext = obj.skyboxext;
4323
+
4324
+ for (int i=0; i<obj.Size(); i++)
4325
+ {
4326
+ copy.add(obj.get(i));
4327
+ }
4328
+
4329
+ copy.RestoreBigData(versiontable);
4330
+
4331
+ CameraPane.SWITCH = temp;
4332
+
4333
+ RefreshSelection();
4334
+ //assert(hashtable.isEmpty());
4335
+
4336
+ copy.Touch();
4337
+
4338
+ ResetModel();
4339
+ copy.HardTouch(); // recompile?
4340
+
4341
+ cRadio ab;
4342
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4343
+ {
4344
+ ab = (cRadio)e.nextElement();
4345
+ Object3D test = copy.GetObject(ab.object.GetUUID());
4346
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4347
+ if (test != null)
4348
+ {
4349
+ test.editWindow = ab.object.editWindow;
4350
+ ab.object = test;
4351
+ }
4352
+ }
4353
+
4354
+ refreshContents(true);
4355
+ }
4356
+
4357
+ cButton previousVersionButton;
4358
+ cButton restoreButton;
4359
+ cButton replaceButton;
4360
+ cButton nextVersionButton;
4361
+ cButton saveVersionButton;
4362
+ cButton deleteVersionButton;
4363
+
4364
+ boolean muteSlider;
4365
+
4366
+ int VersionCount()
4367
+ {
4368
+ int count = 0;
4369
+
4370
+ for (int i = copy.versionlist.length; --i >= 0;)
4371
+ {
4372
+ if (copy.versionlist[i] != null)
4373
+ count++;
4374
+ }
4375
+
4376
+ return count;
4377
+ }
4378
+
4379
+ void SetVersionStates()
4380
+ {
4381
+ //if (true)
4382
+ // return;
4383
+
4384
+ //cRadio tab = GetCurrentTab();
4385
+
4386
+ restoreButton.setEnabled(copy.versionindex != -1);
4387
+ replaceButton.setEnabled(copy.versionindex != -1);
4388
+
4389
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4390
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4391
+
4392
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4393
+ copy.versionlist[copy.versionindex + 1] != null);
4394
+
4395
+ muteSlider = true;
4396
+ versionSlider.setMinimum(0);
4397
+ versionSlider.setMaximum(VersionCount() - 1);
4398
+ versionSlider.setInteger(copy.versionindex);
4399
+ versionSlider.setEnabled(copy.versionindex != -1);
4400
+ muteSlider = false;
4401
+ }
4402
+
4403
+ public boolean PreviousVersion()
4404
+ {
4405
+ // Option?
4406
+ Replace();
4407
+
4408
+ System.err.println("Undo");
4409
+
4410
+ //cRadio tab = GetCurrentTab();
4411
+
4412
+ if (copy.versionindex == 0)
4413
+ {
4414
+ java.awt.Toolkit.getDefaultToolkit().beep();
4415
+ return false;
4416
+ }
4417
+
4418
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
4419
+// {
4420
+// if (Save(false))
4421
+// tab.versionindex -= 1;
4422
+// else
4423
+// {
4424
+// if (tab.versionindex <= 0)
4425
+// return false;
4426
+// else
4427
+// tab.versionindex -= 1;
4428
+// }
4429
+// }
4430
+
4431
+ copy.versionindex -= 1;
4432
+
4433
+ CopyChanged();
4434
+
4435
+ return true;
4436
+ }
4437
+
4438
+ public boolean Restore()
4439
+ {
4440
+ System.err.println("Restore");
4441
+
4442
+ //cRadio tab = GetCurrentTab();
4443
+
4444
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4445
+ {
4446
+ java.awt.Toolkit.getDefaultToolkit().beep();
4447
+ return false;
4448
+ }
4449
+
4450
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4451
+ CopyChanged();
4452
+
4453
+ return true;
4454
+ }
4455
+
4456
+ public boolean Replace()
4457
+ {
4458
+ System.err.println("Replace");
4459
+
4460
+ //cRadio tab = GetCurrentTab();
4461
+
4462
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4463
+ {
4464
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4465
+ return false;
4466
+ }
4467
+
4468
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4469
+
4470
+ return true;
4471
+ }
4472
+
4473
+ public void NextVersion()
4474
+ {
4475
+ // Option?
4476
+ Replace();
4477
+
4478
+ //cRadio tab = GetCurrentTab();
4479
+
4480
+ if (copy.versionlist[copy.versionindex + 1] == null)
4481
+ {
4482
+ java.awt.Toolkit.getDefaultToolkit().beep();
4483
+ return;
4484
+ }
4485
+
4486
+ copy.versionindex += 1;
4487
+
4488
+ CopyChanged();
4489
+
4490
+ //if (!tab.user[tab.versionindex])
4491
+ // tab.graphs[tab.versionindex] = null;
4492
+ }
4493
+
4494
+ void ImportGFD()
4495
+ {
4496
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4497
+ browser.show();
4498
+ String filename = browser.getFile();
4499
+ if (filename != null && filename.length() > 0)
4500
+ {
4501
+ String fullname = browser.getDirectory() + filename;
4502
+
4503
+ //Object3D readobj =
4504
+ objEditor.ReadGFD(fullname, objEditor);
4505
+ //makeSomething(readobj);
4506
+ }
4507
+ }
4508
+
4509
+ void ImportVRMLX3D()
4510
+ {
4511
+ if (Grafreed.standAlone)
4512
+ {
4513
+ /**/
4514
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4515
+ browser.show();
4516
+ String filename = browser.getFile();
4517
+ if (filename != null && filename.length() > 0)
4518
+ {
4519
+ String fullname = browser.getDirectory() + filename;
4520
+ LoadVRMLX3D(fullname);
4521
+ }
4522
+ /**/
4523
+ }
4524
+ }
4525
+
31914526 void ToggleAnimation()
31924527 {
31934528 if (!Globals.ANIMATION)
31944529 {
31954530 FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3196
- browser.show();
4531
+ browser.setVisible(true);
31974532 String filename = browser.getFile();
31984533 if (filename != null && filename.length() > 0)
31994534 {
....@@ -3203,8 +4538,8 @@
32034538
32044539 Globals.ANIMATION ^= true;
32054540
3206
- GrafreeD.wav.cursor = 0;
3207
- GrafreeD.wav.loop = 0;
4541
+ Grafreed.wav.cursor = 0;
4542
+ Grafreed.wav.loop = 0;
32084543 }
32094544 } else
32104545 {
....@@ -3254,7 +4589,7 @@
32544589 void CreateMaterial()
32554590 {
32564591 //copy.ClearMaterial(); // PATCH
3257
- copy.CreateMaterialS(multiplyToggle.isSelected());
4592
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32584593 if (copy.selection.size() > 0)
32594594 //SetMaterial(copy);
32604595 {
....@@ -3305,7 +4640,7 @@
33054640 assert false;
33064641 }
33074642
3308
- void EditSelection()
4643
+ void EditSelection(boolean newWindow)
33094644 {
33104645 }
33114646
....@@ -3313,11 +4648,11 @@
33134648 {
33144649 copy.ResetBlockLoop(); // temporary problem
33154650
3316
- boolean random = CameraPane.RANDOM;
3317
- CameraPane.RANDOM = false; // parse everything
4651
+ boolean random = CameraPane.SWITCH;
4652
+ CameraPane.SWITCH = false; // parse everything
33184653 copy.ResetDisplayList();
33194654 copy.HardTouch();
3320
- CameraPane.RANDOM = random;
4655
+ CameraPane.SWITCH = random;
33214656 }
33224657
33234658 // public void applySelf()
....@@ -3364,7 +4699,7 @@
33644699 //copy.material = new cMaterial(copy.GetMaterial());
33654700
33664701 current.color = (float) colorField.getFloat();
3367
- current.modulation = (float) modulationField.getFloat();
4702
+ current.modulation = (float) saturationField.getFloat();
33684703 current.metalness = (float) metalnessField.getFloat();
33694704 current.diffuse = (float) diffuseField.getFloat();
33704705 current.specular = (float) specularField.getFloat();
....@@ -3391,6 +4726,36 @@
33914726 {
33924727 //System.out.println("Propagate = " + propagate);
33934728 copy.UpdateMaterial(anchor, current, propagate);
4729
+
4730
+ if (copy.material != null)
4731
+ {
4732
+ cMaterial mat = copy.material;
4733
+
4734
+ colorField.SetToolTipValue((mat.color));
4735
+ saturationField.SetToolTipValue((mat.modulation));
4736
+ metalnessField.SetToolTipValue((mat.metalness));
4737
+ diffuseField.SetToolTipValue((mat.diffuse));
4738
+ specularField.SetToolTipValue((mat.specular));
4739
+ shininessField.SetToolTipValue((mat.shininess));
4740
+ shiftField.SetToolTipValue((mat.shift));
4741
+ ambientField.SetToolTipValue((mat.ambient));
4742
+ lightareaField.SetToolTipValue((mat.lightarea));
4743
+ diffusenessField.SetToolTipValue((mat.factor));
4744
+ velvetField.SetToolTipValue((mat.velvet));
4745
+ sheenField.SetToolTipValue((mat.sheen));
4746
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4747
+ backlitField.SetToolTipValue((mat.bump));
4748
+ anisoField.SetToolTipValue((mat.aniso));
4749
+ anisoVField.SetToolTipValue((mat.anisoV));
4750
+ cameraField.SetToolTipValue((mat.cameralight));
4751
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4752
+ shadowField.SetToolTipValue((mat.shadow));
4753
+ textureField.SetToolTipValue((mat.texture));
4754
+ opacityField.SetToolTipValue((mat.opacity));
4755
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4756
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4757
+ }
4758
+
33944759 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
33954760 {
33964761 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3419,9 +4784,28 @@
34194784 //copy.Touch();
34204785 }
34214786
4787
+ cNumberSlider versionSlider;
4788
+
34224789 public void stateChanged(ChangeEvent e)
34234790 {
34244791 // assert(false);
4792
+ if (e.getSource() == versionSlider)
4793
+ {
4794
+ if (muteSlider)
4795
+ return;
4796
+
4797
+ Replace();
4798
+
4799
+ int version = versionSlider.getInteger();
4800
+
4801
+ if (version != -1 && copy.versionlist[version] != null)
4802
+ {
4803
+ copy.versionindex = version;
4804
+ CopyChanged();
4805
+ }
4806
+
4807
+ return;
4808
+ }
34254809
34264810 if (freezematerial)
34274811 {
....@@ -3435,6 +4819,7 @@
34354819 || e.getSource() == apertureField
34364820 || e.getSource() == shadowblurField)
34374821 {
4822
+ new Exception().printStackTrace();
34384823 System.exit(0);
34394824 cameraView.options1[0] = (float) focusField.getFloat() * 10;
34404825 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3456,6 +4841,12 @@
34564841 {
34574842 //System.out.println("stateChanged = " + this);
34584843 materialtouched = true;
4844
+
4845
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4846
+ {
4847
+ saturationField.setFloat(1);
4848
+ }
4849
+
34594850 applySelf();
34604851 //System.out.println("this = " + this);
34614852 //System.out.println("PARENT = " + parent);
....@@ -3505,7 +4896,7 @@
35054896 }
35064897
35074898 if (normalpushField != null)
3508
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4899
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35094900 }
35104901
35114902 void SnapObject()
....@@ -3755,6 +5146,7 @@
37555146 {
37565147 if (GetTree() != null)
37575148 {
5149
+ GetTree().revalidate();
37585150 GetTree().repaint();
37595151 }
37605152
....@@ -3763,12 +5155,17 @@
37635155 ctrlPanel.validate(); // ? new
37645156 ctrlPanel.repaint();
37655157 }
5158
+
5159
+ if (previousVersionButton != null && copy.versionlist != null)
5160
+ SetVersionStates();
37665161 }
37675162
37685163 static TweenManager tweenManager = new TweenManager();
37695164
37705165 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
37715166 {
5167
+ if (Globals.REPLACEONMAKE) // && resetmodel)
5168
+ Save();
37725169 //Tween.set(thing, 0).target(1).start(tweenManager);
37735170 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
37745171 // if (thing instanceof GenericJointDemo)
....@@ -3855,6 +5252,12 @@
38555252 {
38565253 ResetModel();
38575254 Select(thing.GetTreePath(), true, false); // unselect... false);
5255
+
5256
+ if (thing.Size() == 0)
5257
+ {
5258
+ //EditSelection(false);
5259
+ }
5260
+
38585261 refreshContents();
38595262 }
38605263
....@@ -3972,6 +5375,7 @@
39725375 }
39735376 }
39745377 }
5378
+
39755379 LoadGFDThread loadGFDThread;
39765380
39775381 void ReadGFD(String fullname, iCallBack cb)
....@@ -3991,8 +5395,10 @@
39915395
39925396 try
39935397 {
5398
+ // Try compressed version first.
39945399 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3995
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
5400
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
5401
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
39965402
39975403 readobj = (Object3D) p.readObject();
39985404 istream.close();
....@@ -4000,7 +5406,22 @@
40005406 readobj.ResetDisplayList();
40015407 } catch (Exception e)
40025408 {
4003
- e.printStackTrace();
5409
+ if (!e.toString().contains("GZIP"))
5410
+ e.printStackTrace();
5411
+
5412
+ try
5413
+ {
5414
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
5415
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
5416
+
5417
+ readobj = (Object3D) p.readObject();
5418
+ istream.close();
5419
+
5420
+ readobj.ResetDisplayList();
5421
+ } catch (Exception e2)
5422
+ {
5423
+ e2.printStackTrace();
5424
+ }
40045425 }
40055426 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40065427 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4046,6 +5467,12 @@
40465467
40475468 void LoadIt(Object obj)
40485469 {
5470
+ if (obj == null)
5471
+ {
5472
+ // Invalid file
5473
+ return;
5474
+ }
5475
+
40495476 System.out.println("Loaded " + obj);
40505477 //new Exception().printStackTrace();
40515478 Object3D readobj = (Object3D) obj;
....@@ -4055,10 +5482,14 @@
40555482
40565483 if (readobj != null)
40575484 {
5485
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5486
+ // Save();
40585487 try
40595488 {
40605489 //readobj.deepCopySelf(copy);
40615490 copy.clear(); // june 2014
5491
+ copy.skyboxname = readobj.skyboxname;
5492
+ copy.skyboxext = readobj.skyboxext;
40625493 for (int i = 0; i < readobj.size(); i++)
40635494 {
40645495 Object3D child = readobj.get(i); // reserve(i);
....@@ -4099,6 +5530,7 @@
40995530 }
41005531 } catch (ClassCastException e)
41015532 {
5533
+ e.printStackTrace();
41025534 assert (false);
41035535 Composite c = (Composite) copy;
41045536 c.children.clear();
....@@ -4109,17 +5541,31 @@
41095541 c.addChild(csg);
41105542 }
41115543
5544
+ copy.versionlist = readobj.versionlist;
5545
+ copy.versionindex = readobj.versionindex;
5546
+
5547
+ if (copy.versionlist == null)
5548
+ {
5549
+ // Backward compatibility
5550
+ copy.versionlist = new Object3D[100];
5551
+ copy.versionindex = -1;
5552
+
5553
+ //Save(true);
5554
+ }
5555
+
5556
+ //? SetUndoStates();
5557
+
41125558 ResetModel();
41135559 copy.HardTouch(); // recompile?
41145560 refreshContents();
41155561 }
41165562 }
41175563
4118
- void load() // throws ClassNotFoundException
5564
+ void Open() // throws ClassNotFoundException
41195565 {
4120
- if (GrafreeD.standAlone)
5566
+ if (Grafreed.standAlone)
41215567 {
4122
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5568
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
41235569 browser.show();
41245570 String filename = browser.getFile();
41255571 if (filename != null && filename.length() > 0)
....@@ -4196,6 +5642,8 @@
41965642
41975643 void save()
41985644 {
5645
+ Replace();
5646
+
41995647 if (lastname == null)
42005648 {
42015649 return;
....@@ -4204,11 +5652,13 @@
42045652 try
42055653 {
42065654 FileOutputStream ostream = new FileOutputStream(lastname);
4207
- ObjectOutputStream p = new ObjectOutputStream(ostream);
5655
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5656
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42085657
42095658 p.writeObject(copy);
42105659 p.flush();
42115660
5661
+ zstream.close();
42125662 ostream.close();
42135663
42145664 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4216,19 +5666,23 @@
42165666 //ps.print(buffer.toString());
42175667 } catch (IOException e)
42185668 {
5669
+ e.printStackTrace();
42195670 }
42205671 }
5672
+
42215673 String lastname;
42225674
42235675 void saveAs()
42245676 {
4225
- if (GrafreeD.standAlone)
5677
+ if (Grafreed.standAlone)
42265678 {
42275679 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42285680 browser.setVisible(true);
42295681 String filename = browser.getFile();
42305682 if (filename != null && filename.length() > 0)
42315683 {
5684
+ if (!filename.endsWith(".gfd"))
5685
+ filename += ".gfd";
42325686 lastname = browser.getDirectory() + filename;
42335687 save();
42345688 }
....@@ -4327,13 +5781,13 @@
43275781 try
43285782 {
43295783 FileOutputStream ostream = new FileOutputStream(filename);
4330
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4331
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
5784
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5785
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43325786
43335787 Object3D objectparent = obj.parent;
43345788 obj.parent = null;
43355789
4336
- Object3D object = (Object3D) GrafreeD.clone(obj);
5790
+ Object3D object = (Object3D) Grafreed.clone(obj);
43375791
43385792 obj.parent = objectparent;
43395793
....@@ -4345,8 +5799,8 @@
43455799 p.writeObject(object);
43465800 p.flush();
43475801
5802
+ zstream.close();
43485803 ostream.close();
4349
- // zstream.close();
43505804
43515805 // group.selection.get(0).parent = parent;
43525806 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4367,7 +5821,7 @@
43675821 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43685822 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43695823 copy.generatePOV(buffer);
4370
- if (GrafreeD.standAlone)
5824
+ if (Grafreed.standAlone)
43715825 {
43725826 FileDialog browser = new FileDialog(frame, "Export POV", 1);
43735827 browser.show();
....@@ -4393,21 +5847,20 @@
43935847 Object3D client;
43945848 Object3D copy;
43955849 MenuBar menuBar;
4396
- Menu windowMenu;
4397
- MenuItem loadItem;
5850
+ Menu fileMenu;
5851
+ MenuItem newItem;
5852
+ MenuItem openItem;
43985853 MenuItem saveItem;
43995854 MenuItem saveAsItem;
44005855 MenuItem exportAsItem;
44015856 MenuItem reexportItem;
44025857 MenuItem povItem;
44035858 MenuItem closeItem;
4404
- Menu cameraMenu;
5859
+
44055860 CheckboxMenuItem zBufferItem;
44065861 //MenuItem normalLensItem;
4407
- MenuItem editCameraItem;
4408
- MenuItem revertCameraItem;
4409
- CheckboxMenuItem toggleLiveItem;
44105862 MenuItem stepItem;
5863
+ CheckboxMenuItem toggleLiveItem;
44115864 CheckboxMenuItem toggleFullScreenItem;
44125865 CheckboxMenuItem toggleTimelineItem;
44135866 CheckboxMenuItem toggleRenderItem;
....@@ -4416,25 +5869,40 @@
44165869 CheckboxMenuItem toggleFootContactItem;
44175870 CheckboxMenuItem toggleDLItem;
44185871 CheckboxMenuItem toggleTextureItem;
4419
- CheckboxMenuItem toggleRandomItem;
5872
+ CheckboxMenuItem toggleSwitchItem;
44205873 CheckboxMenuItem toggleRootItem;
44215874 CheckboxMenuItem animationItem;
5875
+ MenuItem archiveItem;
44225876 CheckboxMenuItem toggleHandleItem;
44235877 CheckboxMenuItem togglePaintItem;
44245878 JSplitPane mainPanel;
44255879 JScrollPane scrollpane;
5880
+
44265881 JPanel toolbarPanel;
4427
- JPanel treePanel;
5882
+
5883
+ cGridBag treePanel;
5884
+
44285885 JPanel radioPanel;
44295886 ButtonGroup buttonGroup;
4430
- cGridBag ctrlPanel;
5887
+
5888
+ cGridBag toolboxPanel;
5889
+ cGridBag skyboxPanel;
44315890 cGridBag materialPanel;
5891
+ cGridBag ctrlPanel;
5892
+
44325893 JScrollPane infoPanel;
5894
+
44335895 cGridBag optionsPanel;
5896
+
44345897 JTabbedPane objectPanel;
5898
+ boolean materialFlushed;
5899
+ Object3D latestObject;
5900
+
44355901 cGridBag XYZPanel;
5902
+
44365903 JSplitPane gridPanel;
44375904 JSplitPane bigPanel;
5905
+
44385906 cGridBag bigThree;
44395907 cGridBag scenePanel;
44405908 cGridBag centralPanel;
....@@ -4492,7 +5960,7 @@
44925960 JLabel colorLabel;
44935961 cNumberSlider colorField;
44945962 JLabel modulationLabel;
4495
- cNumberSlider modulationField;
5963
+ cNumberSlider saturationField;
44965964 JLabel metalnessLabel;
44975965 cNumberSlider metalnessField;
44985966 JLabel diffuseLabel;
....@@ -4523,6 +5991,7 @@
45235991 cNumberSlider anisoField;
45245992 JLabel anisoVLabel;
45255993 cNumberSlider anisoVField;
5994
+
45265995 JLabel cameraLabel;
45275996 cNumberSlider cameraField;
45285997 JLabel selfshadowLabel;
....@@ -4537,6 +6006,7 @@
45376006 cNumberSlider fakedepthField;
45386007 JLabel shadowbiasLabel;
45396008 cNumberSlider shadowbiasField;
6009
+
45406010 JLabel bumpLabel;
45416011 cNumberSlider bumpField;
45426012 JLabel noiseLabel;
....@@ -4549,8 +6019,13 @@
45496019 cNumberSlider fogField;
45506020 JLabel opacityPowerLabel;
45516021 cNumberSlider opacityPowerField;
4552
- JTree jTree;
6022
+ cTree jTree;
45536023 //ObjectUI parent;
45546024
45556025 cNumberSlider normalpushField;
6026
+
6027
+ private MenuItem importGFDItem;
6028
+ private MenuItem importVRMLX3DItem;
6029
+ private MenuItem import3DSItem;
6030
+ private MenuItem importOBJItem;
45566031 }