From 7b6b5ba546450e71ecc812356952b594acc5add5 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 16 Jun 2019 12:44:54 -0400
Subject: [PATCH] Fix shadow touched.
---
ObjEditor.java | 669 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 494 insertions(+), 175 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 177b5d2..9cf4839 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -143,6 +143,8 @@
//nameField.removeActionListener(this);
// objEditor.ctrlPanel.remove(nameField);
+ objEditor.ctrlPanel.remove(namePanel);
+
if (!GroupEditor.allparams)
return;
@@ -165,7 +167,6 @@
// objEditor.ctrlPanel.remove(fasterButton);
// objEditor.ctrlPanel.remove(remarkButton);
- objEditor.ctrlPanel.remove(namePanel);
objEditor.ctrlPanel.remove(setupPanel);
objEditor.ctrlPanel.remove(commandsPanel);
objEditor.ctrlPanel.remove(pushPanel);
@@ -275,24 +276,40 @@
void SetupMenu()
{
frame.setMenuBar(menuBar = new MenuBar());
- menuBar.add(windowMenu = new Menu("File"));
- windowMenu.add(loadItem = new MenuItem("Load..."));
- windowMenu.add("-");
- windowMenu.add(saveItem = new MenuItem("Save"));
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
+ menuBar.add(fileMenu = new Menu("File"));
+ fileMenu.add(newItem = new MenuItem("New"));
+ fileMenu.add(loadItem = new MenuItem("Open..."));
+
+ //oe.menuBar.add(menu = new Menu("Include"));
+ Menu menu = new Menu("Import");
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
+ importOBJItem.addActionListener(this);
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
+ import3DSItem.addActionListener(this);
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
+ importVRMLX3DItem.addActionListener(this);
+ menu.add("-");
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
+ importGFDItem.addActionListener(this);
+ fileMenu.add(menu);
+ fileMenu.add("-");
+
+ fileMenu.add(saveItem = new MenuItem("Save"));
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
- windowMenu.add("-");
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
- windowMenu.add("-");
+ fileMenu.add("-");
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
+ fileMenu.add("-");
if (client.parent != null)
{
- windowMenu.add(closeItem = new MenuItem("Close"));
+ fileMenu.add(closeItem = new MenuItem("Close"));
} else
{
- windowMenu.add(closeItem = new MenuItem("Exit"));
+ fileMenu.add(closeItem = new MenuItem("Exit"));
}
+ newItem.addActionListener(this);
loadItem.addActionListener(this);
saveItem.addActionListener(this);
saveAsItem.addActionListener(this);
@@ -300,61 +317,6 @@
reexportItem.addActionListener(this);
//povItem.addActionListener(this);
closeItem.addActionListener(this);
-
- menuBar.add(cameraMenu = new Menu("View"));
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
- //zBufferItem.addActionListener(this);
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
- //normalLensItem.addActionListener(this);
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
- revertCameraItem.addActionListener(this);
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
- toggleTimelineItem.addItemListener(this);
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
- toggleFullScreenItem.addItemListener(this);
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
- cameraMenu.add("-");
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
- toggleTextureItem.addItemListener(this);
- toggleTextureItem.setState(CameraPane.textureon);
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
- toggleLiveItem.addItemListener(this);
- toggleLiveItem.setState(Globals.isLIVE());
- cameraMenu.add(stepItem = new MenuItem("Step"));
- stepItem.addActionListener(this);
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
-// toggleDLItem.addItemListener(this);
-// toggleDLItem.setState(false);
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
- toggleRenderItem.addItemListener(this);
- toggleRenderItem.setState(!CameraPane.frozen);
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
- toggleDebugItem.addItemListener(this);
- toggleDebugItem.setState(CameraPane.DEBUG);
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
- toggleFrustumItem.addItemListener(this);
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
- toggleFootContactItem.addItemListener(this);
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
- toggleRandomItem.addItemListener(this);
- toggleRandomItem.setState(CameraPane.RANDOM);
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
- toggleHandleItem.addItemListener(this);
- toggleHandleItem.setState(CameraPane.HANDLES);
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
- togglePaintItem.addItemListener(this);
- togglePaintItem.setState(CameraPane.PAINTMODE);
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
-// toggleRootItem.addItemListener(this);
-// toggleRootItem.setState(false);
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
-// animationItem.addItemListener(this);
-// animationItem.setState(CameraPane.ANIMATION);
- cameraMenu.add("-");
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
- editCameraItem.addActionListener(this);
objectPanel = new JTabbedPane();
toolbarPanel = new JPanel();
@@ -457,10 +419,10 @@
e.printStackTrace();
}
- String selection = infoarea.getText();
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
- java.awt.datatransfer.Clipboard clipboard =
- Toolkit.getDefaultToolkit().getSystemClipboard();
+// String selection = infoarea.getText();
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
+// java.awt.datatransfer.Clipboard clipboard =
+// Toolkit.getDefaultToolkit().getSystemClipboard();
//clipboard.setContents(data, data);
}
@@ -483,13 +445,13 @@
//SendInfo("Name:", "bold");
if (sel.GetTextures() != null || debug)
{
- si.SendInfo(sel.toString(), "bold");
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
if (sel.Size() > 0)
{
si.SendInfo("#children = " + sel.Size(), "regular");
}
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
if (debug)
{
try
@@ -531,7 +493,7 @@
}
if (sel.support != null)
{
- si.SendInfo(" support: " + sel.support, "regular");
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
}
if (sel.scriptnode != null)
{
@@ -734,7 +696,7 @@
protected static ImageIcon createImageIcon(String path,
String description)
{
- java.net.URL imgURL = GrafreeD.class.getResource(path);
+ java.net.URL imgURL = Grafreed.class.getResource(path);
if (imgURL != null)
{
return new ImageIcon(imgURL, description);
@@ -766,6 +728,7 @@
// NumberSlider vDivsField;
// JCheckBox endcaps;
JCheckBox liveCB;
+ JCheckBox selectCB;
JCheckBox hideCB;
JCheckBox link2masterCB;
JCheckBox markCB;
@@ -951,10 +914,6 @@
void SetupUI2(ObjEditor oe)
{
-// oe.aConstraints.weightx = 0;
-// oe.aConstraints.weighty = 0;
-// oe.aConstraints.gridx = 0;
-// oe.aConstraints.gridy = 0;
//SetupName(oe);
namePanel = new cGridBag();
@@ -971,32 +930,52 @@
setupPanel = new cGridBag().setVertical(false);
liveCB = AddCheckBox(setupPanel, "Live", copy.live);
- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
+ liveCB.setToolTipText("Animate object");
+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
+ selectCB.setToolTipText("Make object selectable");
// Return();
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
+ hideCB.setToolTipText("Hide object");
markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
+ markCB.setToolTipText("Set the animation target transform");
+
+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
+ rewindCB.setToolTipText("Rewind animation");
+
+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
+ randomCB.setToolTipText("Option for switch node");
+ if (Globals.ADVANCED)
+ {
+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
+ link2masterCB.setToolTipText("Attach to support");
+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
+ speedupCB.setToolTipText("Option motion capture");
+ }
+
oe.ctrlPanel.add(setupPanel);
oe.ctrlPanel.Return();
commandsPanel = new cGridBag().setVertical(false);
resetButton = AddButton(commandsPanel, "Reset");
+ resetButton.setToolTipText("Jump to frame zero");
stepButton = AddButton(commandsPanel, "Step");
+ stepButton.setToolTipText("Step one frame");
// resetAllButton = AddButton(oe, "Reset All");
// stepAllButton = AddButton(oe, "Step All");
- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
// Return();
slowerButton = AddButton(commandsPanel, "Slow");
+ slowerButton.setToolTipText("Decrease animation speed");
fasterButton = AddButton(commandsPanel, "Fast");
+ fasterButton.setToolTipText("Increase animation speed");
remarkButton = AddButton(commandsPanel, "Remark");
+ remarkButton.setToolTipText("Set the current transform as the target");
oe.ctrlPanel.add(commandsPanel);
oe.ctrlPanel.Return();
- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
normalpushField = (cNumberSlider)pushPanel.getComponent(1);
//Return();
@@ -1298,7 +1277,7 @@
scrollpane.addMouseWheelListener(this); // Default not fast enough
/*JTabbedPane*/ scenePanel = new cGridBag();
- scenePanel.preferredWidth = 7;
+ scenePanel.preferredWidth = 6;
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(scrollpane);
@@ -1404,8 +1383,8 @@
// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
- frame.setSize(1024, 768);
- frame.show();
+ frame.setSize(1280, 860);
+ frame.setVisible(true);
gridPanel.setDividerLocation(1.0);
@@ -1444,19 +1423,22 @@
cGridBag editBar = new cGridBag().setVertical(false);
- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
createMaterialButton.setToolTipText("Create material");
/*
ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
*/
- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
clearMaterialButton.setToolTipText("Clear material");
- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
+ if (Globals.ADVANCED)
+ {
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
+ }
editBar.preferredHeight = 15;
@@ -1725,12 +1707,15 @@
opacityPowerField.addChangeListener(this);
/**/
- resetSlidersButton.addActionListener(this);
clearMaterialButton.addActionListener(this);
createMaterialButton.addActionListener(this);
-
- propagateToggle.addItemListener(this);
- multiplyToggle.addItemListener(this);
+
+ if (Globals.ADVANCED)
+ {
+ resetSlidersButton.addActionListener(this);
+ propagateToggle.addItemListener(this);
+ multiplyToggle.addItemListener(this);
+ }
}
void DropFile(java.io.File[] files, boolean textures)
@@ -1901,7 +1886,7 @@
//? flashIt = false;
CameraPane pane = (CameraPane) cameraView;
- pane.clickStart(location.x, location.y, 0);
+ pane.clickStart(location.x, location.y, 0, 0);
pane.clickEnd(location.x, location.y, 0, true);
if (group.selection.size() == 1)
@@ -1950,6 +1935,7 @@
e2.printStackTrace();
}
}
+
LoadJMEThread loadThread;
class LoadJMEThread extends Thread
@@ -2007,6 +1993,7 @@
//LoadFile0(filename, converter);
}
}
+
LoadOBJThread loadObjThread;
class LoadOBJThread extends Thread
@@ -2085,19 +2072,19 @@
void LoadObjFile(String fullname)
{
- /*
+ System.out.println("Loading " + fullname);
+ /**/
//lastFilename = fullname;
if(loadObjThread == null)
{
- loadObjThread = new LoadOBJThread();
- loadObjThread.start();
+ loadObjThread = new LoadOBJThread();
+ loadObjThread.start();
}
loadObjThread.add(fullname);
- */
+ /**/
- System.out.println("Loading " + fullname);
- makeSomething(new FileObject(fullname, true), true);
+ //makeSomething(new FileObject(fullname, true), true);
}
void LoadGFDFile(String fullname)
@@ -2358,11 +2345,11 @@
void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
/**/
FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
- browser.show();
+ browser.setVisible(true);
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
@@ -2722,7 +2709,8 @@
return;
}
- multiplyToggle.setSelected(mat.multiply);
+ if (multiplyToggle != null)
+ multiplyToggle.setSelected(mat.multiply);
assert (object.projectedVertices != null);
@@ -2937,9 +2925,9 @@
frame.validate();
return;
- } else if (event.getSource() == toggleRandomItem)
+ } else if (event.getSource() == toggleSwitchItem)
{
- cameraView.ToggleRandom();
+ cameraView.ToggleSwitch();
cameraView.repaint();
return;
} else if (event.getSource() == toggleHandleItem)
@@ -2968,6 +2956,10 @@
{
copy.live ^= true;
return;
+ } else if (event.getSource() == selectCB)
+ {
+ copy.dontselect ^= true;
+ return;
} else if (event.getSource() == hideCB)
{
copy.hide ^= true;
@@ -2982,6 +2974,7 @@
if (event.getSource() == randomCB)
{
copy.random ^= true;
+ objEditor.refreshContents();
return;
}
if (event.getSource() == speedupCB)
@@ -3005,8 +2998,9 @@
public void actionPerformed(ActionEvent event)
{
+ Object source = event.getSource();
// SCRIPT DIALOG
- if (event.getSource() == okbutton)
+ if (source == okbutton)
{
textpanel.setVisible(false);
textpanel.remove(textarea);
@@ -3018,7 +3012,7 @@
textarea = null;
textpanel = null;
}
- if (event.getSource() == cancelbutton)
+ if (source == cancelbutton)
{
textpanel.setVisible(false);
textpanel.remove(textarea);
@@ -3030,50 +3024,50 @@
//applySelf();
//client.refreshEditWindow();
//refreshContents();
- if (event.getSource() == nameField)
+ if (source == nameField)
{
//System.out.println("ObjEditor " + event);
applySelf0(true);
//parent.applySelf();
objEditor.refreshContents();
- } else if (event.getSource() == resetButton)
+ } else if (source == resetButton)
{
CameraPane.fullreset = true;
copy.Reset(); // ResetMeshes();
copy.Touch();
objEditor.refreshContents();
- } else if (event.getSource() == stepItem)
+ } else if (source == stepItem)
{
//cameraView.ONESTEP = true;
Globals.ONESTEP = true;
cameraView.repaint();
return;
- } else if (event.getSource() == stepButton)
+ } else if (source == stepButton)
{
copy.Step();
copy.Touch();
objEditor.refreshContents();
- } else if (event.getSource() == slowerButton)
+ } else if (source == slowerButton)
{
copy.Slower();
copy.Touch();
objEditor.refreshContents();
- } else if (event.getSource() == fasterButton)
+ } else if (source == fasterButton)
{
copy.Faster();
copy.Touch();
objEditor.refreshContents();
- } else if (event.getSource() == remarkButton)
+ } else if (source == remarkButton)
{
copy.Remark();
copy.Touch();
objEditor.refreshContents();
- } else if (event.getSource() == stepAllButton)
+ } else if (source == stepAllButton)
{
copy.StepAll();
copy.Touch();
objEditor.refreshContents();
- } else if (event.getSource() == resetAllButton)
+ } else if (source == resetAllButton)
{
//CameraPane.fullreset = true;
copy.ResetAll(); // ResetMeshes();
@@ -3106,53 +3100,75 @@
// Close();
// }
// else
- if (event.getSource() == resetSlidersButton)
+ if (source == resetSlidersButton)
{
ResetSliders();
- } else if (event.getSource() == clearMaterialButton)
+ } else if (source == clearMaterialButton)
{
ClearMaterial();
- } else if (event.getSource() == createMaterialButton)
+ } else if (source == createMaterialButton)
{
CreateMaterial();
- } else if (event.getSource() == clearPanelButton)
+ } else if (source == clearPanelButton)
{
copy.ClearUI();
refreshContents(true);
- } /*
- }
-
- public boolean action(Event event, Object arg)
- {
- */ else if (event.getSource() == closeItem)
+ } else if (source == importGFDItem)
+ {
+ ImportGFD();
+ } else
+ if (source == importVRMLX3DItem)
+ {
+ ImportVRMLX3D();
+ } else
+ if (source == import3DSItem)
+ {
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
+ } else
+ if (source == importOBJItem)
+ {
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
+ browser.setVisible(true);
+ String filename = browser.getFile();
+ if (filename != null && filename.length() > 0)
+ {
+ String fullname = browser.getDirectory() + filename;
+ makeSomething(ReadOBJ(fullname), true);
+ }
+ } else
+ if (source == closeItem)
{
Close();
//return true;
- } else if (event.getSource() == loadItem)
+ } else if (source == loadItem)
{
load();
//return true;
- } else if (event.getSource() == saveItem)
+ } else if (source == newItem)
+ {
+ New();
+ } else if (source == saveItem)
{
save();
//return true;
- } else if (event.getSource() == saveAsItem)
+ } else if (source == saveAsItem)
{
saveAs();
//return true;
- } else if (event.getSource() == reexportItem)
+ } else if (source == reexportItem)
{
reexport();
//return true;
- } else if (event.getSource() == exportAsItem)
+ } else if (source == exportAsItem)
{
export();
//return true;
- } else if (event.getSource() == povItem)
+ } else if (source == povItem)
{
generatePOV();
//return true;
- } else if (event.getSource() == zBufferItem)
+ } else if (source == zBufferItem)
{
try
{
@@ -3174,21 +3190,8 @@
cameraView.repaint();
//return true;
}
- */ else if (event.getSource() == editCameraItem)
- {
- cameraView.ProtectCamera();
- cameraView.repaint();
- return;
- } else if (event.getSource() == revertCameraItem)
- {
- cameraView.RevertCamera();
- cameraView.repaint();
- return;
-// } else if (event.getSource() == textureButton)
-// {
-// return; // true;
- } else // combos...
- if (event.getSource() == texresMenu)
+ */ else // combos...
+ if (source == texresMenu)
{
System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
copy.texres = texresMenu.getSelectedIndex();
@@ -3200,6 +3203,262 @@
}
}
+ void New()
+ {
+ while (copy.Size() > 1)
+ {
+ copy.remove(1);
+ }
+
+ ResetModel();
+ objEditor.refreshContents();
+ }
+
+ static public byte[] Compress(Object3D o)
+ {
+ try
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
+ ObjectOutputStream out = new ObjectOutputStream(zstream);
+
+ Object3D parent = o.parent;
+ o.parent = null;
+
+ out.writeObject(o);
+
+ o.parent = parent;
+
+ out.flush();
+
+ zstream.close();
+ out.close();
+
+ return baos.toByteArray();
+ } catch (Exception e)
+ {
+ System.err.println(e);
+ return null;
+ }
+ }
+
+ static public Object Uncompress(byte[] bytes)
+ {
+ System.out.println("#bytes = " + bytes.length);
+ try
+ {
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
+ ObjectInputStream in = new ObjectInputStream(istream);
+ Object obj = in.readObject();
+ in.close();
+
+ return obj;
+ } catch (Exception e)
+ {
+ System.err.println(e);
+ return null;
+ }
+ }
+
+ static public Object clone(Object o)
+ {
+ try
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(baos);
+
+ out.writeObject(o);
+
+ out.flush();
+ out.close();
+
+ byte[] bytes = baos.toByteArray();
+
+ System.out.println("clone = " + bytes.length);
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ ObjectInputStream in = new ObjectInputStream(bais);
+ Object obj = in.readObject();
+ in.close();
+
+ return obj;
+ } catch (Exception e)
+ {
+ System.err.println(e);
+ return null;
+ }
+ }
+
+ cRadio GetCurrentTab()
+ {
+ cRadio ab;
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
+ {
+ ab = (cRadio)e.nextElement();
+ if(ab.GetObject() == copy)
+ {
+ return ab;
+ }
+ }
+
+ return null;
+ }
+
+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
+
+ public void Save()
+ {
+ cRadio tab = GetCurrentTab();
+
+ boolean temp = CameraPane.SWITCH;
+ CameraPane.SWITCH = false;
+
+ copy.ExtractBigData(hashtable);
+
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
+ tab.graphs[tab.undoindex++] = Compress(copy);
+
+ copy.RestoreBigData(hashtable);
+
+ CameraPane.SWITCH = temp;
+
+ //assert(hashtable.isEmpty());
+
+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
+ {
+ tab.graphs[i] = null;
+ }
+
+ // test save
+ if (false)
+ {
+ try
+ {
+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
+
+ p.writeObject(copy);
+
+ p.flush();
+
+ ostream.close();
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ void CopyChanged(Object3D obj)
+ {
+ boolean temp = CameraPane.SWITCH;
+ CameraPane.SWITCH = false;
+
+ copy.ExtractBigData(hashtable);
+
+ copy.clear();
+
+ for (int i=0; i<obj.Size(); i++)
+ {
+ copy.add(obj.get(i));
+ }
+
+ copy.RestoreBigData(hashtable);
+
+ CameraPane.SWITCH = temp;
+
+ //assert(hashtable.isEmpty());
+
+ copy.Touch();
+
+ ResetModel();
+ copy.HardTouch(); // recompile?
+
+ cRadio ab;
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
+ {
+ ab = (cRadio)e.nextElement();
+ Object3D test = copy.GetObject(ab.object.GetUUID());
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
+ if (test != null)
+ {
+ test.editWindow = ab.object.editWindow;
+ ab.object = test;
+ }
+ }
+
+ refreshContents();
+ }
+
+ public void Undo()
+ {
+ cRadio tab = GetCurrentTab();
+
+ if (tab.undoindex == 0)
+ {
+ java.awt.Toolkit.getDefaultToolkit().beep();
+ return;
+ }
+
+ if (tab.graphs[tab.undoindex] == null)
+ {
+ Save();
+ tab.undoindex -= 1;
+ }
+
+ tab.undoindex -= 1;
+
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
+ }
+
+ public void Redo()
+ {
+ cRadio tab = GetCurrentTab();
+
+ if (tab.graphs[tab.undoindex + 1] == null)
+ {
+ java.awt.Toolkit.getDefaultToolkit().beep();
+ return;
+ }
+
+ tab.undoindex += 1;
+
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
+ }
+
+ void ImportGFD()
+ {
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
+ browser.show();
+ String filename = browser.getFile();
+ if (filename != null && filename.length() > 0)
+ {
+ String fullname = browser.getDirectory() + filename;
+
+ //Object3D readobj =
+ objEditor.ReadGFD(fullname, objEditor);
+ //makeSomething(readobj);
+ }
+ }
+
+ void ImportVRMLX3D()
+ {
+ if (Grafreed.standAlone)
+ {
+ /**/
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
+ browser.show();
+ String filename = browser.getFile();
+ if (filename != null && filename.length() > 0)
+ {
+ String fullname = browser.getDirectory() + filename;
+ LoadVRMLX3D(fullname);
+ }
+ /**/
+ }
+ }
+
void ToggleAnimation()
{
if (!Globals.ANIMATION)
@@ -3215,8 +3474,8 @@
Globals.ANIMATION ^= true;
- GrafreeD.wav.cursor = 0;
- GrafreeD.wav.loop = 0;
+ Grafreed.wav.cursor = 0;
+ Grafreed.wav.loop = 0;
}
} else
{
@@ -3237,7 +3496,6 @@
callee.refreshContents();
} else
{
- new Exception().printStackTrace();
System.exit(0);
}
}
@@ -3267,7 +3525,7 @@
void CreateMaterial()
{
//copy.ClearMaterial(); // PATCH
- copy.CreateMaterialS(multiplyToggle.isSelected());
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
if (copy.selection.size() > 0)
//SetMaterial(copy);
{
@@ -3326,11 +3584,11 @@
{
copy.ResetBlockLoop(); // temporary problem
- boolean random = CameraPane.RANDOM;
- CameraPane.RANDOM = false; // parse everything
+ boolean random = CameraPane.SWITCH;
+ CameraPane.SWITCH = false; // parse everything
copy.ResetDisplayList();
copy.HardTouch();
- CameraPane.RANDOM = random;
+ CameraPane.SWITCH = random;
}
// public void applySelf()
@@ -3404,6 +3662,36 @@
{
//System.out.println("Propagate = " + propagate);
copy.UpdateMaterial(anchor, current, propagate);
+
+ if (copy.material != null)
+ {
+ cMaterial mat = copy.material;
+
+ colorField.SetToolTipValue((mat.color));
+ modulationField.SetToolTipValue((mat.modulation));
+ metalnessField.SetToolTipValue((mat.metalness));
+ diffuseField.SetToolTipValue((mat.diffuse));
+ specularField.SetToolTipValue((mat.specular));
+ shininessField.SetToolTipValue((mat.shininess));
+ shiftField.SetToolTipValue((mat.shift));
+ ambientField.SetToolTipValue((mat.ambient));
+ lightareaField.SetToolTipValue((mat.lightarea));
+ diffusenessField.SetToolTipValue((mat.factor));
+ velvetField.SetToolTipValue((mat.velvet));
+ sheenField.SetToolTipValue((mat.sheen));
+ subsurfaceField.SetToolTipValue((mat.subsurface));
+ backlitField.SetToolTipValue((mat.bump));
+ anisoField.SetToolTipValue((mat.aniso));
+ anisoVField.SetToolTipValue((mat.anisoV));
+ cameraField.SetToolTipValue((mat.cameralight));
+ selfshadowField.SetToolTipValue((mat.diffuseness));
+ shadowField.SetToolTipValue((mat.shadow));
+ textureField.SetToolTipValue((mat.texture));
+ opacityField.SetToolTipValue((mat.opacity));
+ fakedepthField.SetToolTipValue((mat.fakedepth));
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
+ }
+
if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
{
copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
@@ -3519,7 +3807,7 @@
}
if (normalpushField != null)
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
}
void SnapObject()
@@ -3783,6 +4071,7 @@
void makeSomething(Object3D thing, boolean resetmodel) // deselect)
{
+ Save();
//Tween.set(thing, 0).target(1).start(tweenManager);
//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
// if (thing instanceof GenericJointDemo)
@@ -3986,6 +4275,7 @@
}
}
}
+
LoadGFDThread loadGFDThread;
void ReadGFD(String fullname, iCallBack cb)
@@ -4005,8 +4295,10 @@
try
{
+ // Try compressed version first.
java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
readobj = (Object3D) p.readObject();
istream.close();
@@ -4014,7 +4306,20 @@
readobj.ResetDisplayList();
} catch (Exception e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ try
+ {
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
+
+ readobj = (Object3D) p.readObject();
+ istream.close();
+
+ readobj.ResetDisplayList();
+ } catch (Exception e2)
+ {
+ e2.printStackTrace();
+ }
}
// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
@@ -4060,6 +4365,12 @@
void LoadIt(Object obj)
{
+ if (obj == null)
+ {
+ // Invalid file
+ return;
+ }
+
System.out.println("Loaded " + obj);
//new Exception().printStackTrace();
Object3D readobj = (Object3D) obj;
@@ -4069,6 +4380,7 @@
if (readobj != null)
{
+ Save();
try
{
//readobj.deepCopySelf(copy);
@@ -4131,7 +4443,7 @@
void load() // throws ClassNotFoundException
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
browser.show();
@@ -4218,11 +4530,13 @@
try
{
FileOutputStream ostream = new FileOutputStream(lastname);
- ObjectOutputStream p = new ObjectOutputStream(ostream);
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
p.writeObject(copy);
p.flush();
+ zstream.close();
ostream.close();
//FileOutputStream fos = new FileOutputStream(fullname);
@@ -4232,11 +4546,12 @@
{
}
}
+
String lastname;
void saveAs()
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
browser.setVisible(true);
@@ -4341,13 +4656,13 @@
try
{
FileOutputStream ostream = new FileOutputStream(filename);
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
Object3D objectparent = obj.parent;
obj.parent = null;
- Object3D object = (Object3D) GrafreeD.clone(obj);
+ Object3D object = (Object3D) Grafreed.clone(obj);
obj.parent = objectparent;
@@ -4359,8 +4674,8 @@
p.writeObject(object);
p.flush();
+ zstream.close();
ostream.close();
- // zstream.close();
// group.selection.get(0).parent = parent;
//FileOutputStream fos = new FileOutputStream(fullname);
@@ -4381,7 +4696,7 @@
buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
copy.generatePOV(buffer);
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(frame, "Export POV", 1);
browser.show();
@@ -4407,7 +4722,8 @@
Object3D client;
Object3D copy;
MenuBar menuBar;
- Menu windowMenu;
+ Menu fileMenu;
+ MenuItem newItem;
MenuItem loadItem;
MenuItem saveItem;
MenuItem saveAsItem;
@@ -4415,11 +4731,9 @@
MenuItem reexportItem;
MenuItem povItem;
MenuItem closeItem;
- Menu cameraMenu;
+
CheckboxMenuItem zBufferItem;
//MenuItem normalLensItem;
- MenuItem editCameraItem;
- MenuItem revertCameraItem;
MenuItem stepItem;
CheckboxMenuItem toggleLiveItem;
CheckboxMenuItem toggleFullScreenItem;
@@ -4430,7 +4744,7 @@
CheckboxMenuItem toggleFootContactItem;
CheckboxMenuItem toggleDLItem;
CheckboxMenuItem toggleTextureItem;
- CheckboxMenuItem toggleRandomItem;
+ CheckboxMenuItem toggleSwitchItem;
CheckboxMenuItem toggleRootItem;
CheckboxMenuItem animationItem;
CheckboxMenuItem toggleHandleItem;
@@ -4567,4 +4881,9 @@
//ObjectUI parent;
cNumberSlider normalpushField;
+
+ private MenuItem importGFDItem;
+ private MenuItem importVRMLX3DItem;
+ private MenuItem import3DSItem;
+ private MenuItem importOBJItem;
}
--
Gitblit v1.6.2