Normand Briere
2019-06-29 a69bb4474a3264a9a7a7f8b8d8154ea771f167c8
ObjEditor.java
....@@ -4,6 +4,7 @@
44
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -14,10 +15,15 @@
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
1617
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1721 //import javax.media.opengl.GLCanvas;
1822
1923 import //weka.core.
2024 matrix.Matrix;
25
+
26
+import grafeme.ui.*;
2127
2228 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2329 ActionListener, ChangeListener,
....@@ -28,7 +34,73 @@
2834 iSendInfo
2935 //KeyListener
3036 {
37
+ boolean timeline;
38
+ boolean wasFullScreen;
3139
40
+ GroupEditor callee;
41
+ JFrame frame;
42
+
43
+ static ObjEditor theFrame;
44
+
45
+ cButton GetButton(String name, boolean border)
46
+ {
47
+ try
48
+ {
49
+ ImageIcon icon = GetIcon(name);
50
+ return new cButton(icon, border);
51
+ }
52
+ catch (Exception e)
53
+ {
54
+ return new cButton(name, border);
55
+ }
56
+ }
57
+
58
+ cToggleButton GetToggleButton(String name, boolean border)
59
+ {
60
+ try
61
+ {
62
+ ImageIcon icon = GetIcon(name);
63
+ return new cToggleButton(icon, border);
64
+ }
65
+ catch (Exception e)
66
+ {
67
+ return new cToggleButton(name, border);
68
+ }
69
+ }
70
+
71
+ cCheckBox GetCheckBox(String name, boolean border)
72
+ {
73
+ try
74
+ {
75
+ ImageIcon icon = GetIcon(name);
76
+ return new cCheckBox(icon, border);
77
+ }
78
+ catch (Exception e)
79
+ {
80
+ return new cCheckBox(name, border);
81
+ }
82
+ }
83
+
84
+ private ImageIcon GetIcon(String name) throws IOException
85
+ {
86
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
+
88
+ if (image.getWidth() != 24 && image.getHeight() != 24)
89
+ {
90
+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
+ Graphics2D g = resized.createGraphics();
92
+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
+ g.dispose();
96
+
97
+ image = resized;
98
+ }
99
+
100
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
+ return icon;
102
+ }
103
+
32104 // SCRIPT
33105
34106 transient JFrame textpanel = null;
....@@ -119,51 +191,62 @@
119191 void keyPressed(int key, int modifiers)
120192 {
121193 System.out.println("KEY PRESSED");
122
- CameraPane.theRenderer.keyPressed(key, modifiers);
194
+ Globals.theRenderer.keyPressed(key, modifiers);
123195 }
124196 */
125197
126198 static GridBagConstraints aConstraints;
127199 static GridBagConstraints aWindowConstraints;
128
- GroupEditor callee;
129
- JFrame frame;
200
+
130201 static int GRIDWIDTH = 100; // 4;
131202
132203 public void closeUI()
133204 {
134205 //new Exception().printStackTrace();
135
- System.out.println("this = " + this);
136
- System.out.println("objEditor = " + objEditor);
206
+// System.out.println("this = " + this);
207
+// System.out.println("objEditor = " + objEditor);
137208 //nameField.removeActionListener(this);
138
- objEditor.ctrlPanel.remove(nameField);
209
+// objEditor.ctrlPanel.remove(nameField);
139210
140
- if (!GroupEditor.allparams)
211
+ objEditor.ctrlPanel.remove(namePanel);
212
+
213
+ if (!allparams)
141214 return;
142215
143
- objEditor.ctrlPanel.remove(liveCB);
144
- objEditor.ctrlPanel.remove(hideCB);
145
- objEditor.ctrlPanel.remove(markCB);
146
-
147
- objEditor.ctrlPanel.remove(randomCB);
148
- objEditor.ctrlPanel.remove(speedupCB);
149
- objEditor.ctrlPanel.remove(rewindCB);
150
-
151
- objEditor.ctrlPanel.remove(resetButton);
152
- objEditor.ctrlPanel.remove(stepButton);
153
-// objEditor.ctrlPanel.remove(stepAllButton);
154
-// objEditor.ctrlPanel.remove(resetAllButton);
155
- objEditor.ctrlPanel.remove(link2masterCB);
156
- //objEditor.ctrlPanel.remove(flipVCB);
157
- //objEditor.ctrlPanel.remove(texresMenu);
158
- objEditor.ctrlPanel.remove(slowerButton);
159
- objEditor.ctrlPanel.remove(fasterButton);
160
- objEditor.ctrlPanel.remove(remarkButton);
216
+// objEditor.ctrlPanel.remove(liveCB);
217
+// objEditor.ctrlPanel.remove(hideCB);
218
+// objEditor.ctrlPanel.remove(markCB);
219
+//
220
+// objEditor.ctrlPanel.remove(randomCB);
221
+// objEditor.ctrlPanel.remove(speedupCB);
222
+// objEditor.ctrlPanel.remove(rewindCB);
223
+//
224
+// objEditor.ctrlPanel.remove(resetButton);
225
+// objEditor.ctrlPanel.remove(stepButton);
226
+//// objEditor.ctrlPanel.remove(stepAllButton);
227
+//// objEditor.ctrlPanel.remove(resetAllButton);
228
+// objEditor.ctrlPanel.remove(link2masterCB);
229
+// //objEditor.ctrlPanel.remove(flipVCB);
230
+// //objEditor.ctrlPanel.remove(texresMenu);
231
+// objEditor.ctrlPanel.remove(slowerButton);
232
+// objEditor.ctrlPanel.remove(fasterButton);
233
+// objEditor.ctrlPanel.remove(remarkButton);
234
+
235
+ objEditor.ctrlPanel.remove(setupPanel);
236
+ objEditor.ctrlPanel.remove(setupPanel2);
237
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
238
+ objEditor.ctrlPanel.remove(pushPanel);
239
+ //objEditor.ctrlPanel.remove(fillPanel);
240
+
241
+ //Remove(normalpushField);
161242 }
162243
163244 public ObjEditor GetEditor()
164245 {
165246 return objEditor; //.GetEditor();
166247 }
248
+
249
+ // Sometimes myself, sometimes my callee's.
167250 ObjEditor objEditor;
168251
169252 /*
....@@ -226,6 +309,7 @@
226309 //localCopy.parent = null;
227310
228311 frame = new JFrame();
312
+ frame.setUndecorated(true);
229313 objEditor = this;
230314 this.callee = callee;
231315
....@@ -238,7 +322,7 @@
238322 //if (!isDisplayable())
239323 //setUndecorated(true);
240324
241
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
325
+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242326 client = inClient;
243327 copy = localCopy;
244328 copy.editWindow = this;
....@@ -256,27 +340,48 @@
256340 return frame.action(event, obj);
257341 }
258342
343
+ // Cannot work without static
344
+ static boolean allparams = true;
345
+
346
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
259348 void SetupMenu()
260349 {
261350 frame.setMenuBar(menuBar = new MenuBar());
262
- menuBar.add(windowMenu = new Menu("File"));
263
- windowMenu.add(loadItem = new MenuItem("Load..."));
264
- windowMenu.add("-");
265
- windowMenu.add(saveItem = new MenuItem("Save"));
266
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
351
+ menuBar.add(fileMenu = new Menu("File"));
352
+ fileMenu.add(newItem = new MenuItem("New"));
353
+ fileMenu.add(loadItem = new MenuItem("Open..."));
354
+
355
+ //oe.menuBar.add(menu = new Menu("Include"));
356
+ Menu menu = new Menu("Import");
357
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
358
+ importOBJItem.addActionListener(this);
359
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
360
+ import3DSItem.addActionListener(this);
361
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
362
+ importVRMLX3DItem.addActionListener(this);
363
+ menu.add("-");
364
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
365
+ importGFDItem.addActionListener(this);
366
+ fileMenu.add(menu);
367
+ fileMenu.add("-");
368
+
369
+ fileMenu.add(saveItem = new MenuItem("Save"));
370
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267371 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268
- windowMenu.add("-");
269
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271
- windowMenu.add("-");
372
+ fileMenu.add("-");
373
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
374
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
375
+ fileMenu.add("-");
272376 if (client.parent != null)
273377 {
274
- windowMenu.add(closeItem = new MenuItem("Close"));
378
+ fileMenu.add(closeItem = new MenuItem("Close"));
275379 } else
276380 {
277
- windowMenu.add(closeItem = new MenuItem("Exit"));
381
+ fileMenu.add(closeItem = new MenuItem("Exit"));
278382 }
279383
384
+ newItem.addActionListener(this);
280385 loadItem.addActionListener(this);
281386 saveItem.addActionListener(this);
282387 saveAsItem.addActionListener(this);
....@@ -285,79 +390,66 @@
285390 //povItem.addActionListener(this);
286391 closeItem.addActionListener(this);
287392
288
- menuBar.add(cameraMenu = new Menu("View"));
289
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290
- //zBufferItem.addActionListener(this);
291
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292
- //normalLensItem.addActionListener(this);
293
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294
- revertCameraItem.addActionListener(this);
295
- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
- toggleFullItem.addItemListener(this);
297
- toggleFullItem.setState(CameraPane.FULLSCREEN);
298
- cameraMenu.add("-");
299
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300
- toggleTextureItem.addItemListener(this);
301
- toggleTextureItem.setState(CameraPane.textureon);
302
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303
- toggleLiveItem.addItemListener(this);
304
- toggleLiveItem.setState(CameraPane.isLIVE());
305
- cameraMenu.add(stepItem = new MenuItem("Step"));
306
- stepItem.addActionListener(this);
307
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308
-// toggleDLItem.addItemListener(this);
309
-// toggleDLItem.setState(false);
310
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311
- toggleRenderItem.addItemListener(this);
312
- toggleRenderItem.setState(!CameraPane.frozen);
313
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314
- toggleDebugItem.addItemListener(this);
315
- toggleDebugItem.setState(CameraPane.DEBUG);
316
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317
- toggleFrustumItem.addItemListener(this);
318
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320
- toggleFootContactItem.addItemListener(this);
321
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323
- toggleRandomItem.addItemListener(this);
324
- toggleRandomItem.setState(CameraPane.RANDOM);
325
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326
- toggleHandleItem.addItemListener(this);
327
- toggleHandleItem.setState(CameraPane.HANDLES);
328
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329
- togglePaintItem.addItemListener(this);
330
- togglePaintItem.setState(CameraPane.PAINTMODE);
331
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332
-// toggleRootItem.addItemListener(this);
333
-// toggleRootItem.setState(false);
334
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335
-// animationItem.addItemListener(this);
336
-// animationItem.setState(CameraPane.ANIMATION);
337
- cameraMenu.add("-");
338
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339
- editCameraItem.addActionListener(this);
340
-
341393 objectPanel = new JTabbedPane();
394
+
395
+ ChangeListener changeListener = new ChangeListener()
396
+ {
397
+ public void stateChanged(ChangeEvent changeEvent)
398
+ {
399
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
400
+// {
401
+// if (latestObject != null)
402
+// {
403
+// refreshContents(true);
404
+// SetMaterial(latestObject);
405
+// }
406
+//
407
+// materialFlushed = true;
408
+// }
409
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
410
+// {
411
+// if (listUI.size() == 0)
412
+// EditSelection(false);
413
+// }
414
+
415
+ refreshContents(false); // To refresh Info tab
416
+ }
417
+ };
418
+ objectPanel.addChangeListener(changeListener);
419
+
342420 toolbarPanel = new JPanel();
343421 toolbarPanel.setName("Toolbar");
344
- treePanel = new JPanel();
422
+ treePanel = new cGridBag();
345423 treePanel.setName("Tree");
346
- ctrlPanel = new JPanel(); // new GridBagLayout());
347
- ctrlPanel.setName("Edit");
348
- materialPanel = new JPanel();
424
+
425
+ editPanel = new cGridBag().setVertical(true);
426
+ editPanel.setName("Edit");
427
+
428
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429
+
430
+ editCommandsPanel = new cGridBag();
431
+ editPanel.add(editCommandsPanel);
432
+ editPanel.add(ctrlPanel);
433
+
434
+ toolboxPanel = new cGridBag().setVertical(false);
435
+ toolboxPanel.setName("Toolbox");
436
+
437
+ materialPanel = new cGridBag().setVertical(true);
349438 materialPanel.setName("Material");
439
+
350440 /*JTextPane*/
351441 infoarea = createTextPane();
442
+ doc = infoarea.getStyledDocument();
443
+
352444 infoarea.setEditable(true);
353445 SetText();
354446 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355447 // infoarea.setOpaque(false);
356448 // //infoarea.setForeground(textcolor);
357
- infoarea.setLineWrap(true);
358
- infoarea.setWrapStyleWord(true);
449
+// TEXTAREA infoarea.setLineWrap(true);
450
+// TEXTAREA infoarea.setWrapStyleWord(true);
359451 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360
- infoPanel.setPreferredSize(new Dimension(50, 200));
452
+ //infoPanel.setPreferredSize(new Dimension(50, 200));
361453 infoPanel.setName("Info");
362454 //infoPanel.setLayout(new BorderLayout());
363455 //infoPanel.add(createTextPane());
....@@ -366,16 +458,23 @@
366458 mainPanel.setName("Main");
367459 mainPanel.setContinuousLayout(true);
368460 mainPanel.setOneTouchExpandable(true);
369
- mainPanel.setDividerLocation(1.0);
370461 mainPanel.setDividerSize(9);
371
- mainPanel.setResizeWeight(0);
372
-
462
+ mainPanel.setDividerLocation(0.5); //1.0);
463
+ mainPanel.setResizeWeight(0.5);
464
+
465
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+ divider.setDividerSize(15);
468
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
469
+
470
+ mainPanel.setUI(new BasicSplitPaneUI());
471
+
373472 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374473 //mainPanel.setLayout(new GridBagLayout());
375474 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376
- treePanel.setLayout(new GridBagLayout());
377
- ctrlPanel.setLayout(new GridBagLayout());
378
- materialPanel.setLayout(new GridBagLayout());
475
+// treePanel.setLayout(new GridBagLayout());
476
+ //ctrlPanel.setLayout(new GridBagLayout());
477
+ //materialPanel.setLayout(new GridBagLayout());
379478
380479 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381480 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -414,7 +513,7 @@
414513 static String newline = "\n";
415514 protected static final String buttonString = "JButton";
416515 StyledDocument doc;
417
- JTextArea infoarea;
516
+ JTextPane infoarea;
418517
419518 void ClearInfo()
420519 {
....@@ -437,10 +536,10 @@
437536 e.printStackTrace();
438537 }
439538
440
- String selection = infoarea.getText();
441
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442
- java.awt.datatransfer.Clipboard clipboard =
443
- Toolkit.getDefaultToolkit().getSystemClipboard();
539
+// String selection = infoarea.getText();
540
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
541
+// java.awt.datatransfer.Clipboard clipboard =
542
+// Toolkit.getDefaultToolkit().getSystemClipboard();
444543 //clipboard.setContents(data, data);
445544 }
446545
....@@ -463,13 +562,13 @@
463562 //SendInfo("Name:", "bold");
464563 if (sel.GetTextures() != null || debug)
465564 {
466
- si.SendInfo(sel.toString(), "bold");
565
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467566 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468567 if (sel.Size() > 0)
469568 {
470569 si.SendInfo("#children = " + sel.Size(), "regular");
471570 }
472
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
571
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473572 if (debug)
474573 {
475574 try
....@@ -481,7 +580,10 @@
481580 }
482581
483582 if (full)
484
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
583
+ {
584
+ si.SendInfo(" BBox min: " + minima, "regular");
585
+ si.SendInfo(" BBox max: " + maxima, "regular");
586
+ }
485587
486588 if (sel.bRep != null)
487589 {
....@@ -508,7 +610,7 @@
508610 }
509611 if (sel.support != null)
510612 {
511
- si.SendInfo(" support: " + sel.support, "regular");
613
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512614 }
513615 if (sel.scriptnode != null)
514616 {
....@@ -522,18 +624,18 @@
522624 maxima.y = sel.toParent[3][1];
523625 maxima.z = sel.toParent[3][2];
524626 si.SendInfo(" Orig: " + maxima, "regular");
525
- maxima.x = sel.globalTransform[3][0];
526
- maxima.y = sel.globalTransform[3][1];
527
- maxima.z = sel.globalTransform[3][2];
528
- if (full)
529
- si.SendInfo(" Global Orig: " + maxima, "regular");
530627 maxima.x = sel.toParent[0][0];
531628 maxima.y = sel.toParent[1][1];
532629 maxima.z = sel.toParent[2][2];
533630 si.SendInfo(" Scale: " + maxima, "regular");
534
- maxima.x = sel.globalTransform[0][0];
535
- maxima.y = sel.globalTransform[1][1];
536
- maxima.z = sel.globalTransform[2][2];
631
+ maxima.x = sel.globalTransform[3][0];
632
+ maxima.y = sel.globalTransform[3][1];
633
+ maxima.z = sel.globalTransform[3][2];
634
+ if (full)
635
+ si.SendInfo(" Global Orig: " + maxima, "regular");
636
+ maxima.x = sel.globalTransform[0][0];
637
+ maxima.y = sel.globalTransform[1][1];
638
+ maxima.z = sel.globalTransform[2][2];
537639 if (full)
538640 si.SendInfo(" Global Scale: " + maxima, "regular");
539641 }
....@@ -579,6 +681,9 @@
579681 {
580682 CameraPane.pointflow = (PointFlow) sel;
581683 }
684
+
685
+ si.SendInfo("_____________________", "regular");
686
+ si.SendInfo("", "regular");
582687 }
583688 }
584689
....@@ -594,52 +699,159 @@
594699 }
595700 }
596701
597
- private JTextArea createTextPane()
598
- {
599
- String[] initString =
600
- {
601
- "This is an editable JTextPane, ", //regular
602
- "another ", //italic
603
- "styled ", //bold
604
- "text ", //small
605
- "component, ", //large
606
- "which supports embedded components..." + newline,//regular
607
- " " + newline, //button
608
- "...and embedded icons..." + newline, //regular
609
- " ", //icon
610
- newline + "JTextPane is a subclass of JEditorPane that "
611
- + "uses a StyledEditorKit and StyledDocument, and provides "
612
- + "cover methods for interacting with those objects."
613
- };
702
+static GraphicsDevice device = GraphicsEnvironment
703
+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
614704
615
- String[] initStyles =
616
- {
617
- "regular", "italic", "bold", "small", "large",
618
- "regular", "button", "regular", "icon",
619
- "regular"
620
- };
705
+ Rectangle keeprect;
706
+ cRadio radio;
707
+
708
+cButton keepButton;
709
+ cButton twoButton; // Full 3D
710
+ cButton sixButton;
711
+ cButton threeButton;
712
+ cButton sevenButton;
713
+ cButton fourButton; // full panel
714
+ cButton oneButton; // full XYZ
715
+ //cButton currentLayout;
716
+
717
+ boolean maximized;
718
+
719
+ cButton fullscreenLayout;
621720
622
- JTextPane textPane = new JTextPane();
623
- textPane.setEditable(true);
624
- /*StyledDocument*/ doc = textPane.getStyledDocument();
625
- addStylesToDocument(doc);
626
-
627
- try
721
+ void Minimize()
628722 {
629
- for (int j = 0; j < 2; j++)
723
+ frame.setState(Frame.ICONIFIED);
724
+ frame.validate();
725
+ }
726
+
727
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
728
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
729
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
730
+ void Maximize()
731
+ {
732
+ if (CameraPane.FULLSCREEN)
630733 {
631
- for (int i = 0; i < initString.length; i++)
632
- {
633
- doc.insertString(doc.getLength(), initString[i],
634
- doc.getStyle(initStyles[i]));
635
- }
734
+ ToggleFullScreen();
636735 }
637
- } catch (BadLocationException ble)
736
+
737
+ if (maximized)
738
+ {
739
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
740
+ }
741
+ else
742
+ {
743
+ keeprect = frame.getBounds();
744
+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
+ Dimension rect2 = frame.getToolkit().getScreenSize();
746
+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
747
+// frame.setState(Frame.MAXIMIZED_BOTH);
748
+ }
749
+
750
+ maximized ^= true;
751
+
752
+ frame.validate();
753
+ }
754
+
755
+ cButton minButton;
756
+ cButton maxButton;
757
+ cButton fullButton;
758
+
759
+ void ToggleFullScreen()
638760 {
639
- System.err.println("Couldn't insert initial text into text pane.");
761
+ cameraView.ToggleFullScreen();
762
+
763
+ if (!CameraPane.FULLSCREEN)
764
+ {
765
+ device.setFullScreenWindow(null);
766
+ frame.validate();
767
+
768
+ //frame.setVisible(false);
769
+// frame.removeNotify();
770
+// frame.setUndecorated(false);
771
+// frame.addNotify();
772
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
773
+
774
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
775
+// X framePanel.add(bigThree);
776
+// X frame.getContentPane().add(/*"Center",*/framePanel);
777
+ framePanel.setDividerLocation(1);
778
+
779
+ //frame.setVisible(true);
780
+ radio.layout = keepButton;
781
+ //theFrame = null;
782
+ keepButton = null;
783
+ radio.layout.doClick();
784
+
785
+ } else
786
+ {
787
+ keepButton = radio.layout;
788
+ //keeprect = frame.getBounds();
789
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
790
+// frame.getToolkit().getScreenSize().height);
791
+ //frame.setVisible(false);
792
+ device.setFullScreenWindow(frame);
793
+ frame.validate();
794
+// frame.removeNotify();
795
+// frame.setUndecorated(true);
796
+// frame.addNotify();
797
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
798
+// X framePanel.remove(bigThree);
799
+// X frame.getContentPane().add(/*"Center",*/bigThree);
800
+ framePanel.setDividerLocation(0);
801
+
802
+ radio.layout = fullscreenLayout;
803
+ radio.layout.doClick();
804
+ //frame.setVisible(true);
805
+ }
806
+ frame.validate();
640807 }
641808
642
- return new JTextArea(); // textPane;
809
+ private JTextPane createTextPane()
810
+ {
811
+// TEXTAREA String[] initString =
812
+// {
813
+// "This is an editable JTextPane, ", //regular
814
+// "another ", //italic
815
+// "styled ", //bold
816
+// "text ", //small
817
+// "component, ", //large
818
+// "which supports embedded components..." + newline,//regular
819
+// " " + newline, //button
820
+// "...and embedded icons..." + newline, //regular
821
+// " ", //icon
822
+// newline + "JTextPane is a subclass of JEditorPane that "
823
+// + "uses a StyledEditorKit and StyledDocument, and provides "
824
+// + "cover methods for interacting with those objects."
825
+// };
826
+//
827
+// String[] initStyles =
828
+// {
829
+// "regular", "italic", "bold", "small", "large",
830
+// "regular", "button", "regular", "icon",
831
+// "regular"
832
+// };
833
+//
834
+// JTextPane textPane = new JTextPane();
835
+// textPane.setEditable(true);
836
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
837
+// addStylesToDocument(doc);
838
+//
839
+// try
840
+// {
841
+// for (int j = 0; j < 2; j++)
842
+// {
843
+// for (int i = 0; i < initString.length; i++)
844
+// {
845
+// doc.insertString(doc.getLength(), initString[i],
846
+// doc.getStyle(initStyles[i]));
847
+// }
848
+// }
849
+// } catch (BadLocationException ble)
850
+// {
851
+// System.err.println("Couldn't insert initial text into text pane.");
852
+// }
853
+
854
+ return new JTextPane(); // textPane;
643855 }
644856
645857 protected void addStylesToDocument(StyledDocument doc)
....@@ -692,7 +904,7 @@
692904 protected static ImageIcon createImageIcon(String path,
693905 String description)
694906 {
695
- java.net.URL imgURL = GrafreeD.class.getResource(path);
907
+ java.net.URL imgURL = Grafreed.class.getResource(path);
696908 if (imgURL != null)
697909 {
698910 return new ImageIcon(imgURL, description);
....@@ -724,6 +936,7 @@
724936 // NumberSlider vDivsField;
725937 // JCheckBox endcaps;
726938 JCheckBox liveCB;
939
+ JCheckBox selectCB;
727940 JCheckBox hideCB;
728941 JCheckBox link2masterCB;
729942 JCheckBox markCB;
....@@ -731,7 +944,12 @@
731944 JCheckBox speedupCB;
732945 JCheckBox rewindCB;
733946 JCheckBox flipVCB;
947
+
948
+ cCheckBox toggleTextureCB;
949
+ cCheckBox toggleSwitchCB;
950
+
734951 JComboBox texresMenu;
952
+
735953 JButton resetButton;
736954 JButton stepButton;
737955 JButton stepAllButton;
....@@ -739,115 +957,87 @@
739957 JButton slowerButton;
740958 JButton fasterButton;
741959 JButton remarkButton;
960
+
961
+ cGridBag editPanel;
962
+ cGridBag editCommandsPanel;
963
+
964
+ cGridBag namePanel;
965
+ cGridBag setupPanel;
966
+ cGridBag setupPanel2;
967
+ cGridBag objectCommandsPanel;
968
+ cGridBag pushPanel;
969
+ cGridBag fillPanel;
742970
743
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
971
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744972 {
745973 JCheckBox cb;
746974
747
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748
- oe.aConstraints.gridwidth = 1; // 3;
749
-// oe.aConstraints.weightx = 1;
750
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751
- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
975
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752976 cb.addItemListener(this);
753
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754
- oe.aConstraints.gridwidth = 1;
755
- oe.aConstraints.gridx += 1;
756977
757978 return cb;
758979 }
759980
760
- cButton AddButton(ObjEditor oe, String label)
981
+ cButton AddButton(cGridBag panel, String label)
761982 {
762983 cButton cb;
763984
764
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765
- oe.aConstraints.gridwidth = 1;
766
-// oe.aConstraints.weightx = 1;
767
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768
- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
985
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769986 cb.addActionListener(this);
770
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771
- oe.aConstraints.gridwidth = 1;
772
- oe.aConstraints.gridx += 1;
773987
774988 return cb;
775989 }
776990
777
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
991
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778992 {
779993 JComboBox combo;
780994
781
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782
- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783
- oe.aConstraints.gridx += 1;
995
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784996 combo.addActionListener(this);
785997
786998 return combo;
787999 }
7881000
789
- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
1001
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
7901002 {
791
- NumberSlider combo;
1003
+ cGridBag control = new cGridBag();
1004
+
1005
+ cNumberSlider combo;
7921006
7931007 JLabel jlabel = new JLabel(label);
794
-
795
- aConstraints.fill = GridBagConstraints.VERTICAL;
7961008 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797
- aConstraints.gridwidth = 2;
798
- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799
- aConstraints.gridx += 1;
800
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802
- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803
- aConstraints.gridx += 1;
804
- aConstraints.gridwidth = 1;
805
-
1009
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1010
+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8061011 combo.setFloat(current);
807
-
808
- combo.label = jlabel;
809
-
810
- combo.addChangeListener(this);
811
-
812
- return combo;
1012
+
1013
+ panel.add(control);
1014
+
1015
+ return control;
8131016 }
8141017
815
- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
1018
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
8161019 {
817
- NumberSlider combo;
1020
+ cGridBag control = new cGridBag();
1021
+
1022
+ cNumberSlider combo;
8181023
8191024 JLabel jlabel = new JLabel(label);
820
-
821
- aConstraints.fill = GridBagConstraints.VERTICAL;
8221025 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823
- aConstraints.gridwidth = 2;
824
- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825
- aConstraints.gridx += 1;
826
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828
- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829
- aConstraints.gridx += 1;
830
- aConstraints.gridwidth = 1;
831
-
1026
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1027
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8321028 combo.setInteger(current);
8331029
834
- combo.label = jlabel;
835
-
836
- combo.addChangeListener(this);
837
-
838
- return combo;
1030
+ panel.add(control);
1031
+
1032
+ return control;
8391033 }
8401034
841
- JTextArea AddText(JPanel ctrlPanel, String name)
1035
+ JTextArea AddText(cGridBag ctrlPanel, String name)
8421036 {
8431037 JTextArea text;
8441038
845
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847
- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1039
+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8481040 text.addCaretListener(this);
849
- aConstraints.gridx += 1;
850
- aConstraints.gridwidth = 1;
8511041
8521042 return text;
8531043 }
....@@ -877,9 +1067,16 @@
8771067 objEditor.ctrlPanel.remove(j);
8781068 }
8791069
1070
+ void Remove(cNumberSlider j)
1071
+ {
1072
+ j.removeChangeListener(this);
1073
+ //objEditor.ctrlPanel.remove(j.label);
1074
+ objEditor.ctrlPanel.remove(j);
1075
+ }
1076
+
8801077 /*
8811078 */
882
- void Return() // ObjEditor oe)
1079
+ void Return0() // ObjEditor oe)
8831080 {
8841081 aConstraints.gridy += 1;
8851082 aConstraints.gridx = 0;
....@@ -934,35 +1131,77 @@
9341131
9351132 void SetupUI2(ObjEditor oe)
9361133 {
937
-// oe.aConstraints.weightx = 0;
938
-// oe.aConstraints.weighty = 0;
939
-// oe.aConstraints.gridx = 0;
940
-// oe.aConstraints.gridy = 0;
941
- SetupName(oe);
1134
+ //SetupName(oe);
9421135
943
- if (!GroupEditor.allparams)
1136
+ namePanel = new cGridBag();
1137
+
1138
+ nameField = AddText(namePanel, copy.GetName());
1139
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1140
+ oe.ctrlPanel.add(namePanel);
1141
+
1142
+ oe.ctrlPanel.Return();
1143
+
1144
+ if (!allparams)
9441145 return;
9451146
946
- liveCB = AddCheckBox(oe, "Live", copy.live);
947
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
1147
+ setupPanel = new cGridBag().setVertical(false);
1148
+
1149
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1150
+ liveCB.setToolTipText("Animate object");
1151
+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1152
+ selectCB.setToolTipText("Make object selectable");
9491153 // Return();
950
- markCB = AddCheckBox(oe, "Mark", copy.marked);
951
- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952
- randomCB = AddCheckBox(oe, "Rand", copy.random);
953
- Return();
954
- resetButton = AddButton(oe, "Reset");
955
- stepButton = AddButton(oe, "Step");
1154
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1155
+ hideCB.setToolTipText("Hide object");
1156
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1157
+ markCB.setToolTipText("As animation target transform");
1158
+
1159
+ setupPanel2 = new cGridBag().setVertical(false);
1160
+
1161
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1162
+ rewindCB.setToolTipText("Rewind animation");
1163
+
1164
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1165
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1166
+
1167
+ if (Globals.ADVANCED)
1168
+ {
1169
+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1170
+ link2masterCB.setToolTipText("Attach to support");
1171
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1172
+ speedupCB.setToolTipText("Option motion capture");
1173
+ }
1174
+
1175
+ oe.ctrlPanel.add(setupPanel);
1176
+ oe.ctrlPanel.Return();
1177
+ oe.ctrlPanel.add(setupPanel2);
1178
+ oe.ctrlPanel.Return();
1179
+
1180
+ objectCommandsPanel = new cGridBag().setVertical(false);
1181
+
1182
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1183
+ resetButton.setToolTipText("Jump to frame zero");
1184
+ stepButton = AddButton(objectCommandsPanel, "Step");
1185
+ stepButton.setToolTipText("Step one frame");
9561186 // resetAllButton = AddButton(oe, "Reset All");
9571187 // stepAllButton = AddButton(oe, "Step All");
958
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
9591188 // Return();
960
- slowerButton = AddButton(oe, "Slow");
961
- fasterButton = AddButton(oe, "Fast");
962
- remarkButton = AddButton(oe, "Rem");
1189
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1190
+ slowerButton.setToolTipText("Decrease animation speed");
1191
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1192
+ fasterButton.setToolTipText("Increase animation speed");
1193
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1194
+ remarkButton.setToolTipText("Set the current transform as the target");
9631195
964
- Return();
1196
+ oe.ctrlPanel.add(objectCommandsPanel);
1197
+ oe.ctrlPanel.Return();
9651198
1199
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1200
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1201
+ //Return();
1202
+
1203
+ oe.ctrlPanel.Return();
1204
+
9661205 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9671206 // ObjEditor.aConstraints.gridx += 1;
9681207
....@@ -1056,7 +1295,7 @@
10561295 oe.aConstraints.gridwidth = 1;
10571296 /**/
10581297 nameField = AddText(oe.ctrlPanel, copy.GetName());
1059
- Return();
1298
+ oe.ctrlPanel.Return();
10601299
10611300 //ctrlPanel.add(textureButton = new Button("Texture..."));
10621301 //textureButton.setEnabled(false);
....@@ -1158,10 +1397,28 @@
11581397 //JPanel worldPanel =
11591398 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11601399 //worldPanel.setName("World");
1161
- /*JPanel*/ cameraPanel =
1162
- new JPanel(new BorderLayout());
1163
- cameraPanel.add(cameraView);
1400
+ centralPanel = new cGridBag();
1401
+ centralPanel.preferredWidth = 20;
1402
+
1403
+ if (Globals.ADVANCED)
1404
+ {
1405
+ timelinePanel = new JPanel(new BorderLayout());
1406
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11641407
1408
+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1409
+ cameraPanel.setContinuousLayout(true);
1410
+ cameraPanel.setOneTouchExpandable(true);
1411
+// cameraPanel.setDividerLocation(0.9);
1412
+// cameraPanel.setDividerSize(9);
1413
+ cameraPanel.setResizeWeight(1.0);
1414
+
1415
+ }
1416
+
1417
+ centralPanel.add(cameraView);
1418
+ centralPanel.setFocusable(true);
1419
+ //frame.setJMenuBar(timelineMenubar);
1420
+ //centralPanel.add(timelinePanel);
1421
+
11651422 //topView.camera = ;
11661423 //frontView.camera = new Camera(2);
11671424 //sideView.camera = new Camera(3);
....@@ -1177,12 +1434,13 @@
11771434 //frontView.object = copy;
11781435 //sideView.object = copy;
11791436
1180
- XYZPanel = new JPanel();
1181
- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1437
+ XYZPanel = new cGridBag().setVertical(true);
1438
+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
11821439
1183
- XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1184
- XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1185
- XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1440
+ XYZPanel.preferredWidth = 5;
1441
+ XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1442
+ XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1443
+ XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
11861444
11871445 /*
11881446 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1191,7 +1449,7 @@
11911449 gridPanel.add(cameraView);
11921450 gridPanel.add(XYZPanel);
11931451 */
1194
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1452
+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11951453 gridPanel.setContinuousLayout(true);
11961454 gridPanel.setOneTouchExpandable(true);
11971455 gridPanel.setDividerLocation(1.0);
....@@ -1220,11 +1478,13 @@
12201478 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12211479 //tmp.setName("Edit");
12221480 objectPanel.add(materialPanel);
1223
- JPanel north = new JPanel(new BorderLayout());
1224
- north.setName("Edit");
1225
- north.add(ctrlPanel, BorderLayout.NORTH);
1226
- objectPanel.add(north);
1481
+// JPanel north = new JPanel(new BorderLayout());
1482
+// north.setName("Edit");
1483
+// north.add(ctrlPanel, BorderLayout.NORTH);
1484
+// objectPanel.add(north);
1485
+ objectPanel.add(editPanel);
12271486 objectPanel.add(infoPanel);
1487
+ objectPanel.add(toolboxPanel);
12281488
12291489 /*
12301490 aConstraints.gridx = 0;
....@@ -1233,7 +1493,7 @@
12331493 aConstraints.gridy += 1;
12341494 aConstraints.gridwidth = 1;
12351495 mainPanel.add(objectPanel, aConstraints);
1236
- */
1496
+ */
12371497
12381498 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12391499 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1244,16 +1504,23 @@
12441504 scrollpane.setWheelScrollingEnabled(true);
12451505 scrollpane.addMouseWheelListener(this); // Default not fast enough
12461506
1247
- /*JTabbedPane*/ jtp = new JTabbedPane();
1248
- jtp.add(scrollpane);
1507
+ /*JTabbedPane*/ scenePanel = new cGridBag();
1508
+ scenePanel.preferredWidth = 6;
1509
+
1510
+ JTabbedPane tabbedPane = new JTabbedPane();
1511
+ tabbedPane.add(scrollpane);
12491512
1250
- jtp.add(FSPane = new cFileSystemPane(this));
1251
-
1252
- optionsPanel = new JPanel(new GridBagLayout());
1513
+ optionsPanel = new cGridBag().setVertical(false);
12531514
12541515 optionsPanel.setName("Options");
1255
- jtp.add(optionsPanel);
1516
+
1517
+ AddOptions(optionsPanel); //, aConstraints);
1518
+
1519
+ tabbedPane.add(optionsPanel);
1520
+
1521
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
12561522
1523
+ scenePanel.add(tabbedPane);
12571524
12581525 /*
12591526 cTree jTree = new cTree(null);
....@@ -1275,7 +1542,7 @@
12751542 jtp.add(tree);
12761543 */
12771544
1278
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1545
+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
12791546 bigPanel.setContinuousLayout(true);
12801547 bigPanel.setOneTouchExpandable(true);
12811548 bigPanel.setDividerLocation(0.8);
....@@ -1287,6 +1554,7 @@
12871554 //bigPanel.setSize(new Dimension(10,10));
12881555 //bigPanel.add(ctrlPanel);
12891556 //bigPanel.add(gridPanel);
1557
+ /**
12901558 bigThree = new JPanel();
12911559 //big.setLayout(new FlowLayout(FlowLayout.LEFT));
12921560 bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1297,20 +1565,26 @@
12971565 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
12981566 aWindowConstraints.weightx = 0;
12991567 aWindowConstraints.weighty = 1;
1300
- bigThree.add(jtp, aWindowConstraints);
1568
+ bigThree.add(scenePanel, aWindowConstraints);
13011569 aWindowConstraints.weightx = 1;
13021570 aWindowConstraints.gridwidth = 3;
13031571 // aConstraints.gridheight = 3;
13041572 aWindowConstraints.gridx = 1;
13051573 aWindowConstraints.fill = GridBagConstraints.BOTH;
1306
- bigThree.add(cameraPanel, aWindowConstraints);
1574
+ bigThree.add(centralPanel, aWindowConstraints);
13071575 aWindowConstraints.weightx = 0;
13081576 aWindowConstraints.gridx = 4;
13091577 aWindowConstraints.gridwidth = 1;
13101578 // aConstraints.gridheight = 3;
13111579 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13121580 bigThree.add(XYZPanel, aWindowConstraints);
1581
+ /**/
13131582
1583
+ bigThree = new cGridBag();
1584
+ bigThree.addComponent(scenePanel);
1585
+ bigThree.addComponent(centralPanel);
1586
+ bigThree.addComponent(XYZPanel);
1587
+
13141588 // // SIDE EFFECT!!!
13151589 // aConstraints.gridx = 0;
13161590 // aConstraints.gridy = 0;
....@@ -1331,14 +1605,19 @@
13311605 //worldPane.add(bigPanel);
13321606 //worldPane.add(worldPanel);
13331607 /**/
1334
- frame.getContentPane().add(/*"Center",*/framePanel);
1608
+ //frame.getContentPane().add(/*"Center",*/framePanel);
1609
+ frame.add(/*"Center",*/framePanel);
13351610 //frame.getContentPane().add(/*"Center",*/ worldPane);
13361611
13371612 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13381613
1339
- frame.setSize(1024, 768);
1340
- frame.show();
1614
+ frame.setSize(1280, 860);
1615
+
1616
+ frame.validate();
1617
+ frame.setVisible(true);
13411618
1619
+ cameraView.requestFocusInWindow();
1620
+
13421621 gridPanel.setDividerLocation(1.0);
13431622
13441623 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1352,6 +1631,10 @@
13521631 });
13531632 }
13541633
1634
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1635
+ {
1636
+ }
1637
+
13551638 JTree GetTree()
13561639 {
13571640 return objEditor.jTree;
....@@ -1363,260 +1646,161 @@
13631646 ctrlPanel.removeAll();
13641647 }
13651648
1366
- void SetupMaterial(JPanel ctrlPanel)
1649
+ void SetupMaterial(cGridBag panel)
13671650 {
1368
- aConstraints.weighty = 0;
1369
- //aConstraints.weightx = 1;
1370
- /*
1651
+ /*
13711652 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
13721653 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374
- aConstraints.gridx += 1;
13751654 */
13761655
1377
- aConstraints.gridwidth = 1;
1378
- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379
- aConstraints.gridx += 1;
1380
- aConstraints.weighty = 0;
1381
- aConstraints.gridwidth = 1;
1656
+ cGridBag editBar = new cGridBag().setVertical(false);
1657
+
1658
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1659
+ createMaterialButton.setToolTipText("Create material");
13821660
13831661 /*
13841662 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385
- aConstraints.gridx += 1;
1386
- aConstraints.weighty = 0;
1387
- aConstraints.gridwidth = 1;
13881663 */
13891664
1390
- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391
- aConstraints.gridx += 1;
1665
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1666
+ clearMaterialButton.setToolTipText("Clear material");
1667
+
1668
+ if (Globals.ADVANCED)
1669
+ {
1670
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1671
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1672
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1673
+ }
13921674
1393
- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394
-
1395
- aConstraints.gridx += 1;
1396
-
1397
- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398
-
1399
- aConstraints.gridx += 1;
1400
-
1401
- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402
-
1403
- aConstraints.gridx = 0;
1404
- aConstraints.gridy += 1;
1405
- aConstraints.weighty = 0;
1406
- aConstraints.gridwidth = 1;
1675
+ editBar.preferredHeight = 15;
1676
+
1677
+ panel.add(editBar);
1678
+
14071679 /**/
14081680 //aConstraints.weighty = 0;
14091681 ////aConstraints.weightx = 1;
14101682 //aConstraints.weighty = 1;
14111683 aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14121684 //aConstraints.gridx += 1;
1413
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414
- aConstraints.weighty = 0;
1415
- aConstraints.gridx = 0;
1416
- aConstraints.gridy += 1;
1417
- aConstraints.gridwidth = 1;
1685
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14181686
1419
- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422
- aConstraints.gridx += 1;
1423
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424
- //aConstraints.weightx = 0;
1425
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426
- aConstraints.gridx = 0;
1427
- aConstraints.gridy += 1;
1428
- aConstraints.gridwidth = 1;
1687
+ cGridBag colorSection = new cGridBag().setVertical(true);
1688
+
1689
+ cGridBag color = new cGridBag();
1690
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1691
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1693
+ //colorField.preferredWidth = 200;
1694
+ colorSection.add(color);
14291695
1430
- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431
- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433
- aConstraints.gridx += 1;
1434
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436
- aConstraints.gridx = 0;
1437
- aConstraints.gridy += 1;
1438
- aConstraints.gridwidth = 1;
1696
+ cGridBag modulation = new cGridBag();
1697
+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1698
+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699
+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1700
+ colorSection.add(modulation);
14391701
1440
- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441
- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443
- aConstraints.gridx += 1;
1444
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446
- aConstraints.gridx = 0;
1447
- aConstraints.gridy += 1;
1448
- aConstraints.gridwidth = 1;
1702
+ cGridBag texture = new cGridBag();
1703
+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1704
+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705
+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1706
+ colorSection.add(texture);
14491707
1450
- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453
- aConstraints.gridx += 1;
1454
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456
- aConstraints.gridx = 0;
1457
- aConstraints.gridy += 1;
1458
- aConstraints.gridwidth = 1;
1708
+ panel.add(new JSeparator());
1709
+
1710
+ panel.add(colorSection);
1711
+
1712
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1713
+
1714
+ cGridBag diffuseSection = new cGridBag().setVertical(true);
1715
+
1716
+ cGridBag diffuse = new cGridBag();
1717
+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1718
+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719
+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1720
+ diffuseSection.add(diffuse);
14591721
1460
- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463
- aConstraints.gridx += 1;
1464
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466
- aConstraints.gridx = 0;
1467
- aConstraints.gridy += 1;
1468
- aConstraints.gridwidth = 1;
1722
+ cGridBag diffuseness = new cGridBag();
1723
+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1724
+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1725
+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1726
+ diffuseSection.add(diffuseness);
14691727
1470
- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473
- aConstraints.gridx += 1;
1474
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475
- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476
- aConstraints.gridx = 0;
1477
- aConstraints.gridy += 1;
1478
- aConstraints.gridwidth = 1;
1728
+ cGridBag selfshadow = new cGridBag();
1729
+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1730
+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1731
+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1732
+ diffuseSection.add(selfshadow);
14791733
1480
- //aConstraints.weighty = 1;
1481
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482
- //aConstraints.gridx += 1;
1483
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484
- aConstraints.weighty = 0;
1485
- aConstraints.gridx = 0;
1486
- aConstraints.gridy += 1;
1487
- aConstraints.gridwidth = 1;
1734
+ cGridBag sheen = new cGridBag();
1735
+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1736
+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1737
+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1738
+ diffuseSection.add(sheen);
14881739
1489
- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490
- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492
- aConstraints.gridx += 1;
1493
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494
- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495
- aConstraints.gridx = 0;
1496
- aConstraints.gridy += 1;
1497
- aConstraints.gridwidth = 1;
1740
+ cGridBag subsurface = new cGridBag();
1741
+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1742
+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1744
+ diffuseSection.add(subsurface);
14981745
1499
- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500
- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502
- aConstraints.gridx += 1;
1503
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504
- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505
- aConstraints.gridx = 0;
1506
- aConstraints.gridy += 1;
1507
- aConstraints.gridwidth = 1;
1746
+ cGridBag shadow = new cGridBag();
1747
+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1748
+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1749
+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1750
+ diffuseSection.add(shadow);
15081751
1509
- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510
- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512
- aConstraints.gridx += 1;
1513
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514
- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515
- aConstraints.gridx = 0;
1516
- aConstraints.gridy += 1;
1517
- aConstraints.gridwidth = 1;
1752
+ cGridBag fakedepth = new cGridBag();
1753
+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1754
+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1755
+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1756
+ diffuseSection.add(fakedepth);
15181757
1519
- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520
- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522
- aConstraints.gridx += 1;
1523
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524
- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525
- aConstraints.gridx = 0;
1526
- aConstraints.gridy += 1;
1527
- aConstraints.gridwidth = 1;
1758
+ cGridBag shadowbias = new cGridBag();
1759
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1760
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1761
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1762
+ diffuseSection.add(shadowbias);
15281763
1529
- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530
- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532
- aConstraints.gridx += 1;
1533
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535
- aConstraints.gridx = 0;
1536
- aConstraints.gridy += 1;
1537
- aConstraints.gridwidth = 1;
1764
+ panel.add(new JSeparator());
1765
+
1766
+ panel.add(diffuseSection);
1767
+
1768
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1769
+
1770
+ cGridBag specularSection = new cGridBag().setVertical(true);
15381771
1539
- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540
- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542
- aConstraints.gridx += 1;
1543
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544
- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545
- aConstraints.gridx = 0;
1546
- aConstraints.gridy += 1;
1547
- aConstraints.gridwidth = 1;
1772
+ cGridBag specular = new cGridBag();
1773
+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1774
+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775
+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776
+ specularSection.add(specular);
15481777
1549
- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550
- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552
- aConstraints.gridx += 1;
1553
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554
- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555
- aConstraints.gridx = 0;
1556
- aConstraints.gridy += 1;
1557
- aConstraints.gridwidth = 1;
1778
+ cGridBag lightarea = new cGridBag();
1779
+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1780
+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1781
+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1782
+ specularSection.add(lightarea);
15581783
1559
- //aConstraints.weighty = 1;
1560
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561
- //aConstraints.gridx += 1;
1562
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563
- aConstraints.weighty = 0;
1564
- aConstraints.gridx = 0;
1565
- aConstraints.gridy += 1;
1566
- aConstraints.gridwidth = 1;
1784
+ cGridBag shininess = new cGridBag();
1785
+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1786
+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1787
+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1788
+ specularSection.add(shininess);
15671789
1568
- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569
- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571
- aConstraints.gridx += 1;
1572
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573
- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574
- aConstraints.gridx = 0;
1575
- aConstraints.gridy += 1;
1576
- aConstraints.gridwidth = 1;
1790
+ cGridBag metalness = new cGridBag();
1791
+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1792
+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1793
+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1794
+ specularSection.add(metalness);
15771795
1578
- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579
- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581
- aConstraints.gridx += 1;
1582
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583
- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584
- aConstraints.gridx = 0;
1585
- aConstraints.gridy += 1;
1586
- aConstraints.gridwidth = 1;
1796
+ cGridBag velvet = new cGridBag();
1797
+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1798
+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799
+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1800
+ specularSection.add(velvet);
15871801
1588
- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589
- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591
- aConstraints.gridx += 1;
1592
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593
- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594
- aConstraints.gridx = 0;
1595
- aConstraints.gridy += 1;
1596
- aConstraints.gridwidth = 1;
1597
-
1598
- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599
- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601
- aConstraints.gridx += 1;
1602
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604
- aConstraints.gridx = 0;
1605
- aConstraints.gridy += 1;
1606
- aConstraints.gridwidth = 1;
1607
-
1608
- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609
- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611
- aConstraints.gridx += 1;
1612
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613
- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614
- aConstraints.gridx = 0;
1615
- aConstraints.gridy += 1;
1616
- aConstraints.gridwidth = 1;
1617
-
1618
- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619
- Return();
1802
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1803
+ //Return();
16201804 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16211805 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16221806 // aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1627,130 +1811,105 @@
16271811 // aConstraints.gridy += 1;
16281812 // aConstraints.gridwidth = 1;
16291813
1630
- //aConstraints.weighty = 1;
1631
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632
- //aConstraints.gridx += 1;
1633
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634
- aConstraints.weighty = 0;
1635
- aConstraints.gridx = 0;
1636
- aConstraints.gridy += 1;
1637
- aConstraints.gridwidth = 1;
1814
+ cGridBag anisoU = new cGridBag();
1815
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1816
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818
+ specularSection.add(anisoU);
16381819
1639
- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640
- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
- aConstraints.gridx += 1;
1643
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645
- aConstraints.gridx = 0;
1646
- aConstraints.gridy += 1;
1647
- aConstraints.gridwidth = 1;
1820
+ cGridBag anisoV = new cGridBag();
1821
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1822
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1823
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1824
+ specularSection.add(anisoV);
16481825
1649
- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650
- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652
- aConstraints.gridx += 1;
1653
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654
- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655
- aConstraints.gridx = 0;
1656
- aConstraints.gridy += 1;
1657
- aConstraints.gridwidth = 1;
16581826
1659
- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660
- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662
- aConstraints.gridx += 1;
1663
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664
- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665
- aConstraints.gridx = 0;
1666
- aConstraints.gridy += 1;
1667
- aConstraints.gridwidth = 1;
1827
+ panel.add(new JSeparator());
1828
+
1829
+ panel.add(specularSection);
1830
+
1831
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1832
+
1833
+ //cGridBag globalSection = new cGridBag().setVertical(true);
16681834
1669
- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672
- aConstraints.gridx += 1;
1673
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675
- aConstraints.gridx = 0;
1676
- aConstraints.gridy += 1;
1677
- aConstraints.gridwidth = 1;
1678
- aConstraints.weighty = 0;
1835
+ cGridBag camera = new cGridBag();
1836
+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1837
+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1838
+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1839
+ colorSection.add(camera);
16791840
1680
- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681
- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
- aConstraints.gridx += 1;
1684
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686
- aConstraints.gridx = 0;
1687
- aConstraints.gridy += 1;
1688
- aConstraints.gridwidth = 1;
1841
+ cGridBag ambient = new cGridBag();
1842
+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1843
+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1844
+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1845
+ colorSection.add(ambient);
16891846
1690
- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691
- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
- aConstraints.gridx += 1;
1694
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1696
- aConstraints.gridx = 0;
1697
- aConstraints.gridy += 1;
1698
- aConstraints.gridwidth = 1;
1847
+ cGridBag backlit = new cGridBag();
1848
+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1849
+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1850
+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1851
+ colorSection.add(backlit);
16991852
1700
- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701
- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
- aConstraints.gridx += 1;
1704
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706
- aConstraints.gridx = 0;
1707
- aConstraints.gridy += 1;
1708
- aConstraints.gridwidth = 1;
1853
+ cGridBag opacity = new cGridBag();
1854
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1855
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1856
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1857
+ colorSection.add(opacity);
17091858
1710
- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711
- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713
- aConstraints.gridx += 1;
1714
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715
- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716
- aConstraints.gridx = 0;
1717
- aConstraints.gridy += 1;
1718
- aConstraints.gridwidth = 1;
1859
+ //panel.add(new JSeparator());
1860
+
1861
+ //panel.add(globalSection);
1862
+
1863
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1864
+
1865
+ cGridBag textureSection = new cGridBag().setVertical(true);
17191866
1720
- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721
- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723
- aConstraints.gridx += 1;
1724
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725
- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726
- aConstraints.gridx = 0;
1727
- aConstraints.gridy += 1;
1728
- aConstraints.gridwidth = 1;
1867
+ cGridBag bump = new cGridBag();
1868
+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1869
+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870
+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1871
+ textureSection.add(bump);
17291872
1730
- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731
- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733
- aConstraints.gridx += 1;
1734
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735
- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1736
- aConstraints.gridx = 0;
1737
- aConstraints.gridy += 1;
1738
- aConstraints.gridwidth = 1;
1873
+ cGridBag noise = new cGridBag();
1874
+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1875
+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1876
+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1877
+ textureSection.add(noise);
17391878
1740
- //aConstraints.weighty = 1;
1741
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742
- //aConstraints.gridx += 1;
1743
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744
- aConstraints.weighty = 0;
1879
+ cGridBag power = new cGridBag();
1880
+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1881
+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1882
+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1883
+ textureSection.add(power);
17451884
1746
- aConstraints.gridx = 0;
1747
- aConstraints.gridy = 0;
1748
- aConstraints.gridwidth = 1;
1885
+ cGridBag borderfade = new cGridBag();
1886
+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1887
+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1888
+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1889
+ textureSection.add(borderfade);
1890
+
1891
+ cGridBag fog = new cGridBag();
1892
+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1893
+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1894
+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1895
+ textureSection.add(fog);
1896
+
1897
+ cGridBag opacityPower = new cGridBag();
1898
+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1899
+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1900
+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1901
+ textureSection.add(opacityPower);
1902
+
1903
+ panel.add(new JSeparator());
1904
+
1905
+ panel.add(textureSection);
1906
+
1907
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17491908
17501909 SetMaterial(copy); // .GetMaterial());
17511910
1752
- colorField.addChangeListener(this);
1753
- modulationField.addChangeListener(this);
1911
+ //colorField.addChangeListener(this);
1912
+// modulationField.addChangeListener(this);
17541913 metalnessField.addChangeListener(this);
17551914 diffuseField.addChangeListener(this);
17561915 specularField.addChangeListener(this);
....@@ -1780,12 +1939,15 @@
17801939 opacityPowerField.addChangeListener(this);
17811940 /**/
17821941
1783
- resetSlidersButton.addActionListener(this);
17841942 clearMaterialButton.addActionListener(this);
17851943 createMaterialButton.addActionListener(this);
1786
-
1787
- propagateToggle.addItemListener(this);
1788
- multiplyToggle.addItemListener(this);
1944
+
1945
+ if (Globals.ADVANCED)
1946
+ {
1947
+ resetSlidersButton.addActionListener(this);
1948
+ propagateToggle.addItemListener(this);
1949
+ multiplyToggle.addItemListener(this);
1950
+ }
17891951 }
17901952
17911953 void DropFile(java.io.File[] files, boolean textures)
....@@ -1956,7 +2118,7 @@
19562118
19572119 //? flashIt = false;
19582120 CameraPane pane = (CameraPane) cameraView;
1959
- pane.clickStart(location.x, location.y, 0);
2121
+ pane.clickStart(location.x, location.y, 0, 0);
19602122 pane.clickEnd(location.x, location.y, 0, true);
19612123
19622124 if (group.selection.size() == 1)
....@@ -2005,6 +2167,7 @@
20052167 e2.printStackTrace();
20062168 }
20072169 }
2170
+
20082171 LoadJMEThread loadThread;
20092172
20102173 class LoadJMEThread extends Thread
....@@ -2062,6 +2225,7 @@
20622225 //LoadFile0(filename, converter);
20632226 }
20642227 }
2228
+
20652229 LoadOBJThread loadObjThread;
20662230
20672231 class LoadOBJThread extends Thread
....@@ -2140,19 +2304,19 @@
21402304
21412305 void LoadObjFile(String fullname)
21422306 {
2143
- /*
2307
+ System.out.println("Loading " + fullname);
2308
+ /**/
21442309 //lastFilename = fullname;
21452310 if(loadObjThread == null)
21462311 {
2147
- loadObjThread = new LoadOBJThread();
2148
- loadObjThread.start();
2312
+ loadObjThread = new LoadOBJThread();
2313
+ loadObjThread.start();
21492314 }
21502315
21512316 loadObjThread.add(fullname);
2152
- */
2317
+ /**/
21532318
2154
- System.out.println("Loading " + fullname);
2155
- makeSomething(new FileObject(fullname, true), true);
2319
+ //makeSomething(new FileObject(fullname, true), true);
21562320 }
21572321
21582322 void LoadGFDFile(String fullname)
....@@ -2194,6 +2358,8 @@
21942358 {
21952359 Mocap sel = (Mocap) copy.selection.get(0);
21962360
2361
+ sel.SetCurrentBones(sel.frame);
2362
+
21972363 sel.fullname = fullname;
21982364
21992365 if (changename)
....@@ -2207,14 +2373,18 @@
22072373 sel.smoothed = false;
22082374
22092375 // if (!changename)
2210
- sel.SetPositionDelta(false, true, true, true/*?*/); // false
2376
+ //sel.SetPositionDelta(false, true, true, true/*?*/); // false
2377
+ sel.SetGlobalTransform();
2378
+ sel.LoadData();
2379
+ sel.Rewind();
2380
+ sel.Fade();
22112381 // sel.setPose(0);
22122382 refreshContents();
22132383 } else
22142384 {
22152385 mocap.Reset();
22162386 // new skeleton
2217
- makeSomething(mocap, false); // true);
2387
+ makeSomething(mocap, true); // true);
22182388 }
22192389 } catch (Exception e)
22202390 {
....@@ -2241,6 +2411,8 @@
22412411 {
22422412 Mocap sel = (Mocap) select;
22432413
2414
+ sel.SetCurrentBones(sel.frame);
2415
+
22442416 File file = new File(fullname);
22452417
22462418 // Mocap mocap = new Mocap("Mocap" + file.getName());
....@@ -2307,7 +2479,11 @@
23072479
23082480 if (!changename)
23092481 {
2310
- sel.SetPositionDelta(false, true, true, true/*?*/);
2482
+ //sel.SetPositionDelta(false, true, true, true/*?*/);
2483
+ sel.SetGlobalTransform();
2484
+ sel.LoadData();
2485
+ sel.Rewind();
2486
+ sel.Fade();
23112487 }
23122488
23132489 // sel.setPose(0);
....@@ -2401,11 +2577,11 @@
24012577
24022578 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
24032579 {
2404
- if (GrafreeD.standAlone)
2580
+ if (Grafreed.standAlone)
24052581 {
24062582 /**/
24072583 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2408
- browser.show();
2584
+ browser.setVisible(true);
24092585 String filename = browser.getFile();
24102586 if (filename != null && filename.length() > 0)
24112587 {
....@@ -2550,6 +2726,7 @@
25502726 }
25512727 if (input == null)
25522728 {
2729
+ new Exception().printStackTrace();
25532730 System.exit(0);
25542731 }
25552732
....@@ -2756,6 +2933,8 @@
27562933
27572934 void SetMaterial(Object3D object)
27582935 {
2936
+ latestObject = object;
2937
+
27592938 cMaterial mat = object.material;
27602939
27612940 if (mat == null)
....@@ -2764,7 +2943,8 @@
27642943 return;
27652944 }
27662945
2767
- multiplyToggle.setSelected(mat.multiply);
2946
+ if (multiplyToggle != null)
2947
+ multiplyToggle.setSelected(mat.multiply);
27682948
27692949 assert (object.projectedVertices != null);
27702950
....@@ -2866,12 +3046,17 @@
28663046 // }
28673047
28683048 /**/
2869
- if (deselect)
3049
+ if (deselect || child == null)
28703050 {
28713051 //group.deselectAll();
28723052 //freeze = true;
28733053 GetTree().clearSelection();
28743054 //freeze = false;
3055
+
3056
+ if (child == null)
3057
+ {
3058
+ return;
3059
+ }
28753060 }
28763061
28773062 //group.addSelectee(child);
....@@ -2940,31 +3125,48 @@
29403125 cameraView.ToggleDL();
29413126 cameraView.repaint();
29423127 return;
2943
- } else if (event.getSource() == toggleTextureItem)
3128
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29443129 {
29453130 cameraView.ToggleTexture();
29463131 // june 2013 copy.HardTouch();
29473132 cameraView.repaint();
29483133 return;
2949
- } else if (event.getSource() == toggleFullItem)
3134
+ } else if (event.getSource() == toggleTimelineItem)
29503135 {
2951
- if (CameraPane.FULLSCREEN)
3136
+ timeline ^= true;
3137
+
3138
+ if (timeline)
29523139 {
2953
- frame.getContentPane().remove(/*"Center",*/bigThree);
2954
- framePanel.add(bigThree);
2955
- frame.getContentPane().add(/*"Center",*/framePanel);
2956
- } else
2957
- {
2958
- frame.getContentPane().remove(/*"Center",*/framePanel);
2959
- frame.getContentPane().add(/*"Center",*/bigThree);
3140
+ centralPanel.remove(cameraView);
3141
+ cameraPanel.add(cameraView);
3142
+ centralPanel.add(cameraPanel);
3143
+ frame.setJMenuBar(timelineMenubar);
3144
+ wasFullScreen = CameraPane.FULLSCREEN;
3145
+ if (!CameraPane.FULLSCREEN)
3146
+ ToggleFullScreen();
3147
+ toggleFullScreenItem.setEnabled(false);
29603148 }
3149
+ else
3150
+ {
3151
+ centralPanel.remove(cameraPanel);
3152
+ centralPanel.add(cameraView);
3153
+ frame.setJMenuBar(null);
3154
+ if (!wasFullScreen)
3155
+ ToggleFullScreen();
3156
+ toggleFullScreenItem.setEnabled(true);
3157
+ }
3158
+
29613159 frame.validate();
2962
- cameraView.ToggleFullScreen();
3160
+ return;
3161
+ } else if (event.getSource() == toggleFullScreenItem)
3162
+ {
3163
+ ToggleFullScreen();
3164
+ frame.validate();
29633165
29643166 return;
2965
- } else if (event.getSource() == toggleRandomItem)
3167
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29663168 {
2967
- cameraView.ToggleRandom();
3169
+ cameraView.ToggleSwitch();
29683170 cameraView.repaint();
29693171 return;
29703172 } else if (event.getSource() == toggleHandleItem)
....@@ -2993,6 +3195,10 @@
29933195 {
29943196 copy.live ^= true;
29953197 return;
3198
+ } else if (event.getSource() == selectCB)
3199
+ {
3200
+ copy.dontselect ^= true;
3201
+ return;
29963202 } else if (event.getSource() == hideCB)
29973203 {
29983204 copy.hide ^= true;
....@@ -3007,6 +3213,7 @@
30073213 if (event.getSource() == randomCB)
30083214 {
30093215 copy.random ^= true;
3216
+ objEditor.refreshContents();
30103217 return;
30113218 }
30123219 if (event.getSource() == speedupCB)
....@@ -3030,8 +3237,9 @@
30303237
30313238 public void actionPerformed(ActionEvent event)
30323239 {
3240
+ Object source = event.getSource();
30333241 // SCRIPT DIALOG
3034
- if (event.getSource() == okbutton)
3242
+ if (source == okbutton)
30353243 {
30363244 textpanel.setVisible(false);
30373245 textpanel.remove(textarea);
....@@ -3043,7 +3251,7 @@
30433251 textarea = null;
30443252 textpanel = null;
30453253 }
3046
- if (event.getSource() == cancelbutton)
3254
+ if (source == cancelbutton)
30473255 {
30483256 textpanel.setVisible(false);
30493257 textpanel.remove(textarea);
....@@ -3055,49 +3263,50 @@
30553263 //applySelf();
30563264 //client.refreshEditWindow();
30573265 //refreshContents();
3058
- if (event.getSource() == nameField)
3266
+ if (source == nameField)
30593267 {
30603268 //System.out.println("ObjEditor " + event);
30613269 applySelf0(true);
30623270 //parent.applySelf();
30633271 objEditor.refreshContents();
3064
- } else if (event.getSource() == resetButton)
3272
+ } else if (source == resetButton)
30653273 {
30663274 CameraPane.fullreset = true;
30673275 copy.Reset(); // ResetMeshes();
30683276 copy.Touch();
30693277 objEditor.refreshContents();
3070
- } else if (event.getSource() == stepItem)
3278
+ } else if (source == stepItem)
30713279 {
3072
- cameraView.ONESTEP = true;
3280
+ //cameraView.ONESTEP = true;
3281
+ Globals.ONESTEP = true;
30733282 cameraView.repaint();
30743283 return;
3075
- } else if (event.getSource() == stepButton)
3284
+ } else if (source == stepButton)
30763285 {
30773286 copy.Step();
30783287 copy.Touch();
30793288 objEditor.refreshContents();
3080
- } else if (event.getSource() == slowerButton)
3289
+ } else if (source == slowerButton)
30813290 {
30823291 copy.Slower();
30833292 copy.Touch();
30843293 objEditor.refreshContents();
3085
- } else if (event.getSource() == fasterButton)
3294
+ } else if (source == fasterButton)
30863295 {
30873296 copy.Faster();
30883297 copy.Touch();
30893298 objEditor.refreshContents();
3090
- } else if (event.getSource() == remarkButton)
3299
+ } else if (source == remarkButton)
30913300 {
30923301 copy.Remark();
30933302 copy.Touch();
30943303 objEditor.refreshContents();
3095
- } else if (event.getSource() == stepAllButton)
3304
+ } else if (source == stepAllButton)
30963305 {
30973306 copy.StepAll();
30983307 copy.Touch();
30993308 objEditor.refreshContents();
3100
- } else if (event.getSource() == resetAllButton)
3309
+ } else if (source == resetAllButton)
31013310 {
31023311 //CameraPane.fullreset = true;
31033312 copy.ResetAll(); // ResetMeshes();
....@@ -3130,53 +3339,75 @@
31303339 // Close();
31313340 // }
31323341 // else
3133
- if (event.getSource() == resetSlidersButton)
3342
+ if (source == resetSlidersButton)
31343343 {
31353344 ResetSliders();
3136
- } else if (event.getSource() == clearMaterialButton)
3345
+ } else if (source == clearMaterialButton)
31373346 {
31383347 ClearMaterial();
3139
- } else if (event.getSource() == createMaterialButton)
3348
+ } else if (source == createMaterialButton)
31403349 {
31413350 CreateMaterial();
3142
- } else if (event.getSource() == clearPanelButton)
3351
+ } else if (source == clearPanelButton)
31433352 {
31443353 copy.ClearUI();
31453354 refreshContents(true);
3146
- } /*
3147
- }
3148
-
3149
- public boolean action(Event event, Object arg)
3150
- {
3151
- */ else if (event.getSource() == closeItem)
3355
+ } else if (source == importGFDItem)
3356
+ {
3357
+ ImportGFD();
3358
+ } else
3359
+ if (source == importVRMLX3DItem)
3360
+ {
3361
+ ImportVRMLX3D();
3362
+ } else
3363
+ if (source == import3DSItem)
3364
+ {
3365
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3366
+ } else
3367
+ if (source == importOBJItem)
3368
+ {
3369
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3370
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3371
+ browser.setVisible(true);
3372
+ String filename = browser.getFile();
3373
+ if (filename != null && filename.length() > 0)
3374
+ {
3375
+ String fullname = browser.getDirectory() + filename;
3376
+ makeSomething(ReadOBJ(fullname), true);
3377
+ }
3378
+ } else
3379
+ if (source == closeItem)
31523380 {
31533381 Close();
31543382 //return true;
3155
- } else if (event.getSource() == loadItem)
3383
+ } else if (source == loadItem)
31563384 {
31573385 load();
31583386 //return true;
3159
- } else if (event.getSource() == saveItem)
3387
+ } else if (source == newItem)
3388
+ {
3389
+ New();
3390
+ } else if (source == saveItem)
31603391 {
31613392 save();
31623393 //return true;
3163
- } else if (event.getSource() == saveAsItem)
3394
+ } else if (source == saveAsItem)
31643395 {
31653396 saveAs();
31663397 //return true;
3167
- } else if (event.getSource() == reexportItem)
3398
+ } else if (source == reexportItem)
31683399 {
31693400 reexport();
31703401 //return true;
3171
- } else if (event.getSource() == exportAsItem)
3402
+ } else if (source == exportAsItem)
31723403 {
31733404 export();
31743405 //return true;
3175
- } else if (event.getSource() == povItem)
3406
+ } else if (source == povItem)
31763407 {
31773408 generatePOV();
31783409 //return true;
3179
- } else if (event.getSource() == zBufferItem)
3410
+ } else if (source == zBufferItem)
31803411 {
31813412 try
31823413 {
....@@ -3198,21 +3429,8 @@
31983429 cameraView.repaint();
31993430 //return true;
32003431 }
3201
- */ else if (event.getSource() == editCameraItem)
3202
- {
3203
- cameraView.ProtectCamera();
3204
- cameraView.repaint();
3205
- return;
3206
- } else if (event.getSource() == revertCameraItem)
3207
- {
3208
- cameraView.RevertCamera();
3209
- cameraView.repaint();
3210
- return;
3211
- } else if (event.getSource() == textureButton)
3212
- {
3213
- return; // true;
3214
- } else // combos...
3215
- if (event.getSource() == texresMenu)
3432
+ */ else // combos...
3433
+ if (source == texresMenu)
32163434 {
32173435 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32183436 copy.texres = texresMenu.getSelectedIndex();
....@@ -3224,27 +3442,304 @@
32243442 }
32253443 }
32263444
3227
- void ToggleAnimation()
3445
+ void New()
32283446 {
3229
- if (!CameraPane.ANIMATION)
3447
+ while (copy.Size() > 1)
32303448 {
3231
- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3449
+ copy.remove(1);
3450
+ }
3451
+
3452
+ ResetModel();
3453
+ objEditor.refreshContents();
3454
+ }
3455
+
3456
+ static public byte[] Compress(Object3D o)
3457
+ {
3458
+ try
3459
+ {
3460
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3461
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3462
+ ObjectOutputStream out = new ObjectOutputStream(zstream);
3463
+
3464
+ Object3D parent = o.parent;
3465
+ o.parent = null;
3466
+
3467
+ out.writeObject(o);
3468
+
3469
+ o.parent = parent;
3470
+
3471
+ out.flush();
3472
+
3473
+ zstream.close();
3474
+ out.close();
3475
+
3476
+ return baos.toByteArray();
3477
+ } catch (Exception e)
3478
+ {
3479
+ System.err.println(e);
3480
+ return null;
3481
+ }
3482
+ }
3483
+
3484
+ static public Object Uncompress(byte[] bytes)
3485
+ {
3486
+ System.out.println("#bytes = " + bytes.length);
3487
+ try
3488
+ {
3489
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3490
+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3491
+ ObjectInputStream in = new ObjectInputStream(istream);
3492
+ Object obj = in.readObject();
3493
+ in.close();
3494
+
3495
+ return obj;
3496
+ } catch (Exception e)
3497
+ {
3498
+ System.err.println(e);
3499
+ return null;
3500
+ }
3501
+ }
3502
+
3503
+ static public Object clone(Object o)
3504
+ {
3505
+ try
3506
+ {
3507
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3508
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3509
+
3510
+ out.writeObject(o);
3511
+
3512
+ out.flush();
3513
+ out.close();
3514
+
3515
+ byte[] bytes = baos.toByteArray();
3516
+
3517
+ System.out.println("clone = " + bytes.length);
3518
+
3519
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3520
+ ObjectInputStream in = new ObjectInputStream(bais);
3521
+ Object obj = in.readObject();
3522
+ in.close();
3523
+
3524
+ return obj;
3525
+ } catch (Exception e)
3526
+ {
3527
+ System.err.println(e);
3528
+ return null;
3529
+ }
3530
+ }
3531
+
3532
+ cRadio GetCurrentTab()
3533
+ {
3534
+ cRadio ab;
3535
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3536
+ {
3537
+ ab = (cRadio)e.nextElement();
3538
+ if(ab.GetObject() == copy)
3539
+ {
3540
+ return ab;
3541
+ }
3542
+ }
3543
+
3544
+ return null;
3545
+ }
3546
+
3547
+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3548
+
3549
+ public void Save()
3550
+ {
3551
+ System.err.println("Save");
3552
+
3553
+ cRadio tab = GetCurrentTab();
3554
+
3555
+ boolean temp = CameraPane.SWITCH;
3556
+ CameraPane.SWITCH = false;
3557
+
3558
+ copy.ExtractBigData(hashtable);
3559
+
3560
+ byte[] compress = Compress(copy);
3561
+
3562
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3563
+ tab.graphs[tab.undoindex++] = compress;
3564
+
3565
+ copy.RestoreBigData(hashtable);
3566
+
3567
+ CameraPane.SWITCH = temp;
3568
+
3569
+ //assert(hashtable.isEmpty());
3570
+
3571
+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
3572
+ {
3573
+ tab.graphs[i] = null;
3574
+ }
3575
+
3576
+ SetUndoStates();
3577
+
3578
+ // test save
3579
+ if (false)
3580
+ {
3581
+ try
3582
+ {
3583
+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3584
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3585
+
3586
+ p.writeObject(copy);
3587
+
3588
+ p.flush();
3589
+
3590
+ ostream.close();
3591
+ } catch (Exception e)
3592
+ {
3593
+ e.printStackTrace();
3594
+ }
3595
+ }
3596
+ }
3597
+
3598
+ void CopyChanged(Object3D obj)
3599
+ {
3600
+ SetUndoStates();
3601
+
3602
+ boolean temp = CameraPane.SWITCH;
3603
+ CameraPane.SWITCH = false;
3604
+
3605
+ copy.ExtractBigData(hashtable);
3606
+
3607
+ copy.clear();
3608
+
3609
+ for (int i=0; i<obj.Size(); i++)
3610
+ {
3611
+ copy.add(obj.get(i));
3612
+ }
3613
+
3614
+ copy.RestoreBigData(hashtable);
3615
+
3616
+ CameraPane.SWITCH = temp;
3617
+
3618
+ //assert(hashtable.isEmpty());
3619
+
3620
+ copy.Touch();
3621
+
3622
+ ResetModel();
3623
+ copy.HardTouch(); // recompile?
3624
+
3625
+ cRadio ab;
3626
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3627
+ {
3628
+ ab = (cRadio)e.nextElement();
3629
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3630
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3631
+ if (test != null)
3632
+ {
3633
+ test.editWindow = ab.object.editWindow;
3634
+ ab.object = test;
3635
+ }
3636
+ }
3637
+
3638
+ refreshContents();
3639
+ }
3640
+
3641
+ cButton undoButton;
3642
+ cButton redoButton;
3643
+
3644
+ void SetUndoStates()
3645
+ {
3646
+ cRadio tab = GetCurrentTab();
3647
+
3648
+ undoButton.setEnabled(tab.undoindex > 0);
3649
+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3650
+ }
3651
+
3652
+ public void Undo()
3653
+ {
3654
+ System.err.println("Undo");
3655
+
3656
+ cRadio tab = GetCurrentTab();
3657
+
3658
+ if (tab.undoindex == 0)
3659
+ {
3660
+ java.awt.Toolkit.getDefaultToolkit().beep();
3661
+ return;
3662
+ }
3663
+
3664
+ if (tab.graphs[tab.undoindex] == null)
3665
+ {
3666
+ Save();
3667
+ tab.undoindex -= 1;
3668
+ }
3669
+
3670
+ tab.undoindex -= 1;
3671
+
3672
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3673
+ }
3674
+
3675
+ public void Redo()
3676
+ {
3677
+ cRadio tab = GetCurrentTab();
3678
+
3679
+ if (tab.graphs[tab.undoindex + 1] == null)
3680
+ {
3681
+ java.awt.Toolkit.getDefaultToolkit().beep();
3682
+ return;
3683
+ }
3684
+
3685
+ tab.undoindex += 1;
3686
+
3687
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3688
+ }
3689
+
3690
+ void ImportGFD()
3691
+ {
3692
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
32323693 browser.show();
32333694 String filename = browser.getFile();
32343695 if (filename != null && filename.length() > 0)
32353696 {
3236
- CameraPane.filename = browser.getDirectory() + filename;
3697
+ String fullname = browser.getDirectory() + filename;
3698
+
3699
+ //Object3D readobj =
3700
+ objEditor.ReadGFD(fullname, objEditor);
3701
+ //makeSomething(readobj);
3702
+ }
3703
+ }
3704
+
3705
+ void ImportVRMLX3D()
3706
+ {
3707
+ if (Grafreed.standAlone)
3708
+ {
3709
+ /**/
3710
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3711
+ browser.show();
3712
+ String filename = browser.getFile();
3713
+ if (filename != null && filename.length() > 0)
3714
+ {
3715
+ String fullname = browser.getDirectory() + filename;
3716
+ LoadVRMLX3D(fullname);
3717
+ }
3718
+ /**/
3719
+ }
3720
+ }
3721
+
3722
+ void ToggleAnimation()
3723
+ {
3724
+ if (!Globals.ANIMATION)
3725
+ {
3726
+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3727
+ browser.setVisible(true);
3728
+ String filename = browser.getFile();
3729
+ if (filename != null && filename.length() > 0)
3730
+ {
3731
+ Globals.filename = browser.getDirectory() + filename;
32373732 //CameraPane.framecount = 0;
3238
- CameraPane.imagecount = 0;
3733
+ Globals.imagecount = 0;
32393734
3240
- CameraPane.ANIMATION ^= true;
3735
+ Globals.ANIMATION ^= true;
32413736
3242
- GrafreeD.wav.cursor = 0;
3243
- GrafreeD.wav.loop = 0;
3737
+ Grafreed.wav.cursor = 0;
3738
+ Grafreed.wav.loop = 0;
32443739 }
32453740 } else
32463741 {
3247
- CameraPane.ANIMATION ^= true;
3742
+ Globals.ANIMATION ^= true;
32483743 }
32493744 }
32503745
....@@ -3290,7 +3785,7 @@
32903785 void CreateMaterial()
32913786 {
32923787 //copy.ClearMaterial(); // PATCH
3293
- copy.CreateMaterialS(multiplyToggle.isSelected());
3788
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32943789 if (copy.selection.size() > 0)
32953790 //SetMaterial(copy);
32963791 {
....@@ -3341,7 +3836,7 @@
33413836 assert false;
33423837 }
33433838
3344
- void EditSelection()
3839
+ void EditSelection(boolean newWindow)
33453840 {
33463841 }
33473842
....@@ -3349,11 +3844,11 @@
33493844 {
33503845 copy.ResetBlockLoop(); // temporary problem
33513846
3352
- boolean random = CameraPane.RANDOM;
3353
- CameraPane.RANDOM = false; // parse everything
3847
+ boolean random = CameraPane.SWITCH;
3848
+ CameraPane.SWITCH = false; // parse everything
33543849 copy.ResetDisplayList();
33553850 copy.HardTouch();
3356
- CameraPane.RANDOM = random;
3851
+ CameraPane.SWITCH = random;
33573852 }
33583853
33593854 // public void applySelf()
....@@ -3423,10 +3918,40 @@
34233918 current.fakedepth = (float) fakedepthField.getFloat();
34243919 current.shadowbias = (float) shadowbiasField.getFloat();
34253920
3426
- if (!NumberSlider.frozen)
3921
+ if (!cNumberSlider.frozen)
34273922 {
34283923 //System.out.println("Propagate = " + propagate);
34293924 copy.UpdateMaterial(anchor, current, propagate);
3925
+
3926
+ if (copy.material != null)
3927
+ {
3928
+ cMaterial mat = copy.material;
3929
+
3930
+ colorField.SetToolTipValue((mat.color));
3931
+ modulationField.SetToolTipValue((mat.modulation));
3932
+ metalnessField.SetToolTipValue((mat.metalness));
3933
+ diffuseField.SetToolTipValue((mat.diffuse));
3934
+ specularField.SetToolTipValue((mat.specular));
3935
+ shininessField.SetToolTipValue((mat.shininess));
3936
+ shiftField.SetToolTipValue((mat.shift));
3937
+ ambientField.SetToolTipValue((mat.ambient));
3938
+ lightareaField.SetToolTipValue((mat.lightarea));
3939
+ diffusenessField.SetToolTipValue((mat.factor));
3940
+ velvetField.SetToolTipValue((mat.velvet));
3941
+ sheenField.SetToolTipValue((mat.sheen));
3942
+ subsurfaceField.SetToolTipValue((mat.subsurface));
3943
+ backlitField.SetToolTipValue((mat.bump));
3944
+ anisoField.SetToolTipValue((mat.aniso));
3945
+ anisoVField.SetToolTipValue((mat.anisoV));
3946
+ cameraField.SetToolTipValue((mat.cameralight));
3947
+ selfshadowField.SetToolTipValue((mat.diffuseness));
3948
+ shadowField.SetToolTipValue((mat.shadow));
3949
+ textureField.SetToolTipValue((mat.texture));
3950
+ opacityField.SetToolTipValue((mat.opacity));
3951
+ fakedepthField.SetToolTipValue((mat.fakedepth));
3952
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3953
+ }
3954
+
34303955 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34313956 {
34323957 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3471,6 +3996,7 @@
34713996 || e.getSource() == apertureField
34723997 || e.getSource() == shadowblurField)
34733998 {
3999
+ new Exception().printStackTrace();
34744000 System.exit(0);
34754001 cameraView.options1[0] = (float) focusField.getFloat() * 10;
34764002 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3497,7 +4023,13 @@
34974023 //System.out.println("PARENT = " + parent);
34984024 //if (parent != null)
34994025 // parent.applySelf();
3500
- refreshContents();
4026
+ if (e.getSource() == normalpushField)
4027
+ {
4028
+ objEditor.refreshContents();
4029
+ //Refresh();
4030
+ }
4031
+ else
4032
+ refreshContents();
35014033 // ??? client.refreshEditWindow();
35024034 }
35034035 //else
....@@ -3509,7 +4041,7 @@
35094041 //group.name = nameField.getText();
35104042 //objEditor.applySelf();
35114043
3512
- assert (objEditor == this);
4044
+ // OCT2018: assert (objEditor == this);
35134045 if (copy.selection == null || copy.selection.size() == 0)
35144046 //super.applySelf()
35154047 ; else
....@@ -3533,12 +4065,18 @@
35334065 objEditor.copy = keep;
35344066 }
35354067 }
4068
+
4069
+ if (normalpushField != null)
4070
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35364071 }
35374072
35384073 void SnapObject()
35394074 {
3540
- Object3D obj = (Object3D)copy.selection.elementAt(0);
3541
- SnapObject(obj);
4075
+ if (copy.selection.size() > 0)
4076
+ {
4077
+ Object3D obj = (Object3D)copy.selection.elementAt(0);
4078
+ SnapObject(obj);
4079
+ }
35424080 }
35434081
35444082 void SnapObject(Object3D obj)
....@@ -3652,7 +4190,7 @@
36524190
36534191 if (obj.parent != null)
36544192 {
3655
- obj.parent.TransformToWorld(interest);
4193
+// obj.parent.TransformToWorld(interest);
36564194 }
36574195
36584196 if (!CameraPane.TRACK)
....@@ -3784,7 +4322,7 @@
37844322
37854323 radioPanel.revalidate();
37864324 radioPanel.repaint();
3787
- ctrlPanel.revalidate(); // ? new
4325
+ ctrlPanel.validate(); // ? new
37884326 ctrlPanel.repaint();
37894327 }
37904328 }
....@@ -3793,6 +4331,8 @@
37934331
37944332 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
37954333 {
4334
+ if (Globals.SAVEONMAKE) // && resetmodel)
4335
+ Save();
37964336 //Tween.set(thing, 0).target(1).start(tweenManager);
37974337 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
37984338 // if (thing instanceof GenericJointDemo)
....@@ -3879,6 +4419,12 @@
38794419 {
38804420 ResetModel();
38814421 Select(thing.GetTreePath(), true, false); // unselect... false);
4422
+
4423
+ if (thing.Size() == 0)
4424
+ {
4425
+ //EditSelection(false);
4426
+ }
4427
+
38824428 refreshContents();
38834429 }
38844430
....@@ -3996,6 +4542,7 @@
39964542 }
39974543 }
39984544 }
4545
+
39994546 LoadGFDThread loadGFDThread;
40004547
40014548 void ReadGFD(String fullname, iCallBack cb)
....@@ -4015,8 +4562,10 @@
40154562
40164563 try
40174564 {
4565
+ // Try compressed version first.
40184566 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4019
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4567
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4568
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40204569
40214570 readobj = (Object3D) p.readObject();
40224571 istream.close();
....@@ -4024,7 +4573,20 @@
40244573 readobj.ResetDisplayList();
40254574 } catch (Exception e)
40264575 {
4027
- e.printStackTrace();
4576
+ //e.printStackTrace();
4577
+ try
4578
+ {
4579
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4580
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4581
+
4582
+ readobj = (Object3D) p.readObject();
4583
+ istream.close();
4584
+
4585
+ readobj.ResetDisplayList();
4586
+ } catch (Exception e2)
4587
+ {
4588
+ e2.printStackTrace();
4589
+ }
40284590 }
40294591 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40304592 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4070,6 +4632,12 @@
40704632
40714633 void LoadIt(Object obj)
40724634 {
4635
+ if (obj == null)
4636
+ {
4637
+ // Invalid file
4638
+ return;
4639
+ }
4640
+
40734641 System.out.println("Loaded " + obj);
40744642 //new Exception().printStackTrace();
40754643 Object3D readobj = (Object3D) obj;
....@@ -4079,6 +4647,8 @@
40794647
40804648 if (readobj != null)
40814649 {
4650
+ if (Globals.SAVEONMAKE)
4651
+ Save();
40824652 try
40834653 {
40844654 //readobj.deepCopySelf(copy);
....@@ -4141,7 +4711,7 @@
41414711
41424712 void load() // throws ClassNotFoundException
41434713 {
4144
- if (GrafreeD.standAlone)
4714
+ if (Grafreed.standAlone)
41454715 {
41464716 FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41474717 browser.show();
....@@ -4228,11 +4798,13 @@
42284798 try
42294799 {
42304800 FileOutputStream ostream = new FileOutputStream(lastname);
4231
- ObjectOutputStream p = new ObjectOutputStream(ostream);
4801
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4802
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42324803
42334804 p.writeObject(copy);
42344805 p.flush();
42354806
4807
+ zstream.close();
42364808 ostream.close();
42374809
42384810 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4242,17 +4814,20 @@
42424814 {
42434815 }
42444816 }
4817
+
42454818 String lastname;
42464819
42474820 void saveAs()
42484821 {
4249
- if (GrafreeD.standAlone)
4822
+ if (Grafreed.standAlone)
42504823 {
42514824 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42524825 browser.setVisible(true);
42534826 String filename = browser.getFile();
42544827 if (filename != null && filename.length() > 0)
42554828 {
4829
+ if (!filename.endsWith(".gfd"))
4830
+ filename += ".gfd";
42564831 lastname = browser.getDirectory() + filename;
42574832 save();
42584833 }
....@@ -4351,13 +4926,13 @@
43514926 try
43524927 {
43534928 FileOutputStream ostream = new FileOutputStream(filename);
4354
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4355
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4929
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4930
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43564931
43574932 Object3D objectparent = obj.parent;
43584933 obj.parent = null;
43594934
4360
- Object3D object = (Object3D) GrafreeD.clone(obj);
4935
+ Object3D object = (Object3D) Grafreed.clone(obj);
43614936
43624937 obj.parent = objectparent;
43634938
....@@ -4369,8 +4944,8 @@
43694944 p.writeObject(object);
43704945 p.flush();
43714946
4947
+ zstream.close();
43724948 ostream.close();
4373
- // zstream.close();
43744949
43754950 // group.selection.get(0).parent = parent;
43764951 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4391,7 +4966,7 @@
43914966 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43924967 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43934968 copy.generatePOV(buffer);
4394
- if (GrafreeD.standAlone)
4969
+ if (Grafreed.standAlone)
43954970 {
43964971 FileDialog browser = new FileDialog(frame, "Export POV", 1);
43974972 browser.show();
....@@ -4417,7 +4992,8 @@
44174992 Object3D client;
44184993 Object3D copy;
44194994 MenuBar menuBar;
4420
- Menu windowMenu;
4995
+ Menu fileMenu;
4996
+ MenuItem newItem;
44214997 MenuItem loadItem;
44224998 MenuItem saveItem;
44234999 MenuItem saveAsItem;
....@@ -4425,45 +5001,60 @@
44255001 MenuItem reexportItem;
44265002 MenuItem povItem;
44275003 MenuItem closeItem;
4428
- Menu cameraMenu;
5004
+
44295005 CheckboxMenuItem zBufferItem;
44305006 //MenuItem normalLensItem;
4431
- MenuItem editCameraItem;
4432
- MenuItem revertCameraItem;
4433
- CheckboxMenuItem toggleLiveItem;
44345007 MenuItem stepItem;
4435
- CheckboxMenuItem toggleFullItem;
5008
+ CheckboxMenuItem toggleLiveItem;
5009
+ CheckboxMenuItem toggleFullScreenItem;
5010
+ CheckboxMenuItem toggleTimelineItem;
44365011 CheckboxMenuItem toggleRenderItem;
44375012 CheckboxMenuItem toggleDebugItem;
44385013 CheckboxMenuItem toggleFrustumItem;
44395014 CheckboxMenuItem toggleFootContactItem;
44405015 CheckboxMenuItem toggleDLItem;
44415016 CheckboxMenuItem toggleTextureItem;
4442
- CheckboxMenuItem toggleRandomItem;
5017
+ CheckboxMenuItem toggleSwitchItem;
44435018 CheckboxMenuItem toggleRootItem;
44445019 CheckboxMenuItem animationItem;
44455020 CheckboxMenuItem toggleHandleItem;
44465021 CheckboxMenuItem togglePaintItem;
44475022 JSplitPane mainPanel;
44485023 JScrollPane scrollpane;
5024
+
44495025 JPanel toolbarPanel;
4450
- JPanel treePanel;
5026
+
5027
+ cGridBag treePanel;
5028
+
44515029 JPanel radioPanel;
44525030 ButtonGroup buttonGroup;
4453
- JPanel ctrlPanel;
4454
- JPanel materialPanel;
5031
+
5032
+ cGridBag toolboxPanel;
5033
+ cGridBag materialPanel;
5034
+ cGridBag ctrlPanel;
5035
+
44555036 JScrollPane infoPanel;
4456
- JPanel optionsPanel;
5037
+
5038
+ cGridBag optionsPanel;
5039
+
44575040 JTabbedPane objectPanel;
4458
- JPanel XYZPanel;
5041
+ boolean materialFlushed;
5042
+ Object3D latestObject;
5043
+
5044
+ cGridBag XYZPanel;
5045
+
44595046 JSplitPane gridPanel;
44605047 JSplitPane bigPanel;
4461
- JPanel bigThree;
4462
- JTabbedPane jtp;
4463
- JPanel cameraPanel;
5048
+
5049
+ cGridBag bigThree;
5050
+ cGridBag scenePanel;
5051
+ cGridBag centralPanel;
5052
+ JSplitPane cameraPanel;
5053
+ JPanel timelinePanel;
5054
+ JMenuBar timelineMenubar;
44645055 JSplitPane framePanel;
44655056 JTextArea/*Field*/ nameField;
4466
- cButton textureButton;
5057
+ //cButton textureButton;
44675058 cButton okButton;
44685059 cButton applyButton;
44695060 cButton cancelButton;
....@@ -4510,65 +5101,72 @@
45105101 // MATERIAL
45115102 JLabel materialLabel;
45125103 JLabel colorLabel;
4513
- NumberSlider colorField;
5104
+ cNumberSlider colorField;
45145105 JLabel modulationLabel;
4515
- NumberSlider modulationField;
5106
+ cNumberSlider modulationField;
45165107 JLabel metalnessLabel;
4517
- NumberSlider metalnessField;
5108
+ cNumberSlider metalnessField;
45185109 JLabel diffuseLabel;
4519
- NumberSlider diffuseField;
5110
+ cNumberSlider diffuseField;
45205111 JLabel specularLabel;
4521
- NumberSlider specularField;
5112
+ cNumberSlider specularField;
45225113 JLabel shininessLabel;
4523
- NumberSlider shininessField;
5114
+ cNumberSlider shininessField;
45245115 JLabel shiftLabel;
4525
- NumberSlider shiftField;
5116
+ cNumberSlider shiftField;
45265117 JLabel ambientLabel;
4527
- NumberSlider ambientField;
5118
+ cNumberSlider ambientField;
45285119 JLabel lightareaLabel;
4529
- NumberSlider lightareaField;
5120
+ cNumberSlider lightareaField;
45305121 JLabel diffusenessLabel;
4531
- NumberSlider diffusenessField;
5122
+ cNumberSlider diffusenessField;
45325123 JLabel velvetLabel;
4533
- NumberSlider velvetField;
5124
+ cNumberSlider velvetField;
45345125 JLabel sheenLabel;
4535
- NumberSlider sheenField;
5126
+ cNumberSlider sheenField;
45365127 JLabel subsurfaceLabel;
4537
- NumberSlider subsurfaceField;
5128
+ cNumberSlider subsurfaceField;
45385129 //JLabel bumpLabel;
45395130 //NumberSlider bumpField;
45405131 JLabel backlitLabel;
4541
- NumberSlider backlitField;
5132
+ cNumberSlider backlitField;
45425133 JLabel anisoLabel;
4543
- NumberSlider anisoField;
5134
+ cNumberSlider anisoField;
45445135 JLabel anisoVLabel;
4545
- NumberSlider anisoVField;
5136
+ cNumberSlider anisoVField;
45465137 JLabel cameraLabel;
4547
- NumberSlider cameraField;
5138
+ cNumberSlider cameraField;
45485139 JLabel selfshadowLabel;
4549
- NumberSlider selfshadowField;
5140
+ cNumberSlider selfshadowField;
45505141 JLabel shadowLabel;
4551
- NumberSlider shadowField;
5142
+ cNumberSlider shadowField;
45525143 JLabel textureLabel;
4553
- NumberSlider textureField;
5144
+ cNumberSlider textureField;
45545145 JLabel opacityLabel;
4555
- NumberSlider opacityField;
5146
+ cNumberSlider opacityField;
45565147 JLabel fakedepthLabel;
4557
- NumberSlider fakedepthField;
5148
+ cNumberSlider fakedepthField;
45585149 JLabel shadowbiasLabel;
4559
- NumberSlider shadowbiasField;
5150
+ cNumberSlider shadowbiasField;
45605151 JLabel bumpLabel;
4561
- NumberSlider bumpField;
5152
+ cNumberSlider bumpField;
45625153 JLabel noiseLabel;
4563
- NumberSlider noiseField;
5154
+ cNumberSlider noiseField;
45645155 JLabel powerLabel;
4565
- NumberSlider powerField;
5156
+ cNumberSlider powerField;
45665157 JLabel borderfadeLabel;
4567
- NumberSlider borderfadeField;
5158
+ cNumberSlider borderfadeField;
45685159 JLabel fogLabel;
4569
- NumberSlider fogField;
5160
+ cNumberSlider fogField;
45705161 JLabel opacityPowerLabel;
4571
- NumberSlider opacityPowerField;
4572
- JTree jTree;
5162
+ cNumberSlider opacityPowerField;
5163
+ cTree jTree;
45735164 //ObjectUI parent;
5165
+
5166
+ cNumberSlider normalpushField;
5167
+
5168
+ private MenuItem importGFDItem;
5169
+ private MenuItem importVRMLX3DItem;
5170
+ private MenuItem import3DSItem;
5171
+ private MenuItem importOBJItem;
45745172 }