~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.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	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	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -138,34 +203,42 @@
138	203	public void closeUI()
139	204	{
140	205	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
143	208	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
145	210
146		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
147	214	return;
148	215
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- 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);
167	234
168		- 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);
169	242	}
170	243
171	244	public ObjEditor GetEditor()
..	..	@@ -209,6 +282,12 @@
209	282	client = inClient;
210	283	copy = client;
211	284
	285	+ if (copy.versions == null)
	286	+ {
	287	+ copy.versions = new byte[100][];
	288	+ copy.versionindex = -1;
	289	+ }
	290	+
212	291	// "this" is not called: SetupUI2(objEditor);
213	292	}
214	293
..	..	@@ -222,6 +301,12 @@
222	301	client = inClient;
223	302	copy = client;
224	303
	304	+ if (copy.versions == null)
	305	+ {
	306	+ copy.versions = new byte[100][];
	307	+ copy.versionindex = -1;
	308	+ }
	309	+
225	310	SetupUI2(callee.GetEditor());
226	311	}
227	312
..	..	@@ -236,6 +321,7 @@
236	321	//localCopy.parent = null;
237	322
238	323	frame = new JFrame();
	324	+ frame.setUndecorated(false);
239	325	objEditor = this;
240	326	this.callee = callee;
241	327
..	..	@@ -253,6 +339,12 @@
253	339	copy = localCopy;
254	340	copy.editWindow = this;
255	341
	342	+ if (copy.versions == null)
	343	+ {
	344	+ copy.versions = new byte[100][];
	345	+ copy.versionindex = -1;
	346	+ }
	347	+
256	348	SetupMenu();
257	349
258	350	//SetupName(objEditor); // new
..	..	@@ -266,28 +358,49 @@
266	358	return frame.action(event, obj);
267	359	}
268	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	+
269	366	void SetupMenu()
270	367	{
271	368	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- 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..."));
277	389	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	390	+ fileMenu.add("-");
	391	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	392	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	393	+ fileMenu.add("-");
282	394	if (client.parent != null)
283	395	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	396	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	397	} else
286	398	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	399	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	400	}
289	401
290		- loadItem.addActionListener(this);
	402	+ newItem.addActionListener(this);
	403	+ openItem.addActionListener(this);
291	404	saveItem.addActionListener(this);
292	405	saveAsItem.addActionListener(this);
293	406	exportAsItem.addActionListener(this);
..	..	@@ -295,81 +408,66 @@
295	408	//povItem.addActionListener(this);
296	409	closeItem.addActionListener(this);
297	410
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	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	+
354	438	toolbarPanel = new JPanel();
355	439	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	440	+ treePanel = new cGridBag();
357	441	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- 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);
361	456	materialPanel.setName("Material");
	457	+
362	458	/JTextPane/
363	459	infoarea = createTextPane();
	460	+ doc = infoarea.getStyledDocument();
	461	+
364	462	infoarea.setEditable(true);
365	463	SetText();
366	464	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	465	// infoarea.setOpaque(false);
368	466	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	467	+// TEXTAREA infoarea.setLineWrap(true);
	468	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	469	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
	470	+ infoPanel.setPreferredSize(new Dimension(1, 1));
373	471	infoPanel.setName("Info");
374	472	//infoPanel.setLayout(new BorderLayout());
375	473	//infoPanel.add(createTextPane());
..	..	@@ -378,16 +476,23 @@
378	476	mainPanel.setName("Main");
379	477	mainPanel.setContinuousLayout(true);
380	478	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	479	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	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	+
385	490	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	491	//mainPanel.setLayout(new GridBagLayout());
387	492	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	493	+// treePanel.setLayout(new GridBagLayout());
	494	+ //ctrlPanel.setLayout(new GridBagLayout());
	495	+ //materialPanel.setLayout(new GridBagLayout());
391	496
392	497	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	498	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +531,7 @@
426	531	static String newline = "\n";
427	532	protected static final String buttonString = "JButton";
428	533	StyledDocument doc;
429		- JTextArea infoarea;
	534	+ JTextPane infoarea;
430	535
431	536	void ClearInfo()
432	537	{
..	..	@@ -449,10 +554,10 @@
449	554	e.printStackTrace();
450	555	}
451	556
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- 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();
456	561	//clipboard.setContents(data, data);
457	562	}
458	563
..	..	@@ -475,13 +580,13 @@
475	580	//SendInfo("Name:", "bold");
476	581	if (sel.GetTextures() != null \|\| debug)
477	582	{
478		- si.SendInfo(sel.toString(), "bold");
	583	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	584	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	585	if (sel.Size() > 0)
481	586	{
482	587	si.SendInfo("#children = " + sel.Size(), "regular");
483	588	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	589	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	590	if (debug)
486	591	{
487	592	try
..	..	@@ -493,7 +598,10 @@
493	598	}
494	599
495	600	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	601	+ {
	602	+ si.SendInfo(" BBox min: " + minima, "regular");
	603	+ si.SendInfo(" BBox max: " + maxima, "regular");
	604	+ }
497	605
498	606	if (sel.bRep != null)
499	607	{
..	..	@@ -520,7 +628,7 @@
520	628	}
521	629	if (sel.support != null)
522	630	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	631	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	632	}
525	633	if (sel.scriptnode != null)
526	634	{
..	..	@@ -591,6 +699,9 @@
591	699	{
592	700	CameraPane.pointflow = (PointFlow) sel;
593	701	}
	702	+
	703	+ si.SendInfo("_____________________", "regular");
	704	+ si.SendInfo("", "regular");
594	705	}
595	706	}
596	707
..	..	@@ -606,68 +717,191 @@
606	717	}
607	718	}
608	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	+
609	778	void ToggleFullScreen()
610	779	{
611		- if (CameraPane.FULLSCREEN)
	780	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	781	+
	782	+ cameraView.ToggleFullScreen();
	783	+
	784	+ if (!CameraPane.FULLSCREEN)
612	785	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- 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	+
616	809	} else
617	810	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- 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);
621	833	}
622		- cameraView.ToggleFullScreen();
	834	+ frame.validate();
623	835	}
624	836
625		- private JTextArea createTextPane()
	837	+ private byte[] CompressCopy()
626	838	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	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	+ }
642	858
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	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	+// }
649	903
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	904	+ return new JTextPane(); // textPane;
671	905	}
672	906
673	907	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +954,7 @@
720	954	protected static ImageIcon createImageIcon(String path,
721	955	String description)
722	956	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	957	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	958	if (imgURL != null)
725	959	{
726	960	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +986,7 @@
752	986	// NumberSlider vDivsField;
753	987	// JCheckBox endcaps;
754	988	JCheckBox liveCB;
	989	+ JCheckBox selectCB;
755	990	JCheckBox hideCB;
756	991	JCheckBox link2masterCB;
757	992	JCheckBox markCB;
..	..	@@ -759,7 +994,12 @@
759	994	JCheckBox speedupCB;
760	995	JCheckBox rewindCB;
761	996	JCheckBox flipVCB;
	997	+
	998	+ cCheckBox toggleTextureCB;
	999	+ cCheckBox toggleSwitchCB;
	1000	+
762	1001	JComboBox texresMenu;
	1002	+
763	1003	JButton resetButton;
764	1004	JButton stepButton;
765	1005	JButton stepAllButton;
..	..	@@ -767,115 +1007,87 @@
767	1007	JButton slowerButton;
768	1008	JButton fasterButton;
769	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;
770	1020
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1021	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1022	{
773	1023	JCheckBox cb;
774	1024
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- 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);
780	1026	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1027
785	1028	return cb;
786	1029	}
787	1030
788		- cButton AddButton(ObjEditor oe, String label)
	1031	+ cButton AddButton(cGridBag panel, String label)
789	1032	{
790	1033	cButton cb;
791	1034
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- 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);
797	1036	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1037
802	1038	return cb;
803	1039	}
804	1040
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1041	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1042	{
807	1043	JComboBox combo;
808	1044
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	1045	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1046	combo.addActionListener(this);
813	1047
814	1048	return combo;
815	1049	}
816	1050
817		- 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)
818	1052	{
819		- NumberSlider combo;
	1053	+ cGridBag control = new cGridBag();
	1054	+
	1055	+ cNumberSlider combo;
820	1056
821	1057	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1058	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	1059	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1060	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1061	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1062	+
	1063	+ panel.add(control);
	1064	+
	1065	+ return control;
841	1066	}
842	1067
843		- 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)
844	1069	{
845		- NumberSlider combo;
	1070	+ cGridBag control = new cGridBag();
	1071	+
	1072	+ cNumberSlider combo;
846	1073
847	1074	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1075	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	1076	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1077	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1078	combo.setInteger(current);
861	1079
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1080	+ panel.add(control);
	1081	+
	1082	+ return control;
867	1083	}
868	1084
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1085	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1086	{
871	1087	JTextArea text;
872	1088
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1089	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1090	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1091
880	1092	return text;
881	1093	}
..	..	@@ -905,9 +1117,16 @@
905	1117	objEditor.ctrlPanel.remove(j);
906	1118	}
907	1119
	1120	+ void Remove(cNumberSlider j)
	1121	+ {
	1122	+ j.removeChangeListener(this);
	1123	+ //objEditor.ctrlPanel.remove(j.label);
	1124	+ objEditor.ctrlPanel.remove(j);
	1125	+ }
	1126	+
908	1127	/*
909	1128	*/
910		- void Return() // ObjEditor oe)
	1129	+ void Return0() // ObjEditor oe)
911	1130	{
912	1131	aConstraints.gridy += 1;
913	1132	aConstraints.gridx = 0;
..	..	@@ -962,37 +1181,77 @@
962	1181
963	1182	void SetupUI2(ObjEditor oe)
964	1183	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1184	+ //SetupName(oe);
970	1185
971		- 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)
972	1195	return;
973	1196
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- 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");
977	1203	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- 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");
984	1237	// resetAllButton = AddButton(oe, "Reset All");
985	1238	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1239	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- 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");
991	1246
992		- Return();
	1247	+ oe.ctrlPanel.add(objectCommandsPanel);
	1248	+ oe.ctrlPanel.Return();
993	1249
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- 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();
996	1255
997	1256	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1257	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1346,7 @@
1087	1346	oe.aConstraints.gridwidth = 1;
1088	1347	/**/
1089	1348	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1349	+ oe.ctrlPanel.Return();
1091	1350
1092	1351	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1352	//textureButton.setEnabled(false);
..	..	@@ -1191,8 +1450,11 @@
1191	1450	//worldPanel.setName("World");
1192	1451	centralPanel = new cGridBag();
1193	1452	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1453	+
	1454	+ if (Globals.ADVANCED)
	1455	+ {
	1456	+ timelinePanel = new JPanel(new BorderLayout());
	1457	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1458
1197	1459	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1460	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1463,10 @@
1201	1463	// cameraPanel.setDividerSize(9);
1202	1464	cameraPanel.setResizeWeight(1.0);
1203	1465
	1466	+ }
	1467	+
1204	1468	centralPanel.add(cameraView);
	1469	+ centralPanel.setFocusable(true);
1205	1470	//frame.setJMenuBar(timelineMenubar);
1206	1471	//centralPanel.add(timelinePanel);
1207	1472
..	..	@@ -1264,11 +1529,16 @@
1264	1529	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1530	//tmp.setName("Edit");
1266	1531	objectPanel.add(materialPanel);
1267		- JPanel north = new JPanel(new BorderLayout());
1268		- north.setName("Edit");
1269		- north.add(ctrlPanel, BorderLayout.NORTH);
1270		- objectPanel.add(north);
1271		- 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);
1272	1542
1273	1543	/*
1274	1544	aConstraints.gridx = 0;
..	..	@@ -1277,7 +1547,7 @@
1277	1547	aConstraints.gridy += 1;
1278	1548	aConstraints.gridwidth = 1;
1279	1549	mainPanel.add(objectPanel, aConstraints);
1280		- */
	1550	+ */
1281	1551
1282	1552	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1283	1553	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1289,21 +1559,21 @@
1289	1559	scrollpane.addMouseWheelListener(this); // Default not fast enough
1290	1560
1291	1561	/JTabbedPane/ scenePanel = new cGridBag();
1292		- scenePanel.preferredWidth = 7;
	1562	+ scenePanel.preferredWidth = 6;
1293	1563
1294	1564	JTabbedPane tabbedPane = new JTabbedPane();
1295	1565	tabbedPane.add(scrollpane);
1296	1566
1297		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1298		-
1299		- optionsPanel = new JPanel(new GridBagLayout());
	1567	+ optionsPanel = new cGridBag().setVertical(false);
1300	1568
1301	1569	optionsPanel.setName("Options");
1302	1570
1303		- AddOptions(optionsPanel, aConstraints);
	1571	+ AddOptions(optionsPanel); //, aConstraints);
1304	1572
1305	1573	tabbedPane.add(optionsPanel);
1306	1574
	1575	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1576	+
1307	1577	scenePanel.add(tabbedPane);
1308	1578
1309	1579	/*
..	..	@@ -1376,9 +1646,9 @@
1376	1646	// aConstraints.gridheight = 1;
1377	1647
1378	1648	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1379		- framePanel.setContinuousLayout(true);
1380		- framePanel.setOneTouchExpandable(true);
1381		- framePanel.setDividerLocation(0.8);
	1649	+ framePanel.setContinuousLayout(false);
	1650	+ framePanel.setOneTouchExpandable(false);
	1651	+ //.setDividerLocation(0.8);
1382	1652	//framePanel.setDividerSize(15);
1383	1653	//framePanel.setResizeWeight(0.15);
1384	1654	framePanel.setName("Frame");
..	..	@@ -1395,10 +1665,15 @@
1395	1665
1396	1666	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1397	1667
1398		- frame.setSize(1024, 768);
1399		- frame.show();
1400		-
	1668	+ frame.setSize(1280, 860);
	1669	+
	1670	+ cameraView.requestFocusInWindow();
	1671	+
1401	1672	gridPanel.setDividerLocation(1.0);
	1673	+
	1674	+ frame.validate();
	1675	+
	1676	+ frame.setVisible(true);
1402	1677
1403	1678	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1404	1679	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1411,7 +1686,7 @@
1411	1686	});
1412	1687	}
1413	1688
1414		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1689	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1415	1690	{
1416	1691	}
1417	1692
..	..	@@ -1426,260 +1701,161 @@
1426	1701	ctrlPanel.removeAll();
1427	1702	}
1428	1703
1429		- void SetupMaterial(JPanel ctrlPanel)
	1704	+ void SetupMaterial(cGridBag panel)
1430	1705	{
1431		- aConstraints.weighty = 0;
1432		- //aConstraints.weightx = 1;
1433		- /*
	1706	+ /*
1434	1707	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1435	1708	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1436		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1437		- aConstraints.gridx += 1;
1438	1709	*/
1439	1710
1440		- aConstraints.gridwidth = 1;
1441		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- 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");
1445	1715
1446	1716	/*
1447	1717	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1448		- aConstraints.gridx += 1;
1449		- aConstraints.weighty = 0;
1450		- aConstraints.gridwidth = 1;
1451	1718	*/
1452	1719
1453		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1454		- 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	+ }
1455	1729
1456		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1457		-
1458		- aConstraints.gridx += 1;
1459		-
1460		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1461		-
1462		- aConstraints.gridx += 1;
1463		-
1464		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1465		-
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.weighty = 0;
1469		- aConstraints.gridwidth = 1;
	1730	+ editBar.preferredHeight = 15;
	1731	+
	1732	+ panel.add(editBar);
	1733	+
1470	1734	/**/
1471	1735	//aConstraints.weighty = 0;
1472	1736	////aConstraints.weightx = 1;
1473	1737	//aConstraints.weighty = 1;
1474	1738	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1475	1739	//aConstraints.gridx += 1;
1476		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1477		- aConstraints.weighty = 0;
1478		- aConstraints.gridx = 0;
1479		- aConstraints.gridy += 1;
1480		- aConstraints.gridwidth = 1;
	1740	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1481	1741
1482		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1483		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1485		- aConstraints.gridx += 1;
1486		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1487		- //aConstraints.weightx = 0;
1488		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1489		- aConstraints.gridx = 0;
1490		- aConstraints.gridy += 1;
1491		- 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);
1492	1750
1493		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1494		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1495		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1496		- aConstraints.gridx += 1;
1497		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1498		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1499		- aConstraints.gridx = 0;
1500		- aConstraints.gridy += 1;
1501		- 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);
1502	1756
1503		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1504		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1506		- aConstraints.gridx += 1;
1507		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1508		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- 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);
1512	1762
1513		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1514		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- 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);
1522	1776
1523		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1524		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- 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);
1532	1782
1533		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1534		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- 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);
1542	1788
1543		- //aConstraints.weighty = 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1545		- //aConstraints.gridx += 1;
1546		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1547		- aConstraints.weighty = 0;
1548		- aConstraints.gridx = 0;
1549		- aConstraints.gridy += 1;
1550		- 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);
1551	1794
1552		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1553		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1555		- aConstraints.gridx += 1;
1556		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1557		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1558		- aConstraints.gridx = 0;
1559		- aConstraints.gridy += 1;
1560		- 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);
1561	1800
1562		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1563		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1565		- aConstraints.gridx += 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1567		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1568		- aConstraints.gridx = 0;
1569		- aConstraints.gridy += 1;
1570		- 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);
1571	1806
1572		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1573		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1574		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1575		- aConstraints.gridx += 1;
1576		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1577		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1578		- aConstraints.gridx = 0;
1579		- aConstraints.gridy += 1;
1580		- 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);
1581	1812
1582		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1583		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1585		- aConstraints.gridx += 1;
1586		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1587		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- 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);
1591	1818
1592		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1593		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- 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);
1601	1826
1602		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1603		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- 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);
1611	1832
1612		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1613		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- 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);
1621	1838
1622		- //aConstraints.weighty = 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1624		- //aConstraints.gridx += 1;
1625		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1626		- aConstraints.weighty = 0;
1627		- aConstraints.gridx = 0;
1628		- aConstraints.gridy += 1;
1629		- 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);
1630	1844
1631		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1632		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1633		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1634		- aConstraints.gridx += 1;
1635		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1636		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1637		- aConstraints.gridx = 0;
1638		- aConstraints.gridy += 1;
1639		- 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);
1640	1850
1641		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1642		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1644		- aConstraints.gridx += 1;
1645		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1646		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1647		- aConstraints.gridx = 0;
1648		- aConstraints.gridy += 1;
1649		- 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);
1650	1856
1651		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1652		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1654		- aConstraints.gridx += 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1656		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1657		- aConstraints.gridx = 0;
1658		- aConstraints.gridy += 1;
1659		- aConstraints.gridwidth = 1;
1660		-
1661		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1662		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1664		- aConstraints.gridx += 1;
1665		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1666		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1667		- aConstraints.gridx = 0;
1668		- aConstraints.gridy += 1;
1669		- aConstraints.gridwidth = 1;
1670		-
1671		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1672		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1674		- aConstraints.gridx += 1;
1675		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1676		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1677		- aConstraints.gridx = 0;
1678		- aConstraints.gridy += 1;
1679		- aConstraints.gridwidth = 1;
1680		-
1681		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1682		- Return();
	1857	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1858	+ //Return();
1683	1859	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1684	1860	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685	1861	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1690,130 +1866,105 @@
1690	1866	// aConstraints.gridy += 1;
1691	1867	// aConstraints.gridwidth = 1;
1692	1868
1693		- //aConstraints.weighty = 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1695		- //aConstraints.gridx += 1;
1696		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1697		- aConstraints.weighty = 0;
1698		- aConstraints.gridx = 0;
1699		- aConstraints.gridy += 1;
1700		- 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);
1701	1874
1702		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1703		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1705		- aConstraints.gridx += 1;
1706		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1707		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1708		- aConstraints.gridx = 0;
1709		- aConstraints.gridy += 1;
1710		- 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);
1711	1880
1712		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1713		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1715		- aConstraints.gridx += 1;
1716		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1717		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1718		- aConstraints.gridx = 0;
1719		- aConstraints.gridy += 1;
1720		- aConstraints.gridwidth = 1;
1721	1881
1722		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1723		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1724		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1725		- aConstraints.gridx += 1;
1726		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1727		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1728		- aConstraints.gridx = 0;
1729		- aConstraints.gridy += 1;
1730		- 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);
1731	1889
1732		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1733		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1735		- aConstraints.gridx += 1;
1736		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1737		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1738		- aConstraints.gridx = 0;
1739		- aConstraints.gridy += 1;
1740		- aConstraints.gridwidth = 1;
1741		- 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);
1742	1895
1743		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1744		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1745		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1746		- aConstraints.gridx += 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1748		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1749		- aConstraints.gridx = 0;
1750		- aConstraints.gridy += 1;
1751		- 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);
1752	1901
1753		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1754		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1755		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1756		- aConstraints.gridx += 1;
1757		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1758		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1759		- aConstraints.gridx = 0;
1760		- aConstraints.gridy += 1;
1761		- 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);
1762	1907
1763		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1764		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1765		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1766		- aConstraints.gridx += 1;
1767		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1768		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1769		- aConstraints.gridx = 0;
1770		- aConstraints.gridy += 1;
1771		- 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);
1772	1913
1773		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1774		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1776		- aConstraints.gridx += 1;
1777		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1778		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1779		- aConstraints.gridx = 0;
1780		- aConstraints.gridy += 1;
1781		- 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);
1782	1921
1783		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1784		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1786		- aConstraints.gridx += 1;
1787		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1788		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1789		- aConstraints.gridx = 0;
1790		- aConstraints.gridy += 1;
1791		- 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);
1792	1927
1793		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1794		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1795		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1796		- aConstraints.gridx += 1;
1797		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1798		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1799		- aConstraints.gridx = 0;
1800		- aConstraints.gridy += 1;
1801		- 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);
1802	1933
1803		- //aConstraints.weighty = 1;
1804		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1805		- //aConstraints.gridx += 1;
1806		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1807		- 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);
1808	1939
1809		- aConstraints.gridx = 0;
1810		- aConstraints.gridy = 0;
1811		- 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);
1812	1963
1813	1964	SetMaterial(copy); // .GetMaterial());
1814	1965
1815		- colorField.addChangeListener(this);
1816		- modulationField.addChangeListener(this);
	1966	+ //colorField.addChangeListener(this);
	1967	+// modulationField.addChangeListener(this);
1817	1968	metalnessField.addChangeListener(this);
1818	1969	diffuseField.addChangeListener(this);
1819	1970	specularField.addChangeListener(this);
..	..	@@ -1843,12 +1994,15 @@
1843	1994	opacityPowerField.addChangeListener(this);
1844	1995	/**/
1845	1996
1846		- resetSlidersButton.addActionListener(this);
1847	1997	clearMaterialButton.addActionListener(this);
1848	1998	createMaterialButton.addActionListener(this);
1849		-
1850		- propagateToggle.addItemListener(this);
1851		- multiplyToggle.addItemListener(this);
	1999	+
	2000	+ if (Globals.ADVANCED)
	2001	+ {
	2002	+ resetSlidersButton.addActionListener(this);
	2003	+ propagateToggle.addItemListener(this);
	2004	+ multiplyToggle.addItemListener(this);
	2005	+ }
1852	2006	}
1853	2007
1854	2008	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1866,8 +2020,9 @@
1866	2020	// 3D models
1867	2021	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1868	2022	{
1869		- lastConverter = new com.jmex.model.converters.MaxToJme();
1870		- LoadFile(filename, lastConverter);
	2023	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2024	+ //LoadFile(filename, lastConverter);
	2025	+ LoadObjFile(filename); // New 3ds loader
1871	2026	continue;
1872	2027	}
1873	2028	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2019,7 +2174,7 @@
2019	2174
2020	2175	//? flashIt = false;
2021	2176	CameraPane pane = (CameraPane) cameraView;
2022		- pane.clickStart(location.x, location.y, 0);
	2177	+ pane.clickStart(location.x, location.y, 0, 0);
2023	2178	pane.clickEnd(location.x, location.y, 0, true);
2024	2179
2025	2180	if (group.selection.size() == 1)
..	..	@@ -2068,6 +2223,7 @@
2068	2223	e2.printStackTrace();
2069	2224	}
2070	2225	}
	2226	+
2071	2227	LoadJMEThread loadThread;
2072	2228
2073	2229	class LoadJMEThread extends Thread
..	..	@@ -2125,6 +2281,7 @@
2125	2281	//LoadFile0(filename, converter);
2126	2282	}
2127	2283	}
	2284	+
2128	2285	LoadOBJThread loadObjThread;
2129	2286
2130	2287	class LoadOBJThread extends Thread
..	..	@@ -2203,19 +2360,19 @@
2203	2360
2204	2361	void LoadObjFile(String fullname)
2205	2362	{
2206		- /*
	2363	+ System.out.println("Loading " + fullname);
	2364	+ /**/
2207	2365	//lastFilename = fullname;
2208	2366	if(loadObjThread == null)
2209	2367	{
2210		- loadObjThread = new LoadOBJThread();
2211		- loadObjThread.start();
	2368	+ loadObjThread = new LoadOBJThread();
	2369	+ loadObjThread.start();
2212	2370	}
2213	2371
2214	2372	loadObjThread.add(fullname);
2215		- */
	2373	+ /**/
2216	2374
2217		- System.out.println("Loading " + fullname);
2218		- makeSomething(new FileObject(fullname, true), true);
	2375	+ //makeSomething(new FileObject(fullname, true), true);
2219	2376	}
2220	2377
2221	2378	void LoadGFDFile(String fullname)
..	..	@@ -2476,11 +2633,11 @@
2476	2633
2477	2634	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2478	2635	{
2479		- if (GrafreeD.standAlone)
	2636	+ if (Grafreed.standAlone)
2480	2637	{
2481	2638	/**/
2482	2639	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2483		- browser.show();
	2640	+ browser.setVisible(true);
2484	2641	String filename = browser.getFile();
2485	2642	if (filename != null && filename.length() > 0)
2486	2643	{
..	..	@@ -2591,6 +2748,7 @@
2591	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2592	2749	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2593	2750	}
	2751	+
2594	2752	//cJME.count++;
2595	2753	//cJME.count %= 12;
2596	2754	if (gc)
..	..	@@ -2625,6 +2783,7 @@
2625	2783	}
2626	2784	if (input == null)
2627	2785	{
	2786	+ new Exception().printStackTrace();
2628	2787	System.exit(0);
2629	2788	}
2630	2789
..	..	@@ -2773,6 +2932,7 @@
2773	2932	}
2774	2933	}
2775	2934	}
	2935	+
2776	2936	cFileSystemPane FSPane;
2777	2937
2778	2938	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2826,11 +2986,14 @@
2826	2986	}
2827	2987	}
2828	2988	}
	2989	+
2829	2990	freezematerial = false;
2830	2991	}
2831	2992
2832	2993	void SetMaterial(Object3D object)
2833	2994	{
	2995	+ latestObject = object;
	2996	+
2834	2997	cMaterial mat = object.material;
2835	2998
2836	2999	if (mat == null)
..	..	@@ -2839,7 +3002,8 @@
2839	3002	return;
2840	3003	}
2841	3004
2842		- multiplyToggle.setSelected(mat.multiply);
	3005	+ if (multiplyToggle != null)
	3006	+ multiplyToggle.setSelected(mat.multiply);
2843	3007
2844	3008	assert (object.projectedVertices != null);
2845	3009
..	..	@@ -2941,12 +3105,17 @@
2941	3105	// }
2942	3106
2943	3107	/**/
2944		- if (deselect)
	3108	+ if (deselect \|\| child == null)
2945	3109	{
2946	3110	//group.deselectAll();
2947	3111	//freeze = true;
2948	3112	GetTree().clearSelection();
2949	3113	//freeze = false;
	3114	+
	3115	+ if (child == null)
	3116	+ {
	3117	+ return;
	3118	+ }
2950	3119	}
2951	3120
2952	3121	//group.addSelectee(child);
..	..	@@ -3015,7 +3184,7 @@
3015	3184	cameraView.ToggleDL();
3016	3185	cameraView.repaint();
3017	3186	return;
3018		- } else if (event.getSource() == toggleTextureItem)
	3187	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3019	3188	{
3020	3189	cameraView.ToggleTexture();
3021	3190	// june 2013 copy.HardTouch();
..	..	@@ -3054,9 +3223,9 @@
3054	3223	frame.validate();
3055	3224
3056	3225	return;
3057		- } else if (event.getSource() == toggleRandomItem)
	3226	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3058	3227	{
3059		- cameraView.ToggleRandom();
	3228	+ cameraView.ToggleSwitch();
3060	3229	cameraView.repaint();
3061	3230	return;
3062	3231	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3085,6 +3254,10 @@
3085	3254	{
3086	3255	copy.live ^= true;
3087	3256	return;
	3257	+ } else if (event.getSource() == selectCB)
	3258	+ {
	3259	+ copy.dontselect ^= true;
	3260	+ return;
3088	3261	} else if (event.getSource() == hideCB)
3089	3262	{
3090	3263	copy.hide ^= true;
..	..	@@ -3099,6 +3272,7 @@
3099	3272	if (event.getSource() == randomCB)
3100	3273	{
3101	3274	copy.random ^= true;
	3275	+ objEditor.refreshContents();
3102	3276	return;
3103	3277	}
3104	3278	if (event.getSource() == speedupCB)
..	..	@@ -3122,8 +3296,9 @@
3122	3296
3123	3297	public void actionPerformed(ActionEvent event)
3124	3298	{
	3299	+ Object source = event.getSource();
3125	3300	// SCRIPT DIALOG
3126		- if (event.getSource() == okbutton)
	3301	+ if (source == okbutton)
3127	3302	{
3128	3303	textpanel.setVisible(false);
3129	3304	textpanel.remove(textarea);
..	..	@@ -3135,7 +3310,7 @@
3135	3310	textarea = null;
3136	3311	textpanel = null;
3137	3312	}
3138		- if (event.getSource() == cancelbutton)
	3313	+ if (source == cancelbutton)
3139	3314	{
3140	3315	textpanel.setVisible(false);
3141	3316	textpanel.remove(textarea);
..	..	@@ -3147,50 +3322,50 @@
3147	3322	//applySelf();
3148	3323	//client.refreshEditWindow();
3149	3324	//refreshContents();
3150		- if (event.getSource() == nameField)
	3325	+ if (source == nameField)
3151	3326	{
3152	3327	//System.out.println("ObjEditor " + event);
3153	3328	applySelf0(true);
3154	3329	//parent.applySelf();
3155	3330	objEditor.refreshContents();
3156		- } else if (event.getSource() == resetButton)
	3331	+ } else if (source == resetButton)
3157	3332	{
3158	3333	CameraPane.fullreset = true;
3159	3334	copy.Reset(); // ResetMeshes();
3160	3335	copy.Touch();
3161	3336	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepItem)
	3337	+ } else if (source == stepItem)
3163	3338	{
3164	3339	//cameraView.ONESTEP = true;
3165	3340	Globals.ONESTEP = true;
3166	3341	cameraView.repaint();
3167	3342	return;
3168		- } else if (event.getSource() == stepButton)
	3343	+ } else if (source == stepButton)
3169	3344	{
3170	3345	copy.Step();
3171	3346	copy.Touch();
3172	3347	objEditor.refreshContents();
3173		- } else if (event.getSource() == slowerButton)
	3348	+ } else if (source == slowerButton)
3174	3349	{
3175	3350	copy.Slower();
3176	3351	copy.Touch();
3177	3352	objEditor.refreshContents();
3178		- } else if (event.getSource() == fasterButton)
	3353	+ } else if (source == fasterButton)
3179	3354	{
3180	3355	copy.Faster();
3181	3356	copy.Touch();
3182	3357	objEditor.refreshContents();
3183		- } else if (event.getSource() == remarkButton)
	3358	+ } else if (source == remarkButton)
3184	3359	{
3185	3360	copy.Remark();
3186	3361	copy.Touch();
3187	3362	objEditor.refreshContents();
3188		- } else if (event.getSource() == stepAllButton)
	3363	+ } else if (source == stepAllButton)
3189	3364	{
3190	3365	copy.StepAll();
3191	3366	copy.Touch();
3192	3367	objEditor.refreshContents();
3193		- } else if (event.getSource() == resetAllButton)
	3368	+ } else if (source == resetAllButton)
3194	3369	{
3195	3370	//CameraPane.fullreset = true;
3196	3371	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3223,53 +3398,79 @@
3223	3398	// Close();
3224	3399	// }
3225	3400	// else
3226		- if (event.getSource() == resetSlidersButton)
	3401	+ if (source == resetSlidersButton)
3227	3402	{
3228	3403	ResetSliders();
3229		- } else if (event.getSource() == clearMaterialButton)
	3404	+ } else if (source == clearMaterialButton)
3230	3405	{
3231	3406	ClearMaterial();
3232		- } else if (event.getSource() == createMaterialButton)
	3407	+ } else if (source == createMaterialButton)
3233	3408	{
3234	3409	CreateMaterial();
3235		- } else if (event.getSource() == clearPanelButton)
	3410	+ } else if (source == clearPanelButton)
3236	3411	{
3237	3412	copy.ClearUI();
3238	3413	refreshContents(true);
3239		- } /*
3240		- }
3241		-
3242		- public boolean action(Event event, Object arg)
3243		- {
3244		- */ 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)
3245	3439	{
3246	3440	Close();
3247	3441	//return true;
3248		- } else if (event.getSource() == loadItem)
	3442	+ } else if (source == openItem)
3249	3443	{
3250		- load();
	3444	+ Open();
3251	3445	//return true;
3252		- } else if (event.getSource() == saveItem)
	3446	+ } else if (source == newItem)
	3447	+ {
	3448	+ New();
	3449	+ } else if (source == saveItem)
3253	3450	{
3254	3451	save();
3255	3452	//return true;
3256		- } else if (event.getSource() == saveAsItem)
	3453	+ } else if (source == saveAsItem)
3257	3454	{
3258	3455	saveAs();
3259	3456	//return true;
3260		- } else if (event.getSource() == reexportItem)
	3457	+ } else if (source == reexportItem)
3261	3458	{
3262	3459	reexport();
3263	3460	//return true;
3264		- } else if (event.getSource() == exportAsItem)
	3461	+ } else if (source == exportAsItem)
3265	3462	{
3266	3463	export();
3267	3464	//return true;
3268		- } else if (event.getSource() == povItem)
	3465	+ } else if (source == povItem)
3269	3466	{
3270	3467	generatePOV();
3271	3468	//return true;
3272		- } else if (event.getSource() == zBufferItem)
	3469	+ } else if (event.getSource() == archiveItem)
	3470	+ {
	3471	+ cTools.Archive(frame);
	3472	+ return;
	3473	+ } else if (source == zBufferItem)
3273	3474	{
3274	3475	try
3275	3476	{
..	..	@@ -3291,21 +3492,8 @@
3291	3492	cameraView.repaint();
3292	3493	//return true;
3293	3494	}
3294		- */ else if (event.getSource() == editCameraItem)
3295		- {
3296		- cameraView.ProtectCamera();
3297		- cameraView.repaint();
3298		- return;
3299		- } else if (event.getSource() == revertCameraItem)
3300		- {
3301		- cameraView.RevertCamera();
3302		- cameraView.repaint();
3303		- return;
3304		-// } else if (event.getSource() == textureButton)
3305		-// {
3306		-// return; // true;
3307		- } else // combos...
3308		- if (event.getSource() == texresMenu)
	3495	+ */ else // combos...
	3496	+ if (source == texresMenu)
3309	3497	{
3310	3498	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3311	3499	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3317,12 +3505,409 @@
3317	3505	}
3318	3506	}
3319	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	+
3320	3905	void ToggleAnimation()
3321	3906	{
3322	3907	if (!Globals.ANIMATION)
3323	3908	{
3324	3909	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3325		- browser.show();
	3910	+ browser.setVisible(true);
3326	3911	String filename = browser.getFile();
3327	3912	if (filename != null && filename.length() > 0)
3328	3913	{
..	..	@@ -3332,8 +3917,8 @@
3332	3917
3333	3918	Globals.ANIMATION ^= true;
3334	3919
3335		- GrafreeD.wav.cursor = 0;
3336		- GrafreeD.wav.loop = 0;
	3920	+ Grafreed.wav.cursor = 0;
	3921	+ Grafreed.wav.loop = 0;
3337	3922	}
3338	3923	} else
3339	3924	{
..	..	@@ -3383,7 +3968,7 @@
3383	3968	void CreateMaterial()
3384	3969	{
3385	3970	//copy.ClearMaterial(); // PATCH
3386		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3971	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3387	3972	if (copy.selection.size() > 0)
3388	3973	//SetMaterial(copy);
3389	3974	{
..	..	@@ -3434,7 +4019,7 @@
3434	4019	assert false;
3435	4020	}
3436	4021
3437		- void EditSelection()
	4022	+ void EditSelection(boolean newWindow)
3438	4023	{
3439	4024	}
3440	4025
..	..	@@ -3442,11 +4027,11 @@
3442	4027	{
3443	4028	copy.ResetBlockLoop(); // temporary problem
3444	4029
3445		- boolean random = CameraPane.RANDOM;
3446		- CameraPane.RANDOM = false; // parse everything
	4030	+ boolean random = CameraPane.SWITCH;
	4031	+ CameraPane.SWITCH = false; // parse everything
3447	4032	copy.ResetDisplayList();
3448	4033	copy.HardTouch();
3449		- CameraPane.RANDOM = random;
	4034	+ CameraPane.SWITCH = random;
3450	4035	}
3451	4036
3452	4037	// public void applySelf()
..	..	@@ -3516,10 +4101,40 @@
3516	4101	current.fakedepth = (float) fakedepthField.getFloat();
3517	4102	current.shadowbias = (float) shadowbiasField.getFloat();
3518	4103
3519		- if (!NumberSlider.frozen)
	4104	+ if (!cNumberSlider.frozen)
3520	4105	{
3521	4106	//System.out.println("Propagate = " + propagate);
3522	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	+
3523	4138	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3524	4139	{
3525	4140	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3548,9 +4163,25 @@
3548	4163	//copy.Touch();
3549	4164	}
3550	4165
	4166	+ cNumberSlider versionSlider;
	4167	+
3551	4168	public void stateChanged(ChangeEvent e)
3552	4169	{
3553	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	+ }
3554	4185
3555	4186	if (freezematerial)
3556	4187	{
..	..	@@ -3564,6 +4195,7 @@
3564	4195	\|\| e.getSource() == apertureField
3565	4196	\|\| e.getSource() == shadowblurField)
3566	4197	{
	4198	+ new Exception().printStackTrace();
3567	4199	System.exit(0);
3568	4200	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3569	4201	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3634,7 +4266,7 @@
3634	4266	}
3635	4267
3636	4268	if (normalpushField != null)
3637		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4269	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3638	4270	}
3639	4271
3640	4272	void SnapObject()
..	..	@@ -3889,7 +4521,7 @@
3889	4521
3890	4522	radioPanel.revalidate();
3891	4523	radioPanel.repaint();
3892		- ctrlPanel.revalidate(); // ? new
	4524	+ ctrlPanel.validate(); // ? new
3893	4525	ctrlPanel.repaint();
3894	4526	}
3895	4527	}
..	..	@@ -3898,6 +4530,8 @@
3898	4530
3899	4531	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3900	4532	{
	4533	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4534	+ Save();
3901	4535	//Tween.set(thing, 0).target(1).start(tweenManager);
3902	4536	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3903	4537	// if (thing instanceof GenericJointDemo)
..	..	@@ -3984,6 +4618,12 @@
3984	4618	{
3985	4619	ResetModel();
3986	4620	Select(thing.GetTreePath(), true, false); // unselect... false);
	4621	+
	4622	+ if (thing.Size() == 0)
	4623	+ {
	4624	+ //EditSelection(false);
	4625	+ }
	4626	+
3987	4627	refreshContents();
3988	4628	}
3989	4629
..	..	@@ -4101,6 +4741,7 @@
4101	4741	}
4102	4742	}
4103	4743	}
	4744	+
4104	4745	LoadGFDThread loadGFDThread;
4105	4746
4106	4747	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4120,8 +4761,10 @@
4120	4761
4121	4762	try
4122	4763	{
	4764	+ // Try compressed version first.
4123	4765	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4124		- 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);
4125	4768
4126	4769	readobj = (Object3D) p.readObject();
4127	4770	istream.close();
..	..	@@ -4129,7 +4772,20 @@
4129	4772	readobj.ResetDisplayList();
4130	4773	} catch (Exception e)
4131	4774	{
4132		- 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	+ }
4133	4789	}
4134	4790	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4135	4791	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4175,6 +4831,12 @@
4175	4831
4176	4832	void LoadIt(Object obj)
4177	4833	{
	4834	+ if (obj == null)
	4835	+ {
	4836	+ // Invalid file
	4837	+ return;
	4838	+ }
	4839	+
4178	4840	System.out.println("Loaded " + obj);
4179	4841	//new Exception().printStackTrace();
4180	4842	Object3D readobj = (Object3D) obj;
..	..	@@ -4184,6 +4846,8 @@
4184	4846
4185	4847	if (readobj != null)
4186	4848	{
	4849	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4850	+ // Save();
4187	4851	try
4188	4852	{
4189	4853	//readobj.deepCopySelf(copy);
..	..	@@ -4238,15 +4902,26 @@
4238	4902	c.addChild(csg);
4239	4903	}
4240	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	+
4241	4916	ResetModel();
4242	4917	copy.HardTouch(); // recompile?
4243	4918	refreshContents();
4244	4919	}
4245	4920	}
4246	4921
4247		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4248	4923	{
4249		- if (GrafreeD.standAlone)
	4924	+ if (Grafreed.standAlone)
4250	4925	{
4251	4926	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4252	4927	browser.show();
..	..	@@ -4333,11 +5008,13 @@
4333	5008	try
4334	5009	{
4335	5010	FileOutputStream ostream = new FileOutputStream(lastname);
4336		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5011	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5012	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4337	5013
4338	5014	p.writeObject(copy);
4339	5015	p.flush();
4340	5016
	5017	+ zstream.close();
4341	5018	ostream.close();
4342	5019
4343	5020	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4347,17 +5024,20 @@
4347	5024	{
4348	5025	}
4349	5026	}
	5027	+
4350	5028	String lastname;
4351	5029
4352	5030	void saveAs()
4353	5031	{
4354		- if (GrafreeD.standAlone)
	5032	+ if (Grafreed.standAlone)
4355	5033	{
4356	5034	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4357	5035	browser.setVisible(true);
4358	5036	String filename = browser.getFile();
4359	5037	if (filename != null && filename.length() > 0)
4360	5038	{
	5039	+ if (!filename.endsWith(".gfd"))
	5040	+ filename += ".gfd";
4361	5041	lastname = browser.getDirectory() + filename;
4362	5042	save();
4363	5043	}
..	..	@@ -4456,13 +5136,13 @@
4456	5136	try
4457	5137	{
4458	5138	FileOutputStream ostream = new FileOutputStream(filename);
4459		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4460		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5139	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5140	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4461	5141
4462	5142	Object3D objectparent = obj.parent;
4463	5143	obj.parent = null;
4464	5144
4465		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5145	+ Object3D object = (Object3D) Grafreed.clone(obj);
4466	5146
4467	5147	obj.parent = objectparent;
4468	5148
..	..	@@ -4474,8 +5154,8 @@
4474	5154	p.writeObject(object);
4475	5155	p.flush();
4476	5156
	5157	+ zstream.close();
4477	5158	ostream.close();
4478		- // zstream.close();
4479	5159
4480	5160	// group.selection.get(0).parent = parent;
4481	5161	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4496,7 +5176,7 @@
4496	5176	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4497	5177	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4498	5178	copy.generatePOV(buffer);
4499		- if (GrafreeD.standAlone)
	5179	+ if (Grafreed.standAlone)
4500	5180	{
4501	5181	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4502	5182	browser.show();
..	..	@@ -4522,21 +5202,20 @@
4522	5202	Object3D client;
4523	5203	Object3D copy;
4524	5204	MenuBar menuBar;
4525		- Menu windowMenu;
4526		- MenuItem loadItem;
	5205	+ Menu fileMenu;
	5206	+ MenuItem newItem;
	5207	+ MenuItem openItem;
4527	5208	MenuItem saveItem;
4528	5209	MenuItem saveAsItem;
4529	5210	MenuItem exportAsItem;
4530	5211	MenuItem reexportItem;
4531	5212	MenuItem povItem;
4532	5213	MenuItem closeItem;
4533		- Menu cameraMenu;
	5214	+
4534	5215	CheckboxMenuItem zBufferItem;
4535	5216	//MenuItem normalLensItem;
4536		- MenuItem editCameraItem;
4537		- MenuItem revertCameraItem;
4538		- CheckboxMenuItem toggleLiveItem;
4539	5217	MenuItem stepItem;
	5218	+ CheckboxMenuItem toggleLiveItem;
4540	5219	CheckboxMenuItem toggleFullScreenItem;
4541	5220	CheckboxMenuItem toggleTimelineItem;
4542	5221	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4545,25 +5224,39 @@
4545	5224	CheckboxMenuItem toggleFootContactItem;
4546	5225	CheckboxMenuItem toggleDLItem;
4547	5226	CheckboxMenuItem toggleTextureItem;
4548		- CheckboxMenuItem toggleRandomItem;
	5227	+ CheckboxMenuItem toggleSwitchItem;
4549	5228	CheckboxMenuItem toggleRootItem;
4550	5229	CheckboxMenuItem animationItem;
	5230	+ MenuItem archiveItem;
4551	5231	CheckboxMenuItem toggleHandleItem;
4552	5232	CheckboxMenuItem togglePaintItem;
4553	5233	JSplitPane mainPanel;
4554	5234	JScrollPane scrollpane;
	5235	+
4555	5236	JPanel toolbarPanel;
4556		- JPanel treePanel;
	5237	+
	5238	+ cGridBag treePanel;
	5239	+
4557	5240	JPanel radioPanel;
4558	5241	ButtonGroup buttonGroup;
4559		- JPanel ctrlPanel;
4560		- JPanel materialPanel;
	5242	+
	5243	+ cGridBag toolboxPanel;
	5244	+ cGridBag materialPanel;
	5245	+ cGridBag ctrlPanel;
	5246	+
4561	5247	JScrollPane infoPanel;
4562		- JPanel optionsPanel;
	5248	+
	5249	+ cGridBag optionsPanel;
	5250	+
4563	5251	JTabbedPane objectPanel;
	5252	+ boolean materialFlushed;
	5253	+ Object3D latestObject;
	5254	+
4564	5255	cGridBag XYZPanel;
	5256	+
4565	5257	JSplitPane gridPanel;
4566	5258	JSplitPane bigPanel;
	5259	+
4567	5260	cGridBag bigThree;
4568	5261	cGridBag scenePanel;
4569	5262	cGridBag centralPanel;
..	..	@@ -4619,67 +5312,72 @@
4619	5312	// MATERIAL
4620	5313	JLabel materialLabel;
4621	5314	JLabel colorLabel;
4622		- NumberSlider colorField;
	5315	+ cNumberSlider colorField;
4623	5316	JLabel modulationLabel;
4624		- NumberSlider modulationField;
	5317	+ cNumberSlider modulationField;
4625	5318	JLabel metalnessLabel;
4626		- NumberSlider metalnessField;
	5319	+ cNumberSlider metalnessField;
4627	5320	JLabel diffuseLabel;
4628		- NumberSlider diffuseField;
	5321	+ cNumberSlider diffuseField;
4629	5322	JLabel specularLabel;
4630		- NumberSlider specularField;
	5323	+ cNumberSlider specularField;
4631	5324	JLabel shininessLabel;
4632		- NumberSlider shininessField;
	5325	+ cNumberSlider shininessField;
4633	5326	JLabel shiftLabel;
4634		- NumberSlider shiftField;
	5327	+ cNumberSlider shiftField;
4635	5328	JLabel ambientLabel;
4636		- NumberSlider ambientField;
	5329	+ cNumberSlider ambientField;
4637	5330	JLabel lightareaLabel;
4638		- NumberSlider lightareaField;
	5331	+ cNumberSlider lightareaField;
4639	5332	JLabel diffusenessLabel;
4640		- NumberSlider diffusenessField;
	5333	+ cNumberSlider diffusenessField;
4641	5334	JLabel velvetLabel;
4642		- NumberSlider velvetField;
	5335	+ cNumberSlider velvetField;
4643	5336	JLabel sheenLabel;
4644		- NumberSlider sheenField;
	5337	+ cNumberSlider sheenField;
4645	5338	JLabel subsurfaceLabel;
4646		- NumberSlider subsurfaceField;
	5339	+ cNumberSlider subsurfaceField;
4647	5340	//JLabel bumpLabel;
4648	5341	//NumberSlider bumpField;
4649	5342	JLabel backlitLabel;
4650		- NumberSlider backlitField;
	5343	+ cNumberSlider backlitField;
4651	5344	JLabel anisoLabel;
4652		- NumberSlider anisoField;
	5345	+ cNumberSlider anisoField;
4653	5346	JLabel anisoVLabel;
4654		- NumberSlider anisoVField;
	5347	+ cNumberSlider anisoVField;
4655	5348	JLabel cameraLabel;
4656		- NumberSlider cameraField;
	5349	+ cNumberSlider cameraField;
4657	5350	JLabel selfshadowLabel;
4658		- NumberSlider selfshadowField;
	5351	+ cNumberSlider selfshadowField;
4659	5352	JLabel shadowLabel;
4660		- NumberSlider shadowField;
	5353	+ cNumberSlider shadowField;
4661	5354	JLabel textureLabel;
4662		- NumberSlider textureField;
	5355	+ cNumberSlider textureField;
4663	5356	JLabel opacityLabel;
4664		- NumberSlider opacityField;
	5357	+ cNumberSlider opacityField;
4665	5358	JLabel fakedepthLabel;
4666		- NumberSlider fakedepthField;
	5359	+ cNumberSlider fakedepthField;
4667	5360	JLabel shadowbiasLabel;
4668		- NumberSlider shadowbiasField;
	5361	+ cNumberSlider shadowbiasField;
4669	5362	JLabel bumpLabel;
4670		- NumberSlider bumpField;
	5363	+ cNumberSlider bumpField;
4671	5364	JLabel noiseLabel;
4672		- NumberSlider noiseField;
	5365	+ cNumberSlider noiseField;
4673	5366	JLabel powerLabel;
4674		- NumberSlider powerField;
	5367	+ cNumberSlider powerField;
4675	5368	JLabel borderfadeLabel;
4676		- NumberSlider borderfadeField;
	5369	+ cNumberSlider borderfadeField;
4677	5370	JLabel fogLabel;
4678		- NumberSlider fogField;
	5371	+ cNumberSlider fogField;
4679	5372	JLabel opacityPowerLabel;
4680		- NumberSlider opacityPowerField;
4681		- JTree jTree;
	5373	+ cNumberSlider opacityPowerField;
	5374	+ cTree jTree;
4682	5375	//ObjectUI parent;
4683	5376
4684		- NumberSlider normalpushField;
	5377	+ cNumberSlider normalpushField;
	5378	+
	5379	+ private MenuItem importGFDItem;
	5380	+ private MenuItem importVRMLX3DItem;
	5381	+ private MenuItem import3DSItem;
	5382	+ private MenuItem importOBJItem;
4685	5383	}