~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
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.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -33,6 +39,67 @@
33	39
34	40	GroupEditor callee;
35	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
36	103
37	104	// SCRIPT
38	105
..	..	@@ -136,34 +203,42 @@
136	203	public void closeUI()
137	204	{
138	205	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
141	208	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
143	210
144		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
145	214	return;
146	215
147		- objEditor.ctrlPanel.remove(liveCB);
148		- objEditor.ctrlPanel.remove(hideCB);
149		- objEditor.ctrlPanel.remove(markCB);
150		-
151		- objEditor.ctrlPanel.remove(randomCB);
152		- objEditor.ctrlPanel.remove(speedupCB);
153		- objEditor.ctrlPanel.remove(rewindCB);
154		-
155		- objEditor.ctrlPanel.remove(resetButton);
156		- objEditor.ctrlPanel.remove(stepButton);
157		-// objEditor.ctrlPanel.remove(stepAllButton);
158		-// objEditor.ctrlPanel.remove(resetAllButton);
159		- objEditor.ctrlPanel.remove(link2masterCB);
160		- //objEditor.ctrlPanel.remove(flipVCB);
161		- //objEditor.ctrlPanel.remove(texresMenu);
162		- objEditor.ctrlPanel.remove(slowerButton);
163		- objEditor.ctrlPanel.remove(fasterButton);
164		- objEditor.ctrlPanel.remove(remarkButton);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
165	234
166		- Remove(normalpushField);
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
167	242	}
168	243
169	244	public ObjEditor GetEditor()
..	..	@@ -207,6 +282,12 @@
207	282	client = inClient;
208	283	copy = client;
209	284
	285	+ if (copy.versions == null)
	286	+ {
	287	+ copy.versions = new byte[100][];
	288	+ copy.versionindex = -1;
	289	+ }
	290	+
210	291	// "this" is not called: SetupUI2(objEditor);
211	292	}
212	293
..	..	@@ -220,6 +301,12 @@
220	301	client = inClient;
221	302	copy = client;
222	303
	304	+ if (copy.versions == null)
	305	+ {
	306	+ copy.versions = new byte[100][];
	307	+ copy.versionindex = -1;
	308	+ }
	309	+
223	310	SetupUI2(callee.GetEditor());
224	311	}
225	312
..	..	@@ -234,6 +321,7 @@
234	321	//localCopy.parent = null;
235	322
236	323	frame = new JFrame();
	324	+ frame.setUndecorated(false);
237	325	objEditor = this;
238	326	this.callee = callee;
239	327
..	..	@@ -251,6 +339,12 @@
251	339	copy = localCopy;
252	340	copy.editWindow = this;
253	341
	342	+ if (copy.versions == null)
	343	+ {
	344	+ copy.versions = new byte[100][];
	345	+ copy.versionindex = -1;
	346	+ }
	347	+
254	348	SetupMenu();
255	349
256	350	//SetupName(objEditor); // new
..	..	@@ -264,28 +358,49 @@
264	358	return frame.action(event, obj);
265	359	}
266	360
	361	+ // Cannot work without static
	362	+ static boolean allparams = true;
	363	+
	364	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	365	+
267	366	void SetupMenu()
268	367	{
269	368	frame.setMenuBar(menuBar = new MenuBar());
270		- menuBar.add(windowMenu = new Menu("File"));
271		- windowMenu.add(loadItem = new MenuItem("Load..."));
272		- windowMenu.add("-");
273		- windowMenu.add(saveItem = new MenuItem("Save"));
274		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	369	+ menuBar.add(fileMenu = new Menu("File"));
	370	+ fileMenu.add(newItem = new MenuItem("New"));
	371	+ fileMenu.add(openItem = new MenuItem("Open..."));
	372	+
	373	+ //oe.menuBar.add(menu = new Menu("Include"));
	374	+ Menu menu = new Menu("Import");
	375	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	376	+ importOBJItem.addActionListener(this);
	377	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	378	+ import3DSItem.addActionListener(this);
	379	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	380	+ importVRMLX3DItem.addActionListener(this);
	381	+ menu.add("-");
	382	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	383	+ importGFDItem.addActionListener(this);
	384	+ fileMenu.add(menu);
	385	+ fileMenu.add("-");
	386	+
	387	+ fileMenu.add(saveItem = new MenuItem("Save"));
	388	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275	389	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
276		- windowMenu.add("-");
277		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
278		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
279		- windowMenu.add("-");
	390	+ fileMenu.add("-");
	391	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	392	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	393	+ fileMenu.add("-");
280	394	if (client.parent != null)
281	395	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	396	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	397	} else
284	398	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	399	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	400	}
287	401
288		- loadItem.addActionListener(this);
	402	+ newItem.addActionListener(this);
	403	+ openItem.addActionListener(this);
289	404	saveItem.addActionListener(this);
290	405	saveAsItem.addActionListener(this);
291	406	exportAsItem.addActionListener(this);
..	..	@@ -293,81 +408,66 @@
293	408	//povItem.addActionListener(this);
294	409	closeItem.addActionListener(this);
295	410
296		- menuBar.add(cameraMenu = new Menu("View"));
297		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
298		- //zBufferItem.addActionListener(this);
299		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
300		- //normalLensItem.addActionListener(this);
301		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
302		- revertCameraItem.addActionListener(this);
303		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304		- toggleTimelineItem.addItemListener(this);
305		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306		- toggleFullScreenItem.addItemListener(this);
307		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
308		- cameraMenu.add("-");
309		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
310		- toggleTextureItem.addItemListener(this);
311		- toggleTextureItem.setState(CameraPane.textureon);
312		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313		- toggleLiveItem.addItemListener(this);
314		- toggleLiveItem.setState(Globals.isLIVE());
315		- cameraMenu.add(stepItem = new MenuItem("Step"));
316		- stepItem.addActionListener(this);
317		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
318		-// toggleDLItem.addItemListener(this);
319		-// toggleDLItem.setState(false);
320		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
321		- toggleRenderItem.addItemListener(this);
322		- toggleRenderItem.setState(!CameraPane.frozen);
323		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
324		- toggleDebugItem.addItemListener(this);
325		- toggleDebugItem.setState(CameraPane.DEBUG);
326		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
327		- toggleFrustumItem.addItemListener(this);
328		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
329		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
330		- toggleFootContactItem.addItemListener(this);
331		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
332		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
333		- toggleRandomItem.addItemListener(this);
334		- toggleRandomItem.setState(CameraPane.RANDOM);
335		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
336		- toggleHandleItem.addItemListener(this);
337		- toggleHandleItem.setState(CameraPane.HANDLES);
338		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
339		- togglePaintItem.addItemListener(this);
340		- togglePaintItem.setState(CameraPane.PAINTMODE);
341		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
342		-// toggleRootItem.addItemListener(this);
343		-// toggleRootItem.setState(false);
344		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
345		-// animationItem.addItemListener(this);
346		-// animationItem.setState(CameraPane.ANIMATION);
347		- cameraMenu.add("-");
348		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
349		- editCameraItem.addActionListener(this);
350		-
351	411	objectPanel = new JTabbedPane();
	412	+
	413	+ ChangeListener changeListener = new ChangeListener()
	414	+ {
	415	+ public void stateChanged(ChangeEvent changeEvent)
	416	+ {
	417	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	418	+// {
	419	+// if (latestObject != null)
	420	+// {
	421	+// refreshContents(true);
	422	+// SetMaterial(latestObject);
	423	+// }
	424	+//
	425	+// materialFlushed = true;
	426	+// }
	427	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	428	+// {
	429	+// if (listUI.size() == 0)
	430	+// EditSelection(false);
	431	+// }
	432	+
	433	+ refreshContents(false); // To refresh Info tab
	434	+ }
	435	+ };
	436	+ objectPanel.addChangeListener(changeListener);
	437	+
352	438	toolbarPanel = new JPanel();
353	439	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	440	+ treePanel = new cGridBag();
355	441	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
	442	+
	443	+ editPanel = new cGridBag().setVertical(true);
	444	+ editPanel.setName("Edit");
	445	+
	446	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	447	+
	448	+ editCommandsPanel = new cGridBag();
	449	+ editPanel.add(editCommandsPanel);
	450	+ editPanel.add(ctrlPanel);
	451	+
	452	+ toolboxPanel = new cGridBag().setVertical(false);
	453	+ toolboxPanel.setName("Toolbox");
	454	+
	455	+ materialPanel = new cGridBag().setVertical(true);
359	456	materialPanel.setName("Material");
	457	+
360	458	/JTextPane/
361	459	infoarea = createTextPane();
	460	+ doc = infoarea.getStyledDocument();
	461	+
362	462	infoarea.setEditable(true);
363	463	SetText();
364	464	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	465	// infoarea.setOpaque(false);
366	466	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	467	+// TEXTAREA infoarea.setLineWrap(true);
	468	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	469	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370		- infoPanel.setPreferredSize(new Dimension(50, 200));
	470	+ infoPanel.setPreferredSize(new Dimension(1, 1));
371	471	infoPanel.setName("Info");
372	472	//infoPanel.setLayout(new BorderLayout());
373	473	//infoPanel.add(createTextPane());
..	..	@@ -376,16 +476,23 @@
376	476	mainPanel.setName("Main");
377	477	mainPanel.setContinuousLayout(true);
378	478	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	479	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
382		-
	480	+ mainPanel.setDividerLocation(0.5); //1.0);
	481	+ mainPanel.setResizeWeight(0.5);
	482	+
	483	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	484	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	485	+ divider.setDividerSize(15);
	486	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	487	+
	488	+ mainPanel.setUI(new BasicSplitPaneUI());
	489	+
383	490	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	491	//mainPanel.setLayout(new GridBagLayout());
385	492	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	493	+// treePanel.setLayout(new GridBagLayout());
	494	+ //ctrlPanel.setLayout(new GridBagLayout());
	495	+ //materialPanel.setLayout(new GridBagLayout());
389	496
390	497	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	498	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +531,7 @@
424	531	static String newline = "\n";
425	532	protected static final String buttonString = "JButton";
426	533	StyledDocument doc;
427		- JTextArea infoarea;
	534	+ JTextPane infoarea;
428	535
429	536	void ClearInfo()
430	537	{
..	..	@@ -447,10 +554,10 @@
447	554	e.printStackTrace();
448	555	}
449	556
450		- String selection = infoarea.getText();
451		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
452		- java.awt.datatransfer.Clipboard clipboard =
453		- Toolkit.getDefaultToolkit().getSystemClipboard();
	557	+// String selection = infoarea.getText();
	558	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	559	+// java.awt.datatransfer.Clipboard clipboard =
	560	+// Toolkit.getDefaultToolkit().getSystemClipboard();
454	561	//clipboard.setContents(data, data);
455	562	}
456	563
..	..	@@ -473,13 +580,13 @@
473	580	//SendInfo("Name:", "bold");
474	581	if (sel.GetTextures() != null \|\| debug)
475	582	{
476		- si.SendInfo(sel.toString(), "bold");
	583	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	584	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	585	if (sel.Size() > 0)
479	586	{
480	587	si.SendInfo("#children = " + sel.Size(), "regular");
481	588	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	589	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	590	if (debug)
484	591	{
485	592	try
..	..	@@ -491,7 +598,10 @@
491	598	}
492	599
493	600	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	601	+ {
	602	+ si.SendInfo(" BBox min: " + minima, "regular");
	603	+ si.SendInfo(" BBox max: " + maxima, "regular");
	604	+ }
495	605
496	606	if (sel.bRep != null)
497	607	{
..	..	@@ -518,7 +628,7 @@
518	628	}
519	629	if (sel.support != null)
520	630	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	631	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	632	}
523	633	if (sel.scriptnode != null)
524	634	{
..	..	@@ -589,6 +699,9 @@
589	699	{
590	700	CameraPane.pointflow = (PointFlow) sel;
591	701	}
	702	+
	703	+ si.SendInfo("_____________________", "regular");
	704	+ si.SendInfo("", "regular");
592	705	}
593	706	}
594	707
..	..	@@ -604,68 +717,191 @@
604	717	}
605	718	}
606	719
	720	+//static GraphicsDevice device = GraphicsEnvironment
	721	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	722	+
	723	+ Rectangle keeprect;
	724	+ cRadio radio;
	725	+
	726	+cButton keepButton;
	727	+ cButton twoButton; // Full 3D
	728	+ cButton sixButton;
	729	+ cButton threeButton;
	730	+ cButton sevenButton;
	731	+ cButton fourButton; // full panel
	732	+ cButton oneButton; // full XYZ
	733	+ //cButton currentLayout;
	734	+
	735	+ boolean maximized;
	736	+
	737	+ cButton fullscreenLayout;
	738	+
	739	+ void Minimize()
	740	+ {
	741	+ frame.setState(Frame.ICONIFIED);
	742	+ frame.validate();
	743	+ }
	744	+
	745	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	746	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	747	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	748	+ void Maximize()
	749	+ {
	750	+ if (CameraPane.FULLSCREEN)
	751	+ {
	752	+ ToggleFullScreen();
	753	+ }
	754	+
	755	+ if (maximized)
	756	+ {
	757	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	758	+ }
	759	+ else
	760	+ {
	761	+ keeprect = frame.getBounds();
	762	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	763	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	764	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	765	+// frame.setState(Frame.MAXIMIZED_BOTH);
	766	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	767	+ }
	768	+
	769	+ maximized ^= true;
	770	+
	771	+ frame.validate();
	772	+ }
	773	+
	774	+ cButton minButton;
	775	+ cButton maxButton;
	776	+ cButton fullButton;
	777	+
607	778	void ToggleFullScreen()
608	779	{
609		- if (CameraPane.FULLSCREEN)
	780	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	781	+
	782	+ cameraView.ToggleFullScreen();
	783	+
	784	+ if (!CameraPane.FULLSCREEN)
610	785	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- frame.getContentPane().add(/"Center",/framePanel);
	786	+ device.setFullScreenWindow(null);
	787	+ frame.dispose();
	788	+ frame.setUndecorated(false);
	789	+ frame.validate();
	790	+ frame.setVisible(true);
	791	+
	792	+ //frame.setVisible(false);
	793	+// frame.removeNotify();
	794	+// frame.setUndecorated(false);
	795	+// frame.addNotify();
	796	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	797	+
	798	+// X frame.getContentPane().remove(/"Center",/bigThree);
	799	+// X framePanel.add(bigThree);
	800	+// X frame.getContentPane().add(/"Center",/framePanel);
	801	+ framePanel.setDividerLocation(46);
	802	+
	803	+ //frame.setVisible(true);
	804	+ radio.layout = keepButton;
	805	+ //theFrame = null;
	806	+ keepButton = null;
	807	+ radio.layout.doClick();
	808	+
614	809	} else
615	810	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- frame.getContentPane().add(/"Center",/bigThree);
	811	+ keepButton = radio.layout;
	812	+ //keeprect = frame.getBounds();
	813	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	814	+// frame.getToolkit().getScreenSize().height);
	815	+ //frame.setVisible(false);
	816	+
	817	+ frame.dispose();
	818	+ frame.setUndecorated(true);
	819	+ device.setFullScreenWindow(frame);
	820	+ frame.validate();
	821	+ frame.setVisible(true);
	822	+// frame.removeNotify();
	823	+// frame.setUndecorated(true);
	824	+// frame.addNotify();
	825	+// X frame.getContentPane().remove(/"Center",/framePanel);
	826	+// X framePanel.remove(bigThree);
	827	+// X frame.getContentPane().add(/"Center",/bigThree);
	828	+ framePanel.setDividerLocation(0);
	829	+
	830	+ radio.layout = fullscreenLayout;
	831	+ radio.layout.doClick();
	832	+ //frame.setVisible(true);
619	833	}
620		- cameraView.ToggleFullScreen();
	834	+ frame.validate();
621	835	}
622	836
623		- private JTextArea createTextPane()
	837	+ private byte[] CompressCopy()
624	838	{
625		- String[] initString =
626		- {
627		- "This is an editable JTextPane, ", //regular
628		- "another ", //italic
629		- "styled ", //bold
630		- "text ", //small
631		- "component, ", //large
632		- "which supports embedded components..." + newline,//regular
633		- " " + newline, //button
634		- "...and embedded icons..." + newline, //regular
635		- " ", //icon
636		- newline + "JTextPane is a subclass of JEditorPane that "
637		- + "uses a StyledEditorKit and StyledDocument, and provides "
638		- + "cover methods for interacting with those objects."
639		- };
	839	+ boolean temp = CameraPane.SWITCH;
	840	+ CameraPane.SWITCH = false;
	841	+
	842	+ copy.ExtractBigData(versiontable);
	843	+ // if (copy == client)
	844	+
	845	+ byte[] versions[] = copy.versions;
	846	+ copy.versions = null;
	847	+
	848	+ byte[] compress = Compress(copy);
	849	+
	850	+ copy.versions = versions;
	851	+
	852	+ copy.RestoreBigData(versiontable);
	853	+
	854	+ CameraPane.SWITCH = temp;
	855	+
	856	+ return compress;
	857	+ }
640	858
641		- String[] initStyles =
642		- {
643		- "regular", "italic", "bold", "small", "large",
644		- "regular", "button", "regular", "icon",
645		- "regular"
646		- };
	859	+ private JTextPane createTextPane()
	860	+ {
	861	+// TEXTAREA String[] initString =
	862	+// {
	863	+// "This is an editable JTextPane, ", //regular
	864	+// "another ", //italic
	865	+// "styled ", //bold
	866	+// "text ", //small
	867	+// "component, ", //large
	868	+// "which supports embedded components..." + newline,//regular
	869	+// " " + newline, //button
	870	+// "...and embedded icons..." + newline, //regular
	871	+// " ", //icon
	872	+// newline + "JTextPane is a subclass of JEditorPane that "
	873	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	874	+// + "cover methods for interacting with those objects."
	875	+// };
	876	+//
	877	+// String[] initStyles =
	878	+// {
	879	+// "regular", "italic", "bold", "small", "large",
	880	+// "regular", "button", "regular", "icon",
	881	+// "regular"
	882	+// };
	883	+//
	884	+// JTextPane textPane = new JTextPane();
	885	+// textPane.setEditable(true);
	886	+// /StyledDocument/ doc = textPane.getStyledDocument();
	887	+// addStylesToDocument(doc);
	888	+//
	889	+// try
	890	+// {
	891	+// for (int j = 0; j < 2; j++)
	892	+// {
	893	+// for (int i = 0; i < initString.length; i++)
	894	+// {
	895	+// doc.insertString(doc.getLength(), initString[i],
	896	+// doc.getStyle(initStyles[i]));
	897	+// }
	898	+// }
	899	+// } catch (BadLocationException ble)
	900	+// {
	901	+// System.err.println("Couldn't insert initial text into text pane.");
	902	+// }
647	903
648		- JTextPane textPane = new JTextPane();
649		- textPane.setEditable(true);
650		- /StyledDocument/ doc = textPane.getStyledDocument();
651		- addStylesToDocument(doc);
652		-
653		- try
654		- {
655		- for (int j = 0; j < 2; j++)
656		- {
657		- for (int i = 0; i < initString.length; i++)
658		- {
659		- doc.insertString(doc.getLength(), initString[i],
660		- doc.getStyle(initStyles[i]));
661		- }
662		- }
663		- } catch (BadLocationException ble)
664		- {
665		- System.err.println("Couldn't insert initial text into text pane.");
666		- }
667		-
668		- return new JTextArea(); // textPane;
	904	+ return new JTextPane(); // textPane;
669	905	}
670	906
671	907	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +954,7 @@
718	954	protected static ImageIcon createImageIcon(String path,
719	955	String description)
720	956	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	957	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	958	if (imgURL != null)
723	959	{
724	960	return new ImageIcon(imgURL, description);
..	..	@@ -750,6 +986,7 @@
750	986	// NumberSlider vDivsField;
751	987	// JCheckBox endcaps;
752	988	JCheckBox liveCB;
	989	+ JCheckBox selectCB;
753	990	JCheckBox hideCB;
754	991	JCheckBox link2masterCB;
755	992	JCheckBox markCB;
..	..	@@ -757,7 +994,12 @@
757	994	JCheckBox speedupCB;
758	995	JCheckBox rewindCB;
759	996	JCheckBox flipVCB;
	997	+
	998	+ cCheckBox toggleTextureCB;
	999	+ cCheckBox toggleSwitchCB;
	1000	+
760	1001	JComboBox texresMenu;
	1002	+
761	1003	JButton resetButton;
762	1004	JButton stepButton;
763	1005	JButton stepAllButton;
..	..	@@ -765,115 +1007,87 @@
765	1007	JButton slowerButton;
766	1008	JButton fasterButton;
767	1009	JButton remarkButton;
	1010	+
	1011	+ cGridBag editPanel;
	1012	+ cGridBag editCommandsPanel;
	1013	+
	1014	+ cGridBag namePanel;
	1015	+ cGridBag setupPanel;
	1016	+ cGridBag setupPanel2;
	1017	+ cGridBag objectCommandsPanel;
	1018	+ cGridBag pushPanel;
	1019	+ cGridBag fillPanel;
768	1020
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1021	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	1022	{
771	1023	JCheckBox cb;
772	1024
773		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774		- oe.aConstraints.gridwidth = 1; // 3;
775		-// oe.aConstraints.weightx = 1;
776		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
777		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1025	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778	1026	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	1027
783	1028	return cb;
784	1029	}
785	1030
786		- cButton AddButton(ObjEditor oe, String label)
	1031	+ cButton AddButton(cGridBag panel, String label)
787	1032	{
788	1033	cButton cb;
789	1034
790		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791		- oe.aConstraints.gridwidth = 1;
792		-// oe.aConstraints.weightx = 1;
793		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
794		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1035	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795	1036	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	1037
800	1038	return cb;
801	1039	}
802	1040
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1041	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	1042	{
805	1043	JComboBox combo;
806	1044
807		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809		- oe.aConstraints.gridx += 1;
	1045	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	1046	combo.addActionListener(this);
811	1047
812	1048	return combo;
813	1049	}
814	1050
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1051	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816	1052	{
817		- NumberSlider combo;
	1053	+ cGridBag control = new cGridBag();
	1054	+
	1055	+ cNumberSlider combo;
818	1056
819	1057	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1058	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 1;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1059	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1060	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1061	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1062	+
	1063	+ panel.add(control);
	1064	+
	1065	+ return control;
839	1066	}
840	1067
841		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1068	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842	1069	{
843		- NumberSlider combo;
	1070	+ cGridBag control = new cGridBag();
	1071	+
	1072	+ cNumberSlider combo;
844	1073
845	1074	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	1075	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849		- aConstraints.gridwidth = 2;
850		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851		- aConstraints.gridx += 1;
852		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
853		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855		- aConstraints.gridx += 1;
856		- aConstraints.gridwidth = 1;
857		-
	1076	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1077	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1078	combo.setInteger(current);
859	1079
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	1080	+ panel.add(control);
	1081	+
	1082	+ return control;
865	1083	}
866	1084
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	1085	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	1086	{
869	1087	JTextArea text;
870	1088
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1089	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	1090	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	1091
878	1092	return text;
879	1093	}
..	..	@@ -903,9 +1117,16 @@
903	1117	objEditor.ctrlPanel.remove(j);
904	1118	}
905	1119
	1120	+ void Remove(cNumberSlider j)
	1121	+ {
	1122	+ j.removeChangeListener(this);
	1123	+ //objEditor.ctrlPanel.remove(j.label);
	1124	+ objEditor.ctrlPanel.remove(j);
	1125	+ }
	1126	+
906	1127	/*
907	1128	*/
908		- void Return() // ObjEditor oe)
	1129	+ void Return0() // ObjEditor oe)
909	1130	{
910	1131	aConstraints.gridy += 1;
911	1132	aConstraints.gridx = 0;
..	..	@@ -960,37 +1181,77 @@
960	1181
961	1182	void SetupUI2(ObjEditor oe)
962	1183	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1184	+ //SetupName(oe);
968	1185
969		- if (!GroupEditor.allparams)
	1186	+ namePanel = new cGridBag();
	1187	+
	1188	+ nameField = AddText(namePanel, copy.GetName());
	1189	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1190	+ oe.ctrlPanel.add(namePanel);
	1191	+
	1192	+ oe.ctrlPanel.Return();
	1193	+
	1194	+ if (!allparams)
970	1195	return;
971	1196
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1197	+ setupPanel = new cGridBag().setVertical(false);
	1198	+
	1199	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1200	+ liveCB.setToolTipText("Animate object");
	1201	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1202	+ selectCB.setToolTipText("Make object selectable");
975	1203	// Return();
976		- markCB = AddCheckBox(oe, "Mark", copy.marked);
977		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978		- randomCB = AddCheckBox(oe, "Rand", copy.random);
979		- Return();
980		- resetButton = AddButton(oe, "Reset");
981		- stepButton = AddButton(oe, "Step");
	1204	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1205	+ hideCB.setToolTipText("Hide object");
	1206	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1207	+ markCB.setToolTipText("As animation target transform");
	1208	+
	1209	+ setupPanel2 = new cGridBag().setVertical(false);
	1210	+
	1211	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1212	+ rewindCB.setToolTipText("Rewind animation");
	1213	+
	1214	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1215	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1216	+
	1217	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1218	+ link2masterCB.setToolTipText("Attach to support");
	1219	+
	1220	+ if (Globals.ADVANCED)
	1221	+ {
	1222	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1223	+ speedupCB.setToolTipText("Option motion capture");
	1224	+ }
	1225	+
	1226	+ oe.ctrlPanel.add(setupPanel);
	1227	+ oe.ctrlPanel.Return();
	1228	+ oe.ctrlPanel.add(setupPanel2);
	1229	+ oe.ctrlPanel.Return();
	1230	+
	1231	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1232	+
	1233	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1234	+ resetButton.setToolTipText("Jump to frame zero");
	1235	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1236	+ stepButton.setToolTipText("Step one frame");
982	1237	// resetAllButton = AddButton(oe, "Reset All");
983	1238	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1239	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- remarkButton = AddButton(oe, "Rem");
	1240	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1241	+ slowerButton.setToolTipText("Decrease animation speed");
	1242	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1243	+ fasterButton.setToolTipText("Increase animation speed");
	1244	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1245	+ remarkButton.setToolTipText("Set the current transform as the target");
989	1246
990		- Return();
	1247	+ oe.ctrlPanel.add(objectCommandsPanel);
	1248	+ oe.ctrlPanel.Return();
991	1249
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	1250	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1251	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1252	+ //Return();
	1253	+
	1254	+ oe.ctrlPanel.Return();
994	1255
995	1256	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1257	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1346,7 @@
1085	1346	oe.aConstraints.gridwidth = 1;
1086	1347	/**/
1087	1348	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1349	+ oe.ctrlPanel.Return();
1089	1350
1090	1351	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1352	//textureButton.setEnabled(false);
..	..	@@ -1187,9 +1448,13 @@
1187	1448	//JPanel worldPanel =
1188	1449	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1450	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1451	+ centralPanel = new cGridBag();
	1452	+ centralPanel.preferredWidth = 20;
	1453	+
	1454	+ if (Globals.ADVANCED)
	1455	+ {
	1456	+ timelinePanel = new JPanel(new BorderLayout());
	1457	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193	1458
1194	1459	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1460	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1463,10 @@
1198	1463	// cameraPanel.setDividerSize(9);
1199	1464	cameraPanel.setResizeWeight(1.0);
1200	1465
	1466	+ }
	1467	+
1201	1468	centralPanel.add(cameraView);
	1469	+ centralPanel.setFocusable(true);
1202	1470	//frame.setJMenuBar(timelineMenubar);
1203	1471	//centralPanel.add(timelinePanel);
1204	1472
..	..	@@ -1217,12 +1485,13 @@
1217	1485	//frontView.object = copy;
1218	1486	//sideView.object = copy;
1219	1487
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1488	+ XYZPanel = new cGridBag().setVertical(true);
	1489	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1490
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1491	+ XYZPanel.preferredWidth = 5;
	1492	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1493	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1494	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1226	1495
1227	1496	/*
1228	1497	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1260,11 +1529,16 @@
1260	1529	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1530	//tmp.setName("Edit");
1262	1531	objectPanel.add(materialPanel);
1263		- JPanel north = new JPanel(new BorderLayout());
1264		- north.setName("Edit");
1265		- north.add(ctrlPanel, BorderLayout.NORTH);
1266		- objectPanel.add(north);
1267		- objectPanel.add(infoPanel);
	1532	+// JPanel north = new JPanel(new BorderLayout());
	1533	+// north.setName("Edit");
	1534	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1535	+// objectPanel.add(north);
	1536	+ objectPanel.add(editPanel);
	1537	+
	1538	+ //if (Globals.ADVANCED)
	1539	+ objectPanel.add(infoPanel);
	1540	+
	1541	+ objectPanel.add(toolboxPanel);
1268	1542
1269	1543	/*
1270	1544	aConstraints.gridx = 0;
..	..	@@ -1273,7 +1547,7 @@
1273	1547	aConstraints.gridy += 1;
1274	1548	aConstraints.gridwidth = 1;
1275	1549	mainPanel.add(objectPanel, aConstraints);
1276		- */
	1550	+ */
1277	1551
1278	1552	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1279	1553	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1284,16 +1558,23 @@
1284	1558	scrollpane.setWheelScrollingEnabled(true);
1285	1559	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1560
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1561	+ /JTabbedPane/ scenePanel = new cGridBag();
	1562	+ scenePanel.preferredWidth = 6;
	1563	+
	1564	+ JTabbedPane tabbedPane = new JTabbedPane();
	1565	+ tabbedPane.add(scrollpane);
1289	1566
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
1291		-
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1567	+ optionsPanel = new cGridBag().setVertical(false);
1293	1568
1294	1569	optionsPanel.setName("Options");
1295		- scenePanel.add(optionsPanel);
	1570	+
	1571	+ AddOptions(optionsPanel); //, aConstraints);
	1572	+
	1573	+ tabbedPane.add(optionsPanel);
	1574	+
	1575	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1296	1576
	1577	+ scenePanel.add(tabbedPane);
1297	1578
1298	1579	/*
1299	1580	cTree jTree = new cTree(null);
..	..	@@ -1327,6 +1608,7 @@
1327	1608	//bigPanel.setSize(new Dimension(10,10));
1328	1609	//bigPanel.add(ctrlPanel);
1329	1610	//bigPanel.add(gridPanel);
	1611	+ /**
1330	1612	bigThree = new JPanel();
1331	1613	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1332	1614	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1350,7 +1632,13 @@
1350	1632	// aConstraints.gridheight = 3;
1351	1633	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1352	1634	bigThree.add(XYZPanel, aWindowConstraints);
	1635	+ /**/
1353	1636
	1637	+ bigThree = new cGridBag();
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ bigThree.addComponent(centralPanel);
	1640	+ bigThree.addComponent(XYZPanel);
	1641	+
1354	1642	// // SIDE EFFECT!!!
1355	1643	// aConstraints.gridx = 0;
1356	1644	// aConstraints.gridy = 0;
..	..	@@ -1358,9 +1646,9 @@
1358	1646	// aConstraints.gridheight = 1;
1359	1647
1360	1648	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1361		- framePanel.setContinuousLayout(true);
1362		- framePanel.setOneTouchExpandable(true);
1363		- framePanel.setDividerLocation(0.8);
	1649	+ framePanel.setContinuousLayout(false);
	1650	+ framePanel.setOneTouchExpandable(false);
	1651	+ //.setDividerLocation(0.8);
1364	1652	//framePanel.setDividerSize(15);
1365	1653	//framePanel.setResizeWeight(0.15);
1366	1654	framePanel.setName("Frame");
..	..	@@ -1377,10 +1665,15 @@
1377	1665
1378	1666	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1379	1667
1380		- frame.setSize(1024, 768);
1381		- frame.show();
1382		-
	1668	+ frame.setSize(1280, 860);
	1669	+
	1670	+ cameraView.requestFocusInWindow();
	1671	+
1383	1672	gridPanel.setDividerLocation(1.0);
	1673	+
	1674	+ frame.validate();
	1675	+
	1676	+ frame.setVisible(true);
1384	1677
1385	1678	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1386	1679	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1393,6 +1686,10 @@
1393	1686	});
1394	1687	}
1395	1688
	1689	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1690	+ {
	1691	+ }
	1692	+
1396	1693	JTree GetTree()
1397	1694	{
1398	1695	return objEditor.jTree;
..	..	@@ -1404,260 +1701,161 @@
1404	1701	ctrlPanel.removeAll();
1405	1702	}
1406	1703
1407		- void SetupMaterial(JPanel ctrlPanel)
	1704	+ void SetupMaterial(cGridBag panel)
1408	1705	{
1409		- aConstraints.weighty = 0;
1410		- //aConstraints.weightx = 1;
1411		- /*
	1706	+ /*
1412	1707	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1413	1708	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415		- aConstraints.gridx += 1;
1416	1709	*/
1417	1710
1418		- aConstraints.gridwidth = 1;
1419		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420		- aConstraints.gridx += 1;
1421		- aConstraints.weighty = 0;
1422		- aConstraints.gridwidth = 1;
	1711	+ cGridBag editBar = new cGridBag().setVertical(false);
	1712	+
	1713	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1714	+ createMaterialButton.setToolTipText("Create material");
1423	1715
1424	1716	/*
1425	1717	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426		- aConstraints.gridx += 1;
1427		- aConstraints.weighty = 0;
1428		- aConstraints.gridwidth = 1;
1429	1718	*/
1430	1719
1431		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432		- aConstraints.gridx += 1;
	1720	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1721	+ clearMaterialButton.setToolTipText("Clear material");
	1722	+
	1723	+ if (Globals.ADVANCED)
	1724	+ {
	1725	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1726	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1727	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1728	+ }
1433	1729
1434		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435		-
1436		- aConstraints.gridx += 1;
1437		-
1438		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439		-
1440		- aConstraints.gridx += 1;
1441		-
1442		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443		-
1444		- aConstraints.gridx = 0;
1445		- aConstraints.gridy += 1;
1446		- aConstraints.weighty = 0;
1447		- aConstraints.gridwidth = 1;
	1730	+ editBar.preferredHeight = 15;
	1731	+
	1732	+ panel.add(editBar);
	1733	+
1448	1734	/**/
1449	1735	//aConstraints.weighty = 0;
1450	1736	////aConstraints.weightx = 1;
1451	1737	//aConstraints.weighty = 1;
1452	1738	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1453	1739	//aConstraints.gridx += 1;
1454		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455		- aConstraints.weighty = 0;
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	1740	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	1741
1460		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- //aConstraints.weightx = 0;
1466		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1742	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1743	+
	1744	+ cGridBag color = new cGridBag();
	1745	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1746	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1747	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1748	+ //colorField.preferredWidth = 200;
	1749	+ colorSection.add(color);
1470	1750
1471		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1751	+ cGridBag modulation = new cGridBag();
	1752	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1753	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1754	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1755	+ colorSection.add(modulation);
1480	1756
1481		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- aConstraints.gridwidth = 1;
	1757	+ cGridBag texture = new cGridBag();
	1758	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1759	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1760	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1761	+ colorSection.add(texture);
1490	1762
1491		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- aConstraints.gridwidth = 1;
	1763	+ panel.add(new JSeparator());
	1764	+
	1765	+ panel.add(colorSection);
	1766	+
	1767	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1768	+
	1769	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1770	+
	1771	+ cGridBag diffuse = new cGridBag();
	1772	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1773	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1774	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1775	+ diffuseSection.add(diffuse);
1500	1776
1501		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- aConstraints.gridwidth = 1;
	1777	+ cGridBag diffuseness = new cGridBag();
	1778	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1779	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1780	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1781	+ diffuseSection.add(diffuseness);
1510	1782
1511		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514		- aConstraints.gridx += 1;
1515		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517		- aConstraints.gridx = 0;
1518		- aConstraints.gridy += 1;
1519		- aConstraints.gridwidth = 1;
	1783	+ cGridBag selfshadow = new cGridBag();
	1784	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1785	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1786	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1787	+ diffuseSection.add(selfshadow);
1520	1788
1521		- //aConstraints.weighty = 1;
1522		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523		- //aConstraints.gridx += 1;
1524		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525		- aConstraints.weighty = 0;
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1789	+ cGridBag sheen = new cGridBag();
	1790	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1791	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1793	+ diffuseSection.add(sheen);
1529	1794
1530		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1795	+ cGridBag subsurface = new cGridBag();
	1796	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1797	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1799	+ diffuseSection.add(subsurface);
1539	1800
1540		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1801	+ cGridBag shadow = new cGridBag();
	1802	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1803	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1804	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1805	+ diffuseSection.add(shadow);
1549	1806
1550		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1807	+ cGridBag fakedepth = new cGridBag();
	1808	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1809	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1810	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1811	+ diffuseSection.add(fakedepth);
1559	1812
1560		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- aConstraints.gridwidth = 1;
	1813	+ cGridBag shadowbias = new cGridBag();
	1814	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1815	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1816	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1817	+ diffuseSection.add(shadowbias);
1569	1818
1570		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- aConstraints.gridwidth = 1;
	1819	+ panel.add(new JSeparator());
	1820	+
	1821	+ panel.add(diffuseSection);
	1822	+
	1823	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1824	+
	1825	+ cGridBag specularSection = new cGridBag().setVertical(true);
1579	1826
1580		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- aConstraints.gridwidth = 1;
	1827	+ cGridBag specular = new cGridBag();
	1828	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1829	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1830	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1831	+ specularSection.add(specular);
1589	1832
1590		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593		- aConstraints.gridx += 1;
1594		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596		- aConstraints.gridx = 0;
1597		- aConstraints.gridy += 1;
1598		- aConstraints.gridwidth = 1;
	1833	+ cGridBag lightarea = new cGridBag();
	1834	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1835	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1836	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1837	+ specularSection.add(lightarea);
1599	1838
1600		- //aConstraints.weighty = 1;
1601		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602		- //aConstraints.gridx += 1;
1603		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604		- aConstraints.weighty = 0;
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1839	+ cGridBag shininess = new cGridBag();
	1840	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1841	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1842	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1843	+ specularSection.add(shininess);
1608	1844
1609		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
	1845	+ cGridBag metalness = new cGridBag();
	1846	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1847	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1848	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1849	+ specularSection.add(metalness);
1618	1850
1619		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- aConstraints.gridwidth = 1;
	1851	+ cGridBag velvet = new cGridBag();
	1852	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1853	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1855	+ specularSection.add(velvet);
1628	1856
1629		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638		-
1639		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
1648		-
1649		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
1658		-
1659		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660		- Return();
	1857	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1858	+ //Return();
1661	1859	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1662	1860	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663	1861	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1668,130 +1866,105 @@
1668	1866	// aConstraints.gridy += 1;
1669	1867	// aConstraints.gridwidth = 1;
1670	1868
1671		- //aConstraints.weighty = 1;
1672		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673		- //aConstraints.gridx += 1;
1674		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675		- aConstraints.weighty = 0;
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
	1869	+ cGridBag anisoU = new cGridBag();
	1870	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1871	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1872	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1873	+ specularSection.add(anisoU);
1679	1874
1680		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1875	+ cGridBag anisoV = new cGridBag();
	1876	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1877	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1878	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1879	+ specularSection.add(anisoV);
1689	1880
1690		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
1699	1881
1700		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	1882	+ panel.add(new JSeparator());
	1883	+
	1884	+ panel.add(specularSection);
	1885	+
	1886	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1887	+
	1888	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1709	1889
1710		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
1719		- aConstraints.weighty = 0;
	1890	+ cGridBag camera = new cGridBag();
	1891	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1892	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1893	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1894	+ colorSection.add(camera);
1720	1895
1721		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1896	+ cGridBag ambient = new cGridBag();
	1897	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1898	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1899	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1900	+ colorSection.add(ambient);
1730	1901
1731		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1902	+ cGridBag backlit = new cGridBag();
	1903	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1904	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1905	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1906	+ colorSection.add(backlit);
1740	1907
1741		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- aConstraints.gridwidth = 1;
	1908	+ cGridBag opacity = new cGridBag();
	1909	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1910	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1911	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1912	+ colorSection.add(opacity);
1750	1913
1751		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- aConstraints.gridwidth = 1;
	1914	+ //panel.add(new JSeparator());
	1915	+
	1916	+ //panel.add(globalSection);
	1917	+
	1918	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1919	+
	1920	+ cGridBag textureSection = new cGridBag().setVertical(true);
1760	1921
1761		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- aConstraints.gridwidth = 1;
	1922	+ cGridBag bump = new cGridBag();
	1923	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1924	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1926	+ textureSection.add(bump);
1770	1927
1771		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774		- aConstraints.gridx += 1;
1775		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy += 1;
1779		- aConstraints.gridwidth = 1;
	1928	+ cGridBag noise = new cGridBag();
	1929	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1930	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1932	+ textureSection.add(noise);
1780	1933
1781		- //aConstraints.weighty = 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783		- //aConstraints.gridx += 1;
1784		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785		- aConstraints.weighty = 0;
	1934	+ cGridBag power = new cGridBag();
	1935	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1936	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1937	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1938	+ textureSection.add(power);
1786	1939
1787		- aConstraints.gridx = 0;
1788		- aConstraints.gridy = 0;
1789		- aConstraints.gridwidth = 1;
	1940	+ cGridBag borderfade = new cGridBag();
	1941	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1942	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1943	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1944	+ textureSection.add(borderfade);
	1945	+
	1946	+ cGridBag fog = new cGridBag();
	1947	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1948	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1949	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1950	+ textureSection.add(fog);
	1951	+
	1952	+ cGridBag opacityPower = new cGridBag();
	1953	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1954	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1955	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1956	+ textureSection.add(opacityPower);
	1957	+
	1958	+ panel.add(new JSeparator());
	1959	+
	1960	+ panel.add(textureSection);
	1961	+
	1962	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1790	1963
1791	1964	SetMaterial(copy); // .GetMaterial());
1792	1965
1793		- colorField.addChangeListener(this);
1794		- modulationField.addChangeListener(this);
	1966	+ //colorField.addChangeListener(this);
	1967	+// modulationField.addChangeListener(this);
1795	1968	metalnessField.addChangeListener(this);
1796	1969	diffuseField.addChangeListener(this);
1797	1970	specularField.addChangeListener(this);
..	..	@@ -1821,12 +1994,15 @@
1821	1994	opacityPowerField.addChangeListener(this);
1822	1995	/**/
1823	1996
1824		- resetSlidersButton.addActionListener(this);
1825	1997	clearMaterialButton.addActionListener(this);
1826	1998	createMaterialButton.addActionListener(this);
1827		-
1828		- propagateToggle.addItemListener(this);
1829		- multiplyToggle.addItemListener(this);
	1999	+
	2000	+ if (Globals.ADVANCED)
	2001	+ {
	2002	+ resetSlidersButton.addActionListener(this);
	2003	+ propagateToggle.addItemListener(this);
	2004	+ multiplyToggle.addItemListener(this);
	2005	+ }
1830	2006	}
1831	2007
1832	2008	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1844,8 +2020,9 @@
1844	2020	// 3D models
1845	2021	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1846	2022	{
1847		- lastConverter = new com.jmex.model.converters.MaxToJme();
1848		- LoadFile(filename, lastConverter);
	2023	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2024	+ //LoadFile(filename, lastConverter);
	2025	+ LoadObjFile(filename); // New 3ds loader
1849	2026	continue;
1850	2027	}
1851	2028	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1997,7 +2174,7 @@
1997	2174
1998	2175	//? flashIt = false;
1999	2176	CameraPane pane = (CameraPane) cameraView;
2000		- pane.clickStart(location.x, location.y, 0);
	2177	+ pane.clickStart(location.x, location.y, 0, 0);
2001	2178	pane.clickEnd(location.x, location.y, 0, true);
2002	2179
2003	2180	if (group.selection.size() == 1)
..	..	@@ -2046,6 +2223,7 @@
2046	2223	e2.printStackTrace();
2047	2224	}
2048	2225	}
	2226	+
2049	2227	LoadJMEThread loadThread;
2050	2228
2051	2229	class LoadJMEThread extends Thread
..	..	@@ -2103,6 +2281,7 @@
2103	2281	//LoadFile0(filename, converter);
2104	2282	}
2105	2283	}
	2284	+
2106	2285	LoadOBJThread loadObjThread;
2107	2286
2108	2287	class LoadOBJThread extends Thread
..	..	@@ -2181,19 +2360,19 @@
2181	2360
2182	2361	void LoadObjFile(String fullname)
2183	2362	{
2184		- /*
	2363	+ System.out.println("Loading " + fullname);
	2364	+ /**/
2185	2365	//lastFilename = fullname;
2186	2366	if(loadObjThread == null)
2187	2367	{
2188		- loadObjThread = new LoadOBJThread();
2189		- loadObjThread.start();
	2368	+ loadObjThread = new LoadOBJThread();
	2369	+ loadObjThread.start();
2190	2370	}
2191	2371
2192	2372	loadObjThread.add(fullname);
2193		- */
	2373	+ /**/
2194	2374
2195		- System.out.println("Loading " + fullname);
2196		- makeSomething(new FileObject(fullname, true), true);
	2375	+ //makeSomething(new FileObject(fullname, true), true);
2197	2376	}
2198	2377
2199	2378	void LoadGFDFile(String fullname)
..	..	@@ -2454,11 +2633,11 @@
2454	2633
2455	2634	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2456	2635	{
2457		- if (GrafreeD.standAlone)
	2636	+ if (Grafreed.standAlone)
2458	2637	{
2459	2638	/**/
2460	2639	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2461		- browser.show();
	2640	+ browser.setVisible(true);
2462	2641	String filename = browser.getFile();
2463	2642	if (filename != null && filename.length() > 0)
2464	2643	{
..	..	@@ -2569,6 +2748,7 @@
2569	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2570	2749	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2571	2750	}
	2751	+
2572	2752	//cJME.count++;
2573	2753	//cJME.count %= 12;
2574	2754	if (gc)
..	..	@@ -2603,6 +2783,7 @@
2603	2783	}
2604	2784	if (input == null)
2605	2785	{
	2786	+ new Exception().printStackTrace();
2606	2787	System.exit(0);
2607	2788	}
2608	2789
..	..	@@ -2751,6 +2932,7 @@
2751	2932	}
2752	2933	}
2753	2934	}
	2935	+
2754	2936	cFileSystemPane FSPane;
2755	2937
2756	2938	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2804,11 +2986,14 @@
2804	2986	}
2805	2987	}
2806	2988	}
	2989	+
2807	2990	freezematerial = false;
2808	2991	}
2809	2992
2810	2993	void SetMaterial(Object3D object)
2811	2994	{
	2995	+ latestObject = object;
	2996	+
2812	2997	cMaterial mat = object.material;
2813	2998
2814	2999	if (mat == null)
..	..	@@ -2817,7 +3002,8 @@
2817	3002	return;
2818	3003	}
2819	3004
2820		- multiplyToggle.setSelected(mat.multiply);
	3005	+ if (multiplyToggle != null)
	3006	+ multiplyToggle.setSelected(mat.multiply);
2821	3007
2822	3008	assert (object.projectedVertices != null);
2823	3009
..	..	@@ -2919,12 +3105,17 @@
2919	3105	// }
2920	3106
2921	3107	/**/
2922		- if (deselect)
	3108	+ if (deselect \|\| child == null)
2923	3109	{
2924	3110	//group.deselectAll();
2925	3111	//freeze = true;
2926	3112	GetTree().clearSelection();
2927	3113	//freeze = false;
	3114	+
	3115	+ if (child == null)
	3116	+ {
	3117	+ return;
	3118	+ }
2928	3119	}
2929	3120
2930	3121	//group.addSelectee(child);
..	..	@@ -2993,7 +3184,7 @@
2993	3184	cameraView.ToggleDL();
2994	3185	cameraView.repaint();
2995	3186	return;
2996		- } else if (event.getSource() == toggleTextureItem)
	3187	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2997	3188	{
2998	3189	cameraView.ToggleTexture();
2999	3190	// june 2013 copy.HardTouch();
..	..	@@ -3032,9 +3223,9 @@
3032	3223	frame.validate();
3033	3224
3034	3225	return;
3035		- } else if (event.getSource() == toggleRandomItem)
	3226	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3036	3227	{
3037		- cameraView.ToggleRandom();
	3228	+ cameraView.ToggleSwitch();
3038	3229	cameraView.repaint();
3039	3230	return;
3040	3231	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3063,6 +3254,10 @@
3063	3254	{
3064	3255	copy.live ^= true;
3065	3256	return;
	3257	+ } else if (event.getSource() == selectCB)
	3258	+ {
	3259	+ copy.dontselect ^= true;
	3260	+ return;
3066	3261	} else if (event.getSource() == hideCB)
3067	3262	{
3068	3263	copy.hide ^= true;
..	..	@@ -3077,6 +3272,7 @@
3077	3272	if (event.getSource() == randomCB)
3078	3273	{
3079	3274	copy.random ^= true;
	3275	+ objEditor.refreshContents();
3080	3276	return;
3081	3277	}
3082	3278	if (event.getSource() == speedupCB)
..	..	@@ -3100,8 +3296,9 @@
3100	3296
3101	3297	public void actionPerformed(ActionEvent event)
3102	3298	{
	3299	+ Object source = event.getSource();
3103	3300	// SCRIPT DIALOG
3104		- if (event.getSource() == okbutton)
	3301	+ if (source == okbutton)
3105	3302	{
3106	3303	textpanel.setVisible(false);
3107	3304	textpanel.remove(textarea);
..	..	@@ -3113,7 +3310,7 @@
3113	3310	textarea = null;
3114	3311	textpanel = null;
3115	3312	}
3116		- if (event.getSource() == cancelbutton)
	3313	+ if (source == cancelbutton)
3117	3314	{
3118	3315	textpanel.setVisible(false);
3119	3316	textpanel.remove(textarea);
..	..	@@ -3125,50 +3322,50 @@
3125	3322	//applySelf();
3126	3323	//client.refreshEditWindow();
3127	3324	//refreshContents();
3128		- if (event.getSource() == nameField)
	3325	+ if (source == nameField)
3129	3326	{
3130	3327	//System.out.println("ObjEditor " + event);
3131	3328	applySelf0(true);
3132	3329	//parent.applySelf();
3133	3330	objEditor.refreshContents();
3134		- } else if (event.getSource() == resetButton)
	3331	+ } else if (source == resetButton)
3135	3332	{
3136	3333	CameraPane.fullreset = true;
3137	3334	copy.Reset(); // ResetMeshes();
3138	3335	copy.Touch();
3139	3336	objEditor.refreshContents();
3140		- } else if (event.getSource() == stepItem)
	3337	+ } else if (source == stepItem)
3141	3338	{
3142	3339	//cameraView.ONESTEP = true;
3143	3340	Globals.ONESTEP = true;
3144	3341	cameraView.repaint();
3145	3342	return;
3146		- } else if (event.getSource() == stepButton)
	3343	+ } else if (source == stepButton)
3147	3344	{
3148	3345	copy.Step();
3149	3346	copy.Touch();
3150	3347	objEditor.refreshContents();
3151		- } else if (event.getSource() == slowerButton)
	3348	+ } else if (source == slowerButton)
3152	3349	{
3153	3350	copy.Slower();
3154	3351	copy.Touch();
3155	3352	objEditor.refreshContents();
3156		- } else if (event.getSource() == fasterButton)
	3353	+ } else if (source == fasterButton)
3157	3354	{
3158	3355	copy.Faster();
3159	3356	copy.Touch();
3160	3357	objEditor.refreshContents();
3161		- } else if (event.getSource() == remarkButton)
	3358	+ } else if (source == remarkButton)
3162	3359	{
3163	3360	copy.Remark();
3164	3361	copy.Touch();
3165	3362	objEditor.refreshContents();
3166		- } else if (event.getSource() == stepAllButton)
	3363	+ } else if (source == stepAllButton)
3167	3364	{
3168	3365	copy.StepAll();
3169	3366	copy.Touch();
3170	3367	objEditor.refreshContents();
3171		- } else if (event.getSource() == resetAllButton)
	3368	+ } else if (source == resetAllButton)
3172	3369	{
3173	3370	//CameraPane.fullreset = true;
3174	3371	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3201,53 +3398,79 @@
3201	3398	// Close();
3202	3399	// }
3203	3400	// else
3204		- if (event.getSource() == resetSlidersButton)
	3401	+ if (source == resetSlidersButton)
3205	3402	{
3206	3403	ResetSliders();
3207		- } else if (event.getSource() == clearMaterialButton)
	3404	+ } else if (source == clearMaterialButton)
3208	3405	{
3209	3406	ClearMaterial();
3210		- } else if (event.getSource() == createMaterialButton)
	3407	+ } else if (source == createMaterialButton)
3211	3408	{
3212	3409	CreateMaterial();
3213		- } else if (event.getSource() == clearPanelButton)
	3410	+ } else if (source == clearPanelButton)
3214	3411	{
3215	3412	copy.ClearUI();
3216	3413	refreshContents(true);
3217		- } /*
3218		- }
3219		-
3220		- public boolean action(Event event, Object arg)
3221		- {
3222		- */ else if (event.getSource() == closeItem)
	3414	+ } else if (source == importGFDItem)
	3415	+ {
	3416	+ ImportGFD();
	3417	+ } else
	3418	+ if (source == importVRMLX3DItem)
	3419	+ {
	3420	+ ImportVRMLX3D();
	3421	+ } else
	3422	+ if (source == import3DSItem)
	3423	+ {
	3424	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3425	+ } else
	3426	+ if (source == importOBJItem)
	3427	+ {
	3428	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3429	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3430	+ browser.setVisible(true);
	3431	+ String filename = browser.getFile();
	3432	+ if (filename != null && filename.length() > 0)
	3433	+ {
	3434	+ String fullname = browser.getDirectory() + filename;
	3435	+ makeSomething(ReadOBJ(fullname), true);
	3436	+ }
	3437	+ } else
	3438	+ if (source == closeItem)
3223	3439	{
3224	3440	Close();
3225	3441	//return true;
3226		- } else if (event.getSource() == loadItem)
	3442	+ } else if (source == openItem)
3227	3443	{
3228		- load();
	3444	+ Open();
3229	3445	//return true;
3230		- } else if (event.getSource() == saveItem)
	3446	+ } else if (source == newItem)
	3447	+ {
	3448	+ New();
	3449	+ } else if (source == saveItem)
3231	3450	{
3232	3451	save();
3233	3452	//return true;
3234		- } else if (event.getSource() == saveAsItem)
	3453	+ } else if (source == saveAsItem)
3235	3454	{
3236	3455	saveAs();
3237	3456	//return true;
3238		- } else if (event.getSource() == reexportItem)
	3457	+ } else if (source == reexportItem)
3239	3458	{
3240	3459	reexport();
3241	3460	//return true;
3242		- } else if (event.getSource() == exportAsItem)
	3461	+ } else if (source == exportAsItem)
3243	3462	{
3244	3463	export();
3245	3464	//return true;
3246		- } else if (event.getSource() == povItem)
	3465	+ } else if (source == povItem)
3247	3466	{
3248	3467	generatePOV();
3249	3468	//return true;
3250		- } else if (event.getSource() == zBufferItem)
	3469	+ } else if (event.getSource() == archiveItem)
	3470	+ {
	3471	+ cTools.Archive(frame);
	3472	+ return;
	3473	+ } else if (source == zBufferItem)
3251	3474	{
3252	3475	try
3253	3476	{
..	..	@@ -3269,21 +3492,8 @@
3269	3492	cameraView.repaint();
3270	3493	//return true;
3271	3494	}
3272		- */ else if (event.getSource() == editCameraItem)
3273		- {
3274		- cameraView.ProtectCamera();
3275		- cameraView.repaint();
3276		- return;
3277		- } else if (event.getSource() == revertCameraItem)
3278		- {
3279		- cameraView.RevertCamera();
3280		- cameraView.repaint();
3281		- return;
3282		-// } else if (event.getSource() == textureButton)
3283		-// {
3284		-// return; // true;
3285		- } else // combos...
3286		- if (event.getSource() == texresMenu)
	3495	+ */ else // combos...
	3496	+ if (source == texresMenu)
3287	3497	{
3288	3498	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3289	3499	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3295,12 +3505,409 @@
3295	3505	}
3296	3506	}
3297	3507
	3508	+ void New()
	3509	+ {
	3510	+ while (copy.Size() > 1)
	3511	+ {
	3512	+ copy.remove(1);
	3513	+ }
	3514	+
	3515	+ ResetModel();
	3516	+ objEditor.refreshContents();
	3517	+ }
	3518	+
	3519	+ static public byte[] Compress(Object3D o)
	3520	+ {
	3521	+ try
	3522	+ {
	3523	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3524	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3525	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3526	+
	3527	+ Object3D parent = o.parent;
	3528	+ o.parent = null;
	3529	+
	3530	+ out.writeObject(o);
	3531	+
	3532	+ o.parent = parent;
	3533	+
	3534	+ out.flush();
	3535	+
	3536	+ baos //zstream
	3537	+ .close();
	3538	+ out.close();
	3539	+
	3540	+ byte[] bytes = baos.toByteArray();
	3541	+
	3542	+ System.out.println("save #bytes = " + bytes.length);
	3543	+ return bytes;
	3544	+ } catch (Exception e)
	3545	+ {
	3546	+ System.err.println(e);
	3547	+ return null;
	3548	+ }
	3549	+ }
	3550	+
	3551	+ static public Object Uncompress(byte[] bytes)
	3552	+ {
	3553	+ System.out.println("restore #bytes = " + bytes.length);
	3554	+ try
	3555	+ {
	3556	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3557	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3558	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3559	+ Object obj = in.readObject();
	3560	+
	3561	+ bais //istream
	3562	+ .close();
	3563	+ in.close();
	3564	+
	3565	+ return obj;
	3566	+ } catch (Exception e)
	3567	+ {
	3568	+ System.err.println(e);
	3569	+ return null;
	3570	+ }
	3571	+ }
	3572	+
	3573	+ static public Object clone(Object o)
	3574	+ {
	3575	+ try
	3576	+ {
	3577	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3578	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3579	+
	3580	+ out.writeObject(o);
	3581	+
	3582	+ out.flush();
	3583	+ out.close();
	3584	+
	3585	+ byte[] bytes = baos.toByteArray();
	3586	+
	3587	+ System.out.println("clone = " + bytes.length);
	3588	+
	3589	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3590	+ ObjectInputStream in = new ObjectInputStream(bais);
	3591	+ Object obj = in.readObject();
	3592	+ in.close();
	3593	+
	3594	+ return obj;
	3595	+ } catch (Exception e)
	3596	+ {
	3597	+ System.err.println(e);
	3598	+ return null;
	3599	+ }
	3600	+ }
	3601	+
	3602	+ cRadio GetCurrentTab()
	3603	+ {
	3604	+ cRadio ab;
	3605	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3606	+ {
	3607	+ ab = (cRadio)e.nextElement();
	3608	+ if(ab.GetObject() == copy)
	3609	+ {
	3610	+ return ab;
	3611	+ }
	3612	+ }
	3613	+
	3614	+ return null;
	3615	+ }
	3616	+
	3617	+
	3618	+ public void Save()
	3619	+ {
	3620	+ //Save(true);
	3621	+ Replace();
	3622	+ }
	3623	+
	3624	+ private boolean Equal(byte[] compress, byte[] name)
	3625	+ {
	3626	+ if (compress.length != name.length)
	3627	+ {
	3628	+ return false;
	3629	+ }
	3630	+
	3631	+ for (int i=compress.length; --i>=0;)
	3632	+ {
	3633	+ if (compress[i] != name[i])
	3634	+ return false;
	3635	+ }
	3636	+
	3637	+ return true;
	3638	+ }
	3639	+
	3640	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3641	+
	3642	+ public boolean Save(boolean user)
	3643	+ {
	3644	+ System.err.println("Save");
	3645	+
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ byte[] compress = CompressCopy();
	3649	+
	3650	+ boolean thesame = false;
	3651	+
	3652	+ // Quick heuristic using length. Works only when stream is compressed.
	3653	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3654	+ {
	3655	+ thesame = true;
	3656	+ }
	3657	+
	3658	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3659	+ if (!thesame)
	3660	+ {
	3661	+ //tab.user[tab.versionindex] = user;
	3662	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3663	+
	3664	+ copy.versions[++copy.versionindex] = compress;
	3665	+
	3666	+ // if (increment)
	3667	+ // tab.versionindex++;
	3668	+ }
	3669	+
	3670	+ //copy.RestoreBigData(versiontable);
	3671	+
	3672	+ //assert(hashtable.isEmpty());
	3673	+
	3674	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3675	+ {
	3676	+ //tab.user[i] = false;
	3677	+ copy.versions[i] = null;
	3678	+ }
	3679	+
	3680	+ SetUndoStates();
	3681	+
	3682	+ // test save
	3683	+ if (false)
	3684	+ {
	3685	+ try
	3686	+ {
	3687	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3688	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3689	+
	3690	+ p.writeObject(copy);
	3691	+
	3692	+ p.flush();
	3693	+
	3694	+ ostream.close();
	3695	+ } catch (Exception e)
	3696	+ {
	3697	+ e.printStackTrace();
	3698	+ }
	3699	+ }
	3700	+
	3701	+ return !thesame;
	3702	+ }
	3703	+
	3704	+ void CopyChanged(Object3D obj)
	3705	+ {
	3706	+ SetUndoStates();
	3707	+
	3708	+ boolean temp = CameraPane.SWITCH;
	3709	+ CameraPane.SWITCH = false;
	3710	+
	3711	+ copy.ExtractBigData(versiontable);
	3712	+
	3713	+ copy.clear();
	3714	+
	3715	+ for (int i=0; i<obj.Size(); i++)
	3716	+ {
	3717	+ copy.add(obj.get(i));
	3718	+ }
	3719	+
	3720	+ copy.RestoreBigData(versiontable);
	3721	+
	3722	+ CameraPane.SWITCH = temp;
	3723	+
	3724	+ //assert(hashtable.isEmpty());
	3725	+
	3726	+ copy.Touch();
	3727	+
	3728	+ ResetModel();
	3729	+ copy.HardTouch(); // recompile?
	3730	+
	3731	+ cRadio ab;
	3732	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3733	+ {
	3734	+ ab = (cRadio)e.nextElement();
	3735	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3736	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3737	+ if (test != null)
	3738	+ {
	3739	+ test.editWindow = ab.object.editWindow;
	3740	+ ab.object = test;
	3741	+ }
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ }
	3746	+
	3747	+ cButton undoButton;
	3748	+ cButton restoreButton;
	3749	+ cButton replaceButton;
	3750	+ cButton redoButton;
	3751	+
	3752	+ boolean muteSlider;
	3753	+
	3754	+ int VersionCount()
	3755	+ {
	3756	+ int count = 0;
	3757	+
	3758	+ for (int i = copy.versions.length; --i >= 0;)
	3759	+ {
	3760	+ if (copy.versions[i] != null)
	3761	+ count++;
	3762	+ }
	3763	+
	3764	+ return count;
	3765	+ }
	3766	+
	3767	+ void SetUndoStates()
	3768	+ {
	3769	+ cRadio tab = GetCurrentTab();
	3770	+
	3771	+ restoreButton.setEnabled(copy.versionindex != -1);
	3772	+ replaceButton.setEnabled(copy.versionindex != -1);
	3773	+
	3774	+ undoButton.setEnabled(copy.versionindex > 0);
	3775	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3776	+
	3777	+ muteSlider = true;
	3778	+ versionSlider.setMaximum(VersionCount() - 1);
	3779	+ versionSlider.setInteger(copy.versionindex);
	3780	+ muteSlider = false;
	3781	+ }
	3782	+
	3783	+ public boolean Undo()
	3784	+ {
	3785	+ // Option?
	3786	+ Replace();
	3787	+
	3788	+ System.err.println("Undo");
	3789	+
	3790	+ cRadio tab = GetCurrentTab();
	3791	+
	3792	+ if (copy.versionindex == 0)
	3793	+ {
	3794	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3795	+ return false;
	3796	+ }
	3797	+
	3798	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3799	+// {
	3800	+// if (Save(false))
	3801	+// tab.versionindex -= 1;
	3802	+// else
	3803	+// {
	3804	+// if (tab.versionindex <= 0)
	3805	+// return false;
	3806	+// else
	3807	+// tab.versionindex -= 1;
	3808	+// }
	3809	+// }
	3810	+
	3811	+ copy.versionindex -= 1;
	3812	+
	3813	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3814	+
	3815	+ return true;
	3816	+ }
	3817	+
	3818	+ public boolean Restore()
	3819	+ {
	3820	+ System.err.println("Restore");
	3821	+
	3822	+ cRadio tab = GetCurrentTab();
	3823	+
	3824	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3825	+ {
	3826	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3827	+ return false;
	3828	+ }
	3829	+
	3830	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3831	+
	3832	+ return true;
	3833	+ }
	3834	+
	3835	+ public boolean Replace()
	3836	+ {
	3837	+ System.err.println("Replace");
	3838	+
	3839	+ cRadio tab = GetCurrentTab();
	3840	+
	3841	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3842	+ {
	3843	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3844	+ return false;
	3845	+ }
	3846	+
	3847	+ copy.versions[copy.versionindex] = CompressCopy();
	3848	+
	3849	+ return true;
	3850	+ }
	3851	+
	3852	+ public void Redo()
	3853	+ {
	3854	+ // Option?
	3855	+ Replace();
	3856	+
	3857	+ cRadio tab = GetCurrentTab();
	3858	+
	3859	+ if (copy.versions[copy.versionindex + 1] == null)
	3860	+ {
	3861	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3862	+ return;
	3863	+ }
	3864	+
	3865	+ copy.versionindex += 1;
	3866	+
	3867	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3868	+
	3869	+ //if (!tab.user[tab.versionindex])
	3870	+ // tab.graphs[tab.versionindex] = null;
	3871	+ }
	3872	+
	3873	+ void ImportGFD()
	3874	+ {
	3875	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3876	+ browser.show();
	3877	+ String filename = browser.getFile();
	3878	+ if (filename != null && filename.length() > 0)
	3879	+ {
	3880	+ String fullname = browser.getDirectory() + filename;
	3881	+
	3882	+ //Object3D readobj =
	3883	+ objEditor.ReadGFD(fullname, objEditor);
	3884	+ //makeSomething(readobj);
	3885	+ }
	3886	+ }
	3887	+
	3888	+ void ImportVRMLX3D()
	3889	+ {
	3890	+ if (Grafreed.standAlone)
	3891	+ {
	3892	+ /**/
	3893	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3894	+ browser.show();
	3895	+ String filename = browser.getFile();
	3896	+ if (filename != null && filename.length() > 0)
	3897	+ {
	3898	+ String fullname = browser.getDirectory() + filename;
	3899	+ LoadVRMLX3D(fullname);
	3900	+ }
	3901	+ /**/
	3902	+ }
	3903	+ }
	3904	+
3298	3905	void ToggleAnimation()
3299	3906	{
3300	3907	if (!Globals.ANIMATION)
3301	3908	{
3302	3909	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3303		- browser.show();
	3910	+ browser.setVisible(true);
3304	3911	String filename = browser.getFile();
3305	3912	if (filename != null && filename.length() > 0)
3306	3913	{
..	..	@@ -3310,8 +3917,8 @@
3310	3917
3311	3918	Globals.ANIMATION ^= true;
3312	3919
3313		- GrafreeD.wav.cursor = 0;
3314		- GrafreeD.wav.loop = 0;
	3920	+ Grafreed.wav.cursor = 0;
	3921	+ Grafreed.wav.loop = 0;
3315	3922	}
3316	3923	} else
3317	3924	{
..	..	@@ -3361,7 +3968,7 @@
3361	3968	void CreateMaterial()
3362	3969	{
3363	3970	//copy.ClearMaterial(); // PATCH
3364		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3971	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3365	3972	if (copy.selection.size() > 0)
3366	3973	//SetMaterial(copy);
3367	3974	{
..	..	@@ -3412,7 +4019,7 @@
3412	4019	assert false;
3413	4020	}
3414	4021
3415		- void EditSelection()
	4022	+ void EditSelection(boolean newWindow)
3416	4023	{
3417	4024	}
3418	4025
..	..	@@ -3420,11 +4027,11 @@
3420	4027	{
3421	4028	copy.ResetBlockLoop(); // temporary problem
3422	4029
3423		- boolean random = CameraPane.RANDOM;
3424		- CameraPane.RANDOM = false; // parse everything
	4030	+ boolean random = CameraPane.SWITCH;
	4031	+ CameraPane.SWITCH = false; // parse everything
3425	4032	copy.ResetDisplayList();
3426	4033	copy.HardTouch();
3427		- CameraPane.RANDOM = random;
	4034	+ CameraPane.SWITCH = random;
3428	4035	}
3429	4036
3430	4037	// public void applySelf()
..	..	@@ -3494,10 +4101,40 @@
3494	4101	current.fakedepth = (float) fakedepthField.getFloat();
3495	4102	current.shadowbias = (float) shadowbiasField.getFloat();
3496	4103
3497		- if (!NumberSlider.frozen)
	4104	+ if (!cNumberSlider.frozen)
3498	4105	{
3499	4106	//System.out.println("Propagate = " + propagate);
3500	4107	copy.UpdateMaterial(anchor, current, propagate);
	4108	+
	4109	+ if (copy.material != null)
	4110	+ {
	4111	+ cMaterial mat = copy.material;
	4112	+
	4113	+ colorField.SetToolTipValue((mat.color));
	4114	+ modulationField.SetToolTipValue((mat.modulation));
	4115	+ metalnessField.SetToolTipValue((mat.metalness));
	4116	+ diffuseField.SetToolTipValue((mat.diffuse));
	4117	+ specularField.SetToolTipValue((mat.specular));
	4118	+ shininessField.SetToolTipValue((mat.shininess));
	4119	+ shiftField.SetToolTipValue((mat.shift));
	4120	+ ambientField.SetToolTipValue((mat.ambient));
	4121	+ lightareaField.SetToolTipValue((mat.lightarea));
	4122	+ diffusenessField.SetToolTipValue((mat.factor));
	4123	+ velvetField.SetToolTipValue((mat.velvet));
	4124	+ sheenField.SetToolTipValue((mat.sheen));
	4125	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4126	+ backlitField.SetToolTipValue((mat.bump));
	4127	+ anisoField.SetToolTipValue((mat.aniso));
	4128	+ anisoVField.SetToolTipValue((mat.anisoV));
	4129	+ cameraField.SetToolTipValue((mat.cameralight));
	4130	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4131	+ shadowField.SetToolTipValue((mat.shadow));
	4132	+ textureField.SetToolTipValue((mat.texture));
	4133	+ opacityField.SetToolTipValue((mat.opacity));
	4134	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4135	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4136	+ }
	4137	+
3501	4138	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3502	4139	{
3503	4140	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3526,9 +4163,25 @@
3526	4163	//copy.Touch();
3527	4164	}
3528	4165
	4166	+ cNumberSlider versionSlider;
	4167	+
3529	4168	public void stateChanged(ChangeEvent e)
3530	4169	{
3531	4170	// assert(false);
	4171	+ if (e.getSource() == versionSlider)
	4172	+ {
	4173	+ if (muteSlider)
	4174	+ return;
	4175	+
	4176	+ int version = versionSlider.getInteger();
	4177	+
	4178	+ if (copy.versions[version] != null)
	4179	+ {
	4180	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4181	+ }
	4182	+
	4183	+ return;
	4184	+ }
3532	4185
3533	4186	if (freezematerial)
3534	4187	{
..	..	@@ -3542,6 +4195,7 @@
3542	4195	\|\| e.getSource() == apertureField
3543	4196	\|\| e.getSource() == shadowblurField)
3544	4197	{
	4198	+ new Exception().printStackTrace();
3545	4199	System.exit(0);
3546	4200	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3547	4201	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3612,7 +4266,7 @@
3612	4266	}
3613	4267
3614	4268	if (normalpushField != null)
3615		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4269	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3616	4270	}
3617	4271
3618	4272	void SnapObject()
..	..	@@ -3867,7 +4521,7 @@
3867	4521
3868	4522	radioPanel.revalidate();
3869	4523	radioPanel.repaint();
3870		- ctrlPanel.revalidate(); // ? new
	4524	+ ctrlPanel.validate(); // ? new
3871	4525	ctrlPanel.repaint();
3872	4526	}
3873	4527	}
..	..	@@ -3876,6 +4530,8 @@
3876	4530
3877	4531	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3878	4532	{
	4533	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4534	+ Save();
3879	4535	//Tween.set(thing, 0).target(1).start(tweenManager);
3880	4536	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3881	4537	// if (thing instanceof GenericJointDemo)
..	..	@@ -3962,6 +4618,12 @@
3962	4618	{
3963	4619	ResetModel();
3964	4620	Select(thing.GetTreePath(), true, false); // unselect... false);
	4621	+
	4622	+ if (thing.Size() == 0)
	4623	+ {
	4624	+ //EditSelection(false);
	4625	+ }
	4626	+
3965	4627	refreshContents();
3966	4628	}
3967	4629
..	..	@@ -4079,6 +4741,7 @@
4079	4741	}
4080	4742	}
4081	4743	}
	4744	+
4082	4745	LoadGFDThread loadGFDThread;
4083	4746
4084	4747	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4098,8 +4761,10 @@
4098	4761
4099	4762	try
4100	4763	{
	4764	+ // Try compressed version first.
4101	4765	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4102		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4766	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4767	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4103	4768
4104	4769	readobj = (Object3D) p.readObject();
4105	4770	istream.close();
..	..	@@ -4107,7 +4772,20 @@
4107	4772	readobj.ResetDisplayList();
4108	4773	} catch (Exception e)
4109	4774	{
4110		- e.printStackTrace();
	4775	+ //e.printStackTrace();
	4776	+ try
	4777	+ {
	4778	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4779	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4780	+
	4781	+ readobj = (Object3D) p.readObject();
	4782	+ istream.close();
	4783	+
	4784	+ readobj.ResetDisplayList();
	4785	+ } catch (Exception e2)
	4786	+ {
	4787	+ e2.printStackTrace();
	4788	+ }
4111	4789	}
4112	4790	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4113	4791	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4153,6 +4831,12 @@
4153	4831
4154	4832	void LoadIt(Object obj)
4155	4833	{
	4834	+ if (obj == null)
	4835	+ {
	4836	+ // Invalid file
	4837	+ return;
	4838	+ }
	4839	+
4156	4840	System.out.println("Loaded " + obj);
4157	4841	//new Exception().printStackTrace();
4158	4842	Object3D readobj = (Object3D) obj;
..	..	@@ -4162,6 +4846,8 @@
4162	4846
4163	4847	if (readobj != null)
4164	4848	{
	4849	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4850	+ // Save();
4165	4851	try
4166	4852	{
4167	4853	//readobj.deepCopySelf(copy);
..	..	@@ -4216,15 +4902,26 @@
4216	4902	c.addChild(csg);
4217	4903	}
4218	4904
	4905	+ copy.versions = readobj.versions;
	4906	+ copy.versionindex = readobj.versionindex;
	4907	+
	4908	+ if (copy.versions == null)
	4909	+ {
	4910	+ copy.versions = new byte[100][];
	4911	+ copy.versionindex = -1;
	4912	+ }
	4913	+
	4914	+ //? SetUndoStates();
	4915	+
4219	4916	ResetModel();
4220	4917	copy.HardTouch(); // recompile?
4221	4918	refreshContents();
4222	4919	}
4223	4920	}
4224	4921
4225		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4226	4923	{
4227		- if (GrafreeD.standAlone)
	4924	+ if (Grafreed.standAlone)
4228	4925	{
4229	4926	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4230	4927	browser.show();
..	..	@@ -4311,11 +5008,13 @@
4311	5008	try
4312	5009	{
4313	5010	FileOutputStream ostream = new FileOutputStream(lastname);
4314		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5011	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5012	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4315	5013
4316	5014	p.writeObject(copy);
4317	5015	p.flush();
4318	5016
	5017	+ zstream.close();
4319	5018	ostream.close();
4320	5019
4321	5020	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4325,17 +5024,20 @@
4325	5024	{
4326	5025	}
4327	5026	}
	5027	+
4328	5028	String lastname;
4329	5029
4330	5030	void saveAs()
4331	5031	{
4332		- if (GrafreeD.standAlone)
	5032	+ if (Grafreed.standAlone)
4333	5033	{
4334	5034	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4335	5035	browser.setVisible(true);
4336	5036	String filename = browser.getFile();
4337	5037	if (filename != null && filename.length() > 0)
4338	5038	{
	5039	+ if (!filename.endsWith(".gfd"))
	5040	+ filename += ".gfd";
4339	5041	lastname = browser.getDirectory() + filename;
4340	5042	save();
4341	5043	}
..	..	@@ -4434,13 +5136,13 @@
4434	5136	try
4435	5137	{
4436	5138	FileOutputStream ostream = new FileOutputStream(filename);
4437		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4438		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5139	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5140	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4439	5141
4440	5142	Object3D objectparent = obj.parent;
4441	5143	obj.parent = null;
4442	5144
4443		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5145	+ Object3D object = (Object3D) Grafreed.clone(obj);
4444	5146
4445	5147	obj.parent = objectparent;
4446	5148
..	..	@@ -4452,8 +5154,8 @@
4452	5154	p.writeObject(object);
4453	5155	p.flush();
4454	5156
	5157	+ zstream.close();
4455	5158	ostream.close();
4456		- // zstream.close();
4457	5159
4458	5160	// group.selection.get(0).parent = parent;
4459	5161	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4474,7 +5176,7 @@
4474	5176	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4475	5177	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4476	5178	copy.generatePOV(buffer);
4477		- if (GrafreeD.standAlone)
	5179	+ if (Grafreed.standAlone)
4478	5180	{
4479	5181	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4480	5182	browser.show();
..	..	@@ -4500,21 +5202,20 @@
4500	5202	Object3D client;
4501	5203	Object3D copy;
4502	5204	MenuBar menuBar;
4503		- Menu windowMenu;
4504		- MenuItem loadItem;
	5205	+ Menu fileMenu;
	5206	+ MenuItem newItem;
	5207	+ MenuItem openItem;
4505	5208	MenuItem saveItem;
4506	5209	MenuItem saveAsItem;
4507	5210	MenuItem exportAsItem;
4508	5211	MenuItem reexportItem;
4509	5212	MenuItem povItem;
4510	5213	MenuItem closeItem;
4511		- Menu cameraMenu;
	5214	+
4512	5215	CheckboxMenuItem zBufferItem;
4513	5216	//MenuItem normalLensItem;
4514		- MenuItem editCameraItem;
4515		- MenuItem revertCameraItem;
4516		- CheckboxMenuItem toggleLiveItem;
4517	5217	MenuItem stepItem;
	5218	+ CheckboxMenuItem toggleLiveItem;
4518	5219	CheckboxMenuItem toggleFullScreenItem;
4519	5220	CheckboxMenuItem toggleTimelineItem;
4520	5221	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4523,28 +5224,42 @@
4523	5224	CheckboxMenuItem toggleFootContactItem;
4524	5225	CheckboxMenuItem toggleDLItem;
4525	5226	CheckboxMenuItem toggleTextureItem;
4526		- CheckboxMenuItem toggleRandomItem;
	5227	+ CheckboxMenuItem toggleSwitchItem;
4527	5228	CheckboxMenuItem toggleRootItem;
4528	5229	CheckboxMenuItem animationItem;
	5230	+ MenuItem archiveItem;
4529	5231	CheckboxMenuItem toggleHandleItem;
4530	5232	CheckboxMenuItem togglePaintItem;
4531	5233	JSplitPane mainPanel;
4532	5234	JScrollPane scrollpane;
	5235	+
4533	5236	JPanel toolbarPanel;
4534		- JPanel treePanel;
	5237	+
	5238	+ cGridBag treePanel;
	5239	+
4535	5240	JPanel radioPanel;
4536	5241	ButtonGroup buttonGroup;
4537		- JPanel ctrlPanel;
4538		- JPanel materialPanel;
	5242	+
	5243	+ cGridBag toolboxPanel;
	5244	+ cGridBag materialPanel;
	5245	+ cGridBag ctrlPanel;
	5246	+
4539	5247	JScrollPane infoPanel;
4540		- JPanel optionsPanel;
	5248	+
	5249	+ cGridBag optionsPanel;
	5250	+
4541	5251	JTabbedPane objectPanel;
4542		- JPanel XYZPanel;
	5252	+ boolean materialFlushed;
	5253	+ Object3D latestObject;
	5254	+
	5255	+ cGridBag XYZPanel;
	5256	+
4543	5257	JSplitPane gridPanel;
4544	5258	JSplitPane bigPanel;
4545		- JPanel bigThree;
4546		- JTabbedPane scenePanel;
4547		- JPanel centralPanel;
	5259	+
	5260	+ cGridBag bigThree;
	5261	+ cGridBag scenePanel;
	5262	+ cGridBag centralPanel;
4548	5263	JSplitPane cameraPanel;
4549	5264	JPanel timelinePanel;
4550	5265	JMenuBar timelineMenubar;
..	..	@@ -4597,67 +5312,72 @@
4597	5312	// MATERIAL
4598	5313	JLabel materialLabel;
4599	5314	JLabel colorLabel;
4600		- NumberSlider colorField;
	5315	+ cNumberSlider colorField;
4601	5316	JLabel modulationLabel;
4602		- NumberSlider modulationField;
	5317	+ cNumberSlider modulationField;
4603	5318	JLabel metalnessLabel;
4604		- NumberSlider metalnessField;
	5319	+ cNumberSlider metalnessField;
4605	5320	JLabel diffuseLabel;
4606		- NumberSlider diffuseField;
	5321	+ cNumberSlider diffuseField;
4607	5322	JLabel specularLabel;
4608		- NumberSlider specularField;
	5323	+ cNumberSlider specularField;
4609	5324	JLabel shininessLabel;
4610		- NumberSlider shininessField;
	5325	+ cNumberSlider shininessField;
4611	5326	JLabel shiftLabel;
4612		- NumberSlider shiftField;
	5327	+ cNumberSlider shiftField;
4613	5328	JLabel ambientLabel;
4614		- NumberSlider ambientField;
	5329	+ cNumberSlider ambientField;
4615	5330	JLabel lightareaLabel;
4616		- NumberSlider lightareaField;
	5331	+ cNumberSlider lightareaField;
4617	5332	JLabel diffusenessLabel;
4618		- NumberSlider diffusenessField;
	5333	+ cNumberSlider diffusenessField;
4619	5334	JLabel velvetLabel;
4620		- NumberSlider velvetField;
	5335	+ cNumberSlider velvetField;
4621	5336	JLabel sheenLabel;
4622		- NumberSlider sheenField;
	5337	+ cNumberSlider sheenField;
4623	5338	JLabel subsurfaceLabel;
4624		- NumberSlider subsurfaceField;
	5339	+ cNumberSlider subsurfaceField;
4625	5340	//JLabel bumpLabel;
4626	5341	//NumberSlider bumpField;
4627	5342	JLabel backlitLabel;
4628		- NumberSlider backlitField;
	5343	+ cNumberSlider backlitField;
4629	5344	JLabel anisoLabel;
4630		- NumberSlider anisoField;
	5345	+ cNumberSlider anisoField;
4631	5346	JLabel anisoVLabel;
4632		- NumberSlider anisoVField;
	5347	+ cNumberSlider anisoVField;
4633	5348	JLabel cameraLabel;
4634		- NumberSlider cameraField;
	5349	+ cNumberSlider cameraField;
4635	5350	JLabel selfshadowLabel;
4636		- NumberSlider selfshadowField;
	5351	+ cNumberSlider selfshadowField;
4637	5352	JLabel shadowLabel;
4638		- NumberSlider shadowField;
	5353	+ cNumberSlider shadowField;
4639	5354	JLabel textureLabel;
4640		- NumberSlider textureField;
	5355	+ cNumberSlider textureField;
4641	5356	JLabel opacityLabel;
4642		- NumberSlider opacityField;
	5357	+ cNumberSlider opacityField;
4643	5358	JLabel fakedepthLabel;
4644		- NumberSlider fakedepthField;
	5359	+ cNumberSlider fakedepthField;
4645	5360	JLabel shadowbiasLabel;
4646		- NumberSlider shadowbiasField;
	5361	+ cNumberSlider shadowbiasField;
4647	5362	JLabel bumpLabel;
4648		- NumberSlider bumpField;
	5363	+ cNumberSlider bumpField;
4649	5364	JLabel noiseLabel;
4650		- NumberSlider noiseField;
	5365	+ cNumberSlider noiseField;
4651	5366	JLabel powerLabel;
4652		- NumberSlider powerField;
	5367	+ cNumberSlider powerField;
4653	5368	JLabel borderfadeLabel;
4654		- NumberSlider borderfadeField;
	5369	+ cNumberSlider borderfadeField;
4655	5370	JLabel fogLabel;
4656		- NumberSlider fogField;
	5371	+ cNumberSlider fogField;
4657	5372	JLabel opacityPowerLabel;
4658		- NumberSlider opacityPowerField;
4659		- JTree jTree;
	5373	+ cNumberSlider opacityPowerField;
	5374	+ cTree jTree;
4660	5375	//ObjectUI parent;
4661	5376
4662		- NumberSlider normalpushField;
	5377	+ cNumberSlider normalpushField;
	5378	+
	5379	+ private MenuItem importGFDItem;
	5380	+ private MenuItem importVRMLX3DItem;
	5381	+ private MenuItem import3DSItem;
	5382	+ private MenuItem importOBJItem;
4663	5383	}