Normand Briere
2019-08-20 564f4d12d93813b5d680fc24d4f118c3886d96ed
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,152 @@
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 void AllocProjectedVertices(Object3D object)
47
+ {
48
+ assert (object.projectedVertices != null);
49
+
50
+ if (object.projectedVertices.length <= 2)
51
+ {
52
+ // Side effect...
53
+ Object3D.cVector2[] keep = object.projectedVertices;
54
+ object.projectedVertices = new Object3D.cVector2[3];
55
+ for (int i = 0; i < 3; i++)
56
+ {
57
+ if (i < keep.length)
58
+ {
59
+ object.projectedVertices[i] = keep[i];
60
+ } else
61
+ {
62
+ object.projectedVertices[i] = new Object3D.cVector2();
63
+ }
64
+ /*
65
+ if(keep.length == 0)
66
+ object.projectedVertices[0] = new Object3D.cVector2();
67
+ else
68
+ object.projectedVertices[0] = keep[0];
69
+ object.projectedVertices[1] = new Object3D.cVector2();
70
+ */
71
+ }
72
+ }
73
+ }
74
+
75
+ public Composite CreateCameras()
76
+ {
77
+ Composite cams = new cTemplate();
78
+ cams.name = "Cameras";
79
+ copy.insertElementAt(cams, 0);
80
+
81
+ cams.addChild(new Camera());
82
+ cams.addChild(new Camera(1));
83
+ cams.addChild(new Camera(2));
84
+ cams.addChild(new Camera(3));
85
+ cams.addChild(new Camera(4));
86
+
87
+ return cams;
88
+ }
89
+
90
+ public cGridBag GetSeparator()
91
+ {
92
+ cGridBag separator = new cGridBag();
93
+ separator.add(new JSeparator());
94
+ separator.preferredHeight = 5;
95
+ return separator;
96
+ }
97
+
98
+ cButton GetButton(String name, boolean border)
99
+ {
100
+ ImageIcon icon = GetIcon(name);
101
+ if (icon != null || name.contains("/"))
102
+ return new cButton(icon, border);
103
+ else
104
+ return new cButton(name, border);
105
+ }
106
+
107
+ cLabel GetLabel(String name, boolean border)
108
+ {
109
+ //ImageIcon icon = GetIcon(name);
110
+ return new cLabel(GetImage(name), border);
111
+ }
112
+
113
+ cToggleButton GetToggleButton(String name, boolean border)
114
+ {
115
+ ImageIcon icon = GetIcon(name);
116
+ return new cToggleButton(icon, border);
117
+ }
118
+
119
+ cCheckBox GetCheckBox(String name, boolean border)
120
+ {
121
+ ImageIcon icon = GetIcon(name);
122
+ return new cCheckBox(icon, border);
123
+ }
124
+
125
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
126
+
127
+ static ImageIcon GetIcon(String name)
128
+ {
129
+ javax.swing.ImageIcon iconCache = icons.get(name);
130
+ if (iconCache != null)
131
+ {
132
+ return iconCache;
133
+ }
134
+
135
+ try
136
+ {
137
+ BufferedImage image;
138
+
139
+ if (name.endsWith("jpg"))
140
+ // Much faster!
141
+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
142
+ else
143
+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
144
+
145
+// if (image.getWidth() > 48 && image.getHeight() > 48)
146
+// {
147
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
148
+// Graphics2D g = resized.createGraphics();
149
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
150
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
151
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
152
+// g.dispose();
153
+//
154
+// image = resized;
155
+// }
156
+
157
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
158
+
159
+ icons.put(name, icon);
160
+
161
+ return icon;
162
+ }
163
+ catch (Exception e)
164
+ {
165
+ //icons.put(name, null);
166
+ return null;
167
+ }
168
+ }
169
+
170
+ BufferedImage GetImage(String name)
171
+ {
172
+ try
173
+ {
174
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
175
+
176
+ return image;
177
+ }
178
+ catch (Exception e)
179
+ {
180
+ return null;
181
+ }
182
+ }
38183
39184 // SCRIPT
40185
....@@ -143,7 +288,9 @@
143288 //nameField.removeActionListener(this);
144289 // objEditor.ctrlPanel.remove(nameField);
145290
146
- if (!GroupEditor.allparams)
291
+ objEditor.ctrlPanel.remove(namePanel);
292
+
293
+ if (!allparams)
147294 return;
148295
149296 // objEditor.ctrlPanel.remove(liveCB);
....@@ -165,9 +312,9 @@
165312 // objEditor.ctrlPanel.remove(fasterButton);
166313 // objEditor.ctrlPanel.remove(remarkButton);
167314
168
- objEditor.ctrlPanel.remove(namePanel);
169315 objEditor.ctrlPanel.remove(setupPanel);
170
- objEditor.ctrlPanel.remove(commandsPanel);
316
+ objEditor.ctrlPanel.remove(setupPanel2);
317
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171318 objEditor.ctrlPanel.remove(pushPanel);
172319 //objEditor.ctrlPanel.remove(fillPanel);
173320
....@@ -215,6 +362,14 @@
215362 client = inClient;
216363 copy = client;
217364
365
+// if (copy.versionlist == null)
366
+// {
367
+// copy.versionlist = new Object3D[100];
368
+// copy.versionindex = -1;
369
+//
370
+// callee.Save(true);
371
+// }
372
+
218373 // "this" is not called: SetupUI2(objEditor);
219374 }
220375
....@@ -228,6 +383,14 @@
228383 client = inClient;
229384 copy = client;
230385
386
+ if (copy.versionlist == null)
387
+ {
388
+ copy.versionlist = new Object3D[100];
389
+ copy.versionindex = -1;
390
+
391
+// Save(true);
392
+ }
393
+
231394 SetupUI2(callee.GetEditor());
232395 }
233396
....@@ -242,13 +405,15 @@
242405 //localCopy.parent = null;
243406
244407 frame = new JFrame();
408
+ frame.setUndecorated(false);
245409 objEditor = this;
246410 this.callee = callee;
247411
248412 //parent = p;
249413
250414 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
251
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
415
+ if (Globals.DEBUG)
416
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
252417 //gd.setFullScreenWindow(this);
253418 //setResizable(false);
254419 //if (!isDisplayable())
....@@ -259,6 +424,14 @@
259424 copy = localCopy;
260425 copy.editWindow = this;
261426
427
+// if (copy.versionlist == null)
428
+// {
429
+// copy.versionlist = new Object3D[100];
430
+// copy.versionindex = -1;
431
+//
432
+// Save(true);
433
+// }
434
+
262435 SetupMenu();
263436
264437 //SetupName(objEditor); // new
....@@ -272,28 +445,55 @@
272445 return frame.action(event, obj);
273446 }
274447
448
+ // Cannot work without static
449
+ static boolean allparams = true;
450
+
451
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
452
+
453
+ // This is to refresh the UI of the material panel.
454
+ boolean patchMaterial;
455
+
275456 void SetupMenu()
276457 {
277458 frame.setMenuBar(menuBar = new MenuBar());
278
- menuBar.add(windowMenu = new Menu("File"));
279
- windowMenu.add(loadItem = new MenuItem("Load..."));
280
- windowMenu.add("-");
281
- windowMenu.add(saveItem = new MenuItem("Save"));
282
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
459
+ menuBar.add(fileMenu = new Menu("File"));
460
+ fileMenu.add(newItem = new MenuItem("New"));
461
+ fileMenu.add(openItem = new MenuItem("Open..."));
462
+
463
+ //oe.menuBar.add(menu = new Menu("Include"));
464
+ Menu menu = new Menu("Import");
465
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
466
+ importOBJItem.addActionListener(this);
467
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
468
+ import3DSItem.addActionListener(this);
469
+ if (Globals.ADVANCED)
470
+ {
471
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
472
+ importVRMLX3DItem.addActionListener(this);
473
+ }
474
+ menu.add("-");
475
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
476
+ importGFDItem.addActionListener(this);
477
+ fileMenu.add(menu);
478
+ fileMenu.add("-");
479
+
480
+ fileMenu.add(saveItem = new MenuItem("Save"));
481
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283482 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284
- windowMenu.add("-");
285
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287
- windowMenu.add("-");
483
+ fileMenu.add("-");
484
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
485
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
486
+ fileMenu.add("-");
288487 if (client.parent != null)
289488 {
290
- windowMenu.add(closeItem = new MenuItem("Close"));
489
+ fileMenu.add(closeItem = new MenuItem("Close"));
291490 } else
292491 {
293
- windowMenu.add(closeItem = new MenuItem("Exit"));
492
+ fileMenu.add(closeItem = new MenuItem("Exit"));
294493 }
295494
296
- loadItem.addActionListener(this);
495
+ newItem.addActionListener(this);
496
+ openItem.addActionListener(this);
297497 saveItem.addActionListener(this);
298498 saveAsItem.addActionListener(this);
299499 exportAsItem.addActionListener(this);
....@@ -301,84 +501,103 @@
301501 //povItem.addActionListener(this);
302502 closeItem.addActionListener(this);
303503
304
- menuBar.add(cameraMenu = new Menu("View"));
305
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306
- //zBufferItem.addActionListener(this);
307
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308
- //normalLensItem.addActionListener(this);
309
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310
- revertCameraItem.addActionListener(this);
311
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312
- toggleTimelineItem.addItemListener(this);
313
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314
- toggleFullScreenItem.addItemListener(this);
315
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316
- cameraMenu.add("-");
317
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318
- toggleTextureItem.addItemListener(this);
319
- toggleTextureItem.setState(CameraPane.textureon);
320
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321
- toggleLiveItem.addItemListener(this);
322
- toggleLiveItem.setState(Globals.isLIVE());
323
- cameraMenu.add(stepItem = new MenuItem("Step"));
324
- stepItem.addActionListener(this);
325
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326
-// toggleDLItem.addItemListener(this);
327
-// toggleDLItem.setState(false);
328
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329
- toggleRenderItem.addItemListener(this);
330
- toggleRenderItem.setState(!CameraPane.frozen);
331
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332
- toggleDebugItem.addItemListener(this);
333
- toggleDebugItem.setState(CameraPane.DEBUG);
334
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335
- toggleFrustumItem.addItemListener(this);
336
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338
- toggleFootContactItem.addItemListener(this);
339
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341
- toggleRandomItem.addItemListener(this);
342
- toggleRandomItem.setState(CameraPane.RANDOM);
343
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344
- toggleHandleItem.addItemListener(this);
345
- toggleHandleItem.setState(CameraPane.HANDLES);
346
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347
- togglePaintItem.addItemListener(this);
348
- togglePaintItem.setState(CameraPane.PAINTMODE);
349
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350
-// toggleRootItem.addItemListener(this);
351
-// toggleRootItem.setState(false);
352
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353
-// animationItem.addItemListener(this);
354
-// animationItem.setState(CameraPane.ANIMATION);
355
- cameraMenu.add("-");
356
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357
- editCameraItem.addActionListener(this);
358
-
359504 objectPanel = new JTabbedPane();
505
+
506
+ ChangeListener changeListener = new ChangeListener()
507
+ {
508
+ //String name;
509
+
510
+ public void stateChanged(ChangeEvent changeEvent)
511
+ {
512
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
513
+// {
514
+// if (latestObject != null)
515
+// {
516
+// refreshContents(true);
517
+// SetMaterial(latestObject);
518
+// }
519
+//
520
+// materialFlushed = true;
521
+// }
522
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
523
+// {
524
+// if (listUI.size() == 0)
525
+// EditSelection(false);
526
+// }
527
+
528
+// if (objectPanel.getSelectedIndex() == 4)
529
+// {
530
+// name = copy.skyboxname;
531
+//
532
+// if (name == null)
533
+// {
534
+// name = "";
535
+// }
536
+//
537
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
538
+// copy.skyboxext = "jpg";
539
+// }
540
+// else
541
+// {
542
+// if (name != null)
543
+// {
544
+// if (name.equals(""))
545
+// {
546
+// copy.skyboxname = null;
547
+// copy.skyboxext = null;
548
+// }
549
+// else
550
+// {
551
+// copy.skyboxname = name;
552
+// }
553
+// }
554
+// }
555
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
556
+
557
+// refreshContents(false); // To refresh Info tab
558
+ cameraView.repaint();
559
+ }
560
+ };
561
+ objectPanel.addChangeListener(changeListener);
562
+
360563 toolbarPanel = new JPanel();
361564 toolbarPanel.setName("Toolbar");
565
+
362566 treePanel = new cGridBag();
363567 treePanel.setName("Tree");
568
+
569
+ editPanel = new cGridBag().setVertical(true);
570
+ //editPanel.setName("Edit");
571
+
364572 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365
- ctrlPanel.setName("Edit");
366
- materialPanel = new cGridBag().setVertical(true);
367
- materialPanel.setName("Material");
573
+
574
+ editCommandsPanel = new cGridBag();
575
+ editPanel.add(editCommandsPanel);
576
+ editPanel.add(ctrlPanel);
577
+
578
+ toolboxPanel = new cGridBag().setVertical(true);
579
+ //toolboxPanel.setName("Toolbox");
580
+
581
+ skyboxPanel = new cGridBag().setVertical(true);
582
+
583
+ materialPanel = new cGridBag().setVertical(false);
584
+ //materialPanel.setName("Material");
585
+
368586 /*JTextPane*/
369587 infoarea = createTextPane();
370588 doc = infoarea.getStyledDocument();
371589
372590 infoarea.setEditable(true);
373591 SetText();
592
+
374593 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
375594 // infoarea.setOpaque(false);
376595 // //infoarea.setForeground(textcolor);
377596 // TEXTAREA infoarea.setLineWrap(true);
378597 // TEXTAREA infoarea.setWrapStyleWord(true);
379598 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
380
- infoPanel.setPreferredSize(new Dimension(50, 200));
381
- infoPanel.setName("Info");
599
+ infoPanel.setPreferredSize(new Dimension(1, 1));
600
+ //infoPanel.setName("Info");
382601 //infoPanel.setLayout(new BorderLayout());
383602 //infoPanel.add(createTextPane());
384603
....@@ -389,7 +608,14 @@
389608 mainPanel.setDividerSize(9);
390609 mainPanel.setDividerLocation(0.5); //1.0);
391610 mainPanel.setResizeWeight(0.5);
392
-
611
+
612
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
613
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
614
+ divider.setDividerSize(15);
615
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
616
+
617
+ mainPanel.setUI(new BasicSplitPaneUI());
618
+
393619 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
394620 //mainPanel.setLayout(new GridBagLayout());
395621 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -457,10 +683,10 @@
457683 e.printStackTrace();
458684 }
459685
460
- String selection = infoarea.getText();
461
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
462
- java.awt.datatransfer.Clipboard clipboard =
463
- Toolkit.getDefaultToolkit().getSystemClipboard();
686
+// String selection = infoarea.getText();
687
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
688
+// java.awt.datatransfer.Clipboard clipboard =
689
+// Toolkit.getDefaultToolkit().getSystemClipboard();
464690 //clipboard.setContents(data, data);
465691 }
466692
....@@ -483,13 +709,13 @@
483709 //SendInfo("Name:", "bold");
484710 if (sel.GetTextures() != null || debug)
485711 {
486
- si.SendInfo(sel.toString(), "bold");
712
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487713 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488714 if (sel.Size() > 0)
489715 {
490716 si.SendInfo("#children = " + sel.Size(), "regular");
491717 }
492
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
718
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493719 if (debug)
494720 {
495721 try
....@@ -531,7 +757,7 @@
531757 }
532758 if (sel.support != null)
533759 {
534
- si.SendInfo(" support: " + sel.support, "regular");
760
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535761 }
536762 if (sel.scriptnode != null)
537763 {
....@@ -620,21 +846,169 @@
620846 }
621847 }
622848
849
+//static GraphicsDevice device = GraphicsEnvironment
850
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
851
+
852
+ Rectangle keeprect;
853
+ cRadio radio;
854
+
855
+cButton keepButton;
856
+ cButton twoButton; // Full 3D
857
+ cButton sixButton;
858
+ cButton threeButton;
859
+ cButton sevenButton;
860
+ cButton fourButton; // full panel
861
+ cButton oneButton; // full XYZ
862
+ //cButton currentLayout;
863
+
864
+ boolean maximized;
865
+
866
+ cButton fullscreenLayout;
867
+ cButton expandedLayout;
868
+
869
+ void Minimize()
870
+ {
871
+ frame.setState(Frame.ICONIFIED);
872
+ frame.validate();
873
+ }
874
+
875
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
876
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
877
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
878
+ void Maximize()
879
+ {
880
+ if (CameraPane.FULLSCREEN)
881
+ {
882
+ ToggleFullScreen();
883
+ }
884
+
885
+ if (maximized)
886
+ {
887
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
888
+ }
889
+ else
890
+ {
891
+ keeprect = frame.getBounds();
892
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
893
+// Dimension rect2 = frame.getToolkit().getScreenSize();
894
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
895
+// frame.setState(Frame.MAXIMIZED_BOTH);
896
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
897
+ }
898
+
899
+ maximized ^= true;
900
+
901
+ frame.validate();
902
+ }
903
+
904
+ cButton minButton;
905
+ cButton maxButton;
906
+ cButton fullButton;
907
+ cButton collapseButton;
908
+ cButton maximize3DButton;
909
+
623910 void ToggleFullScreen()
624911 {
625
- if (CameraPane.FULLSCREEN)
912
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
913
+
914
+ cameraView.ToggleFullScreen();
915
+
916
+ if (!CameraPane.FULLSCREEN)
626917 {
627
- frame.getContentPane().remove(/*"Center",*/bigThree);
628
- framePanel.add(bigThree);
629
- frame.getContentPane().add(/*"Center",*/framePanel);
918
+ device.setFullScreenWindow(null);
919
+ frame.dispose();
920
+ frame.setUndecorated(false);
921
+ frame.validate();
922
+ frame.setVisible(true);
923
+
924
+ //frame.setVisible(false);
925
+// frame.removeNotify();
926
+// frame.setUndecorated(false);
927
+// frame.addNotify();
928
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
929
+
930
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
931
+// X framePanel.add(bigThree);
932
+// X frame.getContentPane().add(/*"Center",*/framePanel);
933
+// framePanel.setDividerLocation(46); // icons are 24x24
934
+
935
+ //frame.setVisible(true);
936
+// radio.layout = keepButton;
937
+ //theFrame = null;
938
+ keepButton = null;
939
+// radio.layout.doClick();
940
+
630941 } else
631942 {
632
- frame.getContentPane().remove(/*"Center",*/framePanel);
633
- framePanel.remove(bigThree);
634
- frame.getContentPane().add(/*"Center",*/bigThree);
943
+ keepButton = radio.layout;
944
+ //keeprect = frame.getBounds();
945
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
946
+// frame.getToolkit().getScreenSize().height);
947
+ //frame.setVisible(false);
948
+
949
+ frame.dispose();
950
+ frame.setUndecorated(true);
951
+ device.setFullScreenWindow(frame);
952
+ frame.validate();
953
+ frame.setVisible(true);
954
+// frame.removeNotify();
955
+// frame.setUndecorated(true);
956
+// frame.addNotify();
957
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
958
+// X framePanel.remove(bigThree);
959
+// X frame.getContentPane().add(/*"Center",*/bigThree);
960
+// framePanel.setDividerLocation(0);
961
+
962
+// radio.layout = fullscreenLayout;
963
+// radio.layout.doClick();
964
+ //frame.setVisible(true);
635965 }
636
- cameraView.ToggleFullScreen();
966
+ frame.validate();
967
+
968
+ cameraView.requestFocusInWindow();
637969 }
970
+
971
+ void CollapseToolbar()
972
+ {
973
+ framePanel.setDividerLocation(0);
974
+ //frame.validate();
975
+
976
+ cameraView.requestFocusInWindow();
977
+ }
978
+
979
+ private Object3D Duplicate(Object3D object)
980
+ {
981
+ boolean temp = CameraPane.SWITCH;
982
+ CameraPane.SWITCH = false;
983
+
984
+ if (Grafreed.grafreed.universe.versiontable == null)
985
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
986
+
987
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
988
+ // if (copy == client)
989
+
990
+ Object3D versions[] = object.versionlist;
991
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
992
+ object.versionlist = null;
993
+ object.versiontable = null;
994
+
995
+ Object3D parent = object.parent;
996
+ object.parent = null;
997
+
998
+ //byte[] compress = Compress(copy);
999
+ Object3D compress = (Object3D)Grafreed.clone(object);
1000
+
1001
+ object.parent = parent;
1002
+
1003
+ object.versionlist = versions;
1004
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
1005
+
1006
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
1007
+
1008
+ CameraPane.SWITCH = temp;
1009
+
1010
+ return compress;
1011
+ }
6381012
6391013 private JTextPane createTextPane()
6401014 {
....@@ -734,7 +1108,7 @@
7341108 protected static ImageIcon createImageIcon(String path,
7351109 String description)
7361110 {
737
- java.net.URL imgURL = GrafreeD.class.getResource(path);
1111
+ java.net.URL imgURL = Grafreed.class.getResource(path);
7381112 if (imgURL != null)
7391113 {
7401114 return new ImageIcon(imgURL, description);
....@@ -757,6 +1131,7 @@
7571131 {
7581132 SetupMaterial(materialPanel);
7591133 }
1134
+
7601135 //SetupName();
7611136 //SetupViews();
7621137 }
....@@ -766,6 +1141,7 @@
7661141 // NumberSlider vDivsField;
7671142 // JCheckBox endcaps;
7681143 JCheckBox liveCB;
1144
+ JCheckBox selectableCB;
7691145 JCheckBox hideCB;
7701146 JCheckBox link2masterCB;
7711147 JCheckBox markCB;
....@@ -773,7 +1149,12 @@
7731149 JCheckBox speedupCB;
7741150 JCheckBox rewindCB;
7751151 JCheckBox flipVCB;
1152
+
1153
+ cCheckBox toggleTextureCB;
1154
+ cCheckBox toggleSwitchCB;
1155
+
7761156 JComboBox texresMenu;
1157
+
7771158 JButton resetButton;
7781159 JButton stepButton;
7791160 JButton stepAllButton;
....@@ -782,9 +1163,13 @@
7821163 JButton fasterButton;
7831164 JButton remarkButton;
7841165
1166
+ cGridBag editPanel;
1167
+ cGridBag editCommandsPanel;
1168
+
7851169 cGridBag namePanel;
7861170 cGridBag setupPanel;
787
- cGridBag commandsPanel;
1171
+ cGridBag setupPanel2;
1172
+ cGridBag objectCommandsPanel;
7881173 cGridBag pushPanel;
7891174 cGridBag fillPanel;
7901175
....@@ -955,45 +1340,84 @@
9551340
9561341 namePanel = new cGridBag();
9571342
1343
+ //if (copy.pinned)
1344
+ {
1345
+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1346
+ pinButton.setSelected(copy.pinned);
1347
+ cGridBag t = new cGridBag();
1348
+ t.preferredWidth = 2;
1349
+ t.add(pinButton);
1350
+ namePanel.add(t);
1351
+
1352
+ pinButton.addItemListener(this);
1353
+ }
1354
+
9581355 nameField = AddText(namePanel, copy.GetName());
959
- namePanel.add(nameField);
1356
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
9601357 oe.ctrlPanel.add(namePanel);
9611358
9621359 oe.ctrlPanel.Return();
9631360
964
- if (!GroupEditor.allparams)
1361
+ if (!allparams)
9651362 return;
9661363
9671364 setupPanel = new cGridBag().setVertical(false);
9681365
9691366 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
970
- if (Globals.ADVANCED)
971
- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
972
- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1367
+ liveCB.setToolTipText("Animate object");
1368
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1369
+ markCB.setToolTipText("Set target transform");
1370
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1371
+ selectableCB.setToolTipText("Make object selectable");
9731372 // Return();
974
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
975
- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
976
- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
1373
+
1374
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1375
+ hideCB.setToolTipText("Hide object");
1376
+
1377
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1378
+
1379
+ setupPanel2 = new cGridBag().setVertical(false);
1380
+
1381
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1382
+ rewindCB.setToolTipText("Rewind animation");
1383
+
1384
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1385
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
9771386
1387
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1388
+ link2masterCB.setToolTipText("Attach to support");
1389
+
1390
+ if (Globals.ADVANCED)
1391
+ {
1392
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1393
+ speedupCB.setToolTipText("Option motion capture");
1394
+ }
1395
+
9781396 oe.ctrlPanel.add(setupPanel);
9791397 oe.ctrlPanel.Return();
1398
+ oe.ctrlPanel.add(setupPanel2);
1399
+ oe.ctrlPanel.Return();
9801400
981
- commandsPanel = new cGridBag().setVertical(false);
1401
+ objectCommandsPanel = new cGridBag().setVertical(false);
9821402
983
- resetButton = AddButton(commandsPanel, "Reset");
984
- stepButton = AddButton(commandsPanel, "Step");
1403
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1404
+ resetButton.setToolTipText("Jump to frame zero");
1405
+ stepButton = AddButton(objectCommandsPanel, "Step");
1406
+ stepButton.setToolTipText("Step one frame");
9851407 // resetAllButton = AddButton(oe, "Reset All");
9861408 // stepAllButton = AddButton(oe, "Step All");
987
- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
9881409 // Return();
989
- slowerButton = AddButton(commandsPanel, "Slow");
990
- fasterButton = AddButton(commandsPanel, "Fast");
991
- remarkButton = AddButton(commandsPanel, "Remark");
1410
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1411
+ slowerButton.setToolTipText("Decrease animation speed");
1412
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1413
+ fasterButton.setToolTipText("Increase animation speed");
1414
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1415
+ remarkButton.setToolTipText("Set the current transform as the target");
9921416
993
- oe.ctrlPanel.add(commandsPanel);
1417
+ oe.ctrlPanel.add(objectCommandsPanel);
9941418 oe.ctrlPanel.Return();
9951419
996
- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1420
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
9971421 normalpushField = (cNumberSlider)pushPanel.getComponent(1);
9981422 //Return();
9991423
....@@ -1150,22 +1574,9 @@
11501574
11511575 if (cam == null || !(copy.get(0) instanceof cGroup))
11521576 {
1153
- System.out.println("CREATE CAMERAS");
1154
- cams = new cTemplate();
1155
- cams.name = "Cameras";
1156
- copy.insertElementAt(cams, 0);
1157
- //cams.parent = copy;
1158
-
1159
- cam = new Camera(); // LA.newVector(3, 2, 1));
1160
- cams.addChild(cam);
1161
- cam = new Camera(1);
1162
- cams.addChild(cam);
1163
- cam = new Camera(2);
1164
- cams.addChild(cam);
1165
- cam = new Camera(3);
1166
- cams.addChild(cam);
1167
- cam = new Camera(4); // Light
1168
- cams.addChild(cam);
1577
+ if (Globals.DEBUG)
1578
+ System.out.println("CREATE CAMERAS");
1579
+ cams = CreateCameras();
11691580 } else
11701581 {
11711582 cams = (cGroup) copy.get(0);
....@@ -1196,8 +1607,11 @@
11961607 //worldPanel.setName("World");
11971608 centralPanel = new cGridBag();
11981609 centralPanel.preferredWidth = 20;
1199
- timelinePanel = new JPanel(new BorderLayout());
1200
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1610
+
1611
+ if (Globals.ADVANCED)
1612
+ {
1613
+ timelinePanel = new JPanel(new BorderLayout());
1614
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
12011615
12021616 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12031617 cameraPanel.setContinuousLayout(true);
....@@ -1206,7 +1620,10 @@
12061620 // cameraPanel.setDividerSize(9);
12071621 cameraPanel.setResizeWeight(1.0);
12081622
1623
+ }
1624
+
12091625 centralPanel.add(cameraView);
1626
+ centralPanel.setFocusable(true);
12101627 //frame.setJMenuBar(timelineMenubar);
12111628 //centralPanel.add(timelinePanel);
12121629
....@@ -1225,6 +1642,45 @@
12251642 //frontView.object = copy;
12261643 //sideView.object = copy;
12271644
1645
+ transformPanel = new cGridBag().setVertical(true);
1646
+
1647
+ cGridBag resetTransformPanel = new cGridBag();
1648
+
1649
+ resetTransformPanel.preferredHeight = 2;
1650
+
1651
+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1652
+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1653
+ resetTransform.addMouseListener(new MouseAdapter()
1654
+ {
1655
+ public void mouseClicked(MouseEvent e)
1656
+ {
1657
+ ResetTransform();
1658
+ }
1659
+ });
1660
+ resetTransformPanel.add(resetTransform);
1661
+
1662
+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1663
+ resetTransform.setToolTipText("Reset Translation only");
1664
+ resetTransform.addMouseListener(new MouseAdapter()
1665
+ {
1666
+ public void mouseClicked(MouseEvent e)
1667
+ {
1668
+ ResetTransform(1);
1669
+ }
1670
+ });
1671
+ resetTransformPanel.add(resetTransform);
1672
+
1673
+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1674
+ resetTransform.setToolTipText("Reset Rotation and Scale only");
1675
+ resetTransform.addMouseListener(new MouseAdapter()
1676
+ {
1677
+ public void mouseClicked(MouseEvent e)
1678
+ {
1679
+ ResetTransform(2);
1680
+ }
1681
+ });
1682
+ resetTransformPanel.add(resetTransform);
1683
+
12281684 XYZPanel = new cGridBag().setVertical(true);
12291685 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12301686
....@@ -1232,7 +1688,11 @@
12321688 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
12331689 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
12341690 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1691
+ //XYZPanel.setName("XYZ");
12351692
1693
+ transformPanel.add(resetTransformPanel);
1694
+ transformPanel.add(XYZPanel);
1695
+
12361696 /*
12371697 gridPanel = new JPanel(); //new BorderLayout());
12381698 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1240,12 +1700,12 @@
12401700 gridPanel.add(cameraView);
12411701 gridPanel.add(XYZPanel);
12421702 */
1243
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1244
- gridPanel.setContinuousLayout(true);
1245
- gridPanel.setOneTouchExpandable(true);
1246
- gridPanel.setDividerLocation(1.0);
1247
- gridPanel.setDividerSize(9);
1248
- gridPanel.setResizeWeight(0.85);
1703
+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1704
+// gridPanel.setContinuousLayout(true);
1705
+// gridPanel.setOneTouchExpandable(true);
1706
+// gridPanel.setDividerLocation(1.0);
1707
+// gridPanel.setDividerSize(9);
1708
+// gridPanel.setResizeWeight(0.85);
12491709
12501710 // aConstraints.weighty = 0;
12511711 //System.out.println("THIS = " + this);
....@@ -1268,14 +1728,34 @@
12681728
12691729 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12701730 //tmp.setName("Edit");
1731
+ objectPanel.add(skyboxPanel);
1732
+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1733
+ objectPanel.setToolTipTextAt(0, "Backgrounds");
1734
+
1735
+ objectPanel.add(toolboxPanel);
1736
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1737
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1738
+
12711739 objectPanel.add(materialPanel);
1740
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1741
+ objectPanel.setToolTipTextAt(2, "Material");
1742
+
12721743 // JPanel north = new JPanel(new BorderLayout());
12731744 // north.setName("Edit");
12741745 // north.add(ctrlPanel, BorderLayout.NORTH);
12751746 // objectPanel.add(north);
1276
- objectPanel.add(ctrlPanel);
1277
- objectPanel.add(infoPanel);
1278
-
1747
+ objectPanel.add(editPanel);
1748
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1749
+ objectPanel.setToolTipTextAt(3, "Edit controls");
1750
+
1751
+ objectPanel.add(transformPanel);
1752
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1753
+ objectPanel.setToolTipTextAt(4, "TRS transform");
1754
+
1755
+ patchMaterial = true;
1756
+ cameraView.patchMaterial = this;
1757
+ objectPanel.setSelectedIndex(2);
1758
+
12791759 /*
12801760 aConstraints.gridx = 0;
12811761 aConstraints.gridwidth = 1;
....@@ -1283,7 +1763,7 @@
12831763 aConstraints.gridy += 1;
12841764 aConstraints.gridwidth = 1;
12851765 mainPanel.add(objectPanel, aConstraints);
1286
- */
1766
+ */
12871767
12881768 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12891769 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1295,22 +1775,119 @@
12951775 scrollpane.addMouseWheelListener(this); // Default not fast enough
12961776
12971777 /*JTabbedPane*/ scenePanel = new cGridBag();
1298
- scenePanel.preferredWidth = 7;
1778
+ scenePanel.preferredWidth = 6;
12991779
13001780 JTabbedPane tabbedPane = new JTabbedPane();
13011781 tabbedPane.add(scrollpane);
13021782
1303
- tabbedPane.add(FSPane = new cFileSystemPane(this));
1304
-
1305
- optionsPanel = new cGridBag().setVertical(true);
1783
+ optionsPanel = new cGridBag().setVertical(false);
13061784
13071785 optionsPanel.setName("Options");
13081786
13091787 AddOptions(optionsPanel); //, aConstraints);
13101788
1789
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1790
+
13111791 tabbedPane.add(optionsPanel);
13121792
13131793 scenePanel.add(tabbedPane);
1794
+
1795
+ cGridBag creditsPanel = new cGridBag().setVertical(true);
1796
+ creditsPanel.setName("Credits");
1797
+
1798
+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1799
+ creditsPanel.add(ogaLabel);
1800
+
1801
+ cButton creditButton;
1802
+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1803
+ creditButton.setToolTipText("https://opengameart.org");
1804
+
1805
+ creditButton.addMouseListener(new MouseAdapter()
1806
+ {
1807
+ public void mouseClicked(MouseEvent e)
1808
+ {
1809
+ try
1810
+ {
1811
+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1812
+ } catch (Exception e1)
1813
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1814
+ {
1815
+ e1.printStackTrace();
1816
+ }
1817
+ }
1818
+ });
1819
+
1820
+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
1821
+ creditsPanel.add(ogaLabel);
1822
+
1823
+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
1824
+ creditButton.setToolTipText("https://3delicious.net");
1825
+
1826
+ creditButton.addMouseListener(new MouseAdapter()
1827
+ {
1828
+ public void mouseClicked(MouseEvent e)
1829
+ {
1830
+ try
1831
+ {
1832
+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
1833
+ } catch (Exception e1)
1834
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1835
+ {
1836
+ e1.printStackTrace();
1837
+ }
1838
+ }
1839
+ });
1840
+
1841
+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
1842
+ creditButton.setToolTipText("https://archive3d.net");
1843
+
1844
+ creditButton.addMouseListener(new MouseAdapter()
1845
+ {
1846
+ public void mouseClicked(MouseEvent e)
1847
+ {
1848
+ try
1849
+ {
1850
+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
1851
+ } catch (Exception e1)
1852
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1853
+ {
1854
+ e1.printStackTrace();
1855
+ }
1856
+ }
1857
+ });
1858
+
1859
+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
1860
+ creditButton.setToolTipText("https://turbosquid.com");
1861
+
1862
+ creditButton.addMouseListener(new MouseAdapter()
1863
+ {
1864
+ public void mouseClicked(MouseEvent e)
1865
+ {
1866
+ try
1867
+ {
1868
+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
1869
+ } catch (Exception e1)
1870
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1871
+ {
1872
+ e1.printStackTrace();
1873
+ }
1874
+ }
1875
+ });
1876
+
1877
+ for (int i=6; --i>=0;)
1878
+ {
1879
+ creditsPanel.add(new cGridBag());
1880
+ }
1881
+
1882
+ tabbedPane.add(creditsPanel);
1883
+ tabbedPane.setToolTipTextAt(3, "Credits");
1884
+
1885
+ if (Globals.ADVANCED)
1886
+ {
1887
+ tabbedPane.add(infoPanel);
1888
+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1889
+ tabbedPane.setToolTipTextAt(4, "Information");
1890
+ }
13141891
13151892 /*
13161893 cTree jTree = new cTree(null);
....@@ -1332,13 +1909,13 @@
13321909 jtp.add(tree);
13331910 */
13341911
1335
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1336
- bigPanel.setContinuousLayout(true);
1337
- bigPanel.setOneTouchExpandable(true);
1338
- bigPanel.setDividerLocation(0.8);
1339
- bigPanel.setDividerSize(15);
1340
- bigPanel.setResizeWeight(0.15);
1341
- bigPanel.setName("Scene");
1912
+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1913
+// bigPanel.setContinuousLayout(true);
1914
+// bigPanel.setOneTouchExpandable(true);
1915
+// bigPanel.setDividerLocation(0.8);
1916
+// bigPanel.setDividerSize(15);
1917
+// bigPanel.setResizeWeight(0.15);
1918
+// bigPanel.setName("Scene");
13421919
13431920 //bigPanel.setLayout(new BorderLayout());
13441921 //bigPanel.setSize(new Dimension(10,10));
....@@ -1373,7 +1950,7 @@
13731950 bigThree = new cGridBag();
13741951 bigThree.addComponent(scenePanel);
13751952 bigThree.addComponent(centralPanel);
1376
- bigThree.addComponent(XYZPanel);
1953
+ //bigThree.addComponent(XYZPanel);
13771954
13781955 // // SIDE EFFECT!!!
13791956 // aConstraints.gridx = 0;
....@@ -1382,16 +1959,33 @@
13821959 // aConstraints.gridheight = 1;
13831960
13841961 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1385
- framePanel.setContinuousLayout(true);
1386
- framePanel.setOneTouchExpandable(true);
1387
- framePanel.setDividerLocation(0.8);
1962
+
1963
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1964
+ new java.beans.PropertyChangeListener()
1965
+ {
1966
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1967
+ {
1968
+ if ((Integer)pce.getOldValue() == 1)
1969
+ {
1970
+ if (radio.layout != expandedLayout)
1971
+ {
1972
+ radio.layout = expandedLayout;
1973
+ radio.layout.doClick();
1974
+ }
1975
+ }
1976
+ }
1977
+ });
1978
+
1979
+ framePanel.setContinuousLayout(false);
1980
+ framePanel.setOneTouchExpandable(false);
1981
+ //.setDividerLocation(0.8);
13881982 //framePanel.setDividerSize(15);
13891983 //framePanel.setResizeWeight(0.15);
13901984 framePanel.setName("Frame");
13911985
13921986 frame.getContentPane().setLayout(new BorderLayout());
13931987 /**/
1394
- JTabbedPane worldPane = new JTabbedPane();
1988
+ //JTabbedPane worldPane = new JTabbedPane();
13951989 //worldPane.add(bigPanel);
13961990 //worldPane.add(worldPanel);
13971991 /**/
....@@ -1401,15 +1995,19 @@
14011995
14021996 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14031997
1404
- frame.setSize(1024, 768);
1405
- frame.show();
1998
+ frame.setSize(1280, 860);
1999
+
2000
+ cameraView.requestFocusInWindow();
2001
+
2002
+// gridPanel.setDividerLocation(1.0);
2003
+
2004
+ frame.validate();
14062005
1407
- gridPanel.setDividerLocation(1.0);
2006
+ frame.setVisible(true);
14082007
14092008 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
14102009 frame.addWindowListener(new WindowAdapter()
14112010 {
1412
-
14132011 public void windowClosing(WindowEvent e)
14142012 {
14152013 Close();
....@@ -1432,28 +2030,445 @@
14322030 ctrlPanel.removeAll();
14332031 }
14342032
1435
- void SetupMaterial(cGridBag panel)
2033
+ void SetupMaterial(cGridBag materialpanel)
14362034 {
1437
- /*
2035
+ cGridBag presetpanel = new cGridBag().setVertical(true);
2036
+
2037
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
2038
+ skin.setToolTipText("Skin");
2039
+ skin.addMouseListener(new MouseAdapter()
2040
+ {
2041
+ public void mouseClicked(MouseEvent e)
2042
+ {
2043
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
2044
+ cMaterial material = object.material;
2045
+
2046
+ // Skin
2047
+ colorField.setFloat(material.color);
2048
+ float saturation = material.modulation;
2049
+
2050
+ if (!cameraView.Skinshader)
2051
+ {
2052
+ saturation /= 1.5;
2053
+ }
2054
+
2055
+ saturationField.setFloat(saturation);
2056
+
2057
+ subsurfaceField.setFloat(material.subsurface);
2058
+ selfshadowField.setFloat(material.diffuseness);
2059
+ diffusenessField.setFloat(material.factor);
2060
+ shininessField.setFloat(material.shininess);
2061
+ shadowbiasField.setFloat(material.shadowbias);
2062
+ diffuseField.setFloat(material.diffuse);
2063
+ specularField.setFloat(material.specular);
2064
+
2065
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2066
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2067
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2068
+
2069
+ materialtouched = true;
2070
+ applySelf();
2071
+ }
2072
+ });
2073
+ presetpanel.add(skin);
2074
+
2075
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
2076
+ lambert.setToolTipText("Diffuse");
2077
+ lambert.addMouseListener(new MouseAdapter()
2078
+ {
2079
+ public void mouseClicked(MouseEvent e)
2080
+ {
2081
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
2082
+ cMaterial material = object.material;
2083
+
2084
+ diffusenessField.setFloat(material.factor);
2085
+ selfshadowField.setFloat(material.diffuseness);
2086
+
2087
+ materialtouched = true;
2088
+ applySelf();
2089
+ }
2090
+ });
2091
+ presetpanel.add(lambert);
2092
+
2093
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
2094
+ diffuse2.setToolTipText("Diffuse2");
2095
+ diffuse2.addMouseListener(new MouseAdapter()
2096
+ {
2097
+ public void mouseClicked(MouseEvent e)
2098
+ {
2099
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
2100
+ cMaterial material = object.material;
2101
+
2102
+ diffusenessField.setFloat(material.factor);
2103
+ selfshadowField.setFloat(material.diffuseness);
2104
+
2105
+ materialtouched = true;
2106
+ applySelf();
2107
+ }
2108
+ });
2109
+ presetpanel.add(diffuse2);
2110
+
2111
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
2112
+ diffusemoon.setToolTipText("Moon");
2113
+ diffusemoon.addMouseListener(new MouseAdapter()
2114
+ {
2115
+ public void mouseClicked(MouseEvent e)
2116
+ {
2117
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
2118
+ cMaterial material = object.material;
2119
+
2120
+ diffusenessField.setFloat(material.factor);
2121
+ selfshadowField.setFloat(material.diffuseness);
2122
+
2123
+ materialtouched = true;
2124
+ applySelf();
2125
+ }
2126
+ });
2127
+ presetpanel.add(diffusemoon);
2128
+
2129
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
2130
+ diffusemoon2.setToolTipText("Moon2");
2131
+ diffusemoon2.addMouseListener(new MouseAdapter()
2132
+ {
2133
+ public void mouseClicked(MouseEvent e)
2134
+ {
2135
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
2136
+ cMaterial material = object.material;
2137
+
2138
+ diffusenessField.setFloat(material.factor);
2139
+ selfshadowField.setFloat(material.diffuseness);
2140
+
2141
+ materialtouched = true;
2142
+ applySelf();
2143
+ }
2144
+ });
2145
+ presetpanel.add(diffusemoon2);
2146
+
2147
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
2148
+ diffusemoon3.setToolTipText("Moon3");
2149
+ diffusemoon3.addMouseListener(new MouseAdapter()
2150
+ {
2151
+ public void mouseClicked(MouseEvent e)
2152
+ {
2153
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
2154
+ cMaterial material = object.material;
2155
+
2156
+ diffusenessField.setFloat(material.factor);
2157
+ selfshadowField.setFloat(material.diffuseness);
2158
+
2159
+ materialtouched = true;
2160
+ applySelf();
2161
+ }
2162
+ });
2163
+ presetpanel.add(diffusemoon3);
2164
+
2165
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2166
+ diffusesheen.setToolTipText("Sheen");
2167
+ diffusesheen.addMouseListener(new MouseAdapter()
2168
+ {
2169
+ public void mouseClicked(MouseEvent e)
2170
+ {
2171
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
2172
+ cMaterial material = object.material;
2173
+
2174
+ sheenField.setFloat(material.sheen);
2175
+
2176
+ materialtouched = true;
2177
+ applySelf();
2178
+ }
2179
+ });
2180
+ presetpanel.add(diffusesheen);
2181
+
2182
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2183
+ rough.setToolTipText("Rough metal");
2184
+ rough.addMouseListener(new MouseAdapter()
2185
+ {
2186
+ public void mouseClicked(MouseEvent e)
2187
+ {
2188
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2189
+ cMaterial material = object.material;
2190
+
2191
+ shininessField.setFloat(material.shininess);
2192
+ velvetField.setFloat(material.velvet);
2193
+
2194
+ materialtouched = true;
2195
+ applySelf();
2196
+ }
2197
+ });
2198
+ presetpanel.add(rough);
2199
+
2200
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2201
+ rough2.setToolTipText("Medium metal");
2202
+ rough2.addMouseListener(new MouseAdapter()
2203
+ {
2204
+ public void mouseClicked(MouseEvent e)
2205
+ {
2206
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2207
+ cMaterial material = object.material;
2208
+
2209
+ shininessField.setFloat(material.shininess);
2210
+ lightareaField.setFloat(material.lightarea);
2211
+
2212
+ materialtouched = true;
2213
+ applySelf();
2214
+ }
2215
+ });
2216
+ presetpanel.add(rough2);
2217
+
2218
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2219
+ shini0.setToolTipText("Shiny");
2220
+ shini0.addMouseListener(new MouseAdapter()
2221
+ {
2222
+ public void mouseClicked(MouseEvent e)
2223
+ {
2224
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2225
+ cMaterial material = object.material;
2226
+
2227
+ shininessField.setFloat(material.shininess);
2228
+ lightareaField.setFloat(material.lightarea);
2229
+
2230
+ materialtouched = true;
2231
+ applySelf();
2232
+ }
2233
+ });
2234
+ presetpanel.add(shini0);
2235
+
2236
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2237
+ shini1.setToolTipText("Shiny2");
2238
+ shini1.addMouseListener(new MouseAdapter()
2239
+ {
2240
+ public void mouseClicked(MouseEvent e)
2241
+ {
2242
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2243
+ cMaterial material = object.material;
2244
+
2245
+ shininessField.setFloat(material.shininess);
2246
+ lightareaField.setFloat(material.lightarea);
2247
+
2248
+ materialtouched = true;
2249
+ applySelf();
2250
+ }
2251
+ });
2252
+ presetpanel.add(shini1);
2253
+
2254
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2255
+ shini2.setToolTipText("Shiny3");
2256
+ shini2.addMouseListener(new MouseAdapter()
2257
+ {
2258
+ public void mouseClicked(MouseEvent e)
2259
+ {
2260
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2261
+ cMaterial material = object.material;
2262
+
2263
+ shininessField.setFloat(material.shininess);
2264
+ lightareaField.setFloat(material.lightarea);
2265
+
2266
+ materialtouched = true;
2267
+ applySelf();
2268
+ }
2269
+ });
2270
+ presetpanel.add(shini2);
2271
+
2272
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2273
+ aniso.setToolTipText("AnisoU");
2274
+ aniso.addMouseListener(new MouseAdapter()
2275
+ {
2276
+ public void mouseClicked(MouseEvent e)
2277
+ {
2278
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2279
+ cMaterial material = object.material;
2280
+
2281
+ anisoField.setFloat(material.aniso);
2282
+ anisoVField.setFloat(material.anisoV);
2283
+
2284
+ materialtouched = true;
2285
+ applySelf();
2286
+ }
2287
+ });
2288
+ presetpanel.add(aniso);
2289
+
2290
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2291
+ aniso2.setToolTipText("AnisoV");
2292
+ aniso2.addMouseListener(new MouseAdapter()
2293
+ {
2294
+ public void mouseClicked(MouseEvent e)
2295
+ {
2296
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2297
+ cMaterial material = object.material;
2298
+
2299
+ anisoField.setFloat(material.aniso);
2300
+ anisoVField.setFloat(material.anisoV);
2301
+
2302
+ materialtouched = true;
2303
+ applySelf();
2304
+ }
2305
+ });
2306
+ presetpanel.add(aniso2);
2307
+
2308
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2309
+ aniso3.setToolTipText("AnisoUV");
2310
+ aniso3.addMouseListener(new MouseAdapter()
2311
+ {
2312
+ public void mouseClicked(MouseEvent e)
2313
+ {
2314
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2315
+ cMaterial material = object.material;
2316
+
2317
+ anisoField.setFloat(material.aniso);
2318
+ anisoVField.setFloat(material.anisoV);
2319
+
2320
+ materialtouched = true;
2321
+ applySelf();
2322
+ }
2323
+ });
2324
+ presetpanel.add(aniso3);
2325
+
2326
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2327
+ velvet0.setToolTipText("Velvet");
2328
+ velvet0.addMouseListener(new MouseAdapter()
2329
+ {
2330
+ public void mouseClicked(MouseEvent e)
2331
+ {
2332
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2333
+ cMaterial material = object.material;
2334
+
2335
+ diffusenessField.setFloat(material.factor);
2336
+ selfshadowField.setFloat(material.diffuseness);
2337
+ sheenField.setFloat(material.sheen);
2338
+ shininessField.setFloat(material.shininess);
2339
+ velvetField.setFloat(material.velvet);
2340
+ shiftField.setFloat(material.shift);
2341
+
2342
+ materialtouched = true;
2343
+ applySelf();
2344
+ }
2345
+ });
2346
+ presetpanel.add(velvet0);
2347
+
2348
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2349
+ bump0.setToolTipText("Bump texture");
2350
+ bump0.addMouseListener(new MouseAdapter()
2351
+ {
2352
+ public void mouseClicked(MouseEvent e)
2353
+ {
2354
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2355
+ cMaterial material = object.material;
2356
+
2357
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2358
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2359
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2360
+
2361
+ materialtouched = true;
2362
+ applySelf();
2363
+ }
2364
+ });
2365
+ presetpanel.add(bump0);
2366
+
2367
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2368
+ borderShader.setToolTipText("Border fade");
2369
+ borderShader.addMouseListener(new MouseAdapter()
2370
+ {
2371
+ public void mouseClicked(MouseEvent e)
2372
+ {
2373
+ borderfadeField.setFloat(0.5);
2374
+ opacityField.setFloat(0.75);
2375
+
2376
+ materialtouched = true;
2377
+ applySelf();
2378
+ }
2379
+ });
2380
+ presetpanel.add(borderShader);
2381
+
2382
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2383
+ halo.setToolTipText("Halo");
2384
+ halo.addMouseListener(new MouseAdapter()
2385
+ {
2386
+ public void mouseClicked(MouseEvent e)
2387
+ {
2388
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2389
+ cMaterial material = object.material;
2390
+
2391
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2392
+
2393
+ materialtouched = true;
2394
+ applySelf();
2395
+ }
2396
+ });
2397
+ presetpanel.add(halo);
2398
+
2399
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2400
+ candle.setToolTipText("Candle");
2401
+ candle.addMouseListener(new MouseAdapter()
2402
+ {
2403
+ public void mouseClicked(MouseEvent e)
2404
+ {
2405
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2406
+ cMaterial material = object.material;
2407
+
2408
+ subsurfaceField.setFloat(material.subsurface);
2409
+ shadowbiasField.setFloat(material.shadowbias);
2410
+ ambientField.setFloat(material.ambient);
2411
+ specularField.setFloat(material.specular);
2412
+ lightareaField.setFloat(material.lightarea);
2413
+ shininessField.setFloat(material.shininess);
2414
+
2415
+ materialtouched = true;
2416
+ applySelf();
2417
+ }
2418
+ });
2419
+ presetpanel.add(candle);
2420
+
2421
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2422
+ shadowShader.setToolTipText("Shadow");
2423
+ shadowShader.addMouseListener(new MouseAdapter()
2424
+ {
2425
+ public void mouseClicked(MouseEvent e)
2426
+ {
2427
+ diffuseField.setFloat(0.001);
2428
+ ambientField.setFloat(0.001);
2429
+ cameraField.setFloat(0.001);
2430
+ specularField.setFloat(0.001);
2431
+ fakedepthField.setFloat(0.001);
2432
+ opacityField.setFloat(0.6);
2433
+
2434
+ materialtouched = true;
2435
+ applySelf();
2436
+ }
2437
+ });
2438
+ presetpanel.add(shadowShader);
2439
+
2440
+ cGridBag panel = new cGridBag().setVertical(true);
2441
+
2442
+ presetpanel.preferredWidth = 1;
2443
+
2444
+ materialpanel.add(presetpanel);
2445
+ materialpanel.add(panel);
2446
+
2447
+ panel.preferredWidth = 8;
2448
+
2449
+ /*
14382450 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14392451 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1440
- */
2452
+ */
14412453
14422454 cGridBag editBar = new cGridBag().setVertical(false);
14432455
1444
- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
2456
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
14452457 createMaterialButton.setToolTipText("Create material");
14462458
14472459 /*
14482460 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14492461 */
14502462
1451
- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
2463
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
14522464 clearMaterialButton.setToolTipText("Clear material");
14532465
1454
- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1455
- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1456
- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2466
+ if (Globals.ADVANCED)
2467
+ {
2468
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2469
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2470
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2471
+ }
14572472
14582473 editBar.preferredHeight = 15;
14592474
....@@ -1468,45 +2483,61 @@
14682483 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14692484
14702485 cGridBag colorSection = new cGridBag().setVertical(true);
2486
+
2487
+ cGridBag huepanel = new cGridBag();
2488
+ cGridBag huelabel = new cGridBag();
2489
+ cLabel hue = GetLabel("icons/hue.png", false);
2490
+ hue.fit = true;
2491
+
2492
+ hue.addMouseListener(new MouseAdapter()
2493
+ {
2494
+ public void mousePressed(MouseEvent e)
2495
+ {
2496
+ int x = e.getX();
2497
+
2498
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2499
+ }
2500
+ });
2501
+
2502
+ huelabel.add(hue);
2503
+ huelabel.preferredWidth = 20;
2504
+ huepanel.add(new cGridBag()); // Label
2505
+ huepanel.add(huelabel); // Field/slider
2506
+
2507
+ huepanel.preferredHeight = 7;
2508
+
2509
+ colorSection.add(huepanel);
14712510
14722511 cGridBag color = new cGridBag();
1473
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1474
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1475
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2512
+
2513
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2514
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2515
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2516
+
14762517 //colorField.preferredWidth = 200;
14772518 colorSection.add(color);
14782519
14792520 cGridBag modulation = new cGridBag();
14802521 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
14812522 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2523
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
14832524 colorSection.add(modulation);
14842525
2526
+ cGridBag opacity = new cGridBag();
2527
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2528
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2529
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2530
+ colorSection.add(opacity);
2531
+
2532
+ colorSection.add(GetSeparator());
2533
+
14852534 cGridBag texture = new cGridBag();
14862535 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
14872536 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
14882537 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
14892538 colorSection.add(texture);
14902539
1491
- cGridBag anisoU = new cGridBag();
1492
- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1493
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1494
- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1495
- colorSection.add(anisoU);
1496
-
1497
- cGridBag anisoV = new cGridBag();
1498
- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1499
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500
- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1501
- colorSection.add(anisoV);
1502
-
1503
- cGridBag shadowbias = new cGridBag();
1504
- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1505
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1506
- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1507
- colorSection.add(shadowbias);
1508
-
1509
- panel.add(new JSeparator());
2540
+ panel.add(GetSeparator());
15102541
15112542 panel.add(colorSection);
15122543
....@@ -1556,7 +2587,13 @@
15562587 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15572588 diffuseSection.add(fakedepth);
15582589
1559
- panel.add(new JSeparator());
2590
+ cGridBag shadowbias = new cGridBag();
2591
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
2592
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2593
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2594
+ diffuseSection.add(shadowbias);
2595
+
2596
+ panel.add(GetSeparator());
15602597
15612598 panel.add(diffuseSection);
15622599
....@@ -1606,42 +2643,54 @@
16062643 // aConstraints.gridy += 1;
16072644 // aConstraints.gridwidth = 1;
16082645
2646
+ cGridBag anisoU = new cGridBag();
2647
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
2648
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2649
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2650
+ specularSection.add(anisoU);
16092651
1610
- panel.add(new JSeparator());
2652
+ cGridBag anisoV = new cGridBag();
2653
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
2654
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2655
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2656
+ specularSection.add(anisoV);
2657
+
2658
+
2659
+ panel.add(GetSeparator());
16112660
16122661 panel.add(specularSection);
16132662
16142663 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16152664
1616
- cGridBag globalSection = new cGridBag().setVertical(true);
2665
+ //cGridBag globalSection = new cGridBag().setVertical(true);
16172666
16182667 cGridBag camera = new cGridBag();
16192668 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
16202669 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16212670 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1622
- globalSection.add(camera);
2671
+ colorSection.add(camera);
16232672
16242673 cGridBag ambient = new cGridBag();
16252674 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
16262675 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16272676 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1628
- globalSection.add(ambient);
2677
+ colorSection.add(ambient);
16292678
16302679 cGridBag backlit = new cGridBag();
16312680 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
16322681 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16332682 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1634
- globalSection.add(backlit);
2683
+ colorSection.add(backlit);
16352684
1636
- cGridBag opacity = new cGridBag();
1637
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1638
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1639
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1640
- globalSection.add(opacity);
1641
-
1642
- panel.add(new JSeparator());
2685
+ cGridBag parallax = new cGridBag();
2686
+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2687
+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2688
+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
2689
+ colorSection.add(parallax);
16432690
1644
- panel.add(globalSection);
2691
+ //panel.add(new JSeparator());
2692
+
2693
+ //panel.add(globalSection);
16452694
16462695 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16472696
....@@ -1683,7 +2732,7 @@
16832732 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
16842733 textureSection.add(opacityPower);
16852734
1686
- panel.add(new JSeparator());
2735
+ panel.add(GetSeparator());
16872736
16882737 panel.add(textureSection);
16892738
....@@ -1722,12 +2771,15 @@
17222771 opacityPowerField.addChangeListener(this);
17232772 /**/
17242773
1725
- resetSlidersButton.addActionListener(this);
17262774 clearMaterialButton.addActionListener(this);
17272775 createMaterialButton.addActionListener(this);
1728
-
1729
- propagateToggle.addItemListener(this);
1730
- multiplyToggle.addItemListener(this);
2776
+
2777
+ if (Globals.ADVANCED)
2778
+ {
2779
+ resetSlidersButton.addActionListener(this);
2780
+ propagateToggle.addItemListener(this);
2781
+ multiplyToggle.addItemListener(this);
2782
+ }
17312783 }
17322784
17332785 void DropFile(java.io.File[] files, boolean textures)
....@@ -1745,8 +2797,9 @@
17452797 // 3D models
17462798 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
17472799 {
1748
- lastConverter = new com.jmex.model.converters.MaxToJme();
1749
- LoadFile(filename, lastConverter);
2800
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2801
+ //LoadFile(filename, lastConverter);
2802
+ LoadObjFile(filename); // New 3ds loader
17502803 continue;
17512804 }
17522805 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -1898,7 +2951,7 @@
18982951
18992952 //? flashIt = false;
19002953 CameraPane pane = (CameraPane) cameraView;
1901
- pane.clickStart(location.x, location.y, 0);
2954
+ pane.clickStart(location.x, location.y, 0, 0);
19022955 pane.clickEnd(location.x, location.y, 0, true);
19032956
19042957 if (group.selection.size() == 1)
....@@ -1947,6 +3000,7 @@
19473000 e2.printStackTrace();
19483001 }
19493002 }
3003
+
19503004 LoadJMEThread loadThread;
19513005
19523006 class LoadJMEThread extends Thread
....@@ -2004,6 +3058,7 @@
20043058 //LoadFile0(filename, converter);
20053059 }
20063060 }
3061
+
20073062 LoadOBJThread loadObjThread;
20083063
20093064 class LoadOBJThread extends Thread
....@@ -2082,19 +3137,19 @@
20823137
20833138 void LoadObjFile(String fullname)
20843139 {
2085
- /*
3140
+ System.out.println("Loading " + fullname);
3141
+ /**/
20863142 //lastFilename = fullname;
20873143 if(loadObjThread == null)
20883144 {
2089
- loadObjThread = new LoadOBJThread();
2090
- loadObjThread.start();
3145
+ loadObjThread = new LoadOBJThread();
3146
+ loadObjThread.start();
20913147 }
20923148
20933149 loadObjThread.add(fullname);
2094
- */
3150
+ /**/
20953151
2096
- System.out.println("Loading " + fullname);
2097
- makeSomething(new FileObject(fullname, true), true);
3152
+ //makeSomething(new FileObject(fullname, true), true);
20983153 }
20993154
21003155 void LoadGFDFile(String fullname)
....@@ -2355,11 +3410,11 @@
23553410
23563411 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23573412 {
2358
- if (GrafreeD.standAlone)
3413
+ if (Grafreed.standAlone)
23593414 {
23603415 /**/
23613416 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2362
- browser.show();
3417
+ browser.setVisible(true);
23633418 String filename = browser.getFile();
23643419 if (filename != null && filename.length() > 0)
23653420 {
....@@ -2470,6 +3525,7 @@
24703525 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
24713526 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
24723527 }
3528
+
24733529 //cJME.count++;
24743530 //cJME.count %= 12;
24753531 if (gc)
....@@ -2653,6 +3709,7 @@
26533709 }
26543710 }
26553711 }
3712
+
26563713 cFileSystemPane FSPane;
26573714
26583715 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2662,7 +3719,7 @@
26623719
26633720 freezematerial = true;
26643721 colorField.setFloat(mat.color);
2665
- modulationField.setFloat(mat.modulation);
3722
+ saturationField.setFloat(mat.modulation);
26663723 metalnessField.setFloat(mat.metalness);
26673724 diffuseField.setFloat(mat.diffuse);
26683725 specularField.setFloat(mat.specular);
....@@ -2682,6 +3739,7 @@
26823739 shadowField.setFloat(mat.shadow);
26833740 textureField.setFloat(mat.texture);
26843741 opacityField.setFloat(mat.opacity);
3742
+ parallaxField.setFloat(mat.parallax + 0.25f);
26853743 fakedepthField.setFloat(mat.fakedepth);
26863744 shadowbiasField.setFloat(mat.shadowbias);
26873745 bumpField.setInteger(1); // dec 2013
....@@ -2706,11 +3764,14 @@
27063764 }
27073765 }
27083766 }
3767
+
27093768 freezematerial = false;
27103769 }
27113770
27123771 void SetMaterial(Object3D object)
27133772 {
3773
+ latestObject = object;
3774
+
27143775 cMaterial mat = object.material;
27153776
27163777 if (mat == null)
....@@ -2719,33 +3780,10 @@
27193780 return;
27203781 }
27213782
2722
- multiplyToggle.setSelected(mat.multiply);
2723
-
2724
- assert (object.projectedVertices != null);
2725
-
2726
- if (object.projectedVertices.length <= 2)
2727
- {
2728
- // Side effect...
2729
- Object3D.cVector2[] keep = object.projectedVertices;
2730
- object.projectedVertices = new Object3D.cVector2[3];
2731
- for (int i = 0; i < 3; i++)
2732
- {
2733
- if (i < keep.length)
2734
- {
2735
- object.projectedVertices[i] = keep[i];
2736
- } else
2737
- {
2738
- object.projectedVertices[i] = new Object3D.cVector2();
2739
- }
2740
- /*
2741
- if(keep.length == 0)
2742
- object.projectedVertices[0] = new Object3D.cVector2();
2743
- else
2744
- object.projectedVertices[0] = keep[0];
2745
- object.projectedVertices[1] = new Object3D.cVector2();
2746
- */
2747
- }
2748
- }
3783
+ if (multiplyToggle != null)
3784
+ multiplyToggle.setSelected(mat.multiply);
3785
+
3786
+ AllocProjectedVertices(object);
27493787
27503788 SetMaterial(mat, object.projectedVertices);
27513789 }
....@@ -2821,12 +3859,17 @@
28213859 // }
28223860
28233861 /**/
2824
- if (deselect)
3862
+ if (deselect || child == null)
28253863 {
28263864 //group.deselectAll();
28273865 //freeze = true;
28283866 GetTree().clearSelection();
28293867 //freeze = false;
3868
+
3869
+ if (child == null)
3870
+ {
3871
+ return;
3872
+ }
28303873 }
28313874
28323875 //group.addSelectee(child);
....@@ -2860,6 +3903,17 @@
28603903 public void itemStateChanged(ItemEvent event)
28613904 {
28623905 // System.out.println("Propagate = " + propagate);
3906
+ if (event.getSource() == pinButton)
3907
+ {
3908
+ copy.pinned ^= true;
3909
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3910
+ {
3911
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3912
+ copy.CloseUI();
3913
+ //copy.editWindow.refreshContents();
3914
+ }
3915
+ }
3916
+ else
28633917 if (event.getSource() == propagateToggle)
28643918 {
28653919 propagate ^= true;
....@@ -2895,7 +3949,7 @@
28953949 cameraView.ToggleDL();
28963950 cameraView.repaint();
28973951 return;
2898
- } else if (event.getSource() == toggleTextureItem)
3952
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28993953 {
29003954 cameraView.ToggleTexture();
29013955 // june 2013 copy.HardTouch();
....@@ -2934,9 +3988,9 @@
29343988 frame.validate();
29353989
29363990 return;
2937
- } else if (event.getSource() == toggleRandomItem)
3991
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29383992 {
2939
- cameraView.ToggleRandom();
3993
+ cameraView.ToggleSwitch();
29403994 cameraView.repaint();
29413995 return;
29423996 } else if (event.getSource() == toggleHandleItem)
....@@ -2964,12 +4018,17 @@
29644018 } else if (event.getSource() == liveCB)
29654019 {
29664020 copy.live ^= true;
4021
+ objEditor.refreshContents(true); // To show item colors
4022
+ return;
4023
+ } else if (event.getSource() == selectableCB)
4024
+ {
4025
+ copy.dontselect ^= true;
29674026 return;
29684027 } else if (event.getSource() == hideCB)
29694028 {
29704029 copy.hide ^= true;
29714030 copy.Touch(); // display list issue
2972
- objEditor.refreshContents();
4031
+ objEditor.refreshContents(true); // To show item colors
29734032 return;
29744033 } else if (event.getSource() == link2masterCB)
29754034 {
....@@ -2979,6 +4038,7 @@
29794038 if (event.getSource() == randomCB)
29804039 {
29814040 copy.random ^= true;
4041
+ objEditor.refreshContents();
29824042 return;
29834043 }
29844044 if (event.getSource() == speedupCB)
....@@ -3002,8 +4062,9 @@
30024062
30034063 public void actionPerformed(ActionEvent event)
30044064 {
4065
+ Object source = event.getSource();
30054066 // SCRIPT DIALOG
3006
- if (event.getSource() == okbutton)
4067
+ if (source == okbutton)
30074068 {
30084069 textpanel.setVisible(false);
30094070 textpanel.remove(textarea);
....@@ -3015,7 +4076,7 @@
30154076 textarea = null;
30164077 textpanel = null;
30174078 }
3018
- if (event.getSource() == cancelbutton)
4079
+ if (source == cancelbutton)
30194080 {
30204081 textpanel.setVisible(false);
30214082 textpanel.remove(textarea);
....@@ -3027,50 +4088,50 @@
30274088 //applySelf();
30284089 //client.refreshEditWindow();
30294090 //refreshContents();
3030
- if (event.getSource() == nameField)
4091
+ if (source == nameField)
30314092 {
30324093 //System.out.println("ObjEditor " + event);
30334094 applySelf0(true);
30344095 //parent.applySelf();
3035
- objEditor.refreshContents();
3036
- } else if (event.getSource() == resetButton)
4096
+ // conflicts with requestFocus objEditor.refreshContents();
4097
+ } else if (source == resetButton)
30374098 {
30384099 CameraPane.fullreset = true;
30394100 copy.Reset(); // ResetMeshes();
30404101 copy.Touch();
30414102 objEditor.refreshContents();
3042
- } else if (event.getSource() == stepItem)
4103
+ } else if (source == stepItem)
30434104 {
30444105 //cameraView.ONESTEP = true;
30454106 Globals.ONESTEP = true;
30464107 cameraView.repaint();
30474108 return;
3048
- } else if (event.getSource() == stepButton)
4109
+ } else if (source == stepButton)
30494110 {
30504111 copy.Step();
30514112 copy.Touch();
30524113 objEditor.refreshContents();
3053
- } else if (event.getSource() == slowerButton)
4114
+ } else if (source == slowerButton)
30544115 {
30554116 copy.Slower();
30564117 copy.Touch();
30574118 objEditor.refreshContents();
3058
- } else if (event.getSource() == fasterButton)
4119
+ } else if (source == fasterButton)
30594120 {
30604121 copy.Faster();
30614122 copy.Touch();
30624123 objEditor.refreshContents();
3063
- } else if (event.getSource() == remarkButton)
4124
+ } else if (source == remarkButton)
30644125 {
30654126 copy.Remark();
30664127 copy.Touch();
30674128 objEditor.refreshContents();
3068
- } else if (event.getSource() == stepAllButton)
4129
+ } else if (source == stepAllButton)
30694130 {
30704131 copy.StepAll();
30714132 copy.Touch();
30724133 objEditor.refreshContents();
3073
- } else if (event.getSource() == resetAllButton)
4134
+ } else if (source == resetAllButton)
30744135 {
30754136 //CameraPane.fullreset = true;
30764137 copy.ResetAll(); // ResetMeshes();
....@@ -3103,53 +4164,79 @@
31034164 // Close();
31044165 // }
31054166 // else
3106
- if (event.getSource() == resetSlidersButton)
4167
+ if (source == resetSlidersButton)
31074168 {
31084169 ResetSliders();
3109
- } else if (event.getSource() == clearMaterialButton)
4170
+ } else if (source == clearMaterialButton)
31104171 {
31114172 ClearMaterial();
3112
- } else if (event.getSource() == createMaterialButton)
4173
+ } else if (source == createMaterialButton)
31134174 {
31144175 CreateMaterial();
3115
- } else if (event.getSource() == clearPanelButton)
4176
+ } else if (source == clearPanelButton)
31164177 {
31174178 copy.ClearUI();
31184179 refreshContents(true);
3119
- } /*
3120
- }
3121
-
3122
- public boolean action(Event event, Object arg)
3123
- {
3124
- */ else if (event.getSource() == closeItem)
4180
+ } else if (source == importGFDItem)
4181
+ {
4182
+ ImportGFD();
4183
+ } else
4184
+ if (source == importVRMLX3DItem)
4185
+ {
4186
+ ImportVRMLX3D();
4187
+ } else
4188
+ if (source == import3DSItem)
4189
+ {
4190
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
4191
+ } else
4192
+ if (source == importOBJItem)
4193
+ {
4194
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
4195
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
4196
+ browser.setVisible(true);
4197
+ String filename = browser.getFile();
4198
+ if (filename != null && filename.length() > 0)
4199
+ {
4200
+ String fullname = browser.getDirectory() + filename;
4201
+ makeSomething(ReadOBJ(fullname), true);
4202
+ }
4203
+ } else
4204
+ if (source == closeItem)
31254205 {
31264206 Close();
31274207 //return true;
3128
- } else if (event.getSource() == loadItem)
4208
+ } else if (source == openItem)
31294209 {
3130
- load();
4210
+ Open();
31314211 //return true;
3132
- } else if (event.getSource() == saveItem)
4212
+ } else if (source == newItem)
4213
+ {
4214
+ New();
4215
+ } else if (source == saveItem)
31334216 {
31344217 save();
31354218 //return true;
3136
- } else if (event.getSource() == saveAsItem)
4219
+ } else if (source == saveAsItem)
31374220 {
31384221 saveAs();
31394222 //return true;
3140
- } else if (event.getSource() == reexportItem)
4223
+ } else if (source == reexportItem)
31414224 {
31424225 reexport();
31434226 //return true;
3144
- } else if (event.getSource() == exportAsItem)
4227
+ } else if (source == exportAsItem)
31454228 {
31464229 export();
31474230 //return true;
3148
- } else if (event.getSource() == povItem)
4231
+ } else if (source == povItem)
31494232 {
31504233 generatePOV();
31514234 //return true;
3152
- } else if (event.getSource() == zBufferItem)
4235
+ } else if (event.getSource() == archiveItem)
4236
+ {
4237
+ cTools.Archive(frame);
4238
+ return;
4239
+ } else if (source == zBufferItem)
31534240 {
31544241 try
31554242 {
....@@ -3171,21 +4258,8 @@
31714258 cameraView.repaint();
31724259 //return true;
31734260 }
3174
- */ else if (event.getSource() == editCameraItem)
3175
- {
3176
- cameraView.ProtectCamera();
3177
- cameraView.repaint();
3178
- return;
3179
- } else if (event.getSource() == revertCameraItem)
3180
- {
3181
- cameraView.RevertCamera();
3182
- cameraView.repaint();
3183
- return;
3184
-// } else if (event.getSource() == textureButton)
3185
-// {
3186
-// return; // true;
3187
- } else // combos...
3188
- if (event.getSource() == texresMenu)
4261
+ */ else // combos...
4262
+ if (source == texresMenu)
31894263 {
31904264 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
31914265 copy.texres = texresMenu.getSelectedIndex();
....@@ -3197,6 +4271,497 @@
31974271 }
31984272 }
31994273
4274
+ void New()
4275
+ {
4276
+ while (copy.Size() > 0)
4277
+ {
4278
+ copy.remove(0);
4279
+ }
4280
+
4281
+ copy.selection.clear();
4282
+
4283
+ if (copy == Grafreed.grafreed.universe)
4284
+ {
4285
+ CreateCameras();
4286
+ cameraView.SetCamera(GetCamera(copy, 0));
4287
+ }
4288
+ ResetModel();
4289
+ objEditor.refreshContents();
4290
+ }
4291
+
4292
+ static public byte[] Compress(Object3D o)
4293
+ {
4294
+ // Slower to actually compress.
4295
+ try
4296
+ {
4297
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
4298
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
4299
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
4300
+
4301
+ Object3D parent = o.parent;
4302
+ o.parent = null;
4303
+
4304
+ out.writeObject(o);
4305
+
4306
+ o.parent = parent;
4307
+
4308
+ out.flush();
4309
+
4310
+ baos //zstream
4311
+ .close();
4312
+ out.close();
4313
+
4314
+ byte[] bytes = baos.toByteArray();
4315
+
4316
+ System.out.println("save #bytes = " + bytes.length);
4317
+ return bytes;
4318
+ } catch (Exception e)
4319
+ {
4320
+ System.err.println(e);
4321
+ return null;
4322
+ }
4323
+ }
4324
+
4325
+ static public Object Uncompress(byte[] bytes)
4326
+ {
4327
+ System.out.println("restore #bytes = " + bytes.length);
4328
+ try
4329
+ {
4330
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
4331
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
4332
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
4333
+ Object obj = in.readObject();
4334
+
4335
+ bais //istream
4336
+ .close();
4337
+ in.close();
4338
+
4339
+ return obj;
4340
+ } catch (Exception e)
4341
+ {
4342
+ System.err.println(e);
4343
+ return null;
4344
+ }
4345
+ }
4346
+
4347
+ static public Object clone(Object o)
4348
+ {
4349
+ try
4350
+ {
4351
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
4352
+ ObjectOutputStream out = new ObjectOutputStream(baos);
4353
+
4354
+ out.writeObject(o);
4355
+
4356
+ out.flush();
4357
+ out.close();
4358
+
4359
+ byte[] bytes = baos.toByteArray();
4360
+
4361
+ System.out.println("clone = " + bytes.length);
4362
+
4363
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
4364
+ ObjectInputStream in = new ObjectInputStream(bais);
4365
+ Object obj = in.readObject();
4366
+ in.close();
4367
+
4368
+ return obj;
4369
+ } catch (Exception e)
4370
+ {
4371
+ System.err.println(e);
4372
+ return null;
4373
+ }
4374
+ }
4375
+
4376
+ cRadio GetCurrentTab()
4377
+ {
4378
+ cRadio ab;
4379
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4380
+ {
4381
+ ab = (cRadio)e.nextElement();
4382
+ if(ab.GetObject() == copy)
4383
+ {
4384
+ return ab;
4385
+ }
4386
+ }
4387
+
4388
+ return null;
4389
+ }
4390
+
4391
+
4392
+ public void Save()
4393
+ {
4394
+ //Save(true);
4395
+ Replace();
4396
+ SetVersionStates();
4397
+ }
4398
+
4399
+ private boolean Equal(byte[] compress, byte[] name)
4400
+ {
4401
+ if (compress.length != name.length)
4402
+ {
4403
+ return false;
4404
+ }
4405
+
4406
+ for (int i=compress.length; --i>=0;)
4407
+ {
4408
+ if (compress[i] != name[i])
4409
+ return false;
4410
+ }
4411
+
4412
+ return true;
4413
+ }
4414
+
4415
+ void DeleteVersion()
4416
+ {
4417
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4418
+ {
4419
+ copy.versionlist[i] = copy.versionlist[i+1];
4420
+ }
4421
+
4422
+ if (copy.versionlist[copy.versionindex] == null)
4423
+ copy.versionindex -= 1;
4424
+
4425
+ if (copy.versionindex != -1)
4426
+ CopyChanged();
4427
+
4428
+ SetVersionStates();
4429
+ }
4430
+
4431
+ public boolean Save(boolean user)
4432
+ {
4433
+ System.err.println("Save");
4434
+ Replace();
4435
+
4436
+ //cRadio tab = GetCurrentTab();
4437
+
4438
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4439
+
4440
+ boolean thesame = false;
4441
+
4442
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4443
+// {
4444
+// thesame = true;
4445
+// }
4446
+
4447
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
4448
+ if (!thesame)
4449
+ {
4450
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4451
+ {
4452
+ copy.versionlist[i] = copy.versionlist[i-1];
4453
+ }
4454
+
4455
+ //tab.user[tab.versionindex] = user;
4456
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
4457
+
4458
+ copy.versionlist[++copy.versionindex] = compress;
4459
+
4460
+ // if (increment)
4461
+ // tab.versionindex++;
4462
+ }
4463
+
4464
+ //copy.RestoreBigData(versiontable);
4465
+
4466
+ //assert(hashtable.isEmpty());
4467
+
4468
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4469
+// {
4470
+// //tab.user[i] = false;
4471
+// copy.versionlist[i] = null;
4472
+// }
4473
+
4474
+ SetVersionStates();
4475
+
4476
+ // test save
4477
+ if (false)
4478
+ {
4479
+ try
4480
+ {
4481
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
4482
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
4483
+
4484
+ p.writeObject(copy);
4485
+
4486
+ p.flush();
4487
+
4488
+ ostream.close();
4489
+ } catch (Exception e)
4490
+ {
4491
+ e.printStackTrace();
4492
+ }
4493
+ }
4494
+
4495
+ return !thesame;
4496
+ }
4497
+
4498
+ boolean flashIt = true;
4499
+
4500
+ void RefreshSelection()
4501
+ {
4502
+ Object3D selection = new Object3D();
4503
+
4504
+ for (int i = 0; i < copy.selection.size(); i++)
4505
+ {
4506
+ Object3D elem = copy.selection.elementAt(i);
4507
+
4508
+ Object3D obj = copy.GetObject(elem.GetUUID());
4509
+
4510
+ if (obj == null)
4511
+ {
4512
+ copy.selection.remove(i--);
4513
+ }
4514
+ else
4515
+ {
4516
+ selection.add(obj);
4517
+ copy.selection.setElementAt(obj, i);
4518
+ }
4519
+ }
4520
+
4521
+ flashIt = false;
4522
+ GetTree().clearSelection();
4523
+ for (int i = 0; i < selection.size(); i++)
4524
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4525
+ flashIt = true;
4526
+
4527
+ //refreshContents(false);
4528
+ }
4529
+
4530
+ void CopyChanged()
4531
+ {
4532
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4533
+
4534
+ SetVersionStates();
4535
+
4536
+ boolean temp = CameraPane.SWITCH;
4537
+ CameraPane.SWITCH = false;
4538
+
4539
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4540
+
4541
+ copy.clear();
4542
+
4543
+ copy.skyboxname = obj.skyboxname;
4544
+ copy.skyboxext = obj.skyboxext;
4545
+
4546
+ for (int i=0; i<obj.Size(); i++)
4547
+ {
4548
+ copy.add(obj.get(i));
4549
+ }
4550
+
4551
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4552
+
4553
+ CameraPane.SWITCH = temp;
4554
+
4555
+ RefreshSelection();
4556
+ //assert(hashtable.isEmpty());
4557
+
4558
+ copy.Touch();
4559
+
4560
+ ResetModel();
4561
+ copy.HardTouch(); // recompile?
4562
+
4563
+ cRadio ab;
4564
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4565
+ {
4566
+ ab = (cRadio)e.nextElement();
4567
+ Object3D test = copy.GetObject(ab.object.GetUUID());
4568
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4569
+ if (test != null)
4570
+ {
4571
+ test.editWindow = ab.object.editWindow;
4572
+ ab.object = test;
4573
+ }
4574
+ }
4575
+
4576
+ refreshContents(true);
4577
+ }
4578
+
4579
+ cButton previousVersionButton;
4580
+ cButton restoreButton;
4581
+ cButton replaceButton;
4582
+ cButton nextVersionButton;
4583
+ cButton saveVersionButton;
4584
+ cButton deleteVersionButton;
4585
+
4586
+ boolean muteSlider;
4587
+
4588
+ int VersionCount()
4589
+ {
4590
+ int count = 0;
4591
+
4592
+ for (int i = copy.versionlist.length; --i >= 0;)
4593
+ {
4594
+ if (copy.versionlist[i] != null)
4595
+ count++;
4596
+ }
4597
+
4598
+ return count;
4599
+ }
4600
+
4601
+ public cGridBag versionSliderPane;
4602
+
4603
+ void SetVersionStates()
4604
+ {
4605
+ //if (true)
4606
+ // return;
4607
+
4608
+ //cRadio tab = GetCurrentTab();
4609
+
4610
+ if (copy.versionlist == null)
4611
+ {
4612
+ saveVersionButton.setEnabled(false);
4613
+ restoreButton.setEnabled(false);
4614
+ replaceButton.setEnabled(false);
4615
+ previousVersionButton.setEnabled(false);
4616
+ nextVersionButton.setEnabled(false);
4617
+ deleteVersionButton.setEnabled(false);
4618
+ versionSliderPane.setVisible(false);
4619
+ }
4620
+ else
4621
+ {
4622
+ restoreButton.setEnabled(copy.versionindex != -1);
4623
+ replaceButton.setEnabled(copy.versionindex != -1);
4624
+
4625
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4626
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4627
+
4628
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4629
+ //copy.versionlist[copy.versionindex + 1] != null);
4630
+
4631
+ muteSlider = true;
4632
+ versionSlider.setMinimum(0);
4633
+ versionSlider.setMaximum(VersionCount() - 1);
4634
+ versionSlider.setInteger(copy.versionindex);
4635
+ versionSlider.setEnabled(copy.versionindex != -1);
4636
+ muteSlider = false;
4637
+
4638
+ versionSliderPane.setVisible(true);
4639
+ }
4640
+ }
4641
+
4642
+ public boolean PreviousVersion()
4643
+ {
4644
+ // Option?
4645
+ Replace();
4646
+
4647
+ System.err.println("Undo");
4648
+
4649
+ //cRadio tab = GetCurrentTab();
4650
+
4651
+ if (copy.versionindex == 0)
4652
+ {
4653
+ java.awt.Toolkit.getDefaultToolkit().beep();
4654
+ return false;
4655
+ }
4656
+
4657
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
4658
+// {
4659
+// if (Save(false))
4660
+// tab.versionindex -= 1;
4661
+// else
4662
+// {
4663
+// if (tab.versionindex <= 0)
4664
+// return false;
4665
+// else
4666
+// tab.versionindex -= 1;
4667
+// }
4668
+// }
4669
+
4670
+ copy.versionindex -= 1;
4671
+
4672
+ CopyChanged();
4673
+
4674
+ return true;
4675
+ }
4676
+
4677
+ public boolean Restore()
4678
+ {
4679
+ System.err.println("Restore");
4680
+
4681
+ //cRadio tab = GetCurrentTab();
4682
+
4683
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4684
+ {
4685
+ java.awt.Toolkit.getDefaultToolkit().beep();
4686
+ return false;
4687
+ }
4688
+
4689
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4690
+ CopyChanged();
4691
+
4692
+ return true;
4693
+ }
4694
+
4695
+ public boolean Replace()
4696
+ {
4697
+ //System.err.println("Replace");
4698
+
4699
+ //cRadio tab = GetCurrentTab();
4700
+
4701
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4702
+ {
4703
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4704
+ return false;
4705
+ }
4706
+
4707
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4708
+
4709
+ return true;
4710
+ }
4711
+
4712
+ public void NextVersion()
4713
+ {
4714
+ // Option?
4715
+ Replace();
4716
+
4717
+ //cRadio tab = GetCurrentTab();
4718
+
4719
+ if (copy.versionlist[copy.versionindex + 1] == null)
4720
+ {
4721
+ java.awt.Toolkit.getDefaultToolkit().beep();
4722
+ return;
4723
+ }
4724
+
4725
+ copy.versionindex += 1;
4726
+
4727
+ CopyChanged();
4728
+
4729
+ //if (!tab.user[tab.versionindex])
4730
+ // tab.graphs[tab.versionindex] = null;
4731
+ }
4732
+
4733
+ void ImportGFD()
4734
+ {
4735
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4736
+ browser.show();
4737
+ String filename = browser.getFile();
4738
+ if (filename != null && filename.length() > 0)
4739
+ {
4740
+ String fullname = browser.getDirectory() + filename;
4741
+
4742
+ //Object3D readobj =
4743
+ objEditor.ReadGFD(fullname, objEditor);
4744
+ //makeSomething(readobj);
4745
+ }
4746
+ }
4747
+
4748
+ void ImportVRMLX3D()
4749
+ {
4750
+ if (Grafreed.standAlone)
4751
+ {
4752
+ /**/
4753
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4754
+ browser.show();
4755
+ String filename = browser.getFile();
4756
+ if (filename != null && filename.length() > 0)
4757
+ {
4758
+ String fullname = browser.getDirectory() + filename;
4759
+ LoadVRMLX3D(fullname);
4760
+ }
4761
+ /**/
4762
+ }
4763
+ }
4764
+
32004765 void ToggleAnimation()
32014766 {
32024767 if (!Globals.ANIMATION)
....@@ -3212,8 +4777,8 @@
32124777
32134778 Globals.ANIMATION ^= true;
32144779
3215
- GrafreeD.wav.cursor = 0;
3216
- GrafreeD.wav.loop = 0;
4780
+ Grafreed.wav.cursor = 0;
4781
+ Grafreed.wav.loop = 0;
32174782 }
32184783 } else
32194784 {
....@@ -3234,7 +4799,6 @@
32344799 callee.refreshContents();
32354800 } else
32364801 {
3237
- new Exception().printStackTrace();
32384802 System.exit(0);
32394803 }
32404804 }
....@@ -3264,7 +4828,7 @@
32644828 void CreateMaterial()
32654829 {
32664830 //copy.ClearMaterial(); // PATCH
3267
- copy.CreateMaterialS(multiplyToggle.isSelected());
4831
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32684832 if (copy.selection.size() > 0)
32694833 //SetMaterial(copy);
32704834 {
....@@ -3315,7 +4879,7 @@
33154879 assert false;
33164880 }
33174881
3318
- void EditSelection()
4882
+ void EditSelection(boolean newWindow)
33194883 {
33204884 }
33214885
....@@ -3323,11 +4887,11 @@
33234887 {
33244888 copy.ResetBlockLoop(); // temporary problem
33254889
3326
- boolean random = CameraPane.RANDOM;
3327
- CameraPane.RANDOM = false; // parse everything
4890
+ boolean random = CameraPane.SWITCH;
4891
+ CameraPane.SWITCH = false; // parse everything
33284892 copy.ResetDisplayList();
33294893 copy.HardTouch();
3330
- CameraPane.RANDOM = random;
4894
+ CameraPane.SWITCH = random;
33314895 }
33324896
33334897 // public void applySelf()
....@@ -3357,6 +4921,12 @@
33574921 // else
33584922 // applySelf(true);
33594923 // }
4924
+
4925
+ boolean Equal(double a, double b)
4926
+ {
4927
+ return Math.abs(a - b) < 0.001;
4928
+ }
4929
+
33604930 void applySelf0(boolean name)
33614931 {
33624932 if (name)
....@@ -3374,7 +4944,7 @@
33744944 //copy.material = new cMaterial(copy.GetMaterial());
33754945
33764946 current.color = (float) colorField.getFloat();
3377
- current.modulation = (float) modulationField.getFloat();
4947
+ current.modulation = (float) saturationField.getFloat();
33784948 current.metalness = (float) metalnessField.getFloat();
33794949 current.diffuse = (float) diffuseField.getFloat();
33804950 current.specular = (float) specularField.getFloat();
....@@ -3394,6 +4964,7 @@
33944964 current.shadow = (float) shadowField.getFloat();
33954965 current.texture = (float) textureField.getFloat();
33964966 current.opacity = (float) opacityField.getFloat();
4967
+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
33974968 current.fakedepth = (float) fakedepthField.getFloat();
33984969 current.shadowbias = (float) shadowbiasField.getFloat();
33994970
....@@ -3401,6 +4972,61 @@
34014972 {
34024973 //System.out.println("Propagate = " + propagate);
34034974 copy.UpdateMaterial(anchor, current, propagate);
4975
+
4976
+ if (copy.material != null)
4977
+ {
4978
+ cMaterial mat = copy.material;
4979
+
4980
+ if (!Equal(colorField.getFloat(), mat.color))
4981
+ colorField.SetToolTipValue((mat.color));
4982
+ if (!Equal(saturationField.getFloat(), mat.modulation))
4983
+ saturationField.SetToolTipValue((mat.modulation));
4984
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
4985
+ metalnessField.SetToolTipValue((mat.metalness));
4986
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
4987
+ diffuseField.SetToolTipValue((mat.diffuse));
4988
+ if (!Equal(specularField.getFloat(), mat.specular))
4989
+ specularField.SetToolTipValue((mat.specular));
4990
+ if (!Equal(shininessField.getFloat(), mat.shininess))
4991
+ shininessField.SetToolTipValue((mat.shininess));
4992
+ if (!Equal(shiftField.getFloat(), mat.shift))
4993
+ shiftField.SetToolTipValue((mat.shift));
4994
+ if (!Equal(ambientField.getFloat(), mat.ambient))
4995
+ ambientField.SetToolTipValue((mat.ambient));
4996
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
4997
+ lightareaField.SetToolTipValue((mat.lightarea));
4998
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
4999
+ diffusenessField.SetToolTipValue((mat.factor));
5000
+ if (!Equal(velvetField.getFloat(), mat.velvet))
5001
+ velvetField.SetToolTipValue((mat.velvet));
5002
+ if (!Equal(sheenField.getFloat(), mat.sheen))
5003
+ sheenField.SetToolTipValue((mat.sheen));
5004
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
5005
+ subsurfaceField.SetToolTipValue((mat.subsurface));
5006
+ if (!Equal(backlitField.getFloat(), mat.bump))
5007
+ backlitField.SetToolTipValue((mat.bump));
5008
+ if (!Equal(anisoField.getFloat(), mat.aniso))
5009
+ anisoField.SetToolTipValue((mat.aniso));
5010
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
5011
+ anisoVField.SetToolTipValue((mat.anisoV));
5012
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
5013
+ cameraField.SetToolTipValue((mat.cameralight));
5014
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
5015
+ selfshadowField.SetToolTipValue((mat.diffuseness));
5016
+ if (!Equal(shadowField.getFloat(), mat.shadow))
5017
+ shadowField.SetToolTipValue((mat.shadow));
5018
+ if (!Equal(textureField.getFloat(), mat.texture))
5019
+ textureField.SetToolTipValue((mat.texture));
5020
+ if (!Equal(opacityField.getFloat(), mat.opacity))
5021
+ opacityField.SetToolTipValue((mat.opacity));
5022
+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
5023
+ parallaxField.SetToolTipValue((mat.parallax));
5024
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
5025
+ fakedepthField.SetToolTipValue((mat.fakedepth));
5026
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
5027
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
5028
+ }
5029
+
34045030 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34055031 {
34065032 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3429,9 +5055,28 @@
34295055 //copy.Touch();
34305056 }
34315057
5058
+ cNumberSlider versionSlider;
5059
+
34325060 public void stateChanged(ChangeEvent e)
34335061 {
3434
- // assert(false);
5062
+ // assert(false);
5063
+ if (e.getSource() == versionSlider)
5064
+ {
5065
+ if (muteSlider)
5066
+ return;
5067
+
5068
+ Replace();
5069
+
5070
+ int version = versionSlider.getInteger();
5071
+
5072
+ if (version != -1 && copy.versionlist[version] != null)
5073
+ {
5074
+ copy.versionindex = version;
5075
+ CopyChanged();
5076
+ }
5077
+
5078
+ return;
5079
+ }
34355080
34365081 if (freezematerial)
34375082 {
....@@ -3467,6 +5112,12 @@
34675112 {
34685113 //System.out.println("stateChanged = " + this);
34695114 materialtouched = true;
5115
+
5116
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
5117
+ {
5118
+ saturationField.setFloat(1);
5119
+ }
5120
+
34705121 applySelf();
34715122 //System.out.println("this = " + this);
34725123 //System.out.println("PARENT = " + parent);
....@@ -3516,7 +5167,7 @@
35165167 }
35175168
35185169 if (normalpushField != null)
3519
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
5170
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35205171 }
35215172
35225173 void SnapObject()
....@@ -3766,6 +5417,7 @@
37665417 {
37675418 if (GetTree() != null)
37685419 {
5420
+ GetTree().revalidate();
37695421 GetTree().repaint();
37705422 }
37715423
....@@ -3774,12 +5426,19 @@
37745426 ctrlPanel.validate(); // ? new
37755427 ctrlPanel.repaint();
37765428 }
5429
+
5430
+ if (previousVersionButton != null && copy.versionlist != null)
5431
+ SetVersionStates();
5432
+
5433
+ cameraView.requestFocusInWindow();
37775434 }
37785435
37795436 static TweenManager tweenManager = new TweenManager();
37805437
37815438 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
37825439 {
5440
+ if (Globals.REPLACEONMAKE) // && resetmodel)
5441
+ Save();
37835442 //Tween.set(thing, 0).target(1).start(tweenManager);
37845443 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
37855444 // if (thing instanceof GenericJointDemo)
....@@ -3803,7 +5462,7 @@
38035462 // group = (Composite) group.get(0);
38045463 // }
38055464
3806
- System.out.println("makeSomething of " + thing);
5465
+ //System.out.println("makeSomething of " + thing);
38075466
38085467 /*
38095468 if (deselect && jList != null)
....@@ -3866,6 +5525,12 @@
38665525 {
38675526 ResetModel();
38685527 Select(thing.GetTreePath(), true, false); // unselect... false);
5528
+
5529
+ if (thing.Size() == 0)
5530
+ {
5531
+ //EditSelection(false);
5532
+ }
5533
+
38695534 refreshContents();
38705535 }
38715536
....@@ -3983,6 +5648,7 @@
39835648 }
39845649 }
39855650 }
5651
+
39865652 LoadGFDThread loadGFDThread;
39875653
39885654 void ReadGFD(String fullname, iCallBack cb)
....@@ -4002,8 +5668,10 @@
40025668
40035669 try
40045670 {
5671
+ // Try compressed version first.
40055672 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4006
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
5673
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
5674
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40075675
40085676 readobj = (Object3D) p.readObject();
40095677 istream.close();
....@@ -4011,7 +5679,22 @@
40115679 readobj.ResetDisplayList();
40125680 } catch (Exception e)
40135681 {
4014
- e.printStackTrace();
5682
+ if (!e.toString().contains("GZIP"))
5683
+ e.printStackTrace();
5684
+
5685
+ try
5686
+ {
5687
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
5688
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
5689
+
5690
+ readobj = (Object3D) p.readObject();
5691
+ istream.close();
5692
+
5693
+ readobj.ResetDisplayList();
5694
+ } catch (Exception e2)
5695
+ {
5696
+ e2.printStackTrace();
5697
+ }
40155698 }
40165699 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40175700 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4057,6 +5740,12 @@
40575740
40585741 void LoadIt(Object obj)
40595742 {
5743
+ if (obj == null)
5744
+ {
5745
+ // Invalid file
5746
+ return;
5747
+ }
5748
+
40605749 System.out.println("Loaded " + obj);
40615750 //new Exception().printStackTrace();
40625751 Object3D readobj = (Object3D) obj;
....@@ -4066,10 +5755,14 @@
40665755
40675756 if (readobj != null)
40685757 {
5758
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5759
+ // Save();
40695760 try
40705761 {
40715762 //readobj.deepCopySelf(copy);
40725763 copy.clear(); // june 2014
5764
+ copy.skyboxname = readobj.skyboxname;
5765
+ copy.skyboxext = readobj.skyboxext;
40735766 for (int i = 0; i < readobj.size(); i++)
40745767 {
40755768 Object3D child = readobj.get(i); // reserve(i);
....@@ -4110,6 +5803,7 @@
41105803 }
41115804 } catch (ClassCastException e)
41125805 {
5806
+ e.printStackTrace();
41135807 assert (false);
41145808 Composite c = (Composite) copy;
41155809 c.children.clear();
....@@ -4120,17 +5814,32 @@
41205814 c.addChild(csg);
41215815 }
41225816
5817
+ copy.versionlist = readobj.versionlist;
5818
+ copy.versionindex = readobj.versionindex;
5819
+ copy.versiontable = readobj.versiontable;
5820
+
5821
+ if (copy.versionlist == null)
5822
+ {
5823
+ // Backward compatibility
5824
+ copy.versionlist = new Object3D[100];
5825
+ copy.versionindex = -1;
5826
+
5827
+ //Save(true);
5828
+ }
5829
+
5830
+ //? SetUndoStates();
5831
+
41235832 ResetModel();
41245833 copy.HardTouch(); // recompile?
41255834 refreshContents();
41265835 }
41275836 }
41285837
4129
- void load() // throws ClassNotFoundException
5838
+ void Open() // throws ClassNotFoundException
41305839 {
4131
- if (GrafreeD.standAlone)
5840
+ if (Grafreed.standAlone)
41325841 {
4133
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5842
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
41345843 browser.show();
41355844 String filename = browser.getFile();
41365845 if (filename != null && filename.length() > 0)
....@@ -4207,6 +5916,8 @@
42075916
42085917 void save()
42095918 {
5919
+ Replace();
5920
+
42105921 if (lastname == null)
42115922 {
42125923 return;
....@@ -4215,11 +5926,13 @@
42155926 try
42165927 {
42175928 FileOutputStream ostream = new FileOutputStream(lastname);
4218
- ObjectOutputStream p = new ObjectOutputStream(ostream);
5929
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5930
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42195931
42205932 p.writeObject(copy);
42215933 p.flush();
42225934
5935
+ zstream.close();
42235936 ostream.close();
42245937
42255938 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4227,19 +5940,23 @@
42275940 //ps.print(buffer.toString());
42285941 } catch (IOException e)
42295942 {
5943
+ e.printStackTrace();
42305944 }
42315945 }
5946
+
42325947 String lastname;
42335948
42345949 void saveAs()
42355950 {
4236
- if (GrafreeD.standAlone)
5951
+ if (Grafreed.standAlone)
42375952 {
42385953 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42395954 browser.setVisible(true);
42405955 String filename = browser.getFile();
42415956 if (filename != null && filename.length() > 0)
42425957 {
5958
+ if (!filename.endsWith(".gfd"))
5959
+ filename += ".gfd";
42435960 lastname = browser.getDirectory() + filename;
42445961 save();
42455962 }
....@@ -4338,13 +6055,13 @@
43386055 try
43396056 {
43406057 FileOutputStream ostream = new FileOutputStream(filename);
4341
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4342
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
6058
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
6059
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43436060
43446061 Object3D objectparent = obj.parent;
43456062 obj.parent = null;
43466063
4347
- Object3D object = (Object3D) GrafreeD.clone(obj);
6064
+ Object3D object = (Object3D) Grafreed.clone(obj);
43486065
43496066 obj.parent = objectparent;
43506067
....@@ -4356,8 +6073,8 @@
43566073 p.writeObject(object);
43576074 p.flush();
43586075
6076
+ zstream.close();
43596077 ostream.close();
4360
- // zstream.close();
43616078
43626079 // group.selection.get(0).parent = parent;
43636080 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4378,7 +6095,7 @@
43786095 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43796096 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43806097 copy.generatePOV(buffer);
4381
- if (GrafreeD.standAlone)
6098
+ if (Grafreed.standAlone)
43826099 {
43836100 FileDialog browser = new FileDialog(frame, "Export POV", 1);
43846101 browser.show();
....@@ -4404,19 +6121,18 @@
44046121 Object3D client;
44056122 Object3D copy;
44066123 MenuBar menuBar;
4407
- Menu windowMenu;
4408
- MenuItem loadItem;
6124
+ Menu fileMenu;
6125
+ MenuItem newItem;
6126
+ MenuItem openItem;
44096127 MenuItem saveItem;
44106128 MenuItem saveAsItem;
44116129 MenuItem exportAsItem;
44126130 MenuItem reexportItem;
44136131 MenuItem povItem;
44146132 MenuItem closeItem;
4415
- Menu cameraMenu;
6133
+
44166134 CheckboxMenuItem zBufferItem;
44176135 //MenuItem normalLensItem;
4418
- MenuItem editCameraItem;
4419
- MenuItem revertCameraItem;
44206136 MenuItem stepItem;
44216137 CheckboxMenuItem toggleLiveItem;
44226138 CheckboxMenuItem toggleFullScreenItem;
....@@ -4427,25 +6143,41 @@
44276143 CheckboxMenuItem toggleFootContactItem;
44286144 CheckboxMenuItem toggleDLItem;
44296145 CheckboxMenuItem toggleTextureItem;
4430
- CheckboxMenuItem toggleRandomItem;
6146
+ CheckboxMenuItem toggleSwitchItem;
44316147 CheckboxMenuItem toggleRootItem;
44326148 CheckboxMenuItem animationItem;
6149
+ MenuItem archiveItem;
44336150 CheckboxMenuItem toggleHandleItem;
44346151 CheckboxMenuItem togglePaintItem;
44356152 JSplitPane mainPanel;
44366153 JScrollPane scrollpane;
6154
+
44376155 JPanel toolbarPanel;
6156
+
44386157 cGridBag treePanel;
6158
+
44396159 JPanel radioPanel;
44406160 ButtonGroup buttonGroup;
4441
- cGridBag ctrlPanel;
6161
+
6162
+ cGridBag toolboxPanel;
6163
+ cGridBag skyboxPanel;
44426164 cGridBag materialPanel;
6165
+ cGridBag ctrlPanel;
6166
+
44436167 JScrollPane infoPanel;
6168
+
44446169 cGridBag optionsPanel;
6170
+
44456171 JTabbedPane objectPanel;
6172
+ boolean materialFlushed;
6173
+ Object3D latestObject;
6174
+
6175
+ cGridBag transformPanel;
44466176 cGridBag XYZPanel;
6177
+
44476178 JSplitPane gridPanel;
44486179 JSplitPane bigPanel;
6180
+
44496181 cGridBag bigThree;
44506182 cGridBag scenePanel;
44516183 cGridBag centralPanel;
....@@ -4503,7 +6235,7 @@
45036235 JLabel colorLabel;
45046236 cNumberSlider colorField;
45056237 JLabel modulationLabel;
4506
- cNumberSlider modulationField;
6238
+ cNumberSlider saturationField;
45076239 JLabel metalnessLabel;
45086240 cNumberSlider metalnessField;
45096241 JLabel diffuseLabel;
....@@ -4534,6 +6266,7 @@
45346266 cNumberSlider anisoField;
45356267 JLabel anisoVLabel;
45366268 cNumberSlider anisoVField;
6269
+
45376270 JLabel cameraLabel;
45386271 cNumberSlider cameraField;
45396272 JLabel selfshadowLabel;
....@@ -4544,10 +6277,13 @@
45446277 cNumberSlider textureField;
45456278 JLabel opacityLabel;
45466279 cNumberSlider opacityField;
6280
+ JLabel parallaxLabel;
6281
+ cNumberSlider parallaxField;
45476282 JLabel fakedepthLabel;
45486283 cNumberSlider fakedepthField;
45496284 JLabel shadowbiasLabel;
45506285 cNumberSlider shadowbiasField;
6286
+
45516287 JLabel bumpLabel;
45526288 cNumberSlider bumpField;
45536289 JLabel noiseLabel;
....@@ -4560,8 +6296,13 @@
45606296 cNumberSlider fogField;
45616297 JLabel opacityPowerLabel;
45626298 cNumberSlider opacityPowerField;
4563
- JTree jTree;
6299
+ cTree jTree;
45646300 //ObjectUI parent;
45656301
45666302 cNumberSlider normalpushField;
6303
+
6304
+ private MenuItem importGFDItem;
6305
+ private MenuItem importVRMLX3DItem;
6306
+ private MenuItem import3DSItem;
6307
+ private MenuItem importOBJItem;
45676308 }