.. | .. |
---|
4 | 4 | |
---|
5 | 5 | import java.awt.*; |
---|
6 | 6 | import java.awt.event.*; |
---|
| 7 | +import java.awt.image.BufferedImage; |
---|
7 | 8 | import javax.swing.*; |
---|
8 | 9 | import javax.swing.event.*; |
---|
9 | 10 | import javax.swing.text.*; |
---|
.. | .. |
---|
13 | 14 | import javax.swing.plaf.metal.MetalLookAndFeel; |
---|
14 | 15 | //import javax.swing.plaf.ColorUIResource; |
---|
15 | 16 | //import javax.swing.plaf.metal.DefaultMetalTheme; |
---|
| 17 | + |
---|
| 18 | +import javax.swing.plaf.basic.BasicSplitPaneDivider; |
---|
| 19 | +import javax.swing.plaf.basic.BasicSplitPaneUI; |
---|
16 | 20 | |
---|
17 | 21 | //import javax.media.opengl.GLCanvas; |
---|
18 | 22 | |
---|
.. | .. |
---|
30 | 34 | iSendInfo |
---|
31 | 35 | //KeyListener |
---|
32 | 36 | { |
---|
| 37 | + public cToggleButton pinButton; |
---|
33 | 38 | boolean timeline; |
---|
34 | 39 | boolean wasFullScreen; |
---|
35 | 40 | |
---|
36 | 41 | GroupEditor callee; |
---|
37 | 42 | JFrame frame; |
---|
| 43 | + |
---|
| 44 | + static ObjEditor theFrame; |
---|
| 45 | + |
---|
| 46 | + public void AllocProjectedVertices(Object3D object) |
---|
| 47 | + { |
---|
| 48 | + assert (object.projectedVertices != null); |
---|
| 49 | + |
---|
| 50 | + if (object.projectedVertices.length <= 2) |
---|
| 51 | + { |
---|
| 52 | + // Side effect... |
---|
| 53 | + Object3D.cVector2[] keep = object.projectedVertices; |
---|
| 54 | + object.projectedVertices = new Object3D.cVector2[3]; |
---|
| 55 | + for (int i = 0; i < 3; i++) |
---|
| 56 | + { |
---|
| 57 | + if (i < keep.length) |
---|
| 58 | + { |
---|
| 59 | + object.projectedVertices[i] = keep[i]; |
---|
| 60 | + } else |
---|
| 61 | + { |
---|
| 62 | + object.projectedVertices[i] = new Object3D.cVector2(); |
---|
| 63 | + } |
---|
| 64 | + /* |
---|
| 65 | + if(keep.length == 0) |
---|
| 66 | + object.projectedVertices[0] = new Object3D.cVector2(); |
---|
| 67 | + else |
---|
| 68 | + object.projectedVertices[0] = keep[0]; |
---|
| 69 | + object.projectedVertices[1] = new Object3D.cVector2(); |
---|
| 70 | + */ |
---|
| 71 | + } |
---|
| 72 | + } |
---|
| 73 | + } |
---|
| 74 | + |
---|
| 75 | + public Composite CreateCameras() |
---|
| 76 | + { |
---|
| 77 | + Composite cams = new cTemplate(); |
---|
| 78 | + cams.name = "Cameras"; |
---|
| 79 | + copy.insertElementAt(cams, 0); |
---|
| 80 | + |
---|
| 81 | + cams.addChild(new Camera()); |
---|
| 82 | + cams.addChild(new Camera(1)); |
---|
| 83 | + cams.addChild(new Camera(2)); |
---|
| 84 | + cams.addChild(new Camera(3)); |
---|
| 85 | + cams.addChild(new Camera(4)); |
---|
| 86 | + |
---|
| 87 | + return cams; |
---|
| 88 | + } |
---|
| 89 | + |
---|
| 90 | + public cGridBag GetSeparator() |
---|
| 91 | + { |
---|
| 92 | + cGridBag separator = new cGridBag(); |
---|
| 93 | + separator.add(new JSeparator()); |
---|
| 94 | + separator.preferredHeight = 5; |
---|
| 95 | + return separator; |
---|
| 96 | + } |
---|
| 97 | + |
---|
| 98 | + cButton GetButton(String name, boolean border) |
---|
| 99 | + { |
---|
| 100 | + ImageIcon icon = GetIcon(name); |
---|
| 101 | + if (icon != null || name.contains("/")) |
---|
| 102 | + return new cButton(icon, border); |
---|
| 103 | + else |
---|
| 104 | + return new cButton(name, border); |
---|
| 105 | + } |
---|
| 106 | + |
---|
| 107 | + cLabel GetLabel(String name, boolean border) |
---|
| 108 | + { |
---|
| 109 | + //ImageIcon icon = GetIcon(name); |
---|
| 110 | + return new cLabel(GetImage(name), border); |
---|
| 111 | + } |
---|
| 112 | + |
---|
| 113 | + cToggleButton GetToggleButton(String name, boolean border) |
---|
| 114 | + { |
---|
| 115 | + ImageIcon icon = GetIcon(name); |
---|
| 116 | + return new cToggleButton(icon, border); |
---|
| 117 | + } |
---|
| 118 | + |
---|
| 119 | + cCheckBox GetCheckBox(String name, boolean border) |
---|
| 120 | + { |
---|
| 121 | + ImageIcon icon = GetIcon(name); |
---|
| 122 | + return new cCheckBox(icon, border); |
---|
| 123 | + } |
---|
| 124 | + |
---|
| 125 | + static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>(); |
---|
| 126 | + |
---|
| 127 | + static ImageIcon GetIcon(String name) |
---|
| 128 | + { |
---|
| 129 | + javax.swing.ImageIcon iconCache = icons.get(name); |
---|
| 130 | + if (iconCache != null) |
---|
| 131 | + { |
---|
| 132 | + return iconCache; |
---|
| 133 | + } |
---|
| 134 | + |
---|
| 135 | + try |
---|
| 136 | + { |
---|
| 137 | + BufferedImage image; |
---|
| 138 | + |
---|
| 139 | + if (name.endsWith("jpg")) |
---|
| 140 | + // Much faster! |
---|
| 141 | + image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage(); |
---|
| 142 | + else |
---|
| 143 | + image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name)); |
---|
| 144 | + |
---|
| 145 | +// if (image.getWidth() > 48 && image.getHeight() > 48) |
---|
| 146 | +// { |
---|
| 147 | +// BufferedImage resized = new BufferedImage(48, 48, image.getType()); |
---|
| 148 | +// Graphics2D g = resized.createGraphics(); |
---|
| 149 | +// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); |
---|
| 150 | +// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); |
---|
| 151 | +// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null); |
---|
| 152 | +// g.dispose(); |
---|
| 153 | +// |
---|
| 154 | +// image = resized; |
---|
| 155 | +// } |
---|
| 156 | + |
---|
| 157 | + javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image); |
---|
| 158 | + |
---|
| 159 | + icons.put(name, icon); |
---|
| 160 | + |
---|
| 161 | + return icon; |
---|
| 162 | + } |
---|
| 163 | + catch (Exception e) |
---|
| 164 | + { |
---|
| 165 | + //icons.put(name, null); |
---|
| 166 | + return null; |
---|
| 167 | + } |
---|
| 168 | + } |
---|
| 169 | + |
---|
| 170 | + BufferedImage GetImage(String name) |
---|
| 171 | + { |
---|
| 172 | + try |
---|
| 173 | + { |
---|
| 174 | + BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name)); |
---|
| 175 | + |
---|
| 176 | + return image; |
---|
| 177 | + } |
---|
| 178 | + catch (Exception e) |
---|
| 179 | + { |
---|
| 180 | + return null; |
---|
| 181 | + } |
---|
| 182 | + } |
---|
38 | 183 | |
---|
39 | 184 | // SCRIPT |
---|
40 | 185 | |
---|
.. | .. |
---|
143 | 288 | //nameField.removeActionListener(this); |
---|
144 | 289 | // objEditor.ctrlPanel.remove(nameField); |
---|
145 | 290 | |
---|
146 | | - if (!GroupEditor.allparams) |
---|
| 291 | + objEditor.ctrlPanel.remove(namePanel); |
---|
| 292 | + |
---|
| 293 | + if (!allparams) |
---|
147 | 294 | return; |
---|
148 | 295 | |
---|
149 | 296 | // objEditor.ctrlPanel.remove(liveCB); |
---|
.. | .. |
---|
165 | 312 | // objEditor.ctrlPanel.remove(fasterButton); |
---|
166 | 313 | // objEditor.ctrlPanel.remove(remarkButton); |
---|
167 | 314 | |
---|
168 | | - objEditor.ctrlPanel.remove(namePanel); |
---|
169 | 315 | objEditor.ctrlPanel.remove(setupPanel); |
---|
170 | | - objEditor.ctrlPanel.remove(commandsPanel); |
---|
| 316 | + objEditor.ctrlPanel.remove(setupPanel2); |
---|
| 317 | + objEditor.ctrlPanel.remove(objectCommandsPanel); |
---|
171 | 318 | objEditor.ctrlPanel.remove(pushPanel); |
---|
172 | 319 | //objEditor.ctrlPanel.remove(fillPanel); |
---|
173 | 320 | |
---|
.. | .. |
---|
215 | 362 | client = inClient; |
---|
216 | 363 | copy = client; |
---|
217 | 364 | |
---|
| 365 | +// if (copy.versionlist == null) |
---|
| 366 | +// { |
---|
| 367 | +// copy.versionlist = new Object3D[100]; |
---|
| 368 | +// copy.versionindex = -1; |
---|
| 369 | +// |
---|
| 370 | +// callee.Save(true); |
---|
| 371 | +// } |
---|
| 372 | + |
---|
218 | 373 | // "this" is not called: SetupUI2(objEditor); |
---|
219 | 374 | } |
---|
220 | 375 | |
---|
.. | .. |
---|
228 | 383 | client = inClient; |
---|
229 | 384 | copy = client; |
---|
230 | 385 | |
---|
| 386 | + if (copy.versionlist == null) |
---|
| 387 | + { |
---|
| 388 | + copy.versionlist = new Object3D[100]; |
---|
| 389 | + copy.versionindex = -1; |
---|
| 390 | + |
---|
| 391 | +// Save(true); |
---|
| 392 | + } |
---|
| 393 | + |
---|
231 | 394 | SetupUI2(callee.GetEditor()); |
---|
232 | 395 | } |
---|
233 | 396 | |
---|
.. | .. |
---|
242 | 405 | //localCopy.parent = null; |
---|
243 | 406 | |
---|
244 | 407 | frame = new JFrame(); |
---|
| 408 | + frame.setUndecorated(false); |
---|
245 | 409 | objEditor = this; |
---|
246 | 410 | this.callee = callee; |
---|
247 | 411 | |
---|
248 | 412 | //parent = p; |
---|
249 | 413 | |
---|
250 | 414 | GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); |
---|
251 | | - System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow()); |
---|
| 415 | + if (Globals.DEBUG) |
---|
| 416 | + System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow()); |
---|
252 | 417 | //gd.setFullScreenWindow(this); |
---|
253 | 418 | //setResizable(false); |
---|
254 | 419 | //if (!isDisplayable()) |
---|
.. | .. |
---|
259 | 424 | copy = localCopy; |
---|
260 | 425 | copy.editWindow = this; |
---|
261 | 426 | |
---|
| 427 | +// if (copy.versionlist == null) |
---|
| 428 | +// { |
---|
| 429 | +// copy.versionlist = new Object3D[100]; |
---|
| 430 | +// copy.versionindex = -1; |
---|
| 431 | +// |
---|
| 432 | +// Save(true); |
---|
| 433 | +// } |
---|
| 434 | + |
---|
262 | 435 | SetupMenu(); |
---|
263 | 436 | |
---|
264 | 437 | //SetupName(objEditor); // new |
---|
.. | .. |
---|
272 | 445 | return frame.action(event, obj); |
---|
273 | 446 | } |
---|
274 | 447 | |
---|
| 448 | + // Cannot work without static |
---|
| 449 | + static boolean allparams = true; |
---|
| 450 | + |
---|
| 451 | + static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>(); |
---|
| 452 | + |
---|
| 453 | + // This is to refresh the UI of the material panel. |
---|
| 454 | + boolean patchMaterial; |
---|
| 455 | + |
---|
275 | 456 | void SetupMenu() |
---|
276 | 457 | { |
---|
277 | 458 | frame.setMenuBar(menuBar = new MenuBar()); |
---|
278 | | - menuBar.add(windowMenu = new Menu("File")); |
---|
279 | | - windowMenu.add(loadItem = new MenuItem("Load...")); |
---|
280 | | - windowMenu.add("-"); |
---|
281 | | - windowMenu.add(saveItem = new MenuItem("Save")); |
---|
282 | | - windowMenu.add(saveAsItem = new MenuItem("Save As...")); |
---|
| 459 | + menuBar.add(fileMenu = new Menu("File")); |
---|
| 460 | + fileMenu.add(newItem = new MenuItem("New")); |
---|
| 461 | + fileMenu.add(openItem = new MenuItem("Open...")); |
---|
| 462 | + |
---|
| 463 | + //oe.menuBar.add(menu = new Menu("Include")); |
---|
| 464 | + Menu menu = new Menu("Import"); |
---|
| 465 | + importOBJItem = menu.add(new MenuItem("OBJ file...")); |
---|
| 466 | + importOBJItem.addActionListener(this); |
---|
| 467 | + import3DSItem = menu.add(new MenuItem("3DS file...")); |
---|
| 468 | + import3DSItem.addActionListener(this); |
---|
| 469 | + if (Globals.ADVANCED) |
---|
| 470 | + { |
---|
| 471 | + importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file...")); |
---|
| 472 | + importVRMLX3DItem.addActionListener(this); |
---|
| 473 | + } |
---|
| 474 | + menu.add("-"); |
---|
| 475 | + importGFDItem = menu.add(new MenuItem("Grafreed file...")); |
---|
| 476 | + importGFDItem.addActionListener(this); |
---|
| 477 | + fileMenu.add(menu); |
---|
| 478 | + fileMenu.add("-"); |
---|
| 479 | + |
---|
| 480 | + fileMenu.add(saveItem = new MenuItem("Save")); |
---|
| 481 | + fileMenu.add(saveAsItem = new MenuItem("Save As...")); |
---|
283 | 482 | //windowMenu.add(povItem = new MenuItem("Emit POV-Ray...")); |
---|
284 | | - windowMenu.add("-"); |
---|
285 | | - windowMenu.add(exportAsItem = new MenuItem("Export Selection...")); |
---|
286 | | - windowMenu.add(reexportItem = new MenuItem("Re-export")); |
---|
287 | | - windowMenu.add("-"); |
---|
| 483 | + fileMenu.add("-"); |
---|
| 484 | + fileMenu.add(exportAsItem = new MenuItem("Export Selection...")); |
---|
| 485 | + fileMenu.add(reexportItem = new MenuItem("Re-export")); |
---|
| 486 | + fileMenu.add("-"); |
---|
288 | 487 | if (client.parent != null) |
---|
289 | 488 | { |
---|
290 | | - windowMenu.add(closeItem = new MenuItem("Close")); |
---|
| 489 | + fileMenu.add(closeItem = new MenuItem("Close")); |
---|
291 | 490 | } else |
---|
292 | 491 | { |
---|
293 | | - windowMenu.add(closeItem = new MenuItem("Exit")); |
---|
| 492 | + fileMenu.add(closeItem = new MenuItem("Exit")); |
---|
294 | 493 | } |
---|
295 | 494 | |
---|
296 | | - loadItem.addActionListener(this); |
---|
| 495 | + newItem.addActionListener(this); |
---|
| 496 | + openItem.addActionListener(this); |
---|
297 | 497 | saveItem.addActionListener(this); |
---|
298 | 498 | saveAsItem.addActionListener(this); |
---|
299 | 499 | exportAsItem.addActionListener(this); |
---|
.. | .. |
---|
301 | 501 | //povItem.addActionListener(this); |
---|
302 | 502 | closeItem.addActionListener(this); |
---|
303 | 503 | |
---|
304 | | - menuBar.add(cameraMenu = new Menu("View")); |
---|
305 | | - //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer")); |
---|
306 | | - //zBufferItem.addActionListener(this); |
---|
307 | | - //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens")); |
---|
308 | | - //normalLensItem.addActionListener(this); |
---|
309 | | - cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera")); |
---|
310 | | - revertCameraItem.addActionListener(this); |
---|
311 | | - cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline")); |
---|
312 | | - toggleTimelineItem.addItemListener(this); |
---|
313 | | - cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen")); |
---|
314 | | - toggleFullScreenItem.addItemListener(this); |
---|
315 | | - toggleFullScreenItem.setState(CameraPane.FULLSCREEN); |
---|
316 | | - cameraMenu.add("-"); |
---|
317 | | - cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture")); |
---|
318 | | - toggleTextureItem.addItemListener(this); |
---|
319 | | - toggleTextureItem.setState(CameraPane.textureon); |
---|
320 | | - cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live")); |
---|
321 | | - toggleLiveItem.addItemListener(this); |
---|
322 | | - toggleLiveItem.setState(Globals.isLIVE()); |
---|
323 | | - cameraMenu.add(stepItem = new MenuItem("Step")); |
---|
324 | | - stepItem.addActionListener(this); |
---|
325 | | -// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List")); |
---|
326 | | -// toggleDLItem.addItemListener(this); |
---|
327 | | -// toggleDLItem.setState(false); |
---|
328 | | - cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render")); |
---|
329 | | - toggleRenderItem.addItemListener(this); |
---|
330 | | - toggleRenderItem.setState(!CameraPane.frozen); |
---|
331 | | - cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug")); |
---|
332 | | - toggleDebugItem.addItemListener(this); |
---|
333 | | - toggleDebugItem.setState(CameraPane.DEBUG); |
---|
334 | | - cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum")); |
---|
335 | | - toggleFrustumItem.addItemListener(this); |
---|
336 | | - toggleFrustumItem.setState(CameraPane.FRUSTUM); |
---|
337 | | - cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact")); |
---|
338 | | - toggleFootContactItem.addItemListener(this); |
---|
339 | | - toggleFootContactItem.setState(CameraPane.FOOTCONTACT); |
---|
340 | | - cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random")); |
---|
341 | | - toggleRandomItem.addItemListener(this); |
---|
342 | | - toggleRandomItem.setState(CameraPane.RANDOM); |
---|
343 | | - cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles")); |
---|
344 | | - toggleHandleItem.addItemListener(this); |
---|
345 | | - toggleHandleItem.setState(CameraPane.HANDLES); |
---|
346 | | - cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode")); |
---|
347 | | - togglePaintItem.addItemListener(this); |
---|
348 | | - togglePaintItem.setState(CameraPane.PAINTMODE); |
---|
349 | | -// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root")); |
---|
350 | | -// toggleRootItem.addItemListener(this); |
---|
351 | | -// toggleRootItem.setState(false); |
---|
352 | | -// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation")); |
---|
353 | | -// animationItem.addItemListener(this); |
---|
354 | | -// animationItem.setState(CameraPane.ANIMATION); |
---|
355 | | - cameraMenu.add("-"); |
---|
356 | | - cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera")); |
---|
357 | | - editCameraItem.addActionListener(this); |
---|
358 | | - |
---|
359 | 504 | objectPanel = new JTabbedPane(); |
---|
| 505 | + |
---|
| 506 | + ChangeListener changeListener = new ChangeListener() |
---|
| 507 | + { |
---|
| 508 | + //String name; |
---|
| 509 | + |
---|
| 510 | + public void stateChanged(ChangeEvent changeEvent) |
---|
| 511 | + { |
---|
| 512 | +// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed) |
---|
| 513 | +// { |
---|
| 514 | +// if (latestObject != null) |
---|
| 515 | +// { |
---|
| 516 | +// refreshContents(true); |
---|
| 517 | +// SetMaterial(latestObject); |
---|
| 518 | +// } |
---|
| 519 | +// |
---|
| 520 | +// materialFlushed = true; |
---|
| 521 | +// } |
---|
| 522 | +// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit")) |
---|
| 523 | +// { |
---|
| 524 | +// if (listUI.size() == 0) |
---|
| 525 | +// EditSelection(false); |
---|
| 526 | +// } |
---|
| 527 | + |
---|
| 528 | +// if (objectPanel.getSelectedIndex() == 4) |
---|
| 529 | +// { |
---|
| 530 | +// name = copy.skyboxname; |
---|
| 531 | +// |
---|
| 532 | +// if (name == null) |
---|
| 533 | +// { |
---|
| 534 | +// name = ""; |
---|
| 535 | +// } |
---|
| 536 | +// |
---|
| 537 | +// copy.skyboxname = "cubemaps/default-skyboxes/rgb"; |
---|
| 538 | +// copy.skyboxext = "jpg"; |
---|
| 539 | +// } |
---|
| 540 | +// else |
---|
| 541 | +// { |
---|
| 542 | +// if (name != null) |
---|
| 543 | +// { |
---|
| 544 | +// if (name.equals("")) |
---|
| 545 | +// { |
---|
| 546 | +// copy.skyboxname = null; |
---|
| 547 | +// copy.skyboxext = null; |
---|
| 548 | +// } |
---|
| 549 | +// else |
---|
| 550 | +// { |
---|
| 551 | +// copy.skyboxname = name; |
---|
| 552 | +// } |
---|
| 553 | +// } |
---|
| 554 | +// } |
---|
| 555 | + cameraView.transformMode = objectPanel.getSelectedIndex() == 4; |
---|
| 556 | + |
---|
| 557 | +// refreshContents(false); // To refresh Info tab |
---|
| 558 | + cameraView.repaint(); |
---|
| 559 | + } |
---|
| 560 | + }; |
---|
| 561 | + objectPanel.addChangeListener(changeListener); |
---|
| 562 | + |
---|
360 | 563 | toolbarPanel = new JPanel(); |
---|
361 | 564 | toolbarPanel.setName("Toolbar"); |
---|
| 565 | + |
---|
362 | 566 | treePanel = new cGridBag(); |
---|
363 | 567 | treePanel.setName("Tree"); |
---|
| 568 | + |
---|
| 569 | + editPanel = new cGridBag().setVertical(true); |
---|
| 570 | + //editPanel.setName("Edit"); |
---|
| 571 | + |
---|
364 | 572 | ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout()); |
---|
365 | | - ctrlPanel.setName("Edit"); |
---|
366 | | - materialPanel = new cGridBag().setVertical(true); |
---|
367 | | - materialPanel.setName("Material"); |
---|
| 573 | + |
---|
| 574 | + editCommandsPanel = new cGridBag(); |
---|
| 575 | + editPanel.add(editCommandsPanel); |
---|
| 576 | + editPanel.add(ctrlPanel); |
---|
| 577 | + |
---|
| 578 | + toolboxPanel = new cGridBag().setVertical(true); |
---|
| 579 | + //toolboxPanel.setName("Toolbox"); |
---|
| 580 | + |
---|
| 581 | + skyboxPanel = new cGridBag().setVertical(true); |
---|
| 582 | + |
---|
| 583 | + materialPanel = new cGridBag().setVertical(false); |
---|
| 584 | + //materialPanel.setName("Material"); |
---|
| 585 | + |
---|
368 | 586 | /*JTextPane*/ |
---|
369 | 587 | infoarea = createTextPane(); |
---|
370 | 588 | doc = infoarea.getStyledDocument(); |
---|
371 | 589 | |
---|
372 | 590 | infoarea.setEditable(true); |
---|
373 | 591 | SetText(); |
---|
| 592 | + |
---|
374 | 593 | // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f)); |
---|
375 | 594 | // infoarea.setOpaque(false); |
---|
376 | 595 | // //infoarea.setForeground(textcolor); |
---|
377 | 596 | // TEXTAREA infoarea.setLineWrap(true); |
---|
378 | 597 | // TEXTAREA infoarea.setWrapStyleWord(true); |
---|
379 | 598 | infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED); |
---|
380 | | - infoPanel.setPreferredSize(new Dimension(50, 200)); |
---|
381 | | - infoPanel.setName("Info"); |
---|
| 599 | + infoPanel.setPreferredSize(new Dimension(1, 1)); |
---|
| 600 | + //infoPanel.setName("Info"); |
---|
382 | 601 | //infoPanel.setLayout(new BorderLayout()); |
---|
383 | 602 | //infoPanel.add(createTextPane()); |
---|
384 | 603 | |
---|
.. | .. |
---|
389 | 608 | mainPanel.setDividerSize(9); |
---|
390 | 609 | mainPanel.setDividerLocation(0.5); //1.0); |
---|
391 | 610 | mainPanel.setResizeWeight(0.5); |
---|
392 | | - |
---|
| 611 | + |
---|
| 612 | +//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5)); |
---|
| 613 | + BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider(); |
---|
| 614 | + divider.setDividerSize(15); |
---|
| 615 | + divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!")); |
---|
| 616 | + |
---|
| 617 | + mainPanel.setUI(new BasicSplitPaneUI()); |
---|
| 618 | + |
---|
393 | 619 | //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5)); |
---|
394 | 620 | //mainPanel.setLayout(new GridBagLayout()); |
---|
395 | 621 | toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); |
---|
.. | .. |
---|
457 | 683 | e.printStackTrace(); |
---|
458 | 684 | } |
---|
459 | 685 | |
---|
460 | | - String selection = infoarea.getText(); |
---|
461 | | - java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection); |
---|
462 | | - java.awt.datatransfer.Clipboard clipboard = |
---|
463 | | - Toolkit.getDefaultToolkit().getSystemClipboard(); |
---|
| 686 | +// String selection = infoarea.getText(); |
---|
| 687 | +// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection); |
---|
| 688 | +// java.awt.datatransfer.Clipboard clipboard = |
---|
| 689 | +// Toolkit.getDefaultToolkit().getSystemClipboard(); |
---|
464 | 690 | //clipboard.setContents(data, data); |
---|
465 | 691 | } |
---|
466 | 692 | |
---|
.. | .. |
---|
483 | 709 | //SendInfo("Name:", "bold"); |
---|
484 | 710 | if (sel.GetTextures() != null || debug) |
---|
485 | 711 | { |
---|
486 | | - si.SendInfo(sel.toString(), "bold"); |
---|
| 712 | + si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold"); |
---|
487 | 713 | //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular"); |
---|
488 | 714 | if (sel.Size() > 0) |
---|
489 | 715 | { |
---|
490 | 716 | si.SendInfo("#children = " + sel.Size(), "regular"); |
---|
491 | 717 | } |
---|
492 | | - si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular"); |
---|
| 718 | + si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular"); |
---|
493 | 719 | if (debug) |
---|
494 | 720 | { |
---|
495 | 721 | try |
---|
.. | .. |
---|
531 | 757 | } |
---|
532 | 758 | if (sel.support != null) |
---|
533 | 759 | { |
---|
534 | | - si.SendInfo(" support: " + sel.support, "regular"); |
---|
| 760 | + si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular"); |
---|
535 | 761 | } |
---|
536 | 762 | if (sel.scriptnode != null) |
---|
537 | 763 | { |
---|
.. | .. |
---|
620 | 846 | } |
---|
621 | 847 | } |
---|
622 | 848 | |
---|
| 849 | +//static GraphicsDevice device = GraphicsEnvironment |
---|
| 850 | +// .getLocalGraphicsEnvironment().getScreenDevices()[0]; |
---|
| 851 | + |
---|
| 852 | + Rectangle keeprect; |
---|
| 853 | + cRadio radio; |
---|
| 854 | + |
---|
| 855 | +cButton keepButton; |
---|
| 856 | + cButton twoButton; // Full 3D |
---|
| 857 | + cButton sixButton; |
---|
| 858 | + cButton threeButton; |
---|
| 859 | + cButton sevenButton; |
---|
| 860 | + cButton fourButton; // full panel |
---|
| 861 | + cButton oneButton; // full XYZ |
---|
| 862 | + //cButton currentLayout; |
---|
| 863 | + |
---|
| 864 | + boolean maximized; |
---|
| 865 | + |
---|
| 866 | + cButton fullscreenLayout; |
---|
| 867 | + cButton expandedLayout; |
---|
| 868 | + |
---|
| 869 | + void Minimize() |
---|
| 870 | + { |
---|
| 871 | + frame.setState(Frame.ICONIFIED); |
---|
| 872 | + frame.validate(); |
---|
| 873 | + } |
---|
| 874 | + |
---|
| 875 | +// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={} |
---|
| 876 | +// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={} |
---|
| 877 | +// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={} |
---|
| 878 | + void Maximize() |
---|
| 879 | + { |
---|
| 880 | + if (CameraPane.FULLSCREEN) |
---|
| 881 | + { |
---|
| 882 | + ToggleFullScreen(); |
---|
| 883 | + } |
---|
| 884 | + |
---|
| 885 | + if (maximized) |
---|
| 886 | + { |
---|
| 887 | + frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height); |
---|
| 888 | + } |
---|
| 889 | + else |
---|
| 890 | + { |
---|
| 891 | + keeprect = frame.getBounds(); |
---|
| 892 | +// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds(); |
---|
| 893 | +// Dimension rect2 = frame.getToolkit().getScreenSize(); |
---|
| 894 | +// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height); |
---|
| 895 | +// frame.setState(Frame.MAXIMIZED_BOTH); |
---|
| 896 | + frame.setBounds(frame.getGraphicsConfiguration().getBounds()); |
---|
| 897 | + } |
---|
| 898 | + |
---|
| 899 | + maximized ^= true; |
---|
| 900 | + |
---|
| 901 | + frame.validate(); |
---|
| 902 | + } |
---|
| 903 | + |
---|
| 904 | + cButton minButton; |
---|
| 905 | + cButton maxButton; |
---|
| 906 | + cButton fullButton; |
---|
| 907 | + cButton collapseButton; |
---|
| 908 | + cButton maximize3DButton; |
---|
| 909 | + |
---|
623 | 910 | void ToggleFullScreen() |
---|
624 | 911 | { |
---|
625 | | - if (CameraPane.FULLSCREEN) |
---|
| 912 | + GraphicsDevice device = frame.getGraphicsConfiguration().getDevice(); |
---|
| 913 | + |
---|
| 914 | + cameraView.ToggleFullScreen(); |
---|
| 915 | + |
---|
| 916 | + if (!CameraPane.FULLSCREEN) |
---|
626 | 917 | { |
---|
627 | | - frame.getContentPane().remove(/*"Center",*/bigThree); |
---|
628 | | - framePanel.add(bigThree); |
---|
629 | | - frame.getContentPane().add(/*"Center",*/framePanel); |
---|
| 918 | + device.setFullScreenWindow(null); |
---|
| 919 | + frame.dispose(); |
---|
| 920 | + frame.setUndecorated(false); |
---|
| 921 | + frame.validate(); |
---|
| 922 | + frame.setVisible(true); |
---|
| 923 | + |
---|
| 924 | + //frame.setVisible(false); |
---|
| 925 | +// frame.removeNotify(); |
---|
| 926 | +// frame.setUndecorated(false); |
---|
| 927 | +// frame.addNotify(); |
---|
| 928 | + //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height); |
---|
| 929 | + |
---|
| 930 | +// X frame.getContentPane().remove(/*"Center",*/bigThree); |
---|
| 931 | +// X framePanel.add(bigThree); |
---|
| 932 | +// X frame.getContentPane().add(/*"Center",*/framePanel); |
---|
| 933 | +// framePanel.setDividerLocation(46); // icons are 24x24 |
---|
| 934 | + |
---|
| 935 | + //frame.setVisible(true); |
---|
| 936 | +// radio.layout = keepButton; |
---|
| 937 | + //theFrame = null; |
---|
| 938 | + keepButton = null; |
---|
| 939 | +// radio.layout.doClick(); |
---|
| 940 | + |
---|
630 | 941 | } else |
---|
631 | 942 | { |
---|
632 | | - frame.getContentPane().remove(/*"Center",*/framePanel); |
---|
633 | | - framePanel.remove(bigThree); |
---|
634 | | - frame.getContentPane().add(/*"Center",*/bigThree); |
---|
| 943 | + keepButton = radio.layout; |
---|
| 944 | + //keeprect = frame.getBounds(); |
---|
| 945 | +// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width, |
---|
| 946 | +// frame.getToolkit().getScreenSize().height); |
---|
| 947 | + //frame.setVisible(false); |
---|
| 948 | + |
---|
| 949 | + frame.dispose(); |
---|
| 950 | + frame.setUndecorated(true); |
---|
| 951 | + device.setFullScreenWindow(frame); |
---|
| 952 | + frame.validate(); |
---|
| 953 | + frame.setVisible(true); |
---|
| 954 | +// frame.removeNotify(); |
---|
| 955 | +// frame.setUndecorated(true); |
---|
| 956 | +// frame.addNotify(); |
---|
| 957 | +// X frame.getContentPane().remove(/*"Center",*/framePanel); |
---|
| 958 | +// X framePanel.remove(bigThree); |
---|
| 959 | +// X frame.getContentPane().add(/*"Center",*/bigThree); |
---|
| 960 | +// framePanel.setDividerLocation(0); |
---|
| 961 | + |
---|
| 962 | +// radio.layout = fullscreenLayout; |
---|
| 963 | +// radio.layout.doClick(); |
---|
| 964 | + //frame.setVisible(true); |
---|
635 | 965 | } |
---|
636 | | - cameraView.ToggleFullScreen(); |
---|
| 966 | + frame.validate(); |
---|
| 967 | + |
---|
| 968 | + cameraView.requestFocusInWindow(); |
---|
637 | 969 | } |
---|
| 970 | + |
---|
| 971 | + void CollapseToolbar() |
---|
| 972 | + { |
---|
| 973 | + framePanel.setDividerLocation(0); |
---|
| 974 | + //frame.validate(); |
---|
| 975 | + |
---|
| 976 | + cameraView.requestFocusInWindow(); |
---|
| 977 | + } |
---|
| 978 | + |
---|
| 979 | + private Object3D Duplicate(Object3D object) |
---|
| 980 | + { |
---|
| 981 | + boolean temp = CameraPane.SWITCH; |
---|
| 982 | + CameraPane.SWITCH = false; |
---|
| 983 | + |
---|
| 984 | + if (Grafreed.grafreed.universe.versiontable == null) |
---|
| 985 | + Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>(); |
---|
| 986 | + |
---|
| 987 | + object.ExtractBigData(Grafreed.grafreed.universe.versiontable); |
---|
| 988 | + // if (copy == client) |
---|
| 989 | + |
---|
| 990 | + Object3D versions[] = object.versionlist; |
---|
| 991 | + java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe |
---|
| 992 | + object.versionlist = null; |
---|
| 993 | + object.versiontable = null; |
---|
| 994 | + |
---|
| 995 | + Object3D parent = object.parent; |
---|
| 996 | + object.parent = null; |
---|
| 997 | + |
---|
| 998 | + //byte[] compress = Compress(copy); |
---|
| 999 | + Object3D compress = (Object3D)Grafreed.clone(object); |
---|
| 1000 | + |
---|
| 1001 | + object.parent = parent; |
---|
| 1002 | + |
---|
| 1003 | + object.versionlist = versions; |
---|
| 1004 | + object.versiontable = versiontable; // if Grafreed.grafreed.universe |
---|
| 1005 | + |
---|
| 1006 | + object.RestoreBigData(Grafreed.grafreed.universe.versiontable); |
---|
| 1007 | + |
---|
| 1008 | + CameraPane.SWITCH = temp; |
---|
| 1009 | + |
---|
| 1010 | + return compress; |
---|
| 1011 | + } |
---|
638 | 1012 | |
---|
639 | 1013 | private JTextPane createTextPane() |
---|
640 | 1014 | { |
---|
.. | .. |
---|
734 | 1108 | protected static ImageIcon createImageIcon(String path, |
---|
735 | 1109 | String description) |
---|
736 | 1110 | { |
---|
737 | | - java.net.URL imgURL = GrafreeD.class.getResource(path); |
---|
| 1111 | + java.net.URL imgURL = Grafreed.class.getResource(path); |
---|
738 | 1112 | if (imgURL != null) |
---|
739 | 1113 | { |
---|
740 | 1114 | return new ImageIcon(imgURL, description); |
---|
.. | .. |
---|
757 | 1131 | { |
---|
758 | 1132 | SetupMaterial(materialPanel); |
---|
759 | 1133 | } |
---|
| 1134 | + |
---|
760 | 1135 | //SetupName(); |
---|
761 | 1136 | //SetupViews(); |
---|
762 | 1137 | } |
---|
.. | .. |
---|
766 | 1141 | // NumberSlider vDivsField; |
---|
767 | 1142 | // JCheckBox endcaps; |
---|
768 | 1143 | JCheckBox liveCB; |
---|
| 1144 | + JCheckBox selectableCB; |
---|
769 | 1145 | JCheckBox hideCB; |
---|
770 | 1146 | JCheckBox link2masterCB; |
---|
771 | 1147 | JCheckBox markCB; |
---|
.. | .. |
---|
773 | 1149 | JCheckBox speedupCB; |
---|
774 | 1150 | JCheckBox rewindCB; |
---|
775 | 1151 | JCheckBox flipVCB; |
---|
| 1152 | + |
---|
| 1153 | + cCheckBox toggleTextureCB; |
---|
| 1154 | + cCheckBox toggleSwitchCB; |
---|
| 1155 | + |
---|
776 | 1156 | JComboBox texresMenu; |
---|
| 1157 | + |
---|
777 | 1158 | JButton resetButton; |
---|
778 | 1159 | JButton stepButton; |
---|
779 | 1160 | JButton stepAllButton; |
---|
.. | .. |
---|
782 | 1163 | JButton fasterButton; |
---|
783 | 1164 | JButton remarkButton; |
---|
784 | 1165 | |
---|
| 1166 | + cGridBag editPanel; |
---|
| 1167 | + cGridBag editCommandsPanel; |
---|
| 1168 | + |
---|
785 | 1169 | cGridBag namePanel; |
---|
786 | 1170 | cGridBag setupPanel; |
---|
787 | | - cGridBag commandsPanel; |
---|
| 1171 | + cGridBag setupPanel2; |
---|
| 1172 | + cGridBag objectCommandsPanel; |
---|
788 | 1173 | cGridBag pushPanel; |
---|
789 | 1174 | cGridBag fillPanel; |
---|
790 | 1175 | |
---|
.. | .. |
---|
951 | 1336 | |
---|
952 | 1337 | void SetupUI2(ObjEditor oe) |
---|
953 | 1338 | { |
---|
954 | | -// oe.aConstraints.weightx = 0; |
---|
955 | | -// oe.aConstraints.weighty = 0; |
---|
956 | | -// oe.aConstraints.gridx = 0; |
---|
957 | | -// oe.aConstraints.gridy = 0; |
---|
958 | 1339 | //SetupName(oe); |
---|
959 | 1340 | |
---|
960 | 1341 | namePanel = new cGridBag(); |
---|
961 | 1342 | |
---|
| 1343 | + //if (copy.pinned) |
---|
| 1344 | + { |
---|
| 1345 | + pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF); |
---|
| 1346 | + pinButton.setSelected(copy.pinned); |
---|
| 1347 | + cGridBag t = new cGridBag(); |
---|
| 1348 | + t.preferredWidth = 2; |
---|
| 1349 | + t.add(pinButton); |
---|
| 1350 | + namePanel.add(t); |
---|
| 1351 | + |
---|
| 1352 | + pinButton.addItemListener(this); |
---|
| 1353 | + } |
---|
| 1354 | + |
---|
962 | 1355 | nameField = AddText(namePanel, copy.GetName()); |
---|
963 | | - namePanel.add(nameField); |
---|
| 1356 | + namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER)); |
---|
964 | 1357 | oe.ctrlPanel.add(namePanel); |
---|
965 | 1358 | |
---|
966 | 1359 | oe.ctrlPanel.Return(); |
---|
967 | 1360 | |
---|
968 | | - if (!GroupEditor.allparams) |
---|
| 1361 | + if (!allparams) |
---|
969 | 1362 | return; |
---|
970 | 1363 | |
---|
971 | 1364 | setupPanel = new cGridBag().setVertical(false); |
---|
972 | 1365 | |
---|
973 | 1366 | liveCB = AddCheckBox(setupPanel, "Live", copy.live); |
---|
974 | | - link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master); |
---|
975 | | - hideCB = AddCheckBox(setupPanel, "Hide", copy.hide); |
---|
| 1367 | + liveCB.setToolTipText("Animate object"); |
---|
| 1368 | + markCB = AddCheckBox(setupPanel, "Anim", copy.marked); |
---|
| 1369 | + markCB.setToolTipText("Set target transform"); |
---|
| 1370 | + selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect); |
---|
| 1371 | + selectableCB.setToolTipText("Make object selectable"); |
---|
976 | 1372 | // Return(); |
---|
977 | | - markCB = AddCheckBox(setupPanel, "Mark", copy.marked); |
---|
978 | | - rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind); |
---|
979 | | - randomCB = AddCheckBox(setupPanel, "Rand", copy.random); |
---|
| 1373 | + |
---|
| 1374 | + hideCB = AddCheckBox(setupPanel, "Hide", copy.hide); |
---|
| 1375 | + hideCB.setToolTipText("Hide object"); |
---|
| 1376 | + |
---|
| 1377 | + ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false); |
---|
| 1378 | + |
---|
| 1379 | + setupPanel2 = new cGridBag().setVertical(false); |
---|
| 1380 | + |
---|
| 1381 | + rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind); |
---|
| 1382 | + rewindCB.setToolTipText("Rewind animation"); |
---|
| 1383 | + |
---|
| 1384 | + randomCB = AddCheckBox(setupPanel2, "Random", copy.random); |
---|
| 1385 | + randomCB.setToolTipText("Randomly Rewind (or Go back and forth)"); |
---|
980 | 1386 | |
---|
| 1387 | + link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master); |
---|
| 1388 | + link2masterCB.setToolTipText("Attach to support"); |
---|
| 1389 | + |
---|
| 1390 | + if (Globals.ADVANCED) |
---|
| 1391 | + { |
---|
| 1392 | + speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup); |
---|
| 1393 | + speedupCB.setToolTipText("Option motion capture"); |
---|
| 1394 | + } |
---|
| 1395 | + |
---|
981 | 1396 | oe.ctrlPanel.add(setupPanel); |
---|
982 | 1397 | oe.ctrlPanel.Return(); |
---|
| 1398 | + oe.ctrlPanel.add(setupPanel2); |
---|
| 1399 | + oe.ctrlPanel.Return(); |
---|
983 | 1400 | |
---|
984 | | - commandsPanel = new cGridBag().setVertical(false); |
---|
| 1401 | + objectCommandsPanel = new cGridBag().setVertical(false); |
---|
985 | 1402 | |
---|
986 | | - resetButton = AddButton(commandsPanel, "Reset"); |
---|
987 | | - stepButton = AddButton(commandsPanel, "Step"); |
---|
| 1403 | + resetButton = AddButton(objectCommandsPanel, "Reset"); |
---|
| 1404 | + resetButton.setToolTipText("Jump to frame zero"); |
---|
| 1405 | + stepButton = AddButton(objectCommandsPanel, "Step"); |
---|
| 1406 | + stepButton.setToolTipText("Step one frame"); |
---|
988 | 1407 | // resetAllButton = AddButton(oe, "Reset All"); |
---|
989 | 1408 | // stepAllButton = AddButton(oe, "Step All"); |
---|
990 | | - speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup); |
---|
991 | 1409 | // Return(); |
---|
992 | | - slowerButton = AddButton(commandsPanel, "Slow"); |
---|
993 | | - fasterButton = AddButton(commandsPanel, "Fast"); |
---|
994 | | - remarkButton = AddButton(commandsPanel, "Remark"); |
---|
| 1410 | + slowerButton = AddButton(objectCommandsPanel, "Slow"); |
---|
| 1411 | + slowerButton.setToolTipText("Decrease animation speed"); |
---|
| 1412 | + fasterButton = AddButton(objectCommandsPanel, "Fast"); |
---|
| 1413 | + fasterButton.setToolTipText("Increase animation speed"); |
---|
| 1414 | + remarkButton = AddButton(objectCommandsPanel, "Remark"); |
---|
| 1415 | + remarkButton.setToolTipText("Set the current transform as the target"); |
---|
995 | 1416 | |
---|
996 | | - oe.ctrlPanel.add(commandsPanel); |
---|
| 1417 | + oe.ctrlPanel.add(objectCommandsPanel); |
---|
997 | 1418 | oe.ctrlPanel.Return(); |
---|
998 | 1419 | |
---|
999 | | - pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1); |
---|
| 1420 | + pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons |
---|
1000 | 1421 | normalpushField = (cNumberSlider)pushPanel.getComponent(1); |
---|
1001 | 1422 | //Return(); |
---|
1002 | 1423 | |
---|
.. | .. |
---|
1153 | 1574 | |
---|
1154 | 1575 | if (cam == null || !(copy.get(0) instanceof cGroup)) |
---|
1155 | 1576 | { |
---|
1156 | | - System.out.println("CREATE CAMERAS"); |
---|
1157 | | - cams = new cTemplate(); |
---|
1158 | | - cams.name = "Cameras"; |
---|
1159 | | - copy.insertElementAt(cams, 0); |
---|
1160 | | - //cams.parent = copy; |
---|
1161 | | - |
---|
1162 | | - cam = new Camera(); // LA.newVector(3, 2, 1)); |
---|
1163 | | - cams.addChild(cam); |
---|
1164 | | - cam = new Camera(1); |
---|
1165 | | - cams.addChild(cam); |
---|
1166 | | - cam = new Camera(2); |
---|
1167 | | - cams.addChild(cam); |
---|
1168 | | - cam = new Camera(3); |
---|
1169 | | - cams.addChild(cam); |
---|
1170 | | - cam = new Camera(4); // Light |
---|
1171 | | - cams.addChild(cam); |
---|
| 1577 | + if (Globals.DEBUG) |
---|
| 1578 | + System.out.println("CREATE CAMERAS"); |
---|
| 1579 | + cams = CreateCameras(); |
---|
1172 | 1580 | } else |
---|
1173 | 1581 | { |
---|
1174 | 1582 | cams = (cGroup) copy.get(0); |
---|
.. | .. |
---|
1199 | 1607 | //worldPanel.setName("World"); |
---|
1200 | 1608 | centralPanel = new cGridBag(); |
---|
1201 | 1609 | centralPanel.preferredWidth = 20; |
---|
1202 | | - timelinePanel = new JPanel(new BorderLayout()); |
---|
1203 | | - timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel); |
---|
| 1610 | + |
---|
| 1611 | + if (Globals.ADVANCED) |
---|
| 1612 | + { |
---|
| 1613 | + timelinePanel = new JPanel(new BorderLayout()); |
---|
| 1614 | + timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel); |
---|
1204 | 1615 | |
---|
1205 | 1616 | cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel); |
---|
1206 | 1617 | cameraPanel.setContinuousLayout(true); |
---|
.. | .. |
---|
1209 | 1620 | // cameraPanel.setDividerSize(9); |
---|
1210 | 1621 | cameraPanel.setResizeWeight(1.0); |
---|
1211 | 1622 | |
---|
| 1623 | + } |
---|
| 1624 | + |
---|
1212 | 1625 | centralPanel.add(cameraView); |
---|
| 1626 | + centralPanel.setFocusable(true); |
---|
1213 | 1627 | //frame.setJMenuBar(timelineMenubar); |
---|
1214 | 1628 | //centralPanel.add(timelinePanel); |
---|
1215 | 1629 | |
---|
.. | .. |
---|
1228 | 1642 | //frontView.object = copy; |
---|
1229 | 1643 | //sideView.object = copy; |
---|
1230 | 1644 | |
---|
| 1645 | + transformPanel = new cGridBag().setVertical(true); |
---|
| 1646 | + |
---|
| 1647 | + cGridBag resetTransformPanel = new cGridBag(); |
---|
| 1648 | + |
---|
| 1649 | + resetTransformPanel.preferredHeight = 2; |
---|
| 1650 | + |
---|
| 1651 | + cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF); |
---|
| 1652 | + resetTransform.setToolTipText("Reset Translation, Rotation and Scale"); |
---|
| 1653 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1654 | + { |
---|
| 1655 | + public void mouseClicked(MouseEvent e) |
---|
| 1656 | + { |
---|
| 1657 | + ResetTransform(); |
---|
| 1658 | + } |
---|
| 1659 | + }); |
---|
| 1660 | + resetTransformPanel.add(resetTransform); |
---|
| 1661 | + |
---|
| 1662 | + resetTransform = GetButton("T only", !Globals.NIMBUSLAF); |
---|
| 1663 | + resetTransform.setToolTipText("Reset Translation only"); |
---|
| 1664 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1665 | + { |
---|
| 1666 | + public void mouseClicked(MouseEvent e) |
---|
| 1667 | + { |
---|
| 1668 | + ResetTransform(1); |
---|
| 1669 | + } |
---|
| 1670 | + }); |
---|
| 1671 | + resetTransformPanel.add(resetTransform); |
---|
| 1672 | + |
---|
| 1673 | + resetTransform = GetButton("RS only", !Globals.NIMBUSLAF); |
---|
| 1674 | + resetTransform.setToolTipText("Reset Rotation and Scale only"); |
---|
| 1675 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1676 | + { |
---|
| 1677 | + public void mouseClicked(MouseEvent e) |
---|
| 1678 | + { |
---|
| 1679 | + ResetTransform(2); |
---|
| 1680 | + } |
---|
| 1681 | + }); |
---|
| 1682 | + resetTransformPanel.add(resetTransform); |
---|
| 1683 | + |
---|
1231 | 1684 | XYZPanel = new cGridBag().setVertical(true); |
---|
1232 | 1685 | //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5)); |
---|
1233 | 1686 | |
---|
.. | .. |
---|
1235 | 1688 | XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll); |
---|
1236 | 1689 | XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll); |
---|
1237 | 1690 | XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll); |
---|
| 1691 | + //XYZPanel.setName("XYZ"); |
---|
1238 | 1692 | |
---|
| 1693 | + transformPanel.add(resetTransformPanel); |
---|
| 1694 | + transformPanel.add(XYZPanel); |
---|
| 1695 | + |
---|
1239 | 1696 | /* |
---|
1240 | 1697 | gridPanel = new JPanel(); //new BorderLayout()); |
---|
1241 | 1698 | gridPanel.setLayout(new GridLayout(1, 2)); |
---|
.. | .. |
---|
1243 | 1700 | gridPanel.add(cameraView); |
---|
1244 | 1701 | gridPanel.add(XYZPanel); |
---|
1245 | 1702 | */ |
---|
1246 | | - gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout()); |
---|
1247 | | - gridPanel.setContinuousLayout(true); |
---|
1248 | | - gridPanel.setOneTouchExpandable(true); |
---|
1249 | | - gridPanel.setDividerLocation(1.0); |
---|
1250 | | - gridPanel.setDividerSize(9); |
---|
1251 | | - gridPanel.setResizeWeight(0.85); |
---|
| 1703 | +// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout()); |
---|
| 1704 | +// gridPanel.setContinuousLayout(true); |
---|
| 1705 | +// gridPanel.setOneTouchExpandable(true); |
---|
| 1706 | +// gridPanel.setDividerLocation(1.0); |
---|
| 1707 | +// gridPanel.setDividerSize(9); |
---|
| 1708 | +// gridPanel.setResizeWeight(0.85); |
---|
1252 | 1709 | |
---|
1253 | 1710 | // aConstraints.weighty = 0; |
---|
1254 | 1711 | //System.out.println("THIS = " + this); |
---|
.. | .. |
---|
1271 | 1728 | |
---|
1272 | 1729 | //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); |
---|
1273 | 1730 | //tmp.setName("Edit"); |
---|
| 1731 | + objectPanel.add(skyboxPanel); |
---|
| 1732 | + objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg")); |
---|
| 1733 | + objectPanel.setToolTipTextAt(0, "Backgrounds"); |
---|
| 1734 | + |
---|
| 1735 | + objectPanel.add(toolboxPanel); |
---|
| 1736 | + objectPanel.setIconAt(1, GetIcon("icons/primitives.png")); |
---|
| 1737 | + objectPanel.setToolTipTextAt(1, "Objects & textures"); |
---|
| 1738 | + |
---|
1274 | 1739 | objectPanel.add(materialPanel); |
---|
| 1740 | + objectPanel.setIconAt(2, GetIcon("icons/material.png")); |
---|
| 1741 | + objectPanel.setToolTipTextAt(2, "Material"); |
---|
| 1742 | + |
---|
1275 | 1743 | // JPanel north = new JPanel(new BorderLayout()); |
---|
1276 | 1744 | // north.setName("Edit"); |
---|
1277 | 1745 | // north.add(ctrlPanel, BorderLayout.NORTH); |
---|
1278 | 1746 | // objectPanel.add(north); |
---|
1279 | | - objectPanel.add(ctrlPanel); |
---|
1280 | | - objectPanel.add(infoPanel); |
---|
1281 | | - |
---|
| 1747 | + objectPanel.add(editPanel); |
---|
| 1748 | + objectPanel.setIconAt(3, GetIcon("icons/writewhite.png")); |
---|
| 1749 | + objectPanel.setToolTipTextAt(3, "Edit controls"); |
---|
| 1750 | + |
---|
| 1751 | + objectPanel.add(transformPanel); |
---|
| 1752 | + objectPanel.setIconAt(4, GetIcon("icons/XYZ.png")); |
---|
| 1753 | + objectPanel.setToolTipTextAt(4, "TRS transform"); |
---|
| 1754 | + |
---|
| 1755 | + patchMaterial = true; |
---|
| 1756 | + cameraView.patchMaterial = this; |
---|
| 1757 | + objectPanel.setSelectedIndex(2); |
---|
| 1758 | + |
---|
1282 | 1759 | /* |
---|
1283 | 1760 | aConstraints.gridx = 0; |
---|
1284 | 1761 | aConstraints.gridwidth = 1; |
---|
.. | .. |
---|
1286 | 1763 | aConstraints.gridy += 1; |
---|
1287 | 1764 | aConstraints.gridwidth = 1; |
---|
1288 | 1765 | mainPanel.add(objectPanel, aConstraints); |
---|
1289 | | - */ |
---|
| 1766 | + */ |
---|
1290 | 1767 | |
---|
1291 | 1768 | scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS, |
---|
1292 | 1769 | VERTICAL_SCROLLBAR_AS_NEEDED, |
---|
.. | .. |
---|
1298 | 1775 | scrollpane.addMouseWheelListener(this); // Default not fast enough |
---|
1299 | 1776 | |
---|
1300 | 1777 | /*JTabbedPane*/ scenePanel = new cGridBag(); |
---|
1301 | | - scenePanel.preferredWidth = 7; |
---|
| 1778 | + scenePanel.preferredWidth = 6; |
---|
1302 | 1779 | |
---|
1303 | 1780 | JTabbedPane tabbedPane = new JTabbedPane(); |
---|
1304 | 1781 | tabbedPane.add(scrollpane); |
---|
1305 | 1782 | |
---|
1306 | | - tabbedPane.add(FSPane = new cFileSystemPane(this)); |
---|
1307 | | - |
---|
1308 | | - optionsPanel = new cGridBag().setVertical(true); |
---|
| 1783 | + optionsPanel = new cGridBag().setVertical(false); |
---|
1309 | 1784 | |
---|
1310 | 1785 | optionsPanel.setName("Options"); |
---|
1311 | 1786 | |
---|
1312 | 1787 | AddOptions(optionsPanel); //, aConstraints); |
---|
1313 | 1788 | |
---|
| 1789 | + tabbedPane.add(FSPane = new cFileSystemPane(this)); |
---|
| 1790 | + |
---|
1314 | 1791 | tabbedPane.add(optionsPanel); |
---|
1315 | 1792 | |
---|
1316 | 1793 | scenePanel.add(tabbedPane); |
---|
| 1794 | + |
---|
| 1795 | + cGridBag creditsPanel = new cGridBag().setVertical(true); |
---|
| 1796 | + creditsPanel.setName("Credits"); |
---|
| 1797 | + |
---|
| 1798 | + cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF); |
---|
| 1799 | + creditsPanel.add(ogaLabel); |
---|
| 1800 | + |
---|
| 1801 | + cButton creditButton; |
---|
| 1802 | + creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF)); |
---|
| 1803 | + creditButton.setToolTipText("https://opengameart.org"); |
---|
| 1804 | + |
---|
| 1805 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1806 | + { |
---|
| 1807 | + public void mouseClicked(MouseEvent e) |
---|
| 1808 | + { |
---|
| 1809 | + try |
---|
| 1810 | + { |
---|
| 1811 | + Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/")); |
---|
| 1812 | + } catch (Exception e1) |
---|
| 1813 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1814 | + { |
---|
| 1815 | + e1.printStackTrace(); |
---|
| 1816 | + } |
---|
| 1817 | + } |
---|
| 1818 | + }); |
---|
| 1819 | + |
---|
| 1820 | + ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF); |
---|
| 1821 | + creditsPanel.add(ogaLabel); |
---|
| 1822 | + |
---|
| 1823 | + creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF)); |
---|
| 1824 | + creditButton.setToolTipText("https://3delicious.net"); |
---|
| 1825 | + |
---|
| 1826 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1827 | + { |
---|
| 1828 | + public void mouseClicked(MouseEvent e) |
---|
| 1829 | + { |
---|
| 1830 | + try |
---|
| 1831 | + { |
---|
| 1832 | + Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net")); |
---|
| 1833 | + } catch (Exception e1) |
---|
| 1834 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1835 | + { |
---|
| 1836 | + e1.printStackTrace(); |
---|
| 1837 | + } |
---|
| 1838 | + } |
---|
| 1839 | + }); |
---|
| 1840 | + |
---|
| 1841 | + creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF)); |
---|
| 1842 | + creditButton.setToolTipText("https://archive3d.net"); |
---|
| 1843 | + |
---|
| 1844 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1845 | + { |
---|
| 1846 | + public void mouseClicked(MouseEvent e) |
---|
| 1847 | + { |
---|
| 1848 | + try |
---|
| 1849 | + { |
---|
| 1850 | + Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net")); |
---|
| 1851 | + } catch (Exception e1) |
---|
| 1852 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1853 | + { |
---|
| 1854 | + e1.printStackTrace(); |
---|
| 1855 | + } |
---|
| 1856 | + } |
---|
| 1857 | + }); |
---|
| 1858 | + |
---|
| 1859 | + creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF)); |
---|
| 1860 | + creditButton.setToolTipText("https://turbosquid.com"); |
---|
| 1861 | + |
---|
| 1862 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1863 | + { |
---|
| 1864 | + public void mouseClicked(MouseEvent e) |
---|
| 1865 | + { |
---|
| 1866 | + try |
---|
| 1867 | + { |
---|
| 1868 | + Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free")); |
---|
| 1869 | + } catch (Exception e1) |
---|
| 1870 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1871 | + { |
---|
| 1872 | + e1.printStackTrace(); |
---|
| 1873 | + } |
---|
| 1874 | + } |
---|
| 1875 | + }); |
---|
| 1876 | + |
---|
| 1877 | + for (int i=6; --i>=0;) |
---|
| 1878 | + { |
---|
| 1879 | + creditsPanel.add(new cGridBag()); |
---|
| 1880 | + } |
---|
| 1881 | + |
---|
| 1882 | + tabbedPane.add(creditsPanel); |
---|
| 1883 | + tabbedPane.setToolTipTextAt(3, "Credits"); |
---|
| 1884 | + |
---|
| 1885 | + if (Globals.ADVANCED) |
---|
| 1886 | + { |
---|
| 1887 | + tabbedPane.add(infoPanel); |
---|
| 1888 | + tabbedPane.setIconAt(4, GetIcon("icons/info.png")); |
---|
| 1889 | + tabbedPane.setToolTipTextAt(4, "Information"); |
---|
| 1890 | + } |
---|
1317 | 1891 | |
---|
1318 | 1892 | /* |
---|
1319 | 1893 | cTree jTree = new cTree(null); |
---|
.. | .. |
---|
1335 | 1909 | jtp.add(tree); |
---|
1336 | 1910 | */ |
---|
1337 | 1911 | |
---|
1338 | | - bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel); |
---|
1339 | | - bigPanel.setContinuousLayout(true); |
---|
1340 | | - bigPanel.setOneTouchExpandable(true); |
---|
1341 | | - bigPanel.setDividerLocation(0.8); |
---|
1342 | | - bigPanel.setDividerSize(15); |
---|
1343 | | - bigPanel.setResizeWeight(0.15); |
---|
1344 | | - bigPanel.setName("Scene"); |
---|
| 1912 | +// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel); |
---|
| 1913 | +// bigPanel.setContinuousLayout(true); |
---|
| 1914 | +// bigPanel.setOneTouchExpandable(true); |
---|
| 1915 | +// bigPanel.setDividerLocation(0.8); |
---|
| 1916 | +// bigPanel.setDividerSize(15); |
---|
| 1917 | +// bigPanel.setResizeWeight(0.15); |
---|
| 1918 | +// bigPanel.setName("Scene"); |
---|
1345 | 1919 | |
---|
1346 | 1920 | //bigPanel.setLayout(new BorderLayout()); |
---|
1347 | 1921 | //bigPanel.setSize(new Dimension(10,10)); |
---|
.. | .. |
---|
1376 | 1950 | bigThree = new cGridBag(); |
---|
1377 | 1951 | bigThree.addComponent(scenePanel); |
---|
1378 | 1952 | bigThree.addComponent(centralPanel); |
---|
1379 | | - bigThree.addComponent(XYZPanel); |
---|
| 1953 | + //bigThree.addComponent(XYZPanel); |
---|
1380 | 1954 | |
---|
1381 | 1955 | // // SIDE EFFECT!!! |
---|
1382 | 1956 | // aConstraints.gridx = 0; |
---|
.. | .. |
---|
1385 | 1959 | // aConstraints.gridheight = 1; |
---|
1386 | 1960 | |
---|
1387 | 1961 | framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree); |
---|
1388 | | - framePanel.setContinuousLayout(true); |
---|
1389 | | - framePanel.setOneTouchExpandable(true); |
---|
1390 | | - framePanel.setDividerLocation(0.8); |
---|
| 1962 | + |
---|
| 1963 | + framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, |
---|
| 1964 | + new java.beans.PropertyChangeListener() |
---|
| 1965 | + { |
---|
| 1966 | + public void propertyChange(java.beans.PropertyChangeEvent pce) |
---|
| 1967 | + { |
---|
| 1968 | + if ((Integer)pce.getOldValue() == 1) |
---|
| 1969 | + { |
---|
| 1970 | + if (radio.layout != expandedLayout) |
---|
| 1971 | + { |
---|
| 1972 | + radio.layout = expandedLayout; |
---|
| 1973 | + radio.layout.doClick(); |
---|
| 1974 | + } |
---|
| 1975 | + } |
---|
| 1976 | + } |
---|
| 1977 | + }); |
---|
| 1978 | + |
---|
| 1979 | + framePanel.setContinuousLayout(false); |
---|
| 1980 | + framePanel.setOneTouchExpandable(false); |
---|
| 1981 | + //.setDividerLocation(0.8); |
---|
1391 | 1982 | //framePanel.setDividerSize(15); |
---|
1392 | 1983 | //framePanel.setResizeWeight(0.15); |
---|
1393 | 1984 | framePanel.setName("Frame"); |
---|
1394 | 1985 | |
---|
1395 | 1986 | frame.getContentPane().setLayout(new BorderLayout()); |
---|
1396 | 1987 | /**/ |
---|
1397 | | - JTabbedPane worldPane = new JTabbedPane(); |
---|
| 1988 | + //JTabbedPane worldPane = new JTabbedPane(); |
---|
1398 | 1989 | //worldPane.add(bigPanel); |
---|
1399 | 1990 | //worldPane.add(worldPanel); |
---|
1400 | 1991 | /**/ |
---|
.. | .. |
---|
1404 | 1995 | |
---|
1405 | 1996 | // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc); |
---|
1406 | 1997 | |
---|
1407 | | - frame.setSize(1024, 768); |
---|
1408 | | - frame.show(); |
---|
| 1998 | + frame.setSize(1280, 860); |
---|
| 1999 | + |
---|
| 2000 | + cameraView.requestFocusInWindow(); |
---|
| 2001 | + |
---|
| 2002 | +// gridPanel.setDividerLocation(1.0); |
---|
| 2003 | + |
---|
| 2004 | + frame.validate(); |
---|
1409 | 2005 | |
---|
1410 | | - gridPanel.setDividerLocation(1.0); |
---|
| 2006 | + frame.setVisible(true); |
---|
1411 | 2007 | |
---|
1412 | 2008 | frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); |
---|
1413 | 2009 | frame.addWindowListener(new WindowAdapter() |
---|
1414 | 2010 | { |
---|
1415 | | - |
---|
1416 | 2011 | public void windowClosing(WindowEvent e) |
---|
1417 | 2012 | { |
---|
1418 | 2013 | Close(); |
---|
.. | .. |
---|
1435 | 2030 | ctrlPanel.removeAll(); |
---|
1436 | 2031 | } |
---|
1437 | 2032 | |
---|
1438 | | - void SetupMaterial(cGridBag panel) |
---|
| 2033 | + void SetupMaterial(cGridBag materialpanel) |
---|
1439 | 2034 | { |
---|
1440 | | - /* |
---|
| 2035 | + cGridBag presetpanel = new cGridBag().setVertical(true); |
---|
| 2036 | + |
---|
| 2037 | + cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF); |
---|
| 2038 | + skin.setToolTipText("Skin"); |
---|
| 2039 | + skin.addMouseListener(new MouseAdapter() |
---|
| 2040 | + { |
---|
| 2041 | + public void mouseClicked(MouseEvent e) |
---|
| 2042 | + { |
---|
| 2043 | + Object3D object = Grafreed.materials.versionlist[0].get(0); |
---|
| 2044 | + cMaterial material = object.material; |
---|
| 2045 | + |
---|
| 2046 | + // Skin |
---|
| 2047 | + colorField.setFloat(material.color); |
---|
| 2048 | + float saturation = material.modulation; |
---|
| 2049 | + |
---|
| 2050 | + if (!cameraView.Skinshader) |
---|
| 2051 | + { |
---|
| 2052 | + saturation /= 1.5; |
---|
| 2053 | + } |
---|
| 2054 | + |
---|
| 2055 | + saturationField.setFloat(saturation); |
---|
| 2056 | + |
---|
| 2057 | + subsurfaceField.setFloat(material.subsurface); |
---|
| 2058 | + selfshadowField.setFloat(material.diffuseness); |
---|
| 2059 | + diffusenessField.setFloat(material.factor); |
---|
| 2060 | + shininessField.setFloat(material.shininess); |
---|
| 2061 | + shadowbiasField.setFloat(material.shadowbias); |
---|
| 2062 | + diffuseField.setFloat(material.diffuse); |
---|
| 2063 | + specularField.setFloat(material.specular); |
---|
| 2064 | + |
---|
| 2065 | + bumpField.setFloat(object.projectedVertices[0].x / 1000.0); |
---|
| 2066 | + noiseField.setFloat(object.projectedVertices[0].y / 1000.0); |
---|
| 2067 | + powerField.setFloat(object.projectedVertices[2].x / 1000.0); |
---|
| 2068 | + |
---|
| 2069 | + materialtouched = true; |
---|
| 2070 | + applySelf(); |
---|
| 2071 | + } |
---|
| 2072 | + }); |
---|
| 2073 | + presetpanel.add(skin); |
---|
| 2074 | + |
---|
| 2075 | + cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF); |
---|
| 2076 | + lambert.setToolTipText("Diffuse"); |
---|
| 2077 | + lambert.addMouseListener(new MouseAdapter() |
---|
| 2078 | + { |
---|
| 2079 | + public void mouseClicked(MouseEvent e) |
---|
| 2080 | + { |
---|
| 2081 | + Object3D object = Grafreed.materials.versionlist[2].get(0); |
---|
| 2082 | + cMaterial material = object.material; |
---|
| 2083 | + |
---|
| 2084 | + diffusenessField.setFloat(material.factor); |
---|
| 2085 | + selfshadowField.setFloat(material.diffuseness); |
---|
| 2086 | + |
---|
| 2087 | + materialtouched = true; |
---|
| 2088 | + applySelf(); |
---|
| 2089 | + } |
---|
| 2090 | + }); |
---|
| 2091 | + presetpanel.add(lambert); |
---|
| 2092 | + |
---|
| 2093 | + cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF); |
---|
| 2094 | + diffuse2.setToolTipText("Diffuse2"); |
---|
| 2095 | + diffuse2.addMouseListener(new MouseAdapter() |
---|
| 2096 | + { |
---|
| 2097 | + public void mouseClicked(MouseEvent e) |
---|
| 2098 | + { |
---|
| 2099 | + Object3D object = Grafreed.materials.versionlist[3].get(0); |
---|
| 2100 | + cMaterial material = object.material; |
---|
| 2101 | + |
---|
| 2102 | + diffusenessField.setFloat(material.factor); |
---|
| 2103 | + selfshadowField.setFloat(material.diffuseness); |
---|
| 2104 | + |
---|
| 2105 | + materialtouched = true; |
---|
| 2106 | + applySelf(); |
---|
| 2107 | + } |
---|
| 2108 | + }); |
---|
| 2109 | + presetpanel.add(diffuse2); |
---|
| 2110 | + |
---|
| 2111 | + cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF); |
---|
| 2112 | + diffusemoon.setToolTipText("Moon"); |
---|
| 2113 | + diffusemoon.addMouseListener(new MouseAdapter() |
---|
| 2114 | + { |
---|
| 2115 | + public void mouseClicked(MouseEvent e) |
---|
| 2116 | + { |
---|
| 2117 | + Object3D object = Grafreed.materials.versionlist[4].get(0); |
---|
| 2118 | + cMaterial material = object.material; |
---|
| 2119 | + |
---|
| 2120 | + diffusenessField.setFloat(material.factor); |
---|
| 2121 | + selfshadowField.setFloat(material.diffuseness); |
---|
| 2122 | + |
---|
| 2123 | + materialtouched = true; |
---|
| 2124 | + applySelf(); |
---|
| 2125 | + } |
---|
| 2126 | + }); |
---|
| 2127 | + presetpanel.add(diffusemoon); |
---|
| 2128 | + |
---|
| 2129 | + cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF); |
---|
| 2130 | + diffusemoon2.setToolTipText("Moon2"); |
---|
| 2131 | + diffusemoon2.addMouseListener(new MouseAdapter() |
---|
| 2132 | + { |
---|
| 2133 | + public void mouseClicked(MouseEvent e) |
---|
| 2134 | + { |
---|
| 2135 | + Object3D object = Grafreed.materials.versionlist[5].get(0); |
---|
| 2136 | + cMaterial material = object.material; |
---|
| 2137 | + |
---|
| 2138 | + diffusenessField.setFloat(material.factor); |
---|
| 2139 | + selfshadowField.setFloat(material.diffuseness); |
---|
| 2140 | + |
---|
| 2141 | + materialtouched = true; |
---|
| 2142 | + applySelf(); |
---|
| 2143 | + } |
---|
| 2144 | + }); |
---|
| 2145 | + presetpanel.add(diffusemoon2); |
---|
| 2146 | + |
---|
| 2147 | + cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF); |
---|
| 2148 | + diffusemoon3.setToolTipText("Moon3"); |
---|
| 2149 | + diffusemoon3.addMouseListener(new MouseAdapter() |
---|
| 2150 | + { |
---|
| 2151 | + public void mouseClicked(MouseEvent e) |
---|
| 2152 | + { |
---|
| 2153 | + Object3D object = Grafreed.materials.versionlist[6].get(0); |
---|
| 2154 | + cMaterial material = object.material; |
---|
| 2155 | + |
---|
| 2156 | + diffusenessField.setFloat(material.factor); |
---|
| 2157 | + selfshadowField.setFloat(material.diffuseness); |
---|
| 2158 | + |
---|
| 2159 | + materialtouched = true; |
---|
| 2160 | + applySelf(); |
---|
| 2161 | + } |
---|
| 2162 | + }); |
---|
| 2163 | + presetpanel.add(diffusemoon3); |
---|
| 2164 | + |
---|
| 2165 | + cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF); |
---|
| 2166 | + diffusesheen.setToolTipText("Sheen"); |
---|
| 2167 | + diffusesheen.addMouseListener(new MouseAdapter() |
---|
| 2168 | + { |
---|
| 2169 | + public void mouseClicked(MouseEvent e) |
---|
| 2170 | + { |
---|
| 2171 | + Object3D object = Grafreed.materials.versionlist[7].get(0); |
---|
| 2172 | + cMaterial material = object.material; |
---|
| 2173 | + |
---|
| 2174 | + sheenField.setFloat(material.sheen); |
---|
| 2175 | + |
---|
| 2176 | + materialtouched = true; |
---|
| 2177 | + applySelf(); |
---|
| 2178 | + } |
---|
| 2179 | + }); |
---|
| 2180 | + presetpanel.add(diffusesheen); |
---|
| 2181 | + |
---|
| 2182 | + cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF); |
---|
| 2183 | + rough.setToolTipText("Rough metal"); |
---|
| 2184 | + rough.addMouseListener(new MouseAdapter() |
---|
| 2185 | + { |
---|
| 2186 | + public void mouseClicked(MouseEvent e) |
---|
| 2187 | + { |
---|
| 2188 | + Object3D object = Grafreed.materials.versionlist[1].get(0); |
---|
| 2189 | + cMaterial material = object.material; |
---|
| 2190 | + |
---|
| 2191 | + shininessField.setFloat(material.shininess); |
---|
| 2192 | + velvetField.setFloat(material.velvet); |
---|
| 2193 | + |
---|
| 2194 | + materialtouched = true; |
---|
| 2195 | + applySelf(); |
---|
| 2196 | + } |
---|
| 2197 | + }); |
---|
| 2198 | + presetpanel.add(rough); |
---|
| 2199 | + |
---|
| 2200 | + cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF); |
---|
| 2201 | + rough2.setToolTipText("Medium metal"); |
---|
| 2202 | + rough2.addMouseListener(new MouseAdapter() |
---|
| 2203 | + { |
---|
| 2204 | + public void mouseClicked(MouseEvent e) |
---|
| 2205 | + { |
---|
| 2206 | + Object3D object = Grafreed.materials.versionlist[13].get(0); |
---|
| 2207 | + cMaterial material = object.material; |
---|
| 2208 | + |
---|
| 2209 | + shininessField.setFloat(material.shininess); |
---|
| 2210 | + lightareaField.setFloat(material.lightarea); |
---|
| 2211 | + |
---|
| 2212 | + materialtouched = true; |
---|
| 2213 | + applySelf(); |
---|
| 2214 | + } |
---|
| 2215 | + }); |
---|
| 2216 | + presetpanel.add(rough2); |
---|
| 2217 | + |
---|
| 2218 | + cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF); |
---|
| 2219 | + shini0.setToolTipText("Shiny"); |
---|
| 2220 | + shini0.addMouseListener(new MouseAdapter() |
---|
| 2221 | + { |
---|
| 2222 | + public void mouseClicked(MouseEvent e) |
---|
| 2223 | + { |
---|
| 2224 | + Object3D object = Grafreed.materials.versionlist[14].get(0); |
---|
| 2225 | + cMaterial material = object.material; |
---|
| 2226 | + |
---|
| 2227 | + shininessField.setFloat(material.shininess); |
---|
| 2228 | + lightareaField.setFloat(material.lightarea); |
---|
| 2229 | + |
---|
| 2230 | + materialtouched = true; |
---|
| 2231 | + applySelf(); |
---|
| 2232 | + } |
---|
| 2233 | + }); |
---|
| 2234 | + presetpanel.add(shini0); |
---|
| 2235 | + |
---|
| 2236 | + cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF); |
---|
| 2237 | + shini1.setToolTipText("Shiny2"); |
---|
| 2238 | + shini1.addMouseListener(new MouseAdapter() |
---|
| 2239 | + { |
---|
| 2240 | + public void mouseClicked(MouseEvent e) |
---|
| 2241 | + { |
---|
| 2242 | + Object3D object = Grafreed.materials.versionlist[11].get(0); |
---|
| 2243 | + cMaterial material = object.material; |
---|
| 2244 | + |
---|
| 2245 | + shininessField.setFloat(material.shininess); |
---|
| 2246 | + lightareaField.setFloat(material.lightarea); |
---|
| 2247 | + |
---|
| 2248 | + materialtouched = true; |
---|
| 2249 | + applySelf(); |
---|
| 2250 | + } |
---|
| 2251 | + }); |
---|
| 2252 | + presetpanel.add(shini1); |
---|
| 2253 | + |
---|
| 2254 | + cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF); |
---|
| 2255 | + shini2.setToolTipText("Shiny3"); |
---|
| 2256 | + shini2.addMouseListener(new MouseAdapter() |
---|
| 2257 | + { |
---|
| 2258 | + public void mouseClicked(MouseEvent e) |
---|
| 2259 | + { |
---|
| 2260 | + Object3D object = Grafreed.materials.versionlist[12].get(0); |
---|
| 2261 | + cMaterial material = object.material; |
---|
| 2262 | + |
---|
| 2263 | + shininessField.setFloat(material.shininess); |
---|
| 2264 | + lightareaField.setFloat(material.lightarea); |
---|
| 2265 | + |
---|
| 2266 | + materialtouched = true; |
---|
| 2267 | + applySelf(); |
---|
| 2268 | + } |
---|
| 2269 | + }); |
---|
| 2270 | + presetpanel.add(shini2); |
---|
| 2271 | + |
---|
| 2272 | + cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF); |
---|
| 2273 | + aniso.setToolTipText("AnisoU"); |
---|
| 2274 | + aniso.addMouseListener(new MouseAdapter() |
---|
| 2275 | + { |
---|
| 2276 | + public void mouseClicked(MouseEvent e) |
---|
| 2277 | + { |
---|
| 2278 | + Object3D object = Grafreed.materials.versionlist[8].get(0); |
---|
| 2279 | + cMaterial material = object.material; |
---|
| 2280 | + |
---|
| 2281 | + anisoField.setFloat(material.aniso); |
---|
| 2282 | + anisoVField.setFloat(material.anisoV); |
---|
| 2283 | + |
---|
| 2284 | + materialtouched = true; |
---|
| 2285 | + applySelf(); |
---|
| 2286 | + } |
---|
| 2287 | + }); |
---|
| 2288 | + presetpanel.add(aniso); |
---|
| 2289 | + |
---|
| 2290 | + cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF); |
---|
| 2291 | + aniso2.setToolTipText("AnisoV"); |
---|
| 2292 | + aniso2.addMouseListener(new MouseAdapter() |
---|
| 2293 | + { |
---|
| 2294 | + public void mouseClicked(MouseEvent e) |
---|
| 2295 | + { |
---|
| 2296 | + Object3D object = Grafreed.materials.versionlist[9].get(0); |
---|
| 2297 | + cMaterial material = object.material; |
---|
| 2298 | + |
---|
| 2299 | + anisoField.setFloat(material.aniso); |
---|
| 2300 | + anisoVField.setFloat(material.anisoV); |
---|
| 2301 | + |
---|
| 2302 | + materialtouched = true; |
---|
| 2303 | + applySelf(); |
---|
| 2304 | + } |
---|
| 2305 | + }); |
---|
| 2306 | + presetpanel.add(aniso2); |
---|
| 2307 | + |
---|
| 2308 | + cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF); |
---|
| 2309 | + aniso3.setToolTipText("AnisoUV"); |
---|
| 2310 | + aniso3.addMouseListener(new MouseAdapter() |
---|
| 2311 | + { |
---|
| 2312 | + public void mouseClicked(MouseEvent e) |
---|
| 2313 | + { |
---|
| 2314 | + Object3D object = Grafreed.materials.versionlist[10].get(0); |
---|
| 2315 | + cMaterial material = object.material; |
---|
| 2316 | + |
---|
| 2317 | + anisoField.setFloat(material.aniso); |
---|
| 2318 | + anisoVField.setFloat(material.anisoV); |
---|
| 2319 | + |
---|
| 2320 | + materialtouched = true; |
---|
| 2321 | + applySelf(); |
---|
| 2322 | + } |
---|
| 2323 | + }); |
---|
| 2324 | + presetpanel.add(aniso3); |
---|
| 2325 | + |
---|
| 2326 | + cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF); |
---|
| 2327 | + velvet0.setToolTipText("Velvet"); |
---|
| 2328 | + velvet0.addMouseListener(new MouseAdapter() |
---|
| 2329 | + { |
---|
| 2330 | + public void mouseClicked(MouseEvent e) |
---|
| 2331 | + { |
---|
| 2332 | + Object3D object = Grafreed.materials.versionlist[15].get(0); |
---|
| 2333 | + cMaterial material = object.material; |
---|
| 2334 | + |
---|
| 2335 | + diffusenessField.setFloat(material.factor); |
---|
| 2336 | + selfshadowField.setFloat(material.diffuseness); |
---|
| 2337 | + sheenField.setFloat(material.sheen); |
---|
| 2338 | + shininessField.setFloat(material.shininess); |
---|
| 2339 | + velvetField.setFloat(material.velvet); |
---|
| 2340 | + shiftField.setFloat(material.shift); |
---|
| 2341 | + |
---|
| 2342 | + materialtouched = true; |
---|
| 2343 | + applySelf(); |
---|
| 2344 | + } |
---|
| 2345 | + }); |
---|
| 2346 | + presetpanel.add(velvet0); |
---|
| 2347 | + |
---|
| 2348 | + cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF); |
---|
| 2349 | + bump0.setToolTipText("Bump texture"); |
---|
| 2350 | + bump0.addMouseListener(new MouseAdapter() |
---|
| 2351 | + { |
---|
| 2352 | + public void mouseClicked(MouseEvent e) |
---|
| 2353 | + { |
---|
| 2354 | + Object3D object = Grafreed.materials.versionlist[16].get(0); |
---|
| 2355 | + cMaterial material = object.material; |
---|
| 2356 | + |
---|
| 2357 | + bumpField.setFloat(object.projectedVertices[0].x / 1000.0); |
---|
| 2358 | + noiseField.setFloat(object.projectedVertices[0].y / 1000.0); |
---|
| 2359 | + powerField.setFloat(object.projectedVertices[2].x / 1000.0); |
---|
| 2360 | + |
---|
| 2361 | + materialtouched = true; |
---|
| 2362 | + applySelf(); |
---|
| 2363 | + } |
---|
| 2364 | + }); |
---|
| 2365 | + presetpanel.add(bump0); |
---|
| 2366 | + |
---|
| 2367 | + cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF); |
---|
| 2368 | + borderShader.setToolTipText("Border fade"); |
---|
| 2369 | + borderShader.addMouseListener(new MouseAdapter() |
---|
| 2370 | + { |
---|
| 2371 | + public void mouseClicked(MouseEvent e) |
---|
| 2372 | + { |
---|
| 2373 | + borderfadeField.setFloat(0.5); |
---|
| 2374 | + opacityField.setFloat(0.75); |
---|
| 2375 | + |
---|
| 2376 | + materialtouched = true; |
---|
| 2377 | + applySelf(); |
---|
| 2378 | + } |
---|
| 2379 | + }); |
---|
| 2380 | + presetpanel.add(borderShader); |
---|
| 2381 | + |
---|
| 2382 | + cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF); |
---|
| 2383 | + halo.setToolTipText("Halo"); |
---|
| 2384 | + halo.addMouseListener(new MouseAdapter() |
---|
| 2385 | + { |
---|
| 2386 | + public void mouseClicked(MouseEvent e) |
---|
| 2387 | + { |
---|
| 2388 | + Object3D object = Grafreed.materials.versionlist[17].get(0); |
---|
| 2389 | + cMaterial material = object.material; |
---|
| 2390 | + |
---|
| 2391 | + opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0); |
---|
| 2392 | + |
---|
| 2393 | + materialtouched = true; |
---|
| 2394 | + applySelf(); |
---|
| 2395 | + } |
---|
| 2396 | + }); |
---|
| 2397 | + presetpanel.add(halo); |
---|
| 2398 | + |
---|
| 2399 | + cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF); |
---|
| 2400 | + candle.setToolTipText("Candle"); |
---|
| 2401 | + candle.addMouseListener(new MouseAdapter() |
---|
| 2402 | + { |
---|
| 2403 | + public void mouseClicked(MouseEvent e) |
---|
| 2404 | + { |
---|
| 2405 | + Object3D object = Grafreed.materials.versionlist[18].get(0); |
---|
| 2406 | + cMaterial material = object.material; |
---|
| 2407 | + |
---|
| 2408 | + subsurfaceField.setFloat(material.subsurface); |
---|
| 2409 | + shadowbiasField.setFloat(material.shadowbias); |
---|
| 2410 | + ambientField.setFloat(material.ambient); |
---|
| 2411 | + specularField.setFloat(material.specular); |
---|
| 2412 | + lightareaField.setFloat(material.lightarea); |
---|
| 2413 | + shininessField.setFloat(material.shininess); |
---|
| 2414 | + |
---|
| 2415 | + materialtouched = true; |
---|
| 2416 | + applySelf(); |
---|
| 2417 | + } |
---|
| 2418 | + }); |
---|
| 2419 | + presetpanel.add(candle); |
---|
| 2420 | + |
---|
| 2421 | + cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF); |
---|
| 2422 | + shadowShader.setToolTipText("Shadow"); |
---|
| 2423 | + shadowShader.addMouseListener(new MouseAdapter() |
---|
| 2424 | + { |
---|
| 2425 | + public void mouseClicked(MouseEvent e) |
---|
| 2426 | + { |
---|
| 2427 | + diffuseField.setFloat(0.001); |
---|
| 2428 | + ambientField.setFloat(0.001); |
---|
| 2429 | + cameraField.setFloat(0.001); |
---|
| 2430 | + specularField.setFloat(0.001); |
---|
| 2431 | + fakedepthField.setFloat(0.001); |
---|
| 2432 | + opacityField.setFloat(0.6); |
---|
| 2433 | + |
---|
| 2434 | + materialtouched = true; |
---|
| 2435 | + applySelf(); |
---|
| 2436 | + } |
---|
| 2437 | + }); |
---|
| 2438 | + presetpanel.add(shadowShader); |
---|
| 2439 | + |
---|
| 2440 | + cGridBag panel = new cGridBag().setVertical(true); |
---|
| 2441 | + |
---|
| 2442 | + presetpanel.preferredWidth = 1; |
---|
| 2443 | + |
---|
| 2444 | + materialpanel.add(presetpanel); |
---|
| 2445 | + materialpanel.add(panel); |
---|
| 2446 | + |
---|
| 2447 | + panel.preferredWidth = 8; |
---|
| 2448 | + |
---|
| 2449 | + /* |
---|
1441 | 2450 | ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints); |
---|
1442 | 2451 | materialLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1443 | | - */ |
---|
| 2452 | + */ |
---|
1444 | 2453 | |
---|
1445 | 2454 | cGridBag editBar = new cGridBag().setVertical(false); |
---|
1446 | 2455 | |
---|
1447 | | - editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints); |
---|
| 2456 | + editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
1448 | 2457 | createMaterialButton.setToolTipText("Create material"); |
---|
1449 | 2458 | |
---|
1450 | 2459 | /* |
---|
1451 | 2460 | ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints); |
---|
1452 | 2461 | */ |
---|
1453 | 2462 | |
---|
1454 | | - editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints); |
---|
| 2463 | + editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
1455 | 2464 | clearMaterialButton.setToolTipText("Clear material"); |
---|
1456 | 2465 | |
---|
1457 | | - editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints); |
---|
1458 | | - editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints); |
---|
1459 | | - editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints); |
---|
| 2466 | + if (Globals.ADVANCED) |
---|
| 2467 | + { |
---|
| 2468 | + editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
| 2469 | + editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints); |
---|
| 2470 | + editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints); |
---|
| 2471 | + } |
---|
1460 | 2472 | |
---|
1461 | 2473 | editBar.preferredHeight = 15; |
---|
1462 | 2474 | |
---|
.. | .. |
---|
1471 | 2483 | //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
---|
1472 | 2484 | |
---|
1473 | 2485 | cGridBag colorSection = new cGridBag().setVertical(true); |
---|
| 2486 | + |
---|
| 2487 | + cGridBag huepanel = new cGridBag(); |
---|
| 2488 | + cGridBag huelabel = new cGridBag(); |
---|
| 2489 | + cLabel hue = GetLabel("icons/hue.png", false); |
---|
| 2490 | + hue.fit = true; |
---|
| 2491 | + |
---|
| 2492 | + hue.addMouseListener(new MouseAdapter() |
---|
| 2493 | + { |
---|
| 2494 | + public void mousePressed(MouseEvent e) |
---|
| 2495 | + { |
---|
| 2496 | + int x = e.getX(); |
---|
| 2497 | + |
---|
| 2498 | + colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth()); |
---|
| 2499 | + } |
---|
| 2500 | + }); |
---|
| 2501 | + |
---|
| 2502 | + huelabel.add(hue); |
---|
| 2503 | + huelabel.preferredWidth = 20; |
---|
| 2504 | + huepanel.add(new cGridBag()); // Label |
---|
| 2505 | + huepanel.add(huelabel); // Field/slider |
---|
| 2506 | + |
---|
| 2507 | + huepanel.preferredHeight = 7; |
---|
| 2508 | + |
---|
| 2509 | + colorSection.add(huepanel); |
---|
1474 | 2510 | |
---|
1475 | 2511 | cGridBag color = new cGridBag(); |
---|
1476 | | - color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints); |
---|
1477 | | - colorLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1478 | | - color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
| 2512 | + |
---|
| 2513 | + color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints); |
---|
| 2514 | + colorLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
| 2515 | + color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints); |
---|
| 2516 | + |
---|
1479 | 2517 | //colorField.preferredWidth = 200; |
---|
1480 | 2518 | colorSection.add(color); |
---|
1481 | 2519 | |
---|
1482 | 2520 | cGridBag modulation = new cGridBag(); |
---|
1483 | 2521 | modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints); |
---|
1484 | 2522 | modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1485 | | - modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
| 2523 | + modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints); |
---|
1486 | 2524 | colorSection.add(modulation); |
---|
1487 | 2525 | |
---|
| 2526 | + cGridBag opacity = new cGridBag(); |
---|
| 2527 | + opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints); |
---|
| 2528 | + opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
| 2529 | + opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints); |
---|
| 2530 | + colorSection.add(opacity); |
---|
| 2531 | + |
---|
| 2532 | + colorSection.add(GetSeparator()); |
---|
| 2533 | + |
---|
1488 | 2534 | cGridBag texture = new cGridBag(); |
---|
1489 | 2535 | texture.add(textureLabel = new JLabel("Texture")); // , aConstraints); |
---|
1490 | 2536 | textureLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1491 | 2537 | texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
1492 | 2538 | colorSection.add(texture); |
---|
1493 | 2539 | |
---|
1494 | | - cGridBag anisoU = new cGridBag(); |
---|
1495 | | - anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints); |
---|
1496 | | - anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1497 | | - anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
1498 | | - colorSection.add(anisoU); |
---|
1499 | | - |
---|
1500 | | - cGridBag anisoV = new cGridBag(); |
---|
1501 | | - anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints); |
---|
1502 | | - anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1503 | | - anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
1504 | | - colorSection.add(anisoV); |
---|
1505 | | - |
---|
1506 | | - cGridBag shadowbias = new cGridBag(); |
---|
1507 | | - shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints); |
---|
1508 | | - shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1509 | | - shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
---|
1510 | | - colorSection.add(shadowbias); |
---|
1511 | | - |
---|
1512 | | - panel.add(new JSeparator()); |
---|
| 2540 | + panel.add(GetSeparator()); |
---|
1513 | 2541 | |
---|
1514 | 2542 | panel.add(colorSection); |
---|
1515 | 2543 | |
---|
.. | .. |
---|
1559 | 2587 | fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
---|
1560 | 2588 | diffuseSection.add(fakedepth); |
---|
1561 | 2589 | |
---|
1562 | | - panel.add(new JSeparator()); |
---|
| 2590 | + cGridBag shadowbias = new cGridBag(); |
---|
| 2591 | + shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints); |
---|
| 2592 | + shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
| 2593 | + shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
---|
| 2594 | + diffuseSection.add(shadowbias); |
---|
| 2595 | + |
---|
| 2596 | + panel.add(GetSeparator()); |
---|
1563 | 2597 | |
---|
1564 | 2598 | panel.add(diffuseSection); |
---|
1565 | 2599 | |
---|
.. | .. |
---|
1609 | 2643 | // aConstraints.gridy += 1; |
---|
1610 | 2644 | // aConstraints.gridwidth = 1; |
---|
1611 | 2645 | |
---|
| 2646 | + cGridBag anisoU = new cGridBag(); |
---|
| 2647 | + anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints); |
---|
| 2648 | + anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
| 2649 | + anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
| 2650 | + specularSection.add(anisoU); |
---|
1612 | 2651 | |
---|
1613 | | - panel.add(new JSeparator()); |
---|
| 2652 | + cGridBag anisoV = new cGridBag(); |
---|
| 2653 | + anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints); |
---|
| 2654 | + anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
| 2655 | + anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
| 2656 | + specularSection.add(anisoV); |
---|
| 2657 | + |
---|
| 2658 | + |
---|
| 2659 | + panel.add(GetSeparator()); |
---|
1614 | 2660 | |
---|
1615 | 2661 | panel.add(specularSection); |
---|
1616 | 2662 | |
---|
1617 | 2663 | //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
---|
1618 | 2664 | |
---|
1619 | | - cGridBag globalSection = new cGridBag().setVertical(true); |
---|
| 2665 | + //cGridBag globalSection = new cGridBag().setVertical(true); |
---|
1620 | 2666 | |
---|
1621 | 2667 | cGridBag camera = new cGridBag(); |
---|
1622 | 2668 | camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints); |
---|
1623 | 2669 | cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1624 | 2670 | camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
---|
1625 | | - globalSection.add(camera); |
---|
| 2671 | + colorSection.add(camera); |
---|
1626 | 2672 | |
---|
1627 | 2673 | cGridBag ambient = new cGridBag(); |
---|
1628 | 2674 | ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints); |
---|
1629 | 2675 | ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1630 | 2676 | ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
---|
1631 | | - globalSection.add(ambient); |
---|
| 2677 | + colorSection.add(ambient); |
---|
1632 | 2678 | |
---|
1633 | 2679 | cGridBag backlit = new cGridBag(); |
---|
1634 | 2680 | backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints); |
---|
1635 | 2681 | backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1636 | 2682 | backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
---|
1637 | | - globalSection.add(backlit); |
---|
| 2683 | + colorSection.add(backlit); |
---|
1638 | 2684 | |
---|
1639 | | - cGridBag opacity = new cGridBag(); |
---|
1640 | | - opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints); |
---|
1641 | | - opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
1642 | | - opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
---|
1643 | | - globalSection.add(opacity); |
---|
1644 | | - |
---|
1645 | | - panel.add(new JSeparator()); |
---|
| 2685 | + cGridBag parallax = new cGridBag(); |
---|
| 2686 | + parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints); |
---|
| 2687 | + parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
---|
| 2688 | + parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints); |
---|
| 2689 | + colorSection.add(parallax); |
---|
1646 | 2690 | |
---|
1647 | | - panel.add(globalSection); |
---|
| 2691 | + //panel.add(new JSeparator()); |
---|
| 2692 | + |
---|
| 2693 | + //panel.add(globalSection); |
---|
1648 | 2694 | |
---|
1649 | 2695 | //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
---|
1650 | 2696 | |
---|
.. | .. |
---|
1686 | 2732 | opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints); |
---|
1687 | 2733 | textureSection.add(opacityPower); |
---|
1688 | 2734 | |
---|
1689 | | - panel.add(new JSeparator()); |
---|
| 2735 | + panel.add(GetSeparator()); |
---|
1690 | 2736 | |
---|
1691 | 2737 | panel.add(textureSection); |
---|
1692 | 2738 | |
---|
.. | .. |
---|
1725 | 2771 | opacityPowerField.addChangeListener(this); |
---|
1726 | 2772 | /**/ |
---|
1727 | 2773 | |
---|
1728 | | - resetSlidersButton.addActionListener(this); |
---|
1729 | 2774 | clearMaterialButton.addActionListener(this); |
---|
1730 | 2775 | createMaterialButton.addActionListener(this); |
---|
1731 | | - |
---|
1732 | | - propagateToggle.addItemListener(this); |
---|
1733 | | - multiplyToggle.addItemListener(this); |
---|
| 2776 | + |
---|
| 2777 | + if (Globals.ADVANCED) |
---|
| 2778 | + { |
---|
| 2779 | + resetSlidersButton.addActionListener(this); |
---|
| 2780 | + propagateToggle.addItemListener(this); |
---|
| 2781 | + multiplyToggle.addItemListener(this); |
---|
| 2782 | + } |
---|
1734 | 2783 | } |
---|
1735 | 2784 | |
---|
1736 | 2785 | void DropFile(java.io.File[] files, boolean textures) |
---|
.. | .. |
---|
1748 | 2797 | // 3D models |
---|
1749 | 2798 | if (filename.endsWith(".3ds") || filename.endsWith(".3DS")) |
---|
1750 | 2799 | { |
---|
1751 | | - lastConverter = new com.jmex.model.converters.MaxToJme(); |
---|
1752 | | - LoadFile(filename, lastConverter); |
---|
| 2800 | + //lastConverter = new com.jmex.model.converters.MaxToJme(); |
---|
| 2801 | + //LoadFile(filename, lastConverter); |
---|
| 2802 | + LoadObjFile(filename); // New 3ds loader |
---|
1753 | 2803 | continue; |
---|
1754 | 2804 | } |
---|
1755 | 2805 | if (filename.endsWith(".dae") || filename.endsWith(".DAE")) |
---|
.. | .. |
---|
1901 | 2951 | |
---|
1902 | 2952 | //? flashIt = false; |
---|
1903 | 2953 | CameraPane pane = (CameraPane) cameraView; |
---|
1904 | | - pane.clickStart(location.x, location.y, 0); |
---|
| 2954 | + pane.clickStart(location.x, location.y, 0, 0); |
---|
1905 | 2955 | pane.clickEnd(location.x, location.y, 0, true); |
---|
1906 | 2956 | |
---|
1907 | 2957 | if (group.selection.size() == 1) |
---|
.. | .. |
---|
1950 | 3000 | e2.printStackTrace(); |
---|
1951 | 3001 | } |
---|
1952 | 3002 | } |
---|
| 3003 | + |
---|
1953 | 3004 | LoadJMEThread loadThread; |
---|
1954 | 3005 | |
---|
1955 | 3006 | class LoadJMEThread extends Thread |
---|
.. | .. |
---|
2007 | 3058 | //LoadFile0(filename, converter); |
---|
2008 | 3059 | } |
---|
2009 | 3060 | } |
---|
| 3061 | + |
---|
2010 | 3062 | LoadOBJThread loadObjThread; |
---|
2011 | 3063 | |
---|
2012 | 3064 | class LoadOBJThread extends Thread |
---|
.. | .. |
---|
2085 | 3137 | |
---|
2086 | 3138 | void LoadObjFile(String fullname) |
---|
2087 | 3139 | { |
---|
2088 | | - /* |
---|
| 3140 | + System.out.println("Loading " + fullname); |
---|
| 3141 | + /**/ |
---|
2089 | 3142 | //lastFilename = fullname; |
---|
2090 | 3143 | if(loadObjThread == null) |
---|
2091 | 3144 | { |
---|
2092 | | - loadObjThread = new LoadOBJThread(); |
---|
2093 | | - loadObjThread.start(); |
---|
| 3145 | + loadObjThread = new LoadOBJThread(); |
---|
| 3146 | + loadObjThread.start(); |
---|
2094 | 3147 | } |
---|
2095 | 3148 | |
---|
2096 | 3149 | loadObjThread.add(fullname); |
---|
2097 | | - */ |
---|
| 3150 | + /**/ |
---|
2098 | 3151 | |
---|
2099 | | - System.out.println("Loading " + fullname); |
---|
2100 | | - makeSomething(new FileObject(fullname, true), true); |
---|
| 3152 | + //makeSomething(new FileObject(fullname, true), true); |
---|
2101 | 3153 | } |
---|
2102 | 3154 | |
---|
2103 | 3155 | void LoadGFDFile(String fullname) |
---|
.. | .. |
---|
2358 | 3410 | |
---|
2359 | 3411 | void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName) |
---|
2360 | 3412 | { |
---|
2361 | | - if (GrafreeD.standAlone) |
---|
| 3413 | + if (Grafreed.standAlone) |
---|
2362 | 3414 | { |
---|
2363 | 3415 | /**/ |
---|
2364 | 3416 | FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD); |
---|
2365 | | - browser.show(); |
---|
| 3417 | + browser.setVisible(true); |
---|
2366 | 3418 | String filename = browser.getFile(); |
---|
2367 | 3419 | if (filename != null && filename.length() > 0) |
---|
2368 | 3420 | { |
---|
.. | .. |
---|
2473 | 3525 | LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2); |
---|
2474 | 3526 | LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2); |
---|
2475 | 3527 | } |
---|
| 3528 | + |
---|
2476 | 3529 | //cJME.count++; |
---|
2477 | 3530 | //cJME.count %= 12; |
---|
2478 | 3531 | if (gc) |
---|
.. | .. |
---|
2656 | 3709 | } |
---|
2657 | 3710 | } |
---|
2658 | 3711 | } |
---|
| 3712 | + |
---|
2659 | 3713 | cFileSystemPane FSPane; |
---|
2660 | 3714 | |
---|
2661 | 3715 | void SetMaterial(cMaterial mat, Object3D.cVector2[] others) |
---|
.. | .. |
---|
2665 | 3719 | |
---|
2666 | 3720 | freezematerial = true; |
---|
2667 | 3721 | colorField.setFloat(mat.color); |
---|
2668 | | - modulationField.setFloat(mat.modulation); |
---|
| 3722 | + saturationField.setFloat(mat.modulation); |
---|
2669 | 3723 | metalnessField.setFloat(mat.metalness); |
---|
2670 | 3724 | diffuseField.setFloat(mat.diffuse); |
---|
2671 | 3725 | specularField.setFloat(mat.specular); |
---|
.. | .. |
---|
2685 | 3739 | shadowField.setFloat(mat.shadow); |
---|
2686 | 3740 | textureField.setFloat(mat.texture); |
---|
2687 | 3741 | opacityField.setFloat(mat.opacity); |
---|
| 3742 | + parallaxField.setFloat(mat.parallax + 0.25f); |
---|
2688 | 3743 | fakedepthField.setFloat(mat.fakedepth); |
---|
2689 | 3744 | shadowbiasField.setFloat(mat.shadowbias); |
---|
2690 | 3745 | bumpField.setInteger(1); // dec 2013 |
---|
.. | .. |
---|
2709 | 3764 | } |
---|
2710 | 3765 | } |
---|
2711 | 3766 | } |
---|
| 3767 | + |
---|
2712 | 3768 | freezematerial = false; |
---|
2713 | 3769 | } |
---|
2714 | 3770 | |
---|
2715 | 3771 | void SetMaterial(Object3D object) |
---|
2716 | 3772 | { |
---|
| 3773 | + latestObject = object; |
---|
| 3774 | + |
---|
2717 | 3775 | cMaterial mat = object.material; |
---|
2718 | 3776 | |
---|
2719 | 3777 | if (mat == null) |
---|
.. | .. |
---|
2722 | 3780 | return; |
---|
2723 | 3781 | } |
---|
2724 | 3782 | |
---|
2725 | | - multiplyToggle.setSelected(mat.multiply); |
---|
2726 | | - |
---|
2727 | | - assert (object.projectedVertices != null); |
---|
2728 | | - |
---|
2729 | | - if (object.projectedVertices.length <= 2) |
---|
2730 | | - { |
---|
2731 | | - // Side effect... |
---|
2732 | | - Object3D.cVector2[] keep = object.projectedVertices; |
---|
2733 | | - object.projectedVertices = new Object3D.cVector2[3]; |
---|
2734 | | - for (int i = 0; i < 3; i++) |
---|
2735 | | - { |
---|
2736 | | - if (i < keep.length) |
---|
2737 | | - { |
---|
2738 | | - object.projectedVertices[i] = keep[i]; |
---|
2739 | | - } else |
---|
2740 | | - { |
---|
2741 | | - object.projectedVertices[i] = new Object3D.cVector2(); |
---|
2742 | | - } |
---|
2743 | | - /* |
---|
2744 | | - if(keep.length == 0) |
---|
2745 | | - object.projectedVertices[0] = new Object3D.cVector2(); |
---|
2746 | | - else |
---|
2747 | | - object.projectedVertices[0] = keep[0]; |
---|
2748 | | - object.projectedVertices[1] = new Object3D.cVector2(); |
---|
2749 | | - */ |
---|
2750 | | - } |
---|
2751 | | - } |
---|
| 3783 | + if (multiplyToggle != null) |
---|
| 3784 | + multiplyToggle.setSelected(mat.multiply); |
---|
| 3785 | + |
---|
| 3786 | + AllocProjectedVertices(object); |
---|
2752 | 3787 | |
---|
2753 | 3788 | SetMaterial(mat, object.projectedVertices); |
---|
2754 | 3789 | } |
---|
.. | .. |
---|
2824 | 3859 | // } |
---|
2825 | 3860 | |
---|
2826 | 3861 | /**/ |
---|
2827 | | - if (deselect) |
---|
| 3862 | + if (deselect || child == null) |
---|
2828 | 3863 | { |
---|
2829 | 3864 | //group.deselectAll(); |
---|
2830 | 3865 | //freeze = true; |
---|
2831 | 3866 | GetTree().clearSelection(); |
---|
2832 | 3867 | //freeze = false; |
---|
| 3868 | + |
---|
| 3869 | + if (child == null) |
---|
| 3870 | + { |
---|
| 3871 | + return; |
---|
| 3872 | + } |
---|
2833 | 3873 | } |
---|
2834 | 3874 | |
---|
2835 | 3875 | //group.addSelectee(child); |
---|
.. | .. |
---|
2863 | 3903 | public void itemStateChanged(ItemEvent event) |
---|
2864 | 3904 | { |
---|
2865 | 3905 | // System.out.println("Propagate = " + propagate); |
---|
| 3906 | + if (event.getSource() == pinButton) |
---|
| 3907 | + { |
---|
| 3908 | + copy.pinned ^= true; |
---|
| 3909 | + if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy)) |
---|
| 3910 | + { |
---|
| 3911 | + ((GroupEditor)copy.editWindow).listUI.remove(copy); |
---|
| 3912 | + copy.CloseUI(); |
---|
| 3913 | + //copy.editWindow.refreshContents(); |
---|
| 3914 | + } |
---|
| 3915 | + } |
---|
| 3916 | + else |
---|
2866 | 3917 | if (event.getSource() == propagateToggle) |
---|
2867 | 3918 | { |
---|
2868 | 3919 | propagate ^= true; |
---|
.. | .. |
---|
2898 | 3949 | cameraView.ToggleDL(); |
---|
2899 | 3950 | cameraView.repaint(); |
---|
2900 | 3951 | return; |
---|
2901 | | - } else if (event.getSource() == toggleTextureItem) |
---|
| 3952 | + } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB) |
---|
2902 | 3953 | { |
---|
2903 | 3954 | cameraView.ToggleTexture(); |
---|
2904 | 3955 | // june 2013 copy.HardTouch(); |
---|
.. | .. |
---|
2937 | 3988 | frame.validate(); |
---|
2938 | 3989 | |
---|
2939 | 3990 | return; |
---|
2940 | | - } else if (event.getSource() == toggleRandomItem) |
---|
| 3991 | + } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB) |
---|
2941 | 3992 | { |
---|
2942 | | - cameraView.ToggleRandom(); |
---|
| 3993 | + cameraView.ToggleSwitch(); |
---|
2943 | 3994 | cameraView.repaint(); |
---|
2944 | 3995 | return; |
---|
2945 | 3996 | } else if (event.getSource() == toggleHandleItem) |
---|
.. | .. |
---|
2967 | 4018 | } else if (event.getSource() == liveCB) |
---|
2968 | 4019 | { |
---|
2969 | 4020 | copy.live ^= true; |
---|
| 4021 | + objEditor.refreshContents(true); // To show item colors |
---|
| 4022 | + return; |
---|
| 4023 | + } else if (event.getSource() == selectableCB) |
---|
| 4024 | + { |
---|
| 4025 | + copy.dontselect ^= true; |
---|
2970 | 4026 | return; |
---|
2971 | 4027 | } else if (event.getSource() == hideCB) |
---|
2972 | 4028 | { |
---|
2973 | 4029 | copy.hide ^= true; |
---|
2974 | 4030 | copy.Touch(); // display list issue |
---|
2975 | | - objEditor.refreshContents(); |
---|
| 4031 | + objEditor.refreshContents(true); // To show item colors |
---|
2976 | 4032 | return; |
---|
2977 | 4033 | } else if (event.getSource() == link2masterCB) |
---|
2978 | 4034 | { |
---|
.. | .. |
---|
2982 | 4038 | if (event.getSource() == randomCB) |
---|
2983 | 4039 | { |
---|
2984 | 4040 | copy.random ^= true; |
---|
| 4041 | + objEditor.refreshContents(); |
---|
2985 | 4042 | return; |
---|
2986 | 4043 | } |
---|
2987 | 4044 | if (event.getSource() == speedupCB) |
---|
.. | .. |
---|
3005 | 4062 | |
---|
3006 | 4063 | public void actionPerformed(ActionEvent event) |
---|
3007 | 4064 | { |
---|
| 4065 | + Object source = event.getSource(); |
---|
3008 | 4066 | // SCRIPT DIALOG |
---|
3009 | | - if (event.getSource() == okbutton) |
---|
| 4067 | + if (source == okbutton) |
---|
3010 | 4068 | { |
---|
3011 | 4069 | textpanel.setVisible(false); |
---|
3012 | 4070 | textpanel.remove(textarea); |
---|
.. | .. |
---|
3018 | 4076 | textarea = null; |
---|
3019 | 4077 | textpanel = null; |
---|
3020 | 4078 | } |
---|
3021 | | - if (event.getSource() == cancelbutton) |
---|
| 4079 | + if (source == cancelbutton) |
---|
3022 | 4080 | { |
---|
3023 | 4081 | textpanel.setVisible(false); |
---|
3024 | 4082 | textpanel.remove(textarea); |
---|
.. | .. |
---|
3030 | 4088 | //applySelf(); |
---|
3031 | 4089 | //client.refreshEditWindow(); |
---|
3032 | 4090 | //refreshContents(); |
---|
3033 | | - if (event.getSource() == nameField) |
---|
| 4091 | + if (source == nameField) |
---|
3034 | 4092 | { |
---|
3035 | 4093 | //System.out.println("ObjEditor " + event); |
---|
3036 | 4094 | applySelf0(true); |
---|
3037 | 4095 | //parent.applySelf(); |
---|
3038 | | - objEditor.refreshContents(); |
---|
3039 | | - } else if (event.getSource() == resetButton) |
---|
| 4096 | + // conflicts with requestFocus objEditor.refreshContents(); |
---|
| 4097 | + } else if (source == resetButton) |
---|
3040 | 4098 | { |
---|
3041 | 4099 | CameraPane.fullreset = true; |
---|
3042 | 4100 | copy.Reset(); // ResetMeshes(); |
---|
3043 | 4101 | copy.Touch(); |
---|
3044 | 4102 | objEditor.refreshContents(); |
---|
3045 | | - } else if (event.getSource() == stepItem) |
---|
| 4103 | + } else if (source == stepItem) |
---|
3046 | 4104 | { |
---|
3047 | 4105 | //cameraView.ONESTEP = true; |
---|
3048 | 4106 | Globals.ONESTEP = true; |
---|
3049 | 4107 | cameraView.repaint(); |
---|
3050 | 4108 | return; |
---|
3051 | | - } else if (event.getSource() == stepButton) |
---|
| 4109 | + } else if (source == stepButton) |
---|
3052 | 4110 | { |
---|
3053 | 4111 | copy.Step(); |
---|
3054 | 4112 | copy.Touch(); |
---|
3055 | 4113 | objEditor.refreshContents(); |
---|
3056 | | - } else if (event.getSource() == slowerButton) |
---|
| 4114 | + } else if (source == slowerButton) |
---|
3057 | 4115 | { |
---|
3058 | 4116 | copy.Slower(); |
---|
3059 | 4117 | copy.Touch(); |
---|
3060 | 4118 | objEditor.refreshContents(); |
---|
3061 | | - } else if (event.getSource() == fasterButton) |
---|
| 4119 | + } else if (source == fasterButton) |
---|
3062 | 4120 | { |
---|
3063 | 4121 | copy.Faster(); |
---|
3064 | 4122 | copy.Touch(); |
---|
3065 | 4123 | objEditor.refreshContents(); |
---|
3066 | | - } else if (event.getSource() == remarkButton) |
---|
| 4124 | + } else if (source == remarkButton) |
---|
3067 | 4125 | { |
---|
3068 | 4126 | copy.Remark(); |
---|
3069 | 4127 | copy.Touch(); |
---|
3070 | 4128 | objEditor.refreshContents(); |
---|
3071 | | - } else if (event.getSource() == stepAllButton) |
---|
| 4129 | + } else if (source == stepAllButton) |
---|
3072 | 4130 | { |
---|
3073 | 4131 | copy.StepAll(); |
---|
3074 | 4132 | copy.Touch(); |
---|
3075 | 4133 | objEditor.refreshContents(); |
---|
3076 | | - } else if (event.getSource() == resetAllButton) |
---|
| 4134 | + } else if (source == resetAllButton) |
---|
3077 | 4135 | { |
---|
3078 | 4136 | //CameraPane.fullreset = true; |
---|
3079 | 4137 | copy.ResetAll(); // ResetMeshes(); |
---|
.. | .. |
---|
3106 | 4164 | // Close(); |
---|
3107 | 4165 | // } |
---|
3108 | 4166 | // else |
---|
3109 | | - if (event.getSource() == resetSlidersButton) |
---|
| 4167 | + if (source == resetSlidersButton) |
---|
3110 | 4168 | { |
---|
3111 | 4169 | ResetSliders(); |
---|
3112 | | - } else if (event.getSource() == clearMaterialButton) |
---|
| 4170 | + } else if (source == clearMaterialButton) |
---|
3113 | 4171 | { |
---|
3114 | 4172 | ClearMaterial(); |
---|
3115 | | - } else if (event.getSource() == createMaterialButton) |
---|
| 4173 | + } else if (source == createMaterialButton) |
---|
3116 | 4174 | { |
---|
3117 | 4175 | CreateMaterial(); |
---|
3118 | | - } else if (event.getSource() == clearPanelButton) |
---|
| 4176 | + } else if (source == clearPanelButton) |
---|
3119 | 4177 | { |
---|
3120 | 4178 | copy.ClearUI(); |
---|
3121 | 4179 | refreshContents(true); |
---|
3122 | | - } /* |
---|
3123 | | - } |
---|
3124 | | - |
---|
3125 | | - public boolean action(Event event, Object arg) |
---|
3126 | | - { |
---|
3127 | | - */ else if (event.getSource() == closeItem) |
---|
| 4180 | + } else if (source == importGFDItem) |
---|
| 4181 | + { |
---|
| 4182 | + ImportGFD(); |
---|
| 4183 | + } else |
---|
| 4184 | + if (source == importVRMLX3DItem) |
---|
| 4185 | + { |
---|
| 4186 | + ImportVRMLX3D(); |
---|
| 4187 | + } else |
---|
| 4188 | + if (source == import3DSItem) |
---|
| 4189 | + { |
---|
| 4190 | + objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS"); |
---|
| 4191 | + } else |
---|
| 4192 | + if (source == importOBJItem) |
---|
| 4193 | + { |
---|
| 4194 | + //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ"); |
---|
| 4195 | + FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD); |
---|
| 4196 | + browser.setVisible(true); |
---|
| 4197 | + String filename = browser.getFile(); |
---|
| 4198 | + if (filename != null && filename.length() > 0) |
---|
| 4199 | + { |
---|
| 4200 | + String fullname = browser.getDirectory() + filename; |
---|
| 4201 | + makeSomething(ReadOBJ(fullname), true); |
---|
| 4202 | + } |
---|
| 4203 | + } else |
---|
| 4204 | + if (source == closeItem) |
---|
3128 | 4205 | { |
---|
3129 | 4206 | Close(); |
---|
3130 | 4207 | //return true; |
---|
3131 | | - } else if (event.getSource() == loadItem) |
---|
| 4208 | + } else if (source == openItem) |
---|
3132 | 4209 | { |
---|
3133 | | - load(); |
---|
| 4210 | + Open(); |
---|
3134 | 4211 | //return true; |
---|
3135 | | - } else if (event.getSource() == saveItem) |
---|
| 4212 | + } else if (source == newItem) |
---|
| 4213 | + { |
---|
| 4214 | + New(); |
---|
| 4215 | + } else if (source == saveItem) |
---|
3136 | 4216 | { |
---|
3137 | 4217 | save(); |
---|
3138 | 4218 | //return true; |
---|
3139 | | - } else if (event.getSource() == saveAsItem) |
---|
| 4219 | + } else if (source == saveAsItem) |
---|
3140 | 4220 | { |
---|
3141 | 4221 | saveAs(); |
---|
3142 | 4222 | //return true; |
---|
3143 | | - } else if (event.getSource() == reexportItem) |
---|
| 4223 | + } else if (source == reexportItem) |
---|
3144 | 4224 | { |
---|
3145 | 4225 | reexport(); |
---|
3146 | 4226 | //return true; |
---|
3147 | | - } else if (event.getSource() == exportAsItem) |
---|
| 4227 | + } else if (source == exportAsItem) |
---|
3148 | 4228 | { |
---|
3149 | 4229 | export(); |
---|
3150 | 4230 | //return true; |
---|
3151 | | - } else if (event.getSource() == povItem) |
---|
| 4231 | + } else if (source == povItem) |
---|
3152 | 4232 | { |
---|
3153 | 4233 | generatePOV(); |
---|
3154 | 4234 | //return true; |
---|
3155 | | - } else if (event.getSource() == zBufferItem) |
---|
| 4235 | + } else if (event.getSource() == archiveItem) |
---|
| 4236 | + { |
---|
| 4237 | + cTools.Archive(frame); |
---|
| 4238 | + return; |
---|
| 4239 | + } else if (source == zBufferItem) |
---|
3156 | 4240 | { |
---|
3157 | 4241 | try |
---|
3158 | 4242 | { |
---|
.. | .. |
---|
3174 | 4258 | cameraView.repaint(); |
---|
3175 | 4259 | //return true; |
---|
3176 | 4260 | } |
---|
3177 | | - */ else if (event.getSource() == editCameraItem) |
---|
3178 | | - { |
---|
3179 | | - cameraView.ProtectCamera(); |
---|
3180 | | - cameraView.repaint(); |
---|
3181 | | - return; |
---|
3182 | | - } else if (event.getSource() == revertCameraItem) |
---|
3183 | | - { |
---|
3184 | | - cameraView.RevertCamera(); |
---|
3185 | | - cameraView.repaint(); |
---|
3186 | | - return; |
---|
3187 | | -// } else if (event.getSource() == textureButton) |
---|
3188 | | -// { |
---|
3189 | | -// return; // true; |
---|
3190 | | - } else // combos... |
---|
3191 | | - if (event.getSource() == texresMenu) |
---|
| 4261 | + */ else // combos... |
---|
| 4262 | + if (source == texresMenu) |
---|
3192 | 4263 | { |
---|
3193 | 4264 | System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex()); |
---|
3194 | 4265 | copy.texres = texresMenu.getSelectedIndex(); |
---|
.. | .. |
---|
3200 | 4271 | } |
---|
3201 | 4272 | } |
---|
3202 | 4273 | |
---|
| 4274 | + void New() |
---|
| 4275 | + { |
---|
| 4276 | + while (copy.Size() > 0) |
---|
| 4277 | + { |
---|
| 4278 | + copy.remove(0); |
---|
| 4279 | + } |
---|
| 4280 | + |
---|
| 4281 | + copy.selection.clear(); |
---|
| 4282 | + |
---|
| 4283 | + if (copy == Grafreed.grafreed.universe) |
---|
| 4284 | + { |
---|
| 4285 | + CreateCameras(); |
---|
| 4286 | + cameraView.SetCamera(GetCamera(copy, 0)); |
---|
| 4287 | + } |
---|
| 4288 | + ResetModel(); |
---|
| 4289 | + objEditor.refreshContents(); |
---|
| 4290 | + } |
---|
| 4291 | + |
---|
| 4292 | + static public byte[] Compress(Object3D o) |
---|
| 4293 | + { |
---|
| 4294 | + // Slower to actually compress. |
---|
| 4295 | + try |
---|
| 4296 | + { |
---|
| 4297 | + ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
---|
| 4298 | +// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos); |
---|
| 4299 | + ObjectOutputStream out = new ObjectOutputStream(baos); //zstream); |
---|
| 4300 | + |
---|
| 4301 | + Object3D parent = o.parent; |
---|
| 4302 | + o.parent = null; |
---|
| 4303 | + |
---|
| 4304 | + out.writeObject(o); |
---|
| 4305 | + |
---|
| 4306 | + o.parent = parent; |
---|
| 4307 | + |
---|
| 4308 | + out.flush(); |
---|
| 4309 | + |
---|
| 4310 | + baos //zstream |
---|
| 4311 | + .close(); |
---|
| 4312 | + out.close(); |
---|
| 4313 | + |
---|
| 4314 | + byte[] bytes = baos.toByteArray(); |
---|
| 4315 | + |
---|
| 4316 | + System.out.println("save #bytes = " + bytes.length); |
---|
| 4317 | + return bytes; |
---|
| 4318 | + } catch (Exception e) |
---|
| 4319 | + { |
---|
| 4320 | + System.err.println(e); |
---|
| 4321 | + return null; |
---|
| 4322 | + } |
---|
| 4323 | + } |
---|
| 4324 | + |
---|
| 4325 | + static public Object Uncompress(byte[] bytes) |
---|
| 4326 | + { |
---|
| 4327 | + System.out.println("restore #bytes = " + bytes.length); |
---|
| 4328 | + try |
---|
| 4329 | + { |
---|
| 4330 | + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); |
---|
| 4331 | + //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais); |
---|
| 4332 | + ObjectInputStream in = new ObjectInputStream(bais); // istream); |
---|
| 4333 | + Object obj = in.readObject(); |
---|
| 4334 | + |
---|
| 4335 | + bais //istream |
---|
| 4336 | + .close(); |
---|
| 4337 | + in.close(); |
---|
| 4338 | + |
---|
| 4339 | + return obj; |
---|
| 4340 | + } catch (Exception e) |
---|
| 4341 | + { |
---|
| 4342 | + System.err.println(e); |
---|
| 4343 | + return null; |
---|
| 4344 | + } |
---|
| 4345 | + } |
---|
| 4346 | + |
---|
| 4347 | + static public Object clone(Object o) |
---|
| 4348 | + { |
---|
| 4349 | + try |
---|
| 4350 | + { |
---|
| 4351 | + ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
---|
| 4352 | + ObjectOutputStream out = new ObjectOutputStream(baos); |
---|
| 4353 | + |
---|
| 4354 | + out.writeObject(o); |
---|
| 4355 | + |
---|
| 4356 | + out.flush(); |
---|
| 4357 | + out.close(); |
---|
| 4358 | + |
---|
| 4359 | + byte[] bytes = baos.toByteArray(); |
---|
| 4360 | + |
---|
| 4361 | + System.out.println("clone = " + bytes.length); |
---|
| 4362 | + |
---|
| 4363 | + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); |
---|
| 4364 | + ObjectInputStream in = new ObjectInputStream(bais); |
---|
| 4365 | + Object obj = in.readObject(); |
---|
| 4366 | + in.close(); |
---|
| 4367 | + |
---|
| 4368 | + return obj; |
---|
| 4369 | + } catch (Exception e) |
---|
| 4370 | + { |
---|
| 4371 | + System.err.println(e); |
---|
| 4372 | + return null; |
---|
| 4373 | + } |
---|
| 4374 | + } |
---|
| 4375 | + |
---|
| 4376 | + cRadio GetCurrentTab() |
---|
| 4377 | + { |
---|
| 4378 | + cRadio ab; |
---|
| 4379 | + for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();) |
---|
| 4380 | + { |
---|
| 4381 | + ab = (cRadio)e.nextElement(); |
---|
| 4382 | + if(ab.GetObject() == copy) |
---|
| 4383 | + { |
---|
| 4384 | + return ab; |
---|
| 4385 | + } |
---|
| 4386 | + } |
---|
| 4387 | + |
---|
| 4388 | + return null; |
---|
| 4389 | + } |
---|
| 4390 | + |
---|
| 4391 | + |
---|
| 4392 | + public void Save() |
---|
| 4393 | + { |
---|
| 4394 | + //Save(true); |
---|
| 4395 | + Replace(); |
---|
| 4396 | + SetVersionStates(); |
---|
| 4397 | + } |
---|
| 4398 | + |
---|
| 4399 | + private boolean Equal(byte[] compress, byte[] name) |
---|
| 4400 | + { |
---|
| 4401 | + if (compress.length != name.length) |
---|
| 4402 | + { |
---|
| 4403 | + return false; |
---|
| 4404 | + } |
---|
| 4405 | + |
---|
| 4406 | + for (int i=compress.length; --i>=0;) |
---|
| 4407 | + { |
---|
| 4408 | + if (compress[i] != name[i]) |
---|
| 4409 | + return false; |
---|
| 4410 | + } |
---|
| 4411 | + |
---|
| 4412 | + return true; |
---|
| 4413 | + } |
---|
| 4414 | + |
---|
| 4415 | + void DeleteVersion() |
---|
| 4416 | + { |
---|
| 4417 | + for (int i = copy.versionindex; i < copy.versionlist.length-1; i++) |
---|
| 4418 | + { |
---|
| 4419 | + copy.versionlist[i] = copy.versionlist[i+1]; |
---|
| 4420 | + } |
---|
| 4421 | + |
---|
| 4422 | + if (copy.versionlist[copy.versionindex] == null) |
---|
| 4423 | + copy.versionindex -= 1; |
---|
| 4424 | + |
---|
| 4425 | + if (copy.versionindex != -1) |
---|
| 4426 | + CopyChanged(); |
---|
| 4427 | + |
---|
| 4428 | + SetVersionStates(); |
---|
| 4429 | + } |
---|
| 4430 | + |
---|
| 4431 | + public boolean Save(boolean user) |
---|
| 4432 | + { |
---|
| 4433 | + System.err.println("Save"); |
---|
| 4434 | + Replace(); |
---|
| 4435 | + |
---|
| 4436 | + //cRadio tab = GetCurrentTab(); |
---|
| 4437 | + |
---|
| 4438 | + Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"? |
---|
| 4439 | + |
---|
| 4440 | + boolean thesame = false; |
---|
| 4441 | + |
---|
| 4442 | +// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1])) |
---|
| 4443 | +// { |
---|
| 4444 | +// thesame = true; |
---|
| 4445 | +// } |
---|
| 4446 | + |
---|
| 4447 | + //EditorFrame.m_MainFrame.requestFocusInWindow(); |
---|
| 4448 | + if (!thesame) |
---|
| 4449 | + { |
---|
| 4450 | + for (int i = copy.versionlist.length; --i > copy.versionindex+1;) |
---|
| 4451 | + { |
---|
| 4452 | + copy.versionlist[i] = copy.versionlist[i-1]; |
---|
| 4453 | + } |
---|
| 4454 | + |
---|
| 4455 | + //tab.user[tab.versionindex] = user; |
---|
| 4456 | + //boolean increment = true; // tab.graphs[tab.versionindex] == null; |
---|
| 4457 | + |
---|
| 4458 | + copy.versionlist[++copy.versionindex] = compress; |
---|
| 4459 | + |
---|
| 4460 | + // if (increment) |
---|
| 4461 | + // tab.versionindex++; |
---|
| 4462 | + } |
---|
| 4463 | + |
---|
| 4464 | + //copy.RestoreBigData(versiontable); |
---|
| 4465 | + |
---|
| 4466 | + //assert(hashtable.isEmpty()); |
---|
| 4467 | + |
---|
| 4468 | +// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++) |
---|
| 4469 | +// { |
---|
| 4470 | +// //tab.user[i] = false; |
---|
| 4471 | +// copy.versionlist[i] = null; |
---|
| 4472 | +// } |
---|
| 4473 | + |
---|
| 4474 | + SetVersionStates(); |
---|
| 4475 | + |
---|
| 4476 | + // test save |
---|
| 4477 | + if (false) |
---|
| 4478 | + { |
---|
| 4479 | + try |
---|
| 4480 | + { |
---|
| 4481 | + FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex); |
---|
| 4482 | + ObjectOutputStream p = new ObjectOutputStream(ostream); |
---|
| 4483 | + |
---|
| 4484 | + p.writeObject(copy); |
---|
| 4485 | + |
---|
| 4486 | + p.flush(); |
---|
| 4487 | + |
---|
| 4488 | + ostream.close(); |
---|
| 4489 | + } catch (Exception e) |
---|
| 4490 | + { |
---|
| 4491 | + e.printStackTrace(); |
---|
| 4492 | + } |
---|
| 4493 | + } |
---|
| 4494 | + |
---|
| 4495 | + return !thesame; |
---|
| 4496 | + } |
---|
| 4497 | + |
---|
| 4498 | + boolean flashIt = true; |
---|
| 4499 | + |
---|
| 4500 | + void RefreshSelection() |
---|
| 4501 | + { |
---|
| 4502 | + Object3D selection = new Object3D(); |
---|
| 4503 | + |
---|
| 4504 | + for (int i = 0; i < copy.selection.size(); i++) |
---|
| 4505 | + { |
---|
| 4506 | + Object3D elem = copy.selection.elementAt(i); |
---|
| 4507 | + |
---|
| 4508 | + Object3D obj = copy.GetObject(elem.GetUUID()); |
---|
| 4509 | + |
---|
| 4510 | + if (obj == null) |
---|
| 4511 | + { |
---|
| 4512 | + copy.selection.remove(i--); |
---|
| 4513 | + } |
---|
| 4514 | + else |
---|
| 4515 | + { |
---|
| 4516 | + selection.add(obj); |
---|
| 4517 | + copy.selection.setElementAt(obj, i); |
---|
| 4518 | + } |
---|
| 4519 | + } |
---|
| 4520 | + |
---|
| 4521 | + flashIt = false; |
---|
| 4522 | + GetTree().clearSelection(); |
---|
| 4523 | + for (int i = 0; i < selection.size(); i++) |
---|
| 4524 | + GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath()); |
---|
| 4525 | + flashIt = true; |
---|
| 4526 | + |
---|
| 4527 | + //refreshContents(false); |
---|
| 4528 | + } |
---|
| 4529 | + |
---|
| 4530 | + void CopyChanged() |
---|
| 4531 | + { |
---|
| 4532 | + Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]); |
---|
| 4533 | + |
---|
| 4534 | + SetVersionStates(); |
---|
| 4535 | + |
---|
| 4536 | + boolean temp = CameraPane.SWITCH; |
---|
| 4537 | + CameraPane.SWITCH = false; |
---|
| 4538 | + |
---|
| 4539 | + copy.ExtractBigData(Grafreed.grafreed.universe.versiontable); |
---|
| 4540 | + |
---|
| 4541 | + copy.clear(); |
---|
| 4542 | + |
---|
| 4543 | + copy.skyboxname = obj.skyboxname; |
---|
| 4544 | + copy.skyboxext = obj.skyboxext; |
---|
| 4545 | + |
---|
| 4546 | + for (int i=0; i<obj.Size(); i++) |
---|
| 4547 | + { |
---|
| 4548 | + copy.add(obj.get(i)); |
---|
| 4549 | + } |
---|
| 4550 | + |
---|
| 4551 | + copy.RestoreBigData(Grafreed.grafreed.universe.versiontable); |
---|
| 4552 | + |
---|
| 4553 | + CameraPane.SWITCH = temp; |
---|
| 4554 | + |
---|
| 4555 | + RefreshSelection(); |
---|
| 4556 | + //assert(hashtable.isEmpty()); |
---|
| 4557 | + |
---|
| 4558 | + copy.Touch(); |
---|
| 4559 | + |
---|
| 4560 | + ResetModel(); |
---|
| 4561 | + copy.HardTouch(); // recompile? |
---|
| 4562 | + |
---|
| 4563 | + cRadio ab; |
---|
| 4564 | + for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();) |
---|
| 4565 | + { |
---|
| 4566 | + ab = (cRadio)e.nextElement(); |
---|
| 4567 | + Object3D test = copy.GetObject(ab.object.GetUUID()); |
---|
| 4568 | + //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID()); |
---|
| 4569 | + if (test != null) |
---|
| 4570 | + { |
---|
| 4571 | + test.editWindow = ab.object.editWindow; |
---|
| 4572 | + ab.object = test; |
---|
| 4573 | + } |
---|
| 4574 | + } |
---|
| 4575 | + |
---|
| 4576 | + refreshContents(true); |
---|
| 4577 | + } |
---|
| 4578 | + |
---|
| 4579 | + cButton previousVersionButton; |
---|
| 4580 | + cButton restoreButton; |
---|
| 4581 | + cButton replaceButton; |
---|
| 4582 | + cButton nextVersionButton; |
---|
| 4583 | + cButton saveVersionButton; |
---|
| 4584 | + cButton deleteVersionButton; |
---|
| 4585 | + |
---|
| 4586 | + boolean muteSlider; |
---|
| 4587 | + |
---|
| 4588 | + int VersionCount() |
---|
| 4589 | + { |
---|
| 4590 | + int count = 0; |
---|
| 4591 | + |
---|
| 4592 | + for (int i = copy.versionlist.length; --i >= 0;) |
---|
| 4593 | + { |
---|
| 4594 | + if (copy.versionlist[i] != null) |
---|
| 4595 | + count++; |
---|
| 4596 | + } |
---|
| 4597 | + |
---|
| 4598 | + return count; |
---|
| 4599 | + } |
---|
| 4600 | + |
---|
| 4601 | + public cGridBag versionSliderPane; |
---|
| 4602 | + |
---|
| 4603 | + void SetVersionStates() |
---|
| 4604 | + { |
---|
| 4605 | + //if (true) |
---|
| 4606 | + // return; |
---|
| 4607 | + |
---|
| 4608 | + //cRadio tab = GetCurrentTab(); |
---|
| 4609 | + |
---|
| 4610 | + if (copy.versionlist == null) |
---|
| 4611 | + { |
---|
| 4612 | + saveVersionButton.setEnabled(false); |
---|
| 4613 | + restoreButton.setEnabled(false); |
---|
| 4614 | + replaceButton.setEnabled(false); |
---|
| 4615 | + previousVersionButton.setEnabled(false); |
---|
| 4616 | + nextVersionButton.setEnabled(false); |
---|
| 4617 | + deleteVersionButton.setEnabled(false); |
---|
| 4618 | + versionSliderPane.setVisible(false); |
---|
| 4619 | + } |
---|
| 4620 | + else |
---|
| 4621 | + { |
---|
| 4622 | + restoreButton.setEnabled(copy.versionindex != -1); |
---|
| 4623 | + replaceButton.setEnabled(copy.versionindex != -1); |
---|
| 4624 | + |
---|
| 4625 | + previousVersionButton.setEnabled(copy.versionindex > 0); |
---|
| 4626 | + nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null); |
---|
| 4627 | + |
---|
| 4628 | + deleteVersionButton.setEnabled(copy.versionindex != -1); |
---|
| 4629 | + //copy.versionlist[copy.versionindex + 1] != null); |
---|
| 4630 | + |
---|
| 4631 | + muteSlider = true; |
---|
| 4632 | + versionSlider.setMinimum(0); |
---|
| 4633 | + versionSlider.setMaximum(VersionCount() - 1); |
---|
| 4634 | + versionSlider.setInteger(copy.versionindex); |
---|
| 4635 | + versionSlider.setEnabled(copy.versionindex != -1); |
---|
| 4636 | + muteSlider = false; |
---|
| 4637 | + |
---|
| 4638 | + versionSliderPane.setVisible(true); |
---|
| 4639 | + } |
---|
| 4640 | + } |
---|
| 4641 | + |
---|
| 4642 | + public boolean PreviousVersion() |
---|
| 4643 | + { |
---|
| 4644 | + // Option? |
---|
| 4645 | + Replace(); |
---|
| 4646 | + |
---|
| 4647 | + System.err.println("Undo"); |
---|
| 4648 | + |
---|
| 4649 | + //cRadio tab = GetCurrentTab(); |
---|
| 4650 | + |
---|
| 4651 | + if (copy.versionindex == 0) |
---|
| 4652 | + { |
---|
| 4653 | + java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
| 4654 | + return false; |
---|
| 4655 | + } |
---|
| 4656 | + |
---|
| 4657 | +// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex]) |
---|
| 4658 | +// { |
---|
| 4659 | +// if (Save(false)) |
---|
| 4660 | +// tab.versionindex -= 1; |
---|
| 4661 | +// else |
---|
| 4662 | +// { |
---|
| 4663 | +// if (tab.versionindex <= 0) |
---|
| 4664 | +// return false; |
---|
| 4665 | +// else |
---|
| 4666 | +// tab.versionindex -= 1; |
---|
| 4667 | +// } |
---|
| 4668 | +// } |
---|
| 4669 | + |
---|
| 4670 | + copy.versionindex -= 1; |
---|
| 4671 | + |
---|
| 4672 | + CopyChanged(); |
---|
| 4673 | + |
---|
| 4674 | + return true; |
---|
| 4675 | + } |
---|
| 4676 | + |
---|
| 4677 | + public boolean Restore() |
---|
| 4678 | + { |
---|
| 4679 | + System.err.println("Restore"); |
---|
| 4680 | + |
---|
| 4681 | + //cRadio tab = GetCurrentTab(); |
---|
| 4682 | + |
---|
| 4683 | + if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null) |
---|
| 4684 | + { |
---|
| 4685 | + java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
| 4686 | + return false; |
---|
| 4687 | + } |
---|
| 4688 | + |
---|
| 4689 | + //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex])); |
---|
| 4690 | + CopyChanged(); |
---|
| 4691 | + |
---|
| 4692 | + return true; |
---|
| 4693 | + } |
---|
| 4694 | + |
---|
| 4695 | + public boolean Replace() |
---|
| 4696 | + { |
---|
| 4697 | + //System.err.println("Replace"); |
---|
| 4698 | + |
---|
| 4699 | + //cRadio tab = GetCurrentTab(); |
---|
| 4700 | + |
---|
| 4701 | + if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null) |
---|
| 4702 | + { |
---|
| 4703 | + // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
| 4704 | + return false; |
---|
| 4705 | + } |
---|
| 4706 | + |
---|
| 4707 | + copy.versionlist[copy.versionindex] = Duplicate(copy); |
---|
| 4708 | + |
---|
| 4709 | + return true; |
---|
| 4710 | + } |
---|
| 4711 | + |
---|
| 4712 | + public void NextVersion() |
---|
| 4713 | + { |
---|
| 4714 | + // Option? |
---|
| 4715 | + Replace(); |
---|
| 4716 | + |
---|
| 4717 | + //cRadio tab = GetCurrentTab(); |
---|
| 4718 | + |
---|
| 4719 | + if (copy.versionlist[copy.versionindex + 1] == null) |
---|
| 4720 | + { |
---|
| 4721 | + java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
| 4722 | + return; |
---|
| 4723 | + } |
---|
| 4724 | + |
---|
| 4725 | + copy.versionindex += 1; |
---|
| 4726 | + |
---|
| 4727 | + CopyChanged(); |
---|
| 4728 | + |
---|
| 4729 | + //if (!tab.user[tab.versionindex]) |
---|
| 4730 | + // tab.graphs[tab.versionindex] = null; |
---|
| 4731 | + } |
---|
| 4732 | + |
---|
| 4733 | + void ImportGFD() |
---|
| 4734 | + { |
---|
| 4735 | + FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD); |
---|
| 4736 | + browser.show(); |
---|
| 4737 | + String filename = browser.getFile(); |
---|
| 4738 | + if (filename != null && filename.length() > 0) |
---|
| 4739 | + { |
---|
| 4740 | + String fullname = browser.getDirectory() + filename; |
---|
| 4741 | + |
---|
| 4742 | + //Object3D readobj = |
---|
| 4743 | + objEditor.ReadGFD(fullname, objEditor); |
---|
| 4744 | + //makeSomething(readobj); |
---|
| 4745 | + } |
---|
| 4746 | + } |
---|
| 4747 | + |
---|
| 4748 | + void ImportVRMLX3D() |
---|
| 4749 | + { |
---|
| 4750 | + if (Grafreed.standAlone) |
---|
| 4751 | + { |
---|
| 4752 | + /**/ |
---|
| 4753 | + FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD); |
---|
| 4754 | + browser.show(); |
---|
| 4755 | + String filename = browser.getFile(); |
---|
| 4756 | + if (filename != null && filename.length() > 0) |
---|
| 4757 | + { |
---|
| 4758 | + String fullname = browser.getDirectory() + filename; |
---|
| 4759 | + LoadVRMLX3D(fullname); |
---|
| 4760 | + } |
---|
| 4761 | + /**/ |
---|
| 4762 | + } |
---|
| 4763 | + } |
---|
| 4764 | + |
---|
3203 | 4765 | void ToggleAnimation() |
---|
3204 | 4766 | { |
---|
3205 | 4767 | if (!Globals.ANIMATION) |
---|
3206 | 4768 | { |
---|
3207 | 4769 | FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE); |
---|
3208 | | - browser.show(); |
---|
| 4770 | + browser.setVisible(true); |
---|
3209 | 4771 | String filename = browser.getFile(); |
---|
3210 | 4772 | if (filename != null && filename.length() > 0) |
---|
3211 | 4773 | { |
---|
.. | .. |
---|
3215 | 4777 | |
---|
3216 | 4778 | Globals.ANIMATION ^= true; |
---|
3217 | 4779 | |
---|
3218 | | - GrafreeD.wav.cursor = 0; |
---|
3219 | | - GrafreeD.wav.loop = 0; |
---|
| 4780 | + Grafreed.wav.cursor = 0; |
---|
| 4781 | + Grafreed.wav.loop = 0; |
---|
3220 | 4782 | } |
---|
3221 | 4783 | } else |
---|
3222 | 4784 | { |
---|
.. | .. |
---|
3237 | 4799 | callee.refreshContents(); |
---|
3238 | 4800 | } else |
---|
3239 | 4801 | { |
---|
3240 | | - new Exception().printStackTrace(); |
---|
3241 | 4802 | System.exit(0); |
---|
3242 | 4803 | } |
---|
3243 | 4804 | } |
---|
.. | .. |
---|
3267 | 4828 | void CreateMaterial() |
---|
3268 | 4829 | { |
---|
3269 | 4830 | //copy.ClearMaterial(); // PATCH |
---|
3270 | | - copy.CreateMaterialS(multiplyToggle.isSelected()); |
---|
| 4831 | + copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected()); |
---|
3271 | 4832 | if (copy.selection.size() > 0) |
---|
3272 | 4833 | //SetMaterial(copy); |
---|
3273 | 4834 | { |
---|
.. | .. |
---|
3318 | 4879 | assert false; |
---|
3319 | 4880 | } |
---|
3320 | 4881 | |
---|
3321 | | - void EditSelection() |
---|
| 4882 | + void EditSelection(boolean newWindow) |
---|
3322 | 4883 | { |
---|
3323 | 4884 | } |
---|
3324 | 4885 | |
---|
.. | .. |
---|
3326 | 4887 | { |
---|
3327 | 4888 | copy.ResetBlockLoop(); // temporary problem |
---|
3328 | 4889 | |
---|
3329 | | - boolean random = CameraPane.RANDOM; |
---|
3330 | | - CameraPane.RANDOM = false; // parse everything |
---|
| 4890 | + boolean random = CameraPane.SWITCH; |
---|
| 4891 | + CameraPane.SWITCH = false; // parse everything |
---|
3331 | 4892 | copy.ResetDisplayList(); |
---|
3332 | 4893 | copy.HardTouch(); |
---|
3333 | | - CameraPane.RANDOM = random; |
---|
| 4894 | + CameraPane.SWITCH = random; |
---|
3334 | 4895 | } |
---|
3335 | 4896 | |
---|
3336 | 4897 | // public void applySelf() |
---|
.. | .. |
---|
3360 | 4921 | // else |
---|
3361 | 4922 | // applySelf(true); |
---|
3362 | 4923 | // } |
---|
| 4924 | + |
---|
| 4925 | + boolean Equal(double a, double b) |
---|
| 4926 | + { |
---|
| 4927 | + return Math.abs(a - b) < 0.001; |
---|
| 4928 | + } |
---|
| 4929 | + |
---|
3363 | 4930 | void applySelf0(boolean name) |
---|
3364 | 4931 | { |
---|
3365 | 4932 | if (name) |
---|
.. | .. |
---|
3377 | 4944 | //copy.material = new cMaterial(copy.GetMaterial()); |
---|
3378 | 4945 | |
---|
3379 | 4946 | current.color = (float) colorField.getFloat(); |
---|
3380 | | - current.modulation = (float) modulationField.getFloat(); |
---|
| 4947 | + current.modulation = (float) saturationField.getFloat(); |
---|
3381 | 4948 | current.metalness = (float) metalnessField.getFloat(); |
---|
3382 | 4949 | current.diffuse = (float) diffuseField.getFloat(); |
---|
3383 | 4950 | current.specular = (float) specularField.getFloat(); |
---|
.. | .. |
---|
3397 | 4964 | current.shadow = (float) shadowField.getFloat(); |
---|
3398 | 4965 | current.texture = (float) textureField.getFloat(); |
---|
3399 | 4966 | current.opacity = (float) opacityField.getFloat(); |
---|
| 4967 | + current.parallax = (float) parallaxField.getFloat() - 0.25f; |
---|
3400 | 4968 | current.fakedepth = (float) fakedepthField.getFloat(); |
---|
3401 | 4969 | current.shadowbias = (float) shadowbiasField.getFloat(); |
---|
3402 | 4970 | |
---|
.. | .. |
---|
3404 | 4972 | { |
---|
3405 | 4973 | //System.out.println("Propagate = " + propagate); |
---|
3406 | 4974 | copy.UpdateMaterial(anchor, current, propagate); |
---|
| 4975 | + |
---|
| 4976 | + if (copy.material != null) |
---|
| 4977 | + { |
---|
| 4978 | + cMaterial mat = copy.material; |
---|
| 4979 | + |
---|
| 4980 | + if (!Equal(colorField.getFloat(), mat.color)) |
---|
| 4981 | + colorField.SetToolTipValue((mat.color)); |
---|
| 4982 | + if (!Equal(saturationField.getFloat(), mat.modulation)) |
---|
| 4983 | + saturationField.SetToolTipValue((mat.modulation)); |
---|
| 4984 | + if (!Equal(metalnessField.getFloat(), mat.metalness)) |
---|
| 4985 | + metalnessField.SetToolTipValue((mat.metalness)); |
---|
| 4986 | + if (!Equal(diffuseField.getFloat(), mat.diffuse)) |
---|
| 4987 | + diffuseField.SetToolTipValue((mat.diffuse)); |
---|
| 4988 | + if (!Equal(specularField.getFloat(), mat.specular)) |
---|
| 4989 | + specularField.SetToolTipValue((mat.specular)); |
---|
| 4990 | + if (!Equal(shininessField.getFloat(), mat.shininess)) |
---|
| 4991 | + shininessField.SetToolTipValue((mat.shininess)); |
---|
| 4992 | + if (!Equal(shiftField.getFloat(), mat.shift)) |
---|
| 4993 | + shiftField.SetToolTipValue((mat.shift)); |
---|
| 4994 | + if (!Equal(ambientField.getFloat(), mat.ambient)) |
---|
| 4995 | + ambientField.SetToolTipValue((mat.ambient)); |
---|
| 4996 | + if (!Equal(lightareaField.getFloat(), mat.lightarea)) |
---|
| 4997 | + lightareaField.SetToolTipValue((mat.lightarea)); |
---|
| 4998 | + if (!Equal(diffusenessField.getFloat(), mat.factor)) |
---|
| 4999 | + diffusenessField.SetToolTipValue((mat.factor)); |
---|
| 5000 | + if (!Equal(velvetField.getFloat(), mat.velvet)) |
---|
| 5001 | + velvetField.SetToolTipValue((mat.velvet)); |
---|
| 5002 | + if (!Equal(sheenField.getFloat(), mat.sheen)) |
---|
| 5003 | + sheenField.SetToolTipValue((mat.sheen)); |
---|
| 5004 | + if (!Equal(subsurfaceField.getFloat(), mat.subsurface)) |
---|
| 5005 | + subsurfaceField.SetToolTipValue((mat.subsurface)); |
---|
| 5006 | + if (!Equal(backlitField.getFloat(), mat.bump)) |
---|
| 5007 | + backlitField.SetToolTipValue((mat.bump)); |
---|
| 5008 | + if (!Equal(anisoField.getFloat(), mat.aniso)) |
---|
| 5009 | + anisoField.SetToolTipValue((mat.aniso)); |
---|
| 5010 | + if (!Equal(anisoVField.getFloat(), mat.anisoV)) |
---|
| 5011 | + anisoVField.SetToolTipValue((mat.anisoV)); |
---|
| 5012 | + if (!Equal(cameraField.getFloat(), mat.cameralight)) |
---|
| 5013 | + cameraField.SetToolTipValue((mat.cameralight)); |
---|
| 5014 | + if (!Equal(selfshadowField.getFloat(), mat.diffuseness)) |
---|
| 5015 | + selfshadowField.SetToolTipValue((mat.diffuseness)); |
---|
| 5016 | + if (!Equal(shadowField.getFloat(), mat.shadow)) |
---|
| 5017 | + shadowField.SetToolTipValue((mat.shadow)); |
---|
| 5018 | + if (!Equal(textureField.getFloat(), mat.texture)) |
---|
| 5019 | + textureField.SetToolTipValue((mat.texture)); |
---|
| 5020 | + if (!Equal(opacityField.getFloat(), mat.opacity)) |
---|
| 5021 | + opacityField.SetToolTipValue((mat.opacity)); |
---|
| 5022 | + //if (!Equal(parallaxField.getFloat(), mat.parallax)) |
---|
| 5023 | + parallaxField.SetToolTipValue((mat.parallax)); |
---|
| 5024 | + if (!Equal(fakedepthField.getFloat(), mat.fakedepth)) |
---|
| 5025 | + fakedepthField.SetToolTipValue((mat.fakedepth)); |
---|
| 5026 | + if (!Equal(shadowbiasField.getFloat(), mat.shadowbias)) |
---|
| 5027 | + shadowbiasField.SetToolTipValue((mat.shadowbias)); |
---|
| 5028 | + } |
---|
| 5029 | + |
---|
3407 | 5030 | if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null) |
---|
3408 | 5031 | { |
---|
3409 | 5032 | copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000); |
---|
.. | .. |
---|
3432 | 5055 | //copy.Touch(); |
---|
3433 | 5056 | } |
---|
3434 | 5057 | |
---|
| 5058 | + cNumberSlider versionSlider; |
---|
| 5059 | + |
---|
3435 | 5060 | public void stateChanged(ChangeEvent e) |
---|
3436 | 5061 | { |
---|
3437 | | - // assert(false); |
---|
| 5062 | + // assert(false); |
---|
| 5063 | + if (e.getSource() == versionSlider) |
---|
| 5064 | + { |
---|
| 5065 | + if (muteSlider) |
---|
| 5066 | + return; |
---|
| 5067 | + |
---|
| 5068 | + Replace(); |
---|
| 5069 | + |
---|
| 5070 | + int version = versionSlider.getInteger(); |
---|
| 5071 | + |
---|
| 5072 | + if (version != -1 && copy.versionlist[version] != null) |
---|
| 5073 | + { |
---|
| 5074 | + copy.versionindex = version; |
---|
| 5075 | + CopyChanged(); |
---|
| 5076 | + } |
---|
| 5077 | + |
---|
| 5078 | + return; |
---|
| 5079 | + } |
---|
3438 | 5080 | |
---|
3439 | 5081 | if (freezematerial) |
---|
3440 | 5082 | { |
---|
.. | .. |
---|
3470 | 5112 | { |
---|
3471 | 5113 | //System.out.println("stateChanged = " + this); |
---|
3472 | 5114 | materialtouched = true; |
---|
| 5115 | + |
---|
| 5116 | + if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001) |
---|
| 5117 | + { |
---|
| 5118 | + saturationField.setFloat(1); |
---|
| 5119 | + } |
---|
| 5120 | + |
---|
3473 | 5121 | applySelf(); |
---|
3474 | 5122 | //System.out.println("this = " + this); |
---|
3475 | 5123 | //System.out.println("PARENT = " + parent); |
---|
.. | .. |
---|
3519 | 5167 | } |
---|
3520 | 5168 | |
---|
3521 | 5169 | if (normalpushField != null) |
---|
3522 | | - copy.NORMALPUSH = (float)normalpushField.getFloat()/1000; |
---|
| 5170 | + copy.NORMALPUSH = (float)normalpushField.getFloat()/100; |
---|
3523 | 5171 | } |
---|
3524 | 5172 | |
---|
3525 | 5173 | void SnapObject() |
---|
.. | .. |
---|
3769 | 5417 | { |
---|
3770 | 5418 | if (GetTree() != null) |
---|
3771 | 5419 | { |
---|
| 5420 | + GetTree().revalidate(); |
---|
3772 | 5421 | GetTree().repaint(); |
---|
3773 | 5422 | } |
---|
3774 | 5423 | |
---|
.. | .. |
---|
3777 | 5426 | ctrlPanel.validate(); // ? new |
---|
3778 | 5427 | ctrlPanel.repaint(); |
---|
3779 | 5428 | } |
---|
| 5429 | + |
---|
| 5430 | + if (previousVersionButton != null && copy.versionlist != null) |
---|
| 5431 | + SetVersionStates(); |
---|
| 5432 | + |
---|
| 5433 | + cameraView.requestFocusInWindow(); |
---|
3780 | 5434 | } |
---|
3781 | 5435 | |
---|
3782 | 5436 | static TweenManager tweenManager = new TweenManager(); |
---|
3783 | 5437 | |
---|
3784 | 5438 | void makeSomething(Object3D thing, boolean resetmodel) // deselect) |
---|
3785 | 5439 | { |
---|
| 5440 | + if (Globals.REPLACEONMAKE) // && resetmodel) |
---|
| 5441 | + Save(); |
---|
3786 | 5442 | //Tween.set(thing, 0).target(1).start(tweenManager); |
---|
3787 | 5443 | //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager); |
---|
3788 | 5444 | // if (thing instanceof GenericJointDemo) |
---|
.. | .. |
---|
3806 | 5462 | // group = (Composite) group.get(0); |
---|
3807 | 5463 | // } |
---|
3808 | 5464 | |
---|
3809 | | - System.out.println("makeSomething of " + thing); |
---|
| 5465 | + //System.out.println("makeSomething of " + thing); |
---|
3810 | 5466 | |
---|
3811 | 5467 | /* |
---|
3812 | 5468 | if (deselect && jList != null) |
---|
.. | .. |
---|
3869 | 5525 | { |
---|
3870 | 5526 | ResetModel(); |
---|
3871 | 5527 | Select(thing.GetTreePath(), true, false); // unselect... false); |
---|
| 5528 | + |
---|
| 5529 | + if (thing.Size() == 0) |
---|
| 5530 | + { |
---|
| 5531 | + //EditSelection(false); |
---|
| 5532 | + } |
---|
| 5533 | + |
---|
3872 | 5534 | refreshContents(); |
---|
3873 | 5535 | } |
---|
3874 | 5536 | |
---|
.. | .. |
---|
3986 | 5648 | } |
---|
3987 | 5649 | } |
---|
3988 | 5650 | } |
---|
| 5651 | + |
---|
3989 | 5652 | LoadGFDThread loadGFDThread; |
---|
3990 | 5653 | |
---|
3991 | 5654 | void ReadGFD(String fullname, iCallBack cb) |
---|
.. | .. |
---|
4005 | 5668 | |
---|
4006 | 5669 | try |
---|
4007 | 5670 | { |
---|
| 5671 | + // Try compressed version first. |
---|
4008 | 5672 | java.io.FileInputStream istream = new java.io.FileInputStream(fullname); |
---|
4009 | | - java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream); |
---|
| 5673 | + java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream); |
---|
| 5674 | + java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream); |
---|
4010 | 5675 | |
---|
4011 | 5676 | readobj = (Object3D) p.readObject(); |
---|
4012 | 5677 | istream.close(); |
---|
.. | .. |
---|
4014 | 5679 | readobj.ResetDisplayList(); |
---|
4015 | 5680 | } catch (Exception e) |
---|
4016 | 5681 | { |
---|
4017 | | - e.printStackTrace(); |
---|
| 5682 | + if (!e.toString().contains("GZIP")) |
---|
| 5683 | + e.printStackTrace(); |
---|
| 5684 | + |
---|
| 5685 | + try |
---|
| 5686 | + { |
---|
| 5687 | + java.io.FileInputStream istream = new java.io.FileInputStream(fullname); |
---|
| 5688 | + java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream); |
---|
| 5689 | + |
---|
| 5690 | + readobj = (Object3D) p.readObject(); |
---|
| 5691 | + istream.close(); |
---|
| 5692 | + |
---|
| 5693 | + readobj.ResetDisplayList(); |
---|
| 5694 | + } catch (Exception e2) |
---|
| 5695 | + { |
---|
| 5696 | + e2.printStackTrace(); |
---|
| 5697 | + } |
---|
4018 | 5698 | } |
---|
4019 | 5699 | // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); } |
---|
4020 | 5700 | // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); } |
---|
.. | .. |
---|
4060 | 5740 | |
---|
4061 | 5741 | void LoadIt(Object obj) |
---|
4062 | 5742 | { |
---|
| 5743 | + if (obj == null) |
---|
| 5744 | + { |
---|
| 5745 | + // Invalid file |
---|
| 5746 | + return; |
---|
| 5747 | + } |
---|
| 5748 | + |
---|
4063 | 5749 | System.out.println("Loaded " + obj); |
---|
4064 | 5750 | //new Exception().printStackTrace(); |
---|
4065 | 5751 | Object3D readobj = (Object3D) obj; |
---|
.. | .. |
---|
4069 | 5755 | |
---|
4070 | 5756 | if (readobj != null) |
---|
4071 | 5757 | { |
---|
| 5758 | + //if (Globals.SAVEONMAKE) // A new object cannot share meshes |
---|
| 5759 | + // Save(); |
---|
4072 | 5760 | try |
---|
4073 | 5761 | { |
---|
4074 | 5762 | //readobj.deepCopySelf(copy); |
---|
4075 | 5763 | copy.clear(); // june 2014 |
---|
| 5764 | + copy.skyboxname = readobj.skyboxname; |
---|
| 5765 | + copy.skyboxext = readobj.skyboxext; |
---|
4076 | 5766 | for (int i = 0; i < readobj.size(); i++) |
---|
4077 | 5767 | { |
---|
4078 | 5768 | Object3D child = readobj.get(i); // reserve(i); |
---|
.. | .. |
---|
4113 | 5803 | } |
---|
4114 | 5804 | } catch (ClassCastException e) |
---|
4115 | 5805 | { |
---|
| 5806 | + e.printStackTrace(); |
---|
4116 | 5807 | assert (false); |
---|
4117 | 5808 | Composite c = (Composite) copy; |
---|
4118 | 5809 | c.children.clear(); |
---|
.. | .. |
---|
4123 | 5814 | c.addChild(csg); |
---|
4124 | 5815 | } |
---|
4125 | 5816 | |
---|
| 5817 | + copy.versionlist = readobj.versionlist; |
---|
| 5818 | + copy.versionindex = readobj.versionindex; |
---|
| 5819 | + copy.versiontable = readobj.versiontable; |
---|
| 5820 | + |
---|
| 5821 | + if (copy.versionlist == null) |
---|
| 5822 | + { |
---|
| 5823 | + // Backward compatibility |
---|
| 5824 | + copy.versionlist = new Object3D[100]; |
---|
| 5825 | + copy.versionindex = -1; |
---|
| 5826 | + |
---|
| 5827 | + //Save(true); |
---|
| 5828 | + } |
---|
| 5829 | + |
---|
| 5830 | + //? SetUndoStates(); |
---|
| 5831 | + |
---|
4126 | 5832 | ResetModel(); |
---|
4127 | 5833 | copy.HardTouch(); // recompile? |
---|
4128 | 5834 | refreshContents(); |
---|
4129 | 5835 | } |
---|
4130 | 5836 | } |
---|
4131 | 5837 | |
---|
4132 | | - void load() // throws ClassNotFoundException |
---|
| 5838 | + void Open() // throws ClassNotFoundException |
---|
4133 | 5839 | { |
---|
4134 | | - if (GrafreeD.standAlone) |
---|
| 5840 | + if (Grafreed.standAlone) |
---|
4135 | 5841 | { |
---|
4136 | | - FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD); |
---|
| 5842 | + FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD); |
---|
4137 | 5843 | browser.show(); |
---|
4138 | 5844 | String filename = browser.getFile(); |
---|
4139 | 5845 | if (filename != null && filename.length() > 0) |
---|
.. | .. |
---|
4210 | 5916 | |
---|
4211 | 5917 | void save() |
---|
4212 | 5918 | { |
---|
| 5919 | + Replace(); |
---|
| 5920 | + |
---|
4213 | 5921 | if (lastname == null) |
---|
4214 | 5922 | { |
---|
4215 | 5923 | return; |
---|
.. | .. |
---|
4218 | 5926 | try |
---|
4219 | 5927 | { |
---|
4220 | 5928 | FileOutputStream ostream = new FileOutputStream(lastname); |
---|
4221 | | - ObjectOutputStream p = new ObjectOutputStream(ostream); |
---|
| 5929 | + java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream); |
---|
| 5930 | + ObjectOutputStream p = new ObjectOutputStream(zstream); |
---|
4222 | 5931 | |
---|
4223 | 5932 | p.writeObject(copy); |
---|
4224 | 5933 | p.flush(); |
---|
4225 | 5934 | |
---|
| 5935 | + zstream.close(); |
---|
4226 | 5936 | ostream.close(); |
---|
4227 | 5937 | |
---|
4228 | 5938 | //FileOutputStream fos = new FileOutputStream(fullname); |
---|
.. | .. |
---|
4230 | 5940 | //ps.print(buffer.toString()); |
---|
4231 | 5941 | } catch (IOException e) |
---|
4232 | 5942 | { |
---|
| 5943 | + e.printStackTrace(); |
---|
4233 | 5944 | } |
---|
4234 | 5945 | } |
---|
| 5946 | + |
---|
4235 | 5947 | String lastname; |
---|
4236 | 5948 | |
---|
4237 | 5949 | void saveAs() |
---|
4238 | 5950 | { |
---|
4239 | | - if (GrafreeD.standAlone) |
---|
| 5951 | + if (Grafreed.standAlone) |
---|
4240 | 5952 | { |
---|
4241 | 5953 | FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE); |
---|
4242 | 5954 | browser.setVisible(true); |
---|
4243 | 5955 | String filename = browser.getFile(); |
---|
4244 | 5956 | if (filename != null && filename.length() > 0) |
---|
4245 | 5957 | { |
---|
| 5958 | + if (!filename.endsWith(".gfd")) |
---|
| 5959 | + filename += ".gfd"; |
---|
4246 | 5960 | lastname = browser.getDirectory() + filename; |
---|
4247 | 5961 | save(); |
---|
4248 | 5962 | } |
---|
.. | .. |
---|
4341 | 6055 | try |
---|
4342 | 6056 | { |
---|
4343 | 6057 | FileOutputStream ostream = new FileOutputStream(filename); |
---|
4344 | | - // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream); |
---|
4345 | | - ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream); |
---|
| 6058 | + java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream); |
---|
| 6059 | + ObjectOutputStream p = new ObjectOutputStream(zstream); |
---|
4346 | 6060 | |
---|
4347 | 6061 | Object3D objectparent = obj.parent; |
---|
4348 | 6062 | obj.parent = null; |
---|
4349 | 6063 | |
---|
4350 | | - Object3D object = (Object3D) GrafreeD.clone(obj); |
---|
| 6064 | + Object3D object = (Object3D) Grafreed.clone(obj); |
---|
4351 | 6065 | |
---|
4352 | 6066 | obj.parent = objectparent; |
---|
4353 | 6067 | |
---|
.. | .. |
---|
4359 | 6073 | p.writeObject(object); |
---|
4360 | 6074 | p.flush(); |
---|
4361 | 6075 | |
---|
| 6076 | + zstream.close(); |
---|
4362 | 6077 | ostream.close(); |
---|
4363 | | - // zstream.close(); |
---|
4364 | 6078 | |
---|
4365 | 6079 | // group.selection.get(0).parent = parent; |
---|
4366 | 6080 | //FileOutputStream fos = new FileOutputStream(fullname); |
---|
.. | .. |
---|
4381 | 6095 | buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n"); |
---|
4382 | 6096 | cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height); |
---|
4383 | 6097 | copy.generatePOV(buffer); |
---|
4384 | | - if (GrafreeD.standAlone) |
---|
| 6098 | + if (Grafreed.standAlone) |
---|
4385 | 6099 | { |
---|
4386 | 6100 | FileDialog browser = new FileDialog(frame, "Export POV", 1); |
---|
4387 | 6101 | browser.show(); |
---|
.. | .. |
---|
4407 | 6121 | Object3D client; |
---|
4408 | 6122 | Object3D copy; |
---|
4409 | 6123 | MenuBar menuBar; |
---|
4410 | | - Menu windowMenu; |
---|
4411 | | - MenuItem loadItem; |
---|
| 6124 | + Menu fileMenu; |
---|
| 6125 | + MenuItem newItem; |
---|
| 6126 | + MenuItem openItem; |
---|
4412 | 6127 | MenuItem saveItem; |
---|
4413 | 6128 | MenuItem saveAsItem; |
---|
4414 | 6129 | MenuItem exportAsItem; |
---|
4415 | 6130 | MenuItem reexportItem; |
---|
4416 | 6131 | MenuItem povItem; |
---|
4417 | 6132 | MenuItem closeItem; |
---|
4418 | | - Menu cameraMenu; |
---|
| 6133 | + |
---|
4419 | 6134 | CheckboxMenuItem zBufferItem; |
---|
4420 | 6135 | //MenuItem normalLensItem; |
---|
4421 | | - MenuItem editCameraItem; |
---|
4422 | | - MenuItem revertCameraItem; |
---|
4423 | 6136 | MenuItem stepItem; |
---|
4424 | 6137 | CheckboxMenuItem toggleLiveItem; |
---|
4425 | 6138 | CheckboxMenuItem toggleFullScreenItem; |
---|
.. | .. |
---|
4430 | 6143 | CheckboxMenuItem toggleFootContactItem; |
---|
4431 | 6144 | CheckboxMenuItem toggleDLItem; |
---|
4432 | 6145 | CheckboxMenuItem toggleTextureItem; |
---|
4433 | | - CheckboxMenuItem toggleRandomItem; |
---|
| 6146 | + CheckboxMenuItem toggleSwitchItem; |
---|
4434 | 6147 | CheckboxMenuItem toggleRootItem; |
---|
4435 | 6148 | CheckboxMenuItem animationItem; |
---|
| 6149 | + MenuItem archiveItem; |
---|
4436 | 6150 | CheckboxMenuItem toggleHandleItem; |
---|
4437 | 6151 | CheckboxMenuItem togglePaintItem; |
---|
4438 | 6152 | JSplitPane mainPanel; |
---|
4439 | 6153 | JScrollPane scrollpane; |
---|
| 6154 | + |
---|
4440 | 6155 | JPanel toolbarPanel; |
---|
| 6156 | + |
---|
4441 | 6157 | cGridBag treePanel; |
---|
| 6158 | + |
---|
4442 | 6159 | JPanel radioPanel; |
---|
4443 | 6160 | ButtonGroup buttonGroup; |
---|
4444 | | - cGridBag ctrlPanel; |
---|
| 6161 | + |
---|
| 6162 | + cGridBag toolboxPanel; |
---|
| 6163 | + cGridBag skyboxPanel; |
---|
4445 | 6164 | cGridBag materialPanel; |
---|
| 6165 | + cGridBag ctrlPanel; |
---|
| 6166 | + |
---|
4446 | 6167 | JScrollPane infoPanel; |
---|
| 6168 | + |
---|
4447 | 6169 | cGridBag optionsPanel; |
---|
| 6170 | + |
---|
4448 | 6171 | JTabbedPane objectPanel; |
---|
| 6172 | + boolean materialFlushed; |
---|
| 6173 | + Object3D latestObject; |
---|
| 6174 | + |
---|
| 6175 | + cGridBag transformPanel; |
---|
4449 | 6176 | cGridBag XYZPanel; |
---|
| 6177 | + |
---|
4450 | 6178 | JSplitPane gridPanel; |
---|
4451 | 6179 | JSplitPane bigPanel; |
---|
| 6180 | + |
---|
4452 | 6181 | cGridBag bigThree; |
---|
4453 | 6182 | cGridBag scenePanel; |
---|
4454 | 6183 | cGridBag centralPanel; |
---|
.. | .. |
---|
4506 | 6235 | JLabel colorLabel; |
---|
4507 | 6236 | cNumberSlider colorField; |
---|
4508 | 6237 | JLabel modulationLabel; |
---|
4509 | | - cNumberSlider modulationField; |
---|
| 6238 | + cNumberSlider saturationField; |
---|
4510 | 6239 | JLabel metalnessLabel; |
---|
4511 | 6240 | cNumberSlider metalnessField; |
---|
4512 | 6241 | JLabel diffuseLabel; |
---|
.. | .. |
---|
4537 | 6266 | cNumberSlider anisoField; |
---|
4538 | 6267 | JLabel anisoVLabel; |
---|
4539 | 6268 | cNumberSlider anisoVField; |
---|
| 6269 | + |
---|
4540 | 6270 | JLabel cameraLabel; |
---|
4541 | 6271 | cNumberSlider cameraField; |
---|
4542 | 6272 | JLabel selfshadowLabel; |
---|
.. | .. |
---|
4547 | 6277 | cNumberSlider textureField; |
---|
4548 | 6278 | JLabel opacityLabel; |
---|
4549 | 6279 | cNumberSlider opacityField; |
---|
| 6280 | + JLabel parallaxLabel; |
---|
| 6281 | + cNumberSlider parallaxField; |
---|
4550 | 6282 | JLabel fakedepthLabel; |
---|
4551 | 6283 | cNumberSlider fakedepthField; |
---|
4552 | 6284 | JLabel shadowbiasLabel; |
---|
4553 | 6285 | cNumberSlider shadowbiasField; |
---|
| 6286 | + |
---|
4554 | 6287 | JLabel bumpLabel; |
---|
4555 | 6288 | cNumberSlider bumpField; |
---|
4556 | 6289 | JLabel noiseLabel; |
---|
.. | .. |
---|
4563 | 6296 | cNumberSlider fogField; |
---|
4564 | 6297 | JLabel opacityPowerLabel; |
---|
4565 | 6298 | cNumberSlider opacityPowerField; |
---|
4566 | | - JTree jTree; |
---|
| 6299 | + cTree jTree; |
---|
4567 | 6300 | //ObjectUI parent; |
---|
4568 | 6301 | |
---|
4569 | 6302 | cNumberSlider normalpushField; |
---|
| 6303 | + |
---|
| 6304 | + private MenuItem importGFDItem; |
---|
| 6305 | + private MenuItem importVRMLX3DItem; |
---|
| 6306 | + private MenuItem import3DSItem; |
---|
| 6307 | + private MenuItem importOBJItem; |
---|
4570 | 6308 | } |
---|