~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,53 @@
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	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
	49	+ }
	50	+
	51	+ cToggleButton GetToggleButton(String name, boolean border)
	52	+ {
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
	55	+ }
	56	+
	57	+ cCheckBox GetCheckBox(String name, boolean border)
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
	65	+ try
	66	+ {
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	70	+ {
	71	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	72	+ Graphics2D g = resized.createGraphics();
	73	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+ g.dispose();
	77	+
	78	+ image = resized;
	79	+ }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
	83	+ }
	84	+ catch (Exception e)
	85	+ {
	86	+ return null;
	87	+ }
	88	+ }
38	89
39	90	// SCRIPT
40	91
..	..	@@ -138,34 +189,42 @@
138	189	public void closeUI()
139	190	{
140	191	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	192	+// System.out.println("this = " + this);
	193	+// System.out.println("objEditor = " + objEditor);
143	194	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	195	+// objEditor.ctrlPanel.remove(nameField);
145	196
146		- if (!GroupEditor.allparams)
	197	+ objEditor.ctrlPanel.remove(namePanel);
	198	+
	199	+ if (!allparams)
147	200	return;
148	201
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);
	202	+// objEditor.ctrlPanel.remove(liveCB);
	203	+// objEditor.ctrlPanel.remove(hideCB);
	204	+// objEditor.ctrlPanel.remove(markCB);
	205	+//
	206	+// objEditor.ctrlPanel.remove(randomCB);
	207	+// objEditor.ctrlPanel.remove(speedupCB);
	208	+// objEditor.ctrlPanel.remove(rewindCB);
	209	+//
	210	+// objEditor.ctrlPanel.remove(resetButton);
	211	+// objEditor.ctrlPanel.remove(stepButton);
	212	+//// objEditor.ctrlPanel.remove(stepAllButton);
	213	+//// objEditor.ctrlPanel.remove(resetAllButton);
	214	+// objEditor.ctrlPanel.remove(link2masterCB);
	215	+// //objEditor.ctrlPanel.remove(flipVCB);
	216	+// //objEditor.ctrlPanel.remove(texresMenu);
	217	+// objEditor.ctrlPanel.remove(slowerButton);
	218	+// objEditor.ctrlPanel.remove(fasterButton);
	219	+// objEditor.ctrlPanel.remove(remarkButton);
167	220
168		- Remove(normalpushField);
	221	+ objEditor.ctrlPanel.remove(setupPanel);
	222	+ objEditor.ctrlPanel.remove(setupPanel2);
	223	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	224	+ objEditor.ctrlPanel.remove(pushPanel);
	225	+ //objEditor.ctrlPanel.remove(fillPanel);
	226	+
	227	+ //Remove(normalpushField);
169	228	}
170	229
171	230	public ObjEditor GetEditor()
..	..	@@ -209,6 +268,12 @@
209	268	client = inClient;
210	269	copy = client;
211	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
212	277	// "this" is not called: SetupUI2(objEditor);
213	278	}
214	279
..	..	@@ -222,6 +287,12 @@
222	287	client = inClient;
223	288	copy = client;
224	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
225	296	SetupUI2(callee.GetEditor());
226	297	}
227	298
..	..	@@ -236,6 +307,7 @@
236	307	//localCopy.parent = null;
237	308
238	309	frame = new JFrame();
	310	+ frame.setUndecorated(false);
239	311	objEditor = this;
240	312	this.callee = callee;
241	313
..	..	@@ -253,6 +325,12 @@
253	325	copy = localCopy;
254	326	copy.editWindow = this;
255	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
256	334	SetupMenu();
257	335
258	336	//SetupName(objEditor); // new
..	..	@@ -266,28 +344,49 @@
266	344	return frame.action(event, obj);
267	345	}
268	346
	347	+ // Cannot work without static
	348	+ static boolean allparams = true;
	349	+
	350	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	351	+
269	352	void SetupMenu()
270	353	{
271	354	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..."));
	355	+ menuBar.add(fileMenu = new Menu("File"));
	356	+ fileMenu.add(newItem = new MenuItem("New"));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
	358	+
	359	+ //oe.menuBar.add(menu = new Menu("Include"));
	360	+ Menu menu = new Menu("Import");
	361	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	362	+ importOBJItem.addActionListener(this);
	363	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	364	+ import3DSItem.addActionListener(this);
	365	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	366	+ importVRMLX3DItem.addActionListener(this);
	367	+ menu.add("-");
	368	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	369	+ importGFDItem.addActionListener(this);
	370	+ fileMenu.add(menu);
	371	+ fileMenu.add("-");
	372	+
	373	+ fileMenu.add(saveItem = new MenuItem("Save"));
	374	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	375	//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("-");
	376	+ fileMenu.add("-");
	377	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	378	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	379	+ fileMenu.add("-");
282	380	if (client.parent != null)
283	381	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	382	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	383	} else
286	384	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	385	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	386	}
289	387
290		- loadItem.addActionListener(this);
	388	+ newItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
291	390	saveItem.addActionListener(this);
292	391	saveAsItem.addActionListener(this);
293	392	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +394,69 @@
295	394	//povItem.addActionListener(this);
296	395	closeItem.addActionListener(this);
297	396
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	397	objectPanel = new JTabbedPane();
	398	+
	399	+ ChangeListener changeListener = new ChangeListener()
	400	+ {
	401	+ public void stateChanged(ChangeEvent changeEvent)
	402	+ {
	403	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	404	+// {
	405	+// if (latestObject != null)
	406	+// {
	407	+// refreshContents(true);
	408	+// SetMaterial(latestObject);
	409	+// }
	410	+//
	411	+// materialFlushed = true;
	412	+// }
	413	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	414	+// {
	415	+// if (listUI.size() == 0)
	416	+// EditSelection(false);
	417	+// }
	418	+
	419	+ refreshContents(false); // To refresh Info tab
	420	+ }
	421	+ };
	422	+ objectPanel.addChangeListener(changeListener);
	423	+
354	424	toolbarPanel = new JPanel();
355	425	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	426	+
	427	+ treePanel = new cGridBag();
357	428	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
361		- materialPanel.setName("Material");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
	433	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	434	+
	435	+ editCommandsPanel = new cGridBag();
	436	+ editPanel.add(editCommandsPanel);
	437	+ editPanel.add(ctrlPanel);
	438	+
	439	+ toolboxPanel = new cGridBag().setVertical(false);
	440	+ //toolboxPanel.setName("Toolbox");
	441	+
	442	+ materialPanel = new cGridBag().setVertical(true);
	443	+ //materialPanel.setName("Material");
	444	+
362	445	/JTextPane/
363	446	infoarea = createTextPane();
	447	+ doc = infoarea.getStyledDocument();
	448	+
364	449	infoarea.setEditable(true);
365	450	SetText();
	451	+
366	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	453	// infoarea.setOpaque(false);
368	454	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	455	+// TEXTAREA infoarea.setLineWrap(true);
	456	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
373		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
374	460	//infoPanel.setLayout(new BorderLayout());
375	461	//infoPanel.add(createTextPane());
376	462
..	..	@@ -378,16 +464,23 @@
378	464	mainPanel.setName("Main");
379	465	mainPanel.setContinuousLayout(true);
380	466	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	467	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	468	+ mainPanel.setDividerLocation(0.5); //1.0);
	469	+ mainPanel.setResizeWeight(0.5);
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
385	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	479	//mainPanel.setLayout(new GridBagLayout());
387	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	481	+// treePanel.setLayout(new GridBagLayout());
	482	+ //ctrlPanel.setLayout(new GridBagLayout());
	483	+ //materialPanel.setLayout(new GridBagLayout());
391	484
392	485	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	486	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +519,7 @@
426	519	static String newline = "\n";
427	520	protected static final String buttonString = "JButton";
428	521	StyledDocument doc;
429		- JTextArea infoarea;
	522	+ JTextPane infoarea;
430	523
431	524	void ClearInfo()
432	525	{
..	..	@@ -449,10 +542,10 @@
449	542	e.printStackTrace();
450	543	}
451	544
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();
	545	+// String selection = infoarea.getText();
	546	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	547	+// java.awt.datatransfer.Clipboard clipboard =
	548	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	549	//clipboard.setContents(data, data);
457	550	}
458	551
..	..	@@ -475,13 +568,13 @@
475	568	//SendInfo("Name:", "bold");
476	569	if (sel.GetTextures() != null \|\| debug)
477	570	{
478		- si.SendInfo(sel.toString(), "bold");
	571	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	572	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	573	if (sel.Size() > 0)
481	574	{
482	575	si.SendInfo("#children = " + sel.Size(), "regular");
483	576	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	577	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	578	if (debug)
486	579	{
487	580	try
..	..	@@ -493,7 +586,10 @@
493	586	}
494	587
495	588	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	589	+ {
	590	+ si.SendInfo(" BBox min: " + minima, "regular");
	591	+ si.SendInfo(" BBox max: " + maxima, "regular");
	592	+ }
497	593
498	594	if (sel.bRep != null)
499	595	{
..	..	@@ -520,7 +616,7 @@
520	616	}
521	617	if (sel.support != null)
522	618	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	619	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	620	}
525	621	if (sel.scriptnode != null)
526	622	{
..	..	@@ -591,6 +687,9 @@
591	687	{
592	688	CameraPane.pointflow = (PointFlow) sel;
593	689	}
	690	+
	691	+ si.SendInfo("_____________________", "regular");
	692	+ si.SendInfo("", "regular");
594	693	}
595	694	}
596	695
..	..	@@ -606,68 +705,191 @@
606	705	}
607	706	}
608	707
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	710	+
	711	+ Rectangle keeprect;
	712	+ cRadio radio;
	713	+
	714	+cButton keepButton;
	715	+ cButton twoButton; // Full 3D
	716	+ cButton sixButton;
	717	+ cButton threeButton;
	718	+ cButton sevenButton;
	719	+ cButton fourButton; // full panel
	720	+ cButton oneButton; // full XYZ
	721	+ //cButton currentLayout;
	722	+
	723	+ boolean maximized;
	724	+
	725	+ cButton fullscreenLayout;
	726	+
	727	+ void Minimize()
	728	+ {
	729	+ frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
	731	+ }
	732	+
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	736	+ void Maximize()
	737	+ {
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
	743	+ if (maximized)
	744	+ {
	745	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+ }
	747	+ else
	748	+ {
	749	+ keeprect = frame.getBounds();
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	753	+// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	755	+ }
	756	+
	757	+ maximized ^= true;
	758	+
	759	+ frame.validate();
	760	+ }
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
	765	+
609	766	void ToggleFullScreen()
610	767	{
611		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
612	773	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	774	+ device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
	780	+ //frame.setVisible(false);
	781	+// frame.removeNotify();
	782	+// frame.setUndecorated(false);
	783	+// frame.addNotify();
	784	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	785	+
	786	+// X frame.getContentPane().remove(/"Center",/bigThree);
	787	+// X framePanel.add(bigThree);
	788	+// X frame.getContentPane().add(/"Center",/framePanel);
	789	+ framePanel.setDividerLocation(46);
	790	+
	791	+ //frame.setVisible(true);
	792	+ radio.layout = keepButton;
	793	+ //theFrame = null;
	794	+ keepButton = null;
	795	+ radio.layout.doClick();
	796	+
616	797	} else
617	798	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	799	+ keepButton = radio.layout;
	800	+ //keeprect = frame.getBounds();
	801	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	802	+// frame.getToolkit().getScreenSize().height);
	803	+ //frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
	807	+ device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
	810	+// frame.removeNotify();
	811	+// frame.setUndecorated(true);
	812	+// frame.addNotify();
	813	+// X frame.getContentPane().remove(/"Center",/framePanel);
	814	+// X framePanel.remove(bigThree);
	815	+// X frame.getContentPane().add(/"Center",/bigThree);
	816	+ framePanel.setDividerLocation(0);
	817	+
	818	+ radio.layout = fullscreenLayout;
	819	+ radio.layout.doClick();
	820	+ //frame.setVisible(true);
621	821	}
622		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
623	823	}
624	824
625		- private JTextArea createTextPane()
	825	+ private byte[] CompressCopy()
626	826	{
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		- };
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
642	846
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	847	+ private JTextPane createTextPane()
	848	+ {
	849	+// TEXTAREA String[] initString =
	850	+// {
	851	+// "This is an editable JTextPane, ", //regular
	852	+// "another ", //italic
	853	+// "styled ", //bold
	854	+// "text ", //small
	855	+// "component, ", //large
	856	+// "which supports embedded components..." + newline,//regular
	857	+// " " + newline, //button
	858	+// "...and embedded icons..." + newline, //regular
	859	+// " ", //icon
	860	+// newline + "JTextPane is a subclass of JEditorPane that "
	861	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	862	+// + "cover methods for interacting with those objects."
	863	+// };
	864	+//
	865	+// String[] initStyles =
	866	+// {
	867	+// "regular", "italic", "bold", "small", "large",
	868	+// "regular", "button", "regular", "icon",
	869	+// "regular"
	870	+// };
	871	+//
	872	+// JTextPane textPane = new JTextPane();
	873	+// textPane.setEditable(true);
	874	+// /StyledDocument/ doc = textPane.getStyledDocument();
	875	+// addStylesToDocument(doc);
	876	+//
	877	+// try
	878	+// {
	879	+// for (int j = 0; j < 2; j++)
	880	+// {
	881	+// for (int i = 0; i < initString.length; i++)
	882	+// {
	883	+// doc.insertString(doc.getLength(), initString[i],
	884	+// doc.getStyle(initStyles[i]));
	885	+// }
	886	+// }
	887	+// } catch (BadLocationException ble)
	888	+// {
	889	+// System.err.println("Couldn't insert initial text into text pane.");
	890	+// }
649	891
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;
	892	+ return new JTextPane(); // textPane;
671	893	}
672	894
673	895	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +942,7 @@
720	942	protected static ImageIcon createImageIcon(String path,
721	943	String description)
722	944	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	945	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	946	if (imgURL != null)
725	947	{
726	948	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +974,7 @@
752	974	// NumberSlider vDivsField;
753	975	// JCheckBox endcaps;
754	976	JCheckBox liveCB;
	977	+ JCheckBox selectableCB;
755	978	JCheckBox hideCB;
756	979	JCheckBox link2masterCB;
757	980	JCheckBox markCB;
..	..	@@ -759,7 +982,12 @@
759	982	JCheckBox speedupCB;
760	983	JCheckBox rewindCB;
761	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
762	989	JComboBox texresMenu;
	990	+
763	991	JButton resetButton;
764	992	JButton stepButton;
765	993	JButton stepAllButton;
..	..	@@ -767,115 +995,87 @@
767	995	JButton slowerButton;
768	996	JButton fasterButton;
769	997	JButton remarkButton;
	998	+
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
	1002	+ cGridBag namePanel;
	1003	+ cGridBag setupPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
	1006	+ cGridBag pushPanel;
	1007	+ cGridBag fillPanel;
770	1008
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1009	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1010	{
773	1011	JCheckBox cb;
774	1012
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);
	1013	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1014	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1015
785	1016	return cb;
786	1017	}
787	1018
788		- cButton AddButton(ObjEditor oe, String label)
	1019	+ cButton AddButton(cGridBag panel, String label)
789	1020	{
790	1021	cButton cb;
791	1022
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);
	1023	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1024	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1025
802	1026	return cb;
803	1027	}
804	1028
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1029	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1030	{
807	1031	JComboBox combo;
808	1032
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;
	1033	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1034	combo.addActionListener(this);
813	1035
814	1036	return combo;
815	1037	}
816	1038
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1039	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1040	{
819		- NumberSlider combo;
	1041	+ cGridBag control = new cGridBag();
	1042	+
	1043	+ cNumberSlider combo;
820	1044
821	1045	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1046	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		-
	1047	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1048	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1049	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1050	+
	1051	+ panel.add(control);
	1052	+
	1053	+ return control;
841	1054	}
842	1055
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1056	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	1057	{
845		- NumberSlider combo;
	1058	+ cGridBag control = new cGridBag();
	1059	+
	1060	+ cNumberSlider combo;
846	1061
847	1062	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1063	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		-
	1064	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1065	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1066	combo.setInteger(current);
861	1067
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1068	+ panel.add(control);
	1069	+
	1070	+ return control;
867	1071	}
868	1072
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1073	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1074	{
871	1075	JTextArea text;
872	1076
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1077	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1078	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1079
880	1080	return text;
881	1081	}
..	..	@@ -905,9 +1105,16 @@
905	1105	objEditor.ctrlPanel.remove(j);
906	1106	}
907	1107
	1108	+ void Remove(cNumberSlider j)
	1109	+ {
	1110	+ j.removeChangeListener(this);
	1111	+ //objEditor.ctrlPanel.remove(j.label);
	1112	+ objEditor.ctrlPanel.remove(j);
	1113	+ }
	1114	+
908	1115	/*
909	1116	*/
910		- void Return() // ObjEditor oe)
	1117	+ void Return0() // ObjEditor oe)
911	1118	{
912	1119	aConstraints.gridy += 1;
913	1120	aConstraints.gridx = 0;
..	..	@@ -962,37 +1169,78 @@
962	1169
963	1170	void SetupUI2(ObjEditor oe)
964	1171	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1172	+ //SetupName(oe);
970	1173
971		- if (!GroupEditor.allparams)
	1174	+ namePanel = new cGridBag();
	1175	+
	1176	+ nameField = AddText(namePanel, copy.GetName());
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1178	+ oe.ctrlPanel.add(namePanel);
	1179	+
	1180	+ oe.ctrlPanel.Return();
	1181	+
	1182	+ if (!allparams)
972	1183	return;
973	1184
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1185	+ setupPanel = new cGridBag().setVertical(false);
	1186	+
	1187	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1188	+ liveCB.setToolTipText("Animate object");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
977	1191	// 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");
	1192	+
	1193	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1194	+ hideCB.setToolTipText("Hide object");
	1195	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1196	+ markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ setupPanel2 = new cGridBag().setVertical(false);
	1199	+
	1200	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1201	+ rewindCB.setToolTipText("Rewind animation");
	1202	+
	1203	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1204	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1205	+
	1206	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1207	+ link2masterCB.setToolTipText("Attach to support");
	1208	+
	1209	+ if (Globals.ADVANCED)
	1210	+ {
	1211	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1212	+ speedupCB.setToolTipText("Option motion capture");
	1213	+ }
	1214	+
	1215	+ oe.ctrlPanel.add(setupPanel);
	1216	+ oe.ctrlPanel.Return();
	1217	+ oe.ctrlPanel.add(setupPanel2);
	1218	+ oe.ctrlPanel.Return();
	1219	+
	1220	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1221	+
	1222	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1223	+ resetButton.setToolTipText("Jump to frame zero");
	1224	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1225	+ stepButton.setToolTipText("Step one frame");
984	1226	// resetAllButton = AddButton(oe, "Reset All");
985	1227	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1228	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1229	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1230	+ slowerButton.setToolTipText("Decrease animation speed");
	1231	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1232	+ fasterButton.setToolTipText("Increase animation speed");
	1233	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1234	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1235
992		- Return();
	1236	+ oe.ctrlPanel.add(objectCommandsPanel);
	1237	+ oe.ctrlPanel.Return();
993	1238
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1239	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1240	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1241	+ //Return();
	1242	+
	1243	+ oe.ctrlPanel.Return();
996	1244
997	1245	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1246	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1335,7 @@
1087	1335	oe.aConstraints.gridwidth = 1;
1088	1336	/**/
1089	1337	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1338	+ oe.ctrlPanel.Return();
1091	1339
1092	1340	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1341	//textureButton.setEnabled(false);
..	..	@@ -1191,8 +1439,11 @@
1191	1439	//worldPanel.setName("World");
1192	1440	centralPanel = new cGridBag();
1193	1441	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1442	+
	1443	+ if (Globals.ADVANCED)
	1444	+ {
	1445	+ timelinePanel = new JPanel(new BorderLayout());
	1446	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1447
1197	1448	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1449	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1452,10 @@
1201	1452	// cameraPanel.setDividerSize(9);
1202	1453	cameraPanel.setResizeWeight(1.0);
1203	1454
	1455	+ }
	1456	+
1204	1457	centralPanel.add(cameraView);
	1458	+ centralPanel.setFocusable(true);
1205	1459	//frame.setJMenuBar(timelineMenubar);
1206	1460	//centralPanel.add(timelinePanel);
1207	1461
..	..	@@ -1227,6 +1481,7 @@
1227	1481	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1482	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1483	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1484	+ //XYZPanel.setName("XYZ");
1230	1485
1231	1486	/*
1232	1487	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,11 +1519,23 @@
1264	1519	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1520	//tmp.setName("Edit");
1266	1521	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);
	1522	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1523	+// JPanel north = new JPanel(new BorderLayout());
	1524	+// north.setName("Edit");
	1525	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1526	+// objectPanel.add(north);
	1527	+ objectPanel.add(editPanel);
	1528	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1529	+
	1530	+ //if (Globals.ADVANCED)
	1531	+ objectPanel.add(infoPanel);
	1532	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1533	+
	1534	+ objectPanel.add(XYZPanel);
	1535	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1536	+
	1537	+ objectPanel.add(toolboxPanel);
	1538	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1272	1539
1273	1540	/*
1274	1541	aConstraints.gridx = 0;
..	..	@@ -1277,7 +1544,7 @@
1277	1544	aConstraints.gridy += 1;
1278	1545	aConstraints.gridwidth = 1;
1279	1546	mainPanel.add(objectPanel, aConstraints);
1280		- */
	1547	+ */
1281	1548
1282	1549	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1283	1550	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1289,21 +1556,21 @@
1289	1556	scrollpane.addMouseWheelListener(this); // Default not fast enough
1290	1557
1291	1558	/JTabbedPane/ scenePanel = new cGridBag();
1292		- scenePanel.preferredWidth = 7;
	1559	+ scenePanel.preferredWidth = 5;
1293	1560
1294	1561	JTabbedPane tabbedPane = new JTabbedPane();
1295	1562	tabbedPane.add(scrollpane);
1296	1563
1297		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1298		-
1299		- optionsPanel = new JPanel(new GridBagLayout());
	1564	+ optionsPanel = new cGridBag().setVertical(false);
1300	1565
1301	1566	optionsPanel.setName("Options");
1302	1567
1303		- AddOptions(optionsPanel, aConstraints);
	1568	+ AddOptions(optionsPanel); //, aConstraints);
1304	1569
1305	1570	tabbedPane.add(optionsPanel);
1306	1571
	1572	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1573	+
1307	1574	scenePanel.add(tabbedPane);
1308	1575
1309	1576	/*
..	..	@@ -1367,7 +1634,7 @@
1367	1634	bigThree = new cGridBag();
1368	1635	bigThree.addComponent(scenePanel);
1369	1636	bigThree.addComponent(centralPanel);
1370		- bigThree.addComponent(XYZPanel);
	1637	+ //bigThree.addComponent(XYZPanel);
1371	1638
1372	1639	// // SIDE EFFECT!!!
1373	1640	// aConstraints.gridx = 0;
..	..	@@ -1376,9 +1643,9 @@
1376	1643	// aConstraints.gridheight = 1;
1377	1644
1378	1645	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1379		- framePanel.setContinuousLayout(true);
1380		- framePanel.setOneTouchExpandable(true);
1381		- framePanel.setDividerLocation(0.8);
	1646	+ framePanel.setContinuousLayout(false);
	1647	+ framePanel.setOneTouchExpandable(false);
	1648	+ //.setDividerLocation(0.8);
1382	1649	//framePanel.setDividerSize(15);
1383	1650	//framePanel.setResizeWeight(0.15);
1384	1651	framePanel.setName("Frame");
..	..	@@ -1395,10 +1662,15 @@
1395	1662
1396	1663	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1397	1664
1398		- frame.setSize(1024, 768);
1399		- frame.show();
1400		-
	1665	+ frame.setSize(1280, 860);
	1666	+
	1667	+ cameraView.requestFocusInWindow();
	1668	+
1401	1669	gridPanel.setDividerLocation(1.0);
	1670	+
	1671	+ frame.validate();
	1672	+
	1673	+ frame.setVisible(true);
1402	1674
1403	1675	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1404	1676	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1411,7 +1683,7 @@
1411	1683	});
1412	1684	}
1413	1685
1414		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1686	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1415	1687	{
1416	1688	}
1417	1689
..	..	@@ -1426,260 +1698,161 @@
1426	1698	ctrlPanel.removeAll();
1427	1699	}
1428	1700
1429		- void SetupMaterial(JPanel ctrlPanel)
	1701	+ void SetupMaterial(cGridBag panel)
1430	1702	{
1431		- aConstraints.weighty = 0;
1432		- //aConstraints.weightx = 1;
1433		- /*
	1703	+ /*
1434	1704	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1435	1705	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1436		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1437		- aConstraints.gridx += 1;
1438	1706	*/
1439	1707
1440		- aConstraints.gridwidth = 1;
1441		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	1708	+ cGridBag editBar = new cGridBag().setVertical(false);
	1709	+
	1710	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1711	+ createMaterialButton.setToolTipText("Create material");
1445	1712
1446	1713	/*
1447	1714	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1448		- aConstraints.gridx += 1;
1449		- aConstraints.weighty = 0;
1450		- aConstraints.gridwidth = 1;
1451	1715	*/
1452	1716
1453		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1454		- aConstraints.gridx += 1;
	1717	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1718	+ clearMaterialButton.setToolTipText("Clear material");
	1719	+
	1720	+ if (Globals.ADVANCED)
	1721	+ {
	1722	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1723	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1724	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1725	+ }
1455	1726
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;
	1727	+ editBar.preferredHeight = 15;
	1728	+
	1729	+ panel.add(editBar);
	1730	+
1470	1731	/**/
1471	1732	//aConstraints.weighty = 0;
1472	1733	////aConstraints.weightx = 1;
1473	1734	//aConstraints.weighty = 1;
1474	1735	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1475	1736	//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;
	1737	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1481	1738
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;
	1739	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1740	+
	1741	+ cGridBag color = new cGridBag();
	1742	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1743	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1744	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1745	+ //colorField.preferredWidth = 200;
	1746	+ colorSection.add(color);
1492	1747
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;
	1748	+ cGridBag modulation = new cGridBag();
	1749	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1750	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1751	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1752	+ colorSection.add(modulation);
1502	1753
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;
	1754	+ cGridBag texture = new cGridBag();
	1755	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1756	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1757	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1758	+ colorSection.add(texture);
1512	1759
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;
	1760	+ panel.add(new JSeparator());
	1761	+
	1762	+ panel.add(colorSection);
	1763	+
	1764	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1765	+
	1766	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1767	+
	1768	+ cGridBag diffuse = new cGridBag();
	1769	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1770	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1771	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1772	+ diffuseSection.add(diffuse);
1522	1773
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;
	1774	+ cGridBag diffuseness = new cGridBag();
	1775	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1776	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1777	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1778	+ diffuseSection.add(diffuseness);
1532	1779
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;
	1780	+ cGridBag selfshadow = new cGridBag();
	1781	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1782	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1783	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1784	+ diffuseSection.add(selfshadow);
1542	1785
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;
	1786	+ cGridBag sheen = new cGridBag();
	1787	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1788	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1789	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1790	+ diffuseSection.add(sheen);
1551	1791
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;
	1792	+ cGridBag subsurface = new cGridBag();
	1793	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1794	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1795	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1796	+ diffuseSection.add(subsurface);
1561	1797
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;
	1798	+ cGridBag shadow = new cGridBag();
	1799	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1800	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1801	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1802	+ diffuseSection.add(shadow);
1571	1803
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;
	1804	+ cGridBag fakedepth = new cGridBag();
	1805	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1806	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1807	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1808	+ diffuseSection.add(fakedepth);
1581	1809
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;
	1810	+ cGridBag shadowbias = new cGridBag();
	1811	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1812	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1813	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1814	+ diffuseSection.add(shadowbias);
1591	1815
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;
	1816	+ panel.add(new JSeparator());
	1817	+
	1818	+ panel.add(diffuseSection);
	1819	+
	1820	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1821	+
	1822	+ cGridBag specularSection = new cGridBag().setVertical(true);
1601	1823
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;
	1824	+ cGridBag specular = new cGridBag();
	1825	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1826	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1827	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1828	+ specularSection.add(specular);
1611	1829
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;
	1830	+ cGridBag lightarea = new cGridBag();
	1831	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1832	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1833	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1834	+ specularSection.add(lightarea);
1621	1835
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;
	1836	+ cGridBag shininess = new cGridBag();
	1837	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1838	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1840	+ specularSection.add(shininess);
1630	1841
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;
	1842	+ cGridBag metalness = new cGridBag();
	1843	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1844	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1845	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1846	+ specularSection.add(metalness);
1640	1847
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;
	1848	+ cGridBag velvet = new cGridBag();
	1849	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1850	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1851	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1852	+ specularSection.add(velvet);
1650	1853
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();
	1854	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1855	+ //Return();
1683	1856	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1684	1857	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685	1858	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1690,130 +1863,105 @@
1690	1863	// aConstraints.gridy += 1;
1691	1864	// aConstraints.gridwidth = 1;
1692	1865
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;
	1866	+ cGridBag anisoU = new cGridBag();
	1867	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1868	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1870	+ specularSection.add(anisoU);
1701	1871
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;
	1872	+ cGridBag anisoV = new cGridBag();
	1873	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1874	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1876	+ specularSection.add(anisoV);
1711	1877
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	1878
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;
	1879	+ panel.add(new JSeparator());
	1880	+
	1881	+ panel.add(specularSection);
	1882	+
	1883	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1884	+
	1885	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1731	1886
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;
	1887	+ cGridBag camera = new cGridBag();
	1888	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1889	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1890	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1891	+ colorSection.add(camera);
1742	1892
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;
	1893	+ cGridBag ambient = new cGridBag();
	1894	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1895	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1896	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1897	+ colorSection.add(ambient);
1752	1898
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;
	1899	+ cGridBag backlit = new cGridBag();
	1900	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1901	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1902	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1903	+ colorSection.add(backlit);
1762	1904
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;
	1905	+ cGridBag opacity = new cGridBag();
	1906	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1907	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1908	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1909	+ colorSection.add(opacity);
1772	1910
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;
	1911	+ //panel.add(new JSeparator());
	1912	+
	1913	+ //panel.add(globalSection);
	1914	+
	1915	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1916	+
	1917	+ cGridBag textureSection = new cGridBag().setVertical(true);
1782	1918
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;
	1919	+ cGridBag bump = new cGridBag();
	1920	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1921	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1922	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1923	+ textureSection.add(bump);
1792	1924
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;
	1925	+ cGridBag noise = new cGridBag();
	1926	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1927	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1928	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1929	+ textureSection.add(noise);
1802	1930
1803		- //aConstraints.weighty = 1;
1804		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1805		- //aConstraints.gridx += 1;
1806		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1807		- aConstraints.weighty = 0;
	1931	+ cGridBag power = new cGridBag();
	1932	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1933	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1934	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1935	+ textureSection.add(power);
1808	1936
1809		- aConstraints.gridx = 0;
1810		- aConstraints.gridy = 0;
1811		- aConstraints.gridwidth = 1;
	1937	+ cGridBag borderfade = new cGridBag();
	1938	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1939	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1940	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1941	+ textureSection.add(borderfade);
	1942	+
	1943	+ cGridBag fog = new cGridBag();
	1944	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1945	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1946	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1947	+ textureSection.add(fog);
	1948	+
	1949	+ cGridBag opacityPower = new cGridBag();
	1950	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1951	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1952	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1953	+ textureSection.add(opacityPower);
	1954	+
	1955	+ panel.add(new JSeparator());
	1956	+
	1957	+ panel.add(textureSection);
	1958	+
	1959	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812	1960
1813	1961	SetMaterial(copy); // .GetMaterial());
1814	1962
1815		- colorField.addChangeListener(this);
1816		- modulationField.addChangeListener(this);
	1963	+ //colorField.addChangeListener(this);
	1964	+// modulationField.addChangeListener(this);
1817	1965	metalnessField.addChangeListener(this);
1818	1966	diffuseField.addChangeListener(this);
1819	1967	specularField.addChangeListener(this);
..	..	@@ -1843,12 +1991,15 @@
1843	1991	opacityPowerField.addChangeListener(this);
1844	1992	/**/
1845	1993
1846		- resetSlidersButton.addActionListener(this);
1847	1994	clearMaterialButton.addActionListener(this);
1848	1995	createMaterialButton.addActionListener(this);
1849		-
1850		- propagateToggle.addItemListener(this);
1851		- multiplyToggle.addItemListener(this);
	1996	+
	1997	+ if (Globals.ADVANCED)
	1998	+ {
	1999	+ resetSlidersButton.addActionListener(this);
	2000	+ propagateToggle.addItemListener(this);
	2001	+ multiplyToggle.addItemListener(this);
	2002	+ }
1852	2003	}
1853	2004
1854	2005	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1866,8 +2017,9 @@
1866	2017	// 3D models
1867	2018	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1868	2019	{
1869		- lastConverter = new com.jmex.model.converters.MaxToJme();
1870		- LoadFile(filename, lastConverter);
	2020	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2021	+ //LoadFile(filename, lastConverter);
	2022	+ LoadObjFile(filename); // New 3ds loader
1871	2023	continue;
1872	2024	}
1873	2025	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2019,7 +2171,7 @@
2019	2171
2020	2172	//? flashIt = false;
2021	2173	CameraPane pane = (CameraPane) cameraView;
2022		- pane.clickStart(location.x, location.y, 0);
	2174	+ pane.clickStart(location.x, location.y, 0, 0);
2023	2175	pane.clickEnd(location.x, location.y, 0, true);
2024	2176
2025	2177	if (group.selection.size() == 1)
..	..	@@ -2068,6 +2220,7 @@
2068	2220	e2.printStackTrace();
2069	2221	}
2070	2222	}
	2223	+
2071	2224	LoadJMEThread loadThread;
2072	2225
2073	2226	class LoadJMEThread extends Thread
..	..	@@ -2125,6 +2278,7 @@
2125	2278	//LoadFile0(filename, converter);
2126	2279	}
2127	2280	}
	2281	+
2128	2282	LoadOBJThread loadObjThread;
2129	2283
2130	2284	class LoadOBJThread extends Thread
..	..	@@ -2203,19 +2357,19 @@
2203	2357
2204	2358	void LoadObjFile(String fullname)
2205	2359	{
2206		- /*
	2360	+ System.out.println("Loading " + fullname);
	2361	+ /**/
2207	2362	//lastFilename = fullname;
2208	2363	if(loadObjThread == null)
2209	2364	{
2210		- loadObjThread = new LoadOBJThread();
2211		- loadObjThread.start();
	2365	+ loadObjThread = new LoadOBJThread();
	2366	+ loadObjThread.start();
2212	2367	}
2213	2368
2214	2369	loadObjThread.add(fullname);
2215		- */
	2370	+ /**/
2216	2371
2217		- System.out.println("Loading " + fullname);
2218		- makeSomething(new FileObject(fullname, true), true);
	2372	+ //makeSomething(new FileObject(fullname, true), true);
2219	2373	}
2220	2374
2221	2375	void LoadGFDFile(String fullname)
..	..	@@ -2476,11 +2630,11 @@
2476	2630
2477	2631	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2478	2632	{
2479		- if (GrafreeD.standAlone)
	2633	+ if (Grafreed.standAlone)
2480	2634	{
2481	2635	/**/
2482	2636	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2483		- browser.show();
	2637	+ browser.setVisible(true);
2484	2638	String filename = browser.getFile();
2485	2639	if (filename != null && filename.length() > 0)
2486	2640	{
..	..	@@ -2591,6 +2745,7 @@
2591	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2592	2746	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2593	2747	}
	2748	+
2594	2749	//cJME.count++;
2595	2750	//cJME.count %= 12;
2596	2751	if (gc)
..	..	@@ -2625,6 +2780,7 @@
2625	2780	}
2626	2781	if (input == null)
2627	2782	{
	2783	+ new Exception().printStackTrace();
2628	2784	System.exit(0);
2629	2785	}
2630	2786
..	..	@@ -2773,6 +2929,7 @@
2773	2929	}
2774	2930	}
2775	2931	}
	2932	+
2776	2933	cFileSystemPane FSPane;
2777	2934
2778	2935	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2826,11 +2983,14 @@
2826	2983	}
2827	2984	}
2828	2985	}
	2986	+
2829	2987	freezematerial = false;
2830	2988	}
2831	2989
2832	2990	void SetMaterial(Object3D object)
2833	2991	{
	2992	+ latestObject = object;
	2993	+
2834	2994	cMaterial mat = object.material;
2835	2995
2836	2996	if (mat == null)
..	..	@@ -2839,7 +2999,8 @@
2839	2999	return;
2840	3000	}
2841	3001
2842		- multiplyToggle.setSelected(mat.multiply);
	3002	+ if (multiplyToggle != null)
	3003	+ multiplyToggle.setSelected(mat.multiply);
2843	3004
2844	3005	assert (object.projectedVertices != null);
2845	3006
..	..	@@ -2941,12 +3102,17 @@
2941	3102	// }
2942	3103
2943	3104	/**/
2944		- if (deselect)
	3105	+ if (deselect \|\| child == null)
2945	3106	{
2946	3107	//group.deselectAll();
2947	3108	//freeze = true;
2948	3109	GetTree().clearSelection();
2949	3110	//freeze = false;
	3111	+
	3112	+ if (child == null)
	3113	+ {
	3114	+ return;
	3115	+ }
2950	3116	}
2951	3117
2952	3118	//group.addSelectee(child);
..	..	@@ -3015,7 +3181,7 @@
3015	3181	cameraView.ToggleDL();
3016	3182	cameraView.repaint();
3017	3183	return;
3018		- } else if (event.getSource() == toggleTextureItem)
	3184	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3019	3185	{
3020	3186	cameraView.ToggleTexture();
3021	3187	// june 2013 copy.HardTouch();
..	..	@@ -3054,9 +3220,9 @@
3054	3220	frame.validate();
3055	3221
3056	3222	return;
3057		- } else if (event.getSource() == toggleRandomItem)
	3223	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3058	3224	{
3059		- cameraView.ToggleRandom();
	3225	+ cameraView.ToggleSwitch();
3060	3226	cameraView.repaint();
3061	3227	return;
3062	3228	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3085,6 +3251,10 @@
3085	3251	{
3086	3252	copy.live ^= true;
3087	3253	return;
	3254	+ } else if (event.getSource() == selectableCB)
	3255	+ {
	3256	+ copy.dontselect ^= true;
	3257	+ return;
3088	3258	} else if (event.getSource() == hideCB)
3089	3259	{
3090	3260	copy.hide ^= true;
..	..	@@ -3099,6 +3269,7 @@
3099	3269	if (event.getSource() == randomCB)
3100	3270	{
3101	3271	copy.random ^= true;
	3272	+ objEditor.refreshContents();
3102	3273	return;
3103	3274	}
3104	3275	if (event.getSource() == speedupCB)
..	..	@@ -3122,8 +3293,9 @@
3122	3293
3123	3294	public void actionPerformed(ActionEvent event)
3124	3295	{
	3296	+ Object source = event.getSource();
3125	3297	// SCRIPT DIALOG
3126		- if (event.getSource() == okbutton)
	3298	+ if (source == okbutton)
3127	3299	{
3128	3300	textpanel.setVisible(false);
3129	3301	textpanel.remove(textarea);
..	..	@@ -3135,7 +3307,7 @@
3135	3307	textarea = null;
3136	3308	textpanel = null;
3137	3309	}
3138		- if (event.getSource() == cancelbutton)
	3310	+ if (source == cancelbutton)
3139	3311	{
3140	3312	textpanel.setVisible(false);
3141	3313	textpanel.remove(textarea);
..	..	@@ -3147,50 +3319,50 @@
3147	3319	//applySelf();
3148	3320	//client.refreshEditWindow();
3149	3321	//refreshContents();
3150		- if (event.getSource() == nameField)
	3322	+ if (source == nameField)
3151	3323	{
3152	3324	//System.out.println("ObjEditor " + event);
3153	3325	applySelf0(true);
3154	3326	//parent.applySelf();
3155	3327	objEditor.refreshContents();
3156		- } else if (event.getSource() == resetButton)
	3328	+ } else if (source == resetButton)
3157	3329	{
3158	3330	CameraPane.fullreset = true;
3159	3331	copy.Reset(); // ResetMeshes();
3160	3332	copy.Touch();
3161	3333	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepItem)
	3334	+ } else if (source == stepItem)
3163	3335	{
3164	3336	//cameraView.ONESTEP = true;
3165	3337	Globals.ONESTEP = true;
3166	3338	cameraView.repaint();
3167	3339	return;
3168		- } else if (event.getSource() == stepButton)
	3340	+ } else if (source == stepButton)
3169	3341	{
3170	3342	copy.Step();
3171	3343	copy.Touch();
3172	3344	objEditor.refreshContents();
3173		- } else if (event.getSource() == slowerButton)
	3345	+ } else if (source == slowerButton)
3174	3346	{
3175	3347	copy.Slower();
3176	3348	copy.Touch();
3177	3349	objEditor.refreshContents();
3178		- } else if (event.getSource() == fasterButton)
	3350	+ } else if (source == fasterButton)
3179	3351	{
3180	3352	copy.Faster();
3181	3353	copy.Touch();
3182	3354	objEditor.refreshContents();
3183		- } else if (event.getSource() == remarkButton)
	3355	+ } else if (source == remarkButton)
3184	3356	{
3185	3357	copy.Remark();
3186	3358	copy.Touch();
3187	3359	objEditor.refreshContents();
3188		- } else if (event.getSource() == stepAllButton)
	3360	+ } else if (source == stepAllButton)
3189	3361	{
3190	3362	copy.StepAll();
3191	3363	copy.Touch();
3192	3364	objEditor.refreshContents();
3193		- } else if (event.getSource() == resetAllButton)
	3365	+ } else if (source == resetAllButton)
3194	3366	{
3195	3367	//CameraPane.fullreset = true;
3196	3368	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3223,53 +3395,79 @@
3223	3395	// Close();
3224	3396	// }
3225	3397	// else
3226		- if (event.getSource() == resetSlidersButton)
	3398	+ if (source == resetSlidersButton)
3227	3399	{
3228	3400	ResetSliders();
3229		- } else if (event.getSource() == clearMaterialButton)
	3401	+ } else if (source == clearMaterialButton)
3230	3402	{
3231	3403	ClearMaterial();
3232		- } else if (event.getSource() == createMaterialButton)
	3404	+ } else if (source == createMaterialButton)
3233	3405	{
3234	3406	CreateMaterial();
3235		- } else if (event.getSource() == clearPanelButton)
	3407	+ } else if (source == clearPanelButton)
3236	3408	{
3237	3409	copy.ClearUI();
3238	3410	refreshContents(true);
3239		- } /*
3240		- }
3241		-
3242		- public boolean action(Event event, Object arg)
3243		- {
3244		- */ else if (event.getSource() == closeItem)
	3411	+ } else if (source == importGFDItem)
	3412	+ {
	3413	+ ImportGFD();
	3414	+ } else
	3415	+ if (source == importVRMLX3DItem)
	3416	+ {
	3417	+ ImportVRMLX3D();
	3418	+ } else
	3419	+ if (source == import3DSItem)
	3420	+ {
	3421	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3422	+ } else
	3423	+ if (source == importOBJItem)
	3424	+ {
	3425	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3426	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3427	+ browser.setVisible(true);
	3428	+ String filename = browser.getFile();
	3429	+ if (filename != null && filename.length() > 0)
	3430	+ {
	3431	+ String fullname = browser.getDirectory() + filename;
	3432	+ makeSomething(ReadOBJ(fullname), true);
	3433	+ }
	3434	+ } else
	3435	+ if (source == closeItem)
3245	3436	{
3246	3437	Close();
3247	3438	//return true;
3248		- } else if (event.getSource() == loadItem)
	3439	+ } else if (source == openItem)
3249	3440	{
3250		- load();
	3441	+ Open();
3251	3442	//return true;
3252		- } else if (event.getSource() == saveItem)
	3443	+ } else if (source == newItem)
	3444	+ {
	3445	+ New();
	3446	+ } else if (source == saveItem)
3253	3447	{
3254	3448	save();
3255	3449	//return true;
3256		- } else if (event.getSource() == saveAsItem)
	3450	+ } else if (source == saveAsItem)
3257	3451	{
3258	3452	saveAs();
3259	3453	//return true;
3260		- } else if (event.getSource() == reexportItem)
	3454	+ } else if (source == reexportItem)
3261	3455	{
3262	3456	reexport();
3263	3457	//return true;
3264		- } else if (event.getSource() == exportAsItem)
	3458	+ } else if (source == exportAsItem)
3265	3459	{
3266	3460	export();
3267	3461	//return true;
3268		- } else if (event.getSource() == povItem)
	3462	+ } else if (source == povItem)
3269	3463	{
3270	3464	generatePOV();
3271	3465	//return true;
3272		- } else if (event.getSource() == zBufferItem)
	3466	+ } else if (event.getSource() == archiveItem)
	3467	+ {
	3468	+ cTools.Archive(frame);
	3469	+ return;
	3470	+ } else if (source == zBufferItem)
3273	3471	{
3274	3472	try
3275	3473	{
..	..	@@ -3291,21 +3489,8 @@
3291	3489	cameraView.repaint();
3292	3490	//return true;
3293	3491	}
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)
	3492	+ */ else // combos...
	3493	+ if (source == texresMenu)
3309	3494	{
3310	3495	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3311	3496	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3317,12 +3502,409 @@
3317	3502	}
3318	3503	}
3319	3504
	3505	+ void New()
	3506	+ {
	3507	+ while (copy.Size() > 1)
	3508	+ {
	3509	+ copy.remove(1);
	3510	+ }
	3511	+
	3512	+ ResetModel();
	3513	+ objEditor.refreshContents();
	3514	+ }
	3515	+
	3516	+ static public byte[] Compress(Object3D o)
	3517	+ {
	3518	+ try
	3519	+ {
	3520	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3521	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3522	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3523	+
	3524	+ Object3D parent = o.parent;
	3525	+ o.parent = null;
	3526	+
	3527	+ out.writeObject(o);
	3528	+
	3529	+ o.parent = parent;
	3530	+
	3531	+ out.flush();
	3532	+
	3533	+ baos //zstream
	3534	+ .close();
	3535	+ out.close();
	3536	+
	3537	+ byte[] bytes = baos.toByteArray();
	3538	+
	3539	+ System.out.println("save #bytes = " + bytes.length);
	3540	+ return bytes;
	3541	+ } catch (Exception e)
	3542	+ {
	3543	+ System.err.println(e);
	3544	+ return null;
	3545	+ }
	3546	+ }
	3547	+
	3548	+ static public Object Uncompress(byte[] bytes)
	3549	+ {
	3550	+ System.out.println("restore #bytes = " + bytes.length);
	3551	+ try
	3552	+ {
	3553	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3554	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3555	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3556	+ Object obj = in.readObject();
	3557	+
	3558	+ bais //istream
	3559	+ .close();
	3560	+ in.close();
	3561	+
	3562	+ return obj;
	3563	+ } catch (Exception e)
	3564	+ {
	3565	+ System.err.println(e);
	3566	+ return null;
	3567	+ }
	3568	+ }
	3569	+
	3570	+ static public Object clone(Object o)
	3571	+ {
	3572	+ try
	3573	+ {
	3574	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3575	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3576	+
	3577	+ out.writeObject(o);
	3578	+
	3579	+ out.flush();
	3580	+ out.close();
	3581	+
	3582	+ byte[] bytes = baos.toByteArray();
	3583	+
	3584	+ System.out.println("clone = " + bytes.length);
	3585	+
	3586	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3587	+ ObjectInputStream in = new ObjectInputStream(bais);
	3588	+ Object obj = in.readObject();
	3589	+ in.close();
	3590	+
	3591	+ return obj;
	3592	+ } catch (Exception e)
	3593	+ {
	3594	+ System.err.println(e);
	3595	+ return null;
	3596	+ }
	3597	+ }
	3598	+
	3599	+ cRadio GetCurrentTab()
	3600	+ {
	3601	+ cRadio ab;
	3602	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3603	+ {
	3604	+ ab = (cRadio)e.nextElement();
	3605	+ if(ab.GetObject() == copy)
	3606	+ {
	3607	+ return ab;
	3608	+ }
	3609	+ }
	3610	+
	3611	+ return null;
	3612	+ }
	3613	+
	3614	+
	3615	+ public void Save()
	3616	+ {
	3617	+ //Save(true);
	3618	+ Replace();
	3619	+ }
	3620	+
	3621	+ private boolean Equal(byte[] compress, byte[] name)
	3622	+ {
	3623	+ if (compress.length != name.length)
	3624	+ {
	3625	+ return false;
	3626	+ }
	3627	+
	3628	+ for (int i=compress.length; --i>=0;)
	3629	+ {
	3630	+ if (compress[i] != name[i])
	3631	+ return false;
	3632	+ }
	3633	+
	3634	+ return true;
	3635	+ }
	3636	+
	3637	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3638	+
	3639	+ public boolean Save(boolean user)
	3640	+ {
	3641	+ System.err.println("Save");
	3642	+
	3643	+ cRadio tab = GetCurrentTab();
	3644	+
	3645	+ byte[] compress = CompressCopy();
	3646	+
	3647	+ boolean thesame = false;
	3648	+
	3649	+ // Quick heuristic using length. Works only when stream is compressed.
	3650	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3651	+ {
	3652	+ thesame = true;
	3653	+ }
	3654	+
	3655	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3656	+ if (!thesame)
	3657	+ {
	3658	+ //tab.user[tab.versionindex] = user;
	3659	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3660	+
	3661	+ copy.versions[++copy.versionindex] = compress;
	3662	+
	3663	+ // if (increment)
	3664	+ // tab.versionindex++;
	3665	+ }
	3666	+
	3667	+ //copy.RestoreBigData(versiontable);
	3668	+
	3669	+ //assert(hashtable.isEmpty());
	3670	+
	3671	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3672	+ {
	3673	+ //tab.user[i] = false;
	3674	+ copy.versions[i] = null;
	3675	+ }
	3676	+
	3677	+ SetUndoStates();
	3678	+
	3679	+ // test save
	3680	+ if (false)
	3681	+ {
	3682	+ try
	3683	+ {
	3684	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3685	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3686	+
	3687	+ p.writeObject(copy);
	3688	+
	3689	+ p.flush();
	3690	+
	3691	+ ostream.close();
	3692	+ } catch (Exception e)
	3693	+ {
	3694	+ e.printStackTrace();
	3695	+ }
	3696	+ }
	3697	+
	3698	+ return !thesame;
	3699	+ }
	3700	+
	3701	+ void CopyChanged(Object3D obj)
	3702	+ {
	3703	+ SetUndoStates();
	3704	+
	3705	+ boolean temp = CameraPane.SWITCH;
	3706	+ CameraPane.SWITCH = false;
	3707	+
	3708	+ copy.ExtractBigData(versiontable);
	3709	+
	3710	+ copy.clear();
	3711	+
	3712	+ for (int i=0; i<obj.Size(); i++)
	3713	+ {
	3714	+ copy.add(obj.get(i));
	3715	+ }
	3716	+
	3717	+ copy.RestoreBigData(versiontable);
	3718	+
	3719	+ CameraPane.SWITCH = temp;
	3720	+
	3721	+ //assert(hashtable.isEmpty());
	3722	+
	3723	+ copy.Touch();
	3724	+
	3725	+ ResetModel();
	3726	+ copy.HardTouch(); // recompile?
	3727	+
	3728	+ cRadio ab;
	3729	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3730	+ {
	3731	+ ab = (cRadio)e.nextElement();
	3732	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3733	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3734	+ if (test != null)
	3735	+ {
	3736	+ test.editWindow = ab.object.editWindow;
	3737	+ ab.object = test;
	3738	+ }
	3739	+ }
	3740	+
	3741	+ refreshContents();
	3742	+ }
	3743	+
	3744	+ cButton undoButton;
	3745	+ cButton restoreButton;
	3746	+ cButton replaceButton;
	3747	+ cButton redoButton;
	3748	+
	3749	+ boolean muteSlider;
	3750	+
	3751	+ int VersionCount()
	3752	+ {
	3753	+ int count = 0;
	3754	+
	3755	+ for (int i = copy.versions.length; --i >= 0;)
	3756	+ {
	3757	+ if (copy.versions[i] != null)
	3758	+ count++;
	3759	+ }
	3760	+
	3761	+ return count;
	3762	+ }
	3763	+
	3764	+ void SetUndoStates()
	3765	+ {
	3766	+ cRadio tab = GetCurrentTab();
	3767	+
	3768	+ restoreButton.setEnabled(copy.versionindex != -1);
	3769	+ replaceButton.setEnabled(copy.versionindex != -1);
	3770	+
	3771	+ undoButton.setEnabled(copy.versionindex > 0);
	3772	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3773	+
	3774	+ muteSlider = true;
	3775	+ versionSlider.setMaximum(VersionCount() - 1);
	3776	+ versionSlider.setInteger(copy.versionindex);
	3777	+ muteSlider = false;
	3778	+ }
	3779	+
	3780	+ public boolean Undo()
	3781	+ {
	3782	+ // Option?
	3783	+ Replace();
	3784	+
	3785	+ System.err.println("Undo");
	3786	+
	3787	+ cRadio tab = GetCurrentTab();
	3788	+
	3789	+ if (copy.versionindex == 0)
	3790	+ {
	3791	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3792	+ return false;
	3793	+ }
	3794	+
	3795	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3796	+// {
	3797	+// if (Save(false))
	3798	+// tab.versionindex -= 1;
	3799	+// else
	3800	+// {
	3801	+// if (tab.versionindex <= 0)
	3802	+// return false;
	3803	+// else
	3804	+// tab.versionindex -= 1;
	3805	+// }
	3806	+// }
	3807	+
	3808	+ copy.versionindex -= 1;
	3809	+
	3810	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3811	+
	3812	+ return true;
	3813	+ }
	3814	+
	3815	+ public boolean Restore()
	3816	+ {
	3817	+ System.err.println("Restore");
	3818	+
	3819	+ cRadio tab = GetCurrentTab();
	3820	+
	3821	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3822	+ {
	3823	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3824	+ return false;
	3825	+ }
	3826	+
	3827	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3828	+
	3829	+ return true;
	3830	+ }
	3831	+
	3832	+ public boolean Replace()
	3833	+ {
	3834	+ System.err.println("Replace");
	3835	+
	3836	+ cRadio tab = GetCurrentTab();
	3837	+
	3838	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3839	+ {
	3840	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3841	+ return false;
	3842	+ }
	3843	+
	3844	+ copy.versions[copy.versionindex] = CompressCopy();
	3845	+
	3846	+ return true;
	3847	+ }
	3848	+
	3849	+ public void Redo()
	3850	+ {
	3851	+ // Option?
	3852	+ Replace();
	3853	+
	3854	+ cRadio tab = GetCurrentTab();
	3855	+
	3856	+ if (copy.versions[copy.versionindex + 1] == null)
	3857	+ {
	3858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3859	+ return;
	3860	+ }
	3861	+
	3862	+ copy.versionindex += 1;
	3863	+
	3864	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3865	+
	3866	+ //if (!tab.user[tab.versionindex])
	3867	+ // tab.graphs[tab.versionindex] = null;
	3868	+ }
	3869	+
	3870	+ void ImportGFD()
	3871	+ {
	3872	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3873	+ browser.show();
	3874	+ String filename = browser.getFile();
	3875	+ if (filename != null && filename.length() > 0)
	3876	+ {
	3877	+ String fullname = browser.getDirectory() + filename;
	3878	+
	3879	+ //Object3D readobj =
	3880	+ objEditor.ReadGFD(fullname, objEditor);
	3881	+ //makeSomething(readobj);
	3882	+ }
	3883	+ }
	3884	+
	3885	+ void ImportVRMLX3D()
	3886	+ {
	3887	+ if (Grafreed.standAlone)
	3888	+ {
	3889	+ /**/
	3890	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3891	+ browser.show();
	3892	+ String filename = browser.getFile();
	3893	+ if (filename != null && filename.length() > 0)
	3894	+ {
	3895	+ String fullname = browser.getDirectory() + filename;
	3896	+ LoadVRMLX3D(fullname);
	3897	+ }
	3898	+ /**/
	3899	+ }
	3900	+ }
	3901	+
3320	3902	void ToggleAnimation()
3321	3903	{
3322	3904	if (!Globals.ANIMATION)
3323	3905	{
3324	3906	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3325		- browser.show();
	3907	+ browser.setVisible(true);
3326	3908	String filename = browser.getFile();
3327	3909	if (filename != null && filename.length() > 0)
3328	3910	{
..	..	@@ -3332,8 +3914,8 @@
3332	3914
3333	3915	Globals.ANIMATION ^= true;
3334	3916
3335		- GrafreeD.wav.cursor = 0;
3336		- GrafreeD.wav.loop = 0;
	3917	+ Grafreed.wav.cursor = 0;
	3918	+ Grafreed.wav.loop = 0;
3337	3919	}
3338	3920	} else
3339	3921	{
..	..	@@ -3383,7 +3965,7 @@
3383	3965	void CreateMaterial()
3384	3966	{
3385	3967	//copy.ClearMaterial(); // PATCH
3386		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3968	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3387	3969	if (copy.selection.size() > 0)
3388	3970	//SetMaterial(copy);
3389	3971	{
..	..	@@ -3434,7 +4016,7 @@
3434	4016	assert false;
3435	4017	}
3436	4018
3437		- void EditSelection()
	4019	+ void EditSelection(boolean newWindow)
3438	4020	{
3439	4021	}
3440	4022
..	..	@@ -3442,11 +4024,11 @@
3442	4024	{
3443	4025	copy.ResetBlockLoop(); // temporary problem
3444	4026
3445		- boolean random = CameraPane.RANDOM;
3446		- CameraPane.RANDOM = false; // parse everything
	4027	+ boolean random = CameraPane.SWITCH;
	4028	+ CameraPane.SWITCH = false; // parse everything
3447	4029	copy.ResetDisplayList();
3448	4030	copy.HardTouch();
3449		- CameraPane.RANDOM = random;
	4031	+ CameraPane.SWITCH = random;
3450	4032	}
3451	4033
3452	4034	// public void applySelf()
..	..	@@ -3516,10 +4098,40 @@
3516	4098	current.fakedepth = (float) fakedepthField.getFloat();
3517	4099	current.shadowbias = (float) shadowbiasField.getFloat();
3518	4100
3519		- if (!NumberSlider.frozen)
	4101	+ if (!cNumberSlider.frozen)
3520	4102	{
3521	4103	//System.out.println("Propagate = " + propagate);
3522	4104	copy.UpdateMaterial(anchor, current, propagate);
	4105	+
	4106	+ if (copy.material != null)
	4107	+ {
	4108	+ cMaterial mat = copy.material;
	4109	+
	4110	+ colorField.SetToolTipValue((mat.color));
	4111	+ modulationField.SetToolTipValue((mat.modulation));
	4112	+ metalnessField.SetToolTipValue((mat.metalness));
	4113	+ diffuseField.SetToolTipValue((mat.diffuse));
	4114	+ specularField.SetToolTipValue((mat.specular));
	4115	+ shininessField.SetToolTipValue((mat.shininess));
	4116	+ shiftField.SetToolTipValue((mat.shift));
	4117	+ ambientField.SetToolTipValue((mat.ambient));
	4118	+ lightareaField.SetToolTipValue((mat.lightarea));
	4119	+ diffusenessField.SetToolTipValue((mat.factor));
	4120	+ velvetField.SetToolTipValue((mat.velvet));
	4121	+ sheenField.SetToolTipValue((mat.sheen));
	4122	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4123	+ backlitField.SetToolTipValue((mat.bump));
	4124	+ anisoField.SetToolTipValue((mat.aniso));
	4125	+ anisoVField.SetToolTipValue((mat.anisoV));
	4126	+ cameraField.SetToolTipValue((mat.cameralight));
	4127	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4128	+ shadowField.SetToolTipValue((mat.shadow));
	4129	+ textureField.SetToolTipValue((mat.texture));
	4130	+ opacityField.SetToolTipValue((mat.opacity));
	4131	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4132	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4133	+ }
	4134	+
3523	4135	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3524	4136	{
3525	4137	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3548,9 +4160,25 @@
3548	4160	//copy.Touch();
3549	4161	}
3550	4162
	4163	+ cNumberSlider versionSlider;
	4164	+
3551	4165	public void stateChanged(ChangeEvent e)
3552	4166	{
3553	4167	// assert(false);
	4168	+ if (e.getSource() == versionSlider)
	4169	+ {
	4170	+ if (muteSlider)
	4171	+ return;
	4172	+
	4173	+ int version = versionSlider.getInteger();
	4174	+
	4175	+ if (copy.versions[version] != null)
	4176	+ {
	4177	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4178	+ }
	4179	+
	4180	+ return;
	4181	+ }
3554	4182
3555	4183	if (freezematerial)
3556	4184	{
..	..	@@ -3564,6 +4192,7 @@
3564	4192	\|\| e.getSource() == apertureField
3565	4193	\|\| e.getSource() == shadowblurField)
3566	4194	{
	4195	+ new Exception().printStackTrace();
3567	4196	System.exit(0);
3568	4197	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3569	4198	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3634,7 +4263,7 @@
3634	4263	}
3635	4264
3636	4265	if (normalpushField != null)
3637		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4266	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3638	4267	}
3639	4268
3640	4269	void SnapObject()
..	..	@@ -3889,7 +4518,7 @@
3889	4518
3890	4519	radioPanel.revalidate();
3891	4520	radioPanel.repaint();
3892		- ctrlPanel.revalidate(); // ? new
	4521	+ ctrlPanel.validate(); // ? new
3893	4522	ctrlPanel.repaint();
3894	4523	}
3895	4524	}
..	..	@@ -3898,6 +4527,8 @@
3898	4527
3899	4528	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3900	4529	{
	4530	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4531	+ Save();
3901	4532	//Tween.set(thing, 0).target(1).start(tweenManager);
3902	4533	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3903	4534	// if (thing instanceof GenericJointDemo)
..	..	@@ -3984,6 +4615,12 @@
3984	4615	{
3985	4616	ResetModel();
3986	4617	Select(thing.GetTreePath(), true, false); // unselect... false);
	4618	+
	4619	+ if (thing.Size() == 0)
	4620	+ {
	4621	+ //EditSelection(false);
	4622	+ }
	4623	+
3987	4624	refreshContents();
3988	4625	}
3989	4626
..	..	@@ -4101,6 +4738,7 @@
4101	4738	}
4102	4739	}
4103	4740	}
	4741	+
4104	4742	LoadGFDThread loadGFDThread;
4105	4743
4106	4744	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4120,8 +4758,10 @@
4120	4758
4121	4759	try
4122	4760	{
	4761	+ // Try compressed version first.
4123	4762	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4124		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4763	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4764	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4125	4765
4126	4766	readobj = (Object3D) p.readObject();
4127	4767	istream.close();
..	..	@@ -4129,7 +4769,20 @@
4129	4769	readobj.ResetDisplayList();
4130	4770	} catch (Exception e)
4131	4771	{
4132		- e.printStackTrace();
	4772	+ //e.printStackTrace();
	4773	+ try
	4774	+ {
	4775	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4776	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4777	+
	4778	+ readobj = (Object3D) p.readObject();
	4779	+ istream.close();
	4780	+
	4781	+ readobj.ResetDisplayList();
	4782	+ } catch (Exception e2)
	4783	+ {
	4784	+ e2.printStackTrace();
	4785	+ }
4133	4786	}
4134	4787	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4135	4788	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4175,6 +4828,12 @@
4175	4828
4176	4829	void LoadIt(Object obj)
4177	4830	{
	4831	+ if (obj == null)
	4832	+ {
	4833	+ // Invalid file
	4834	+ return;
	4835	+ }
	4836	+
4178	4837	System.out.println("Loaded " + obj);
4179	4838	//new Exception().printStackTrace();
4180	4839	Object3D readobj = (Object3D) obj;
..	..	@@ -4184,6 +4843,8 @@
4184	4843
4185	4844	if (readobj != null)
4186	4845	{
	4846	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4847	+ // Save();
4187	4848	try
4188	4849	{
4189	4850	//readobj.deepCopySelf(copy);
..	..	@@ -4238,15 +4899,26 @@
4238	4899	c.addChild(csg);
4239	4900	}
4240	4901
	4902	+ copy.versions = readobj.versions;
	4903	+ copy.versionindex = readobj.versionindex;
	4904	+
	4905	+ if (copy.versions == null)
	4906	+ {
	4907	+ copy.versions = new byte[100][];
	4908	+ copy.versionindex = -1;
	4909	+ }
	4910	+
	4911	+ //? SetUndoStates();
	4912	+
4241	4913	ResetModel();
4242	4914	copy.HardTouch(); // recompile?
4243	4915	refreshContents();
4244	4916	}
4245	4917	}
4246	4918
4247		- void load() // throws ClassNotFoundException
	4919	+ void Open() // throws ClassNotFoundException
4248	4920	{
4249		- if (GrafreeD.standAlone)
	4921	+ if (Grafreed.standAlone)
4250	4922	{
4251	4923	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4252	4924	browser.show();
..	..	@@ -4333,11 +5005,13 @@
4333	5005	try
4334	5006	{
4335	5007	FileOutputStream ostream = new FileOutputStream(lastname);
4336		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5008	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5009	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4337	5010
4338	5011	p.writeObject(copy);
4339	5012	p.flush();
4340	5013
	5014	+ zstream.close();
4341	5015	ostream.close();
4342	5016
4343	5017	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4347,17 +5021,20 @@
4347	5021	{
4348	5022	}
4349	5023	}
	5024	+
4350	5025	String lastname;
4351	5026
4352	5027	void saveAs()
4353	5028	{
4354		- if (GrafreeD.standAlone)
	5029	+ if (Grafreed.standAlone)
4355	5030	{
4356	5031	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4357	5032	browser.setVisible(true);
4358	5033	String filename = browser.getFile();
4359	5034	if (filename != null && filename.length() > 0)
4360	5035	{
	5036	+ if (!filename.endsWith(".gfd"))
	5037	+ filename += ".gfd";
4361	5038	lastname = browser.getDirectory() + filename;
4362	5039	save();
4363	5040	}
..	..	@@ -4456,13 +5133,13 @@
4456	5133	try
4457	5134	{
4458	5135	FileOutputStream ostream = new FileOutputStream(filename);
4459		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4460		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5136	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5137	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4461	5138
4462	5139	Object3D objectparent = obj.parent;
4463	5140	obj.parent = null;
4464	5141
4465		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5142	+ Object3D object = (Object3D) Grafreed.clone(obj);
4466	5143
4467	5144	obj.parent = objectparent;
4468	5145
..	..	@@ -4474,8 +5151,8 @@
4474	5151	p.writeObject(object);
4475	5152	p.flush();
4476	5153
	5154	+ zstream.close();
4477	5155	ostream.close();
4478		- // zstream.close();
4479	5156
4480	5157	// group.selection.get(0).parent = parent;
4481	5158	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4496,7 +5173,7 @@
4496	5173	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4497	5174	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4498	5175	copy.generatePOV(buffer);
4499		- if (GrafreeD.standAlone)
	5176	+ if (Grafreed.standAlone)
4500	5177	{
4501	5178	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4502	5179	browser.show();
..	..	@@ -4522,21 +5199,20 @@
4522	5199	Object3D client;
4523	5200	Object3D copy;
4524	5201	MenuBar menuBar;
4525		- Menu windowMenu;
4526		- MenuItem loadItem;
	5202	+ Menu fileMenu;
	5203	+ MenuItem newItem;
	5204	+ MenuItem openItem;
4527	5205	MenuItem saveItem;
4528	5206	MenuItem saveAsItem;
4529	5207	MenuItem exportAsItem;
4530	5208	MenuItem reexportItem;
4531	5209	MenuItem povItem;
4532	5210	MenuItem closeItem;
4533		- Menu cameraMenu;
	5211	+
4534	5212	CheckboxMenuItem zBufferItem;
4535	5213	//MenuItem normalLensItem;
4536		- MenuItem editCameraItem;
4537		- MenuItem revertCameraItem;
4538		- CheckboxMenuItem toggleLiveItem;
4539	5214	MenuItem stepItem;
	5215	+ CheckboxMenuItem toggleLiveItem;
4540	5216	CheckboxMenuItem toggleFullScreenItem;
4541	5217	CheckboxMenuItem toggleTimelineItem;
4542	5218	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4545,25 +5221,39 @@
4545	5221	CheckboxMenuItem toggleFootContactItem;
4546	5222	CheckboxMenuItem toggleDLItem;
4547	5223	CheckboxMenuItem toggleTextureItem;
4548		- CheckboxMenuItem toggleRandomItem;
	5224	+ CheckboxMenuItem toggleSwitchItem;
4549	5225	CheckboxMenuItem toggleRootItem;
4550	5226	CheckboxMenuItem animationItem;
	5227	+ MenuItem archiveItem;
4551	5228	CheckboxMenuItem toggleHandleItem;
4552	5229	CheckboxMenuItem togglePaintItem;
4553	5230	JSplitPane mainPanel;
4554	5231	JScrollPane scrollpane;
	5232	+
4555	5233	JPanel toolbarPanel;
4556		- JPanel treePanel;
	5234	+
	5235	+ cGridBag treePanel;
	5236	+
4557	5237	JPanel radioPanel;
4558	5238	ButtonGroup buttonGroup;
4559		- JPanel ctrlPanel;
4560		- JPanel materialPanel;
	5239	+
	5240	+ cGridBag toolboxPanel;
	5241	+ cGridBag materialPanel;
	5242	+ cGridBag ctrlPanel;
	5243	+
4561	5244	JScrollPane infoPanel;
4562		- JPanel optionsPanel;
	5245	+
	5246	+ cGridBag optionsPanel;
	5247	+
4563	5248	JTabbedPane objectPanel;
	5249	+ boolean materialFlushed;
	5250	+ Object3D latestObject;
	5251	+
4564	5252	cGridBag XYZPanel;
	5253	+
4565	5254	JSplitPane gridPanel;
4566	5255	JSplitPane bigPanel;
	5256	+
4567	5257	cGridBag bigThree;
4568	5258	cGridBag scenePanel;
4569	5259	cGridBag centralPanel;
..	..	@@ -4619,67 +5309,72 @@
4619	5309	// MATERIAL
4620	5310	JLabel materialLabel;
4621	5311	JLabel colorLabel;
4622		- NumberSlider colorField;
	5312	+ cNumberSlider colorField;
4623	5313	JLabel modulationLabel;
4624		- NumberSlider modulationField;
	5314	+ cNumberSlider modulationField;
4625	5315	JLabel metalnessLabel;
4626		- NumberSlider metalnessField;
	5316	+ cNumberSlider metalnessField;
4627	5317	JLabel diffuseLabel;
4628		- NumberSlider diffuseField;
	5318	+ cNumberSlider diffuseField;
4629	5319	JLabel specularLabel;
4630		- NumberSlider specularField;
	5320	+ cNumberSlider specularField;
4631	5321	JLabel shininessLabel;
4632		- NumberSlider shininessField;
	5322	+ cNumberSlider shininessField;
4633	5323	JLabel shiftLabel;
4634		- NumberSlider shiftField;
	5324	+ cNumberSlider shiftField;
4635	5325	JLabel ambientLabel;
4636		- NumberSlider ambientField;
	5326	+ cNumberSlider ambientField;
4637	5327	JLabel lightareaLabel;
4638		- NumberSlider lightareaField;
	5328	+ cNumberSlider lightareaField;
4639	5329	JLabel diffusenessLabel;
4640		- NumberSlider diffusenessField;
	5330	+ cNumberSlider diffusenessField;
4641	5331	JLabel velvetLabel;
4642		- NumberSlider velvetField;
	5332	+ cNumberSlider velvetField;
4643	5333	JLabel sheenLabel;
4644		- NumberSlider sheenField;
	5334	+ cNumberSlider sheenField;
4645	5335	JLabel subsurfaceLabel;
4646		- NumberSlider subsurfaceField;
	5336	+ cNumberSlider subsurfaceField;
4647	5337	//JLabel bumpLabel;
4648	5338	//NumberSlider bumpField;
4649	5339	JLabel backlitLabel;
4650		- NumberSlider backlitField;
	5340	+ cNumberSlider backlitField;
4651	5341	JLabel anisoLabel;
4652		- NumberSlider anisoField;
	5342	+ cNumberSlider anisoField;
4653	5343	JLabel anisoVLabel;
4654		- NumberSlider anisoVField;
	5344	+ cNumberSlider anisoVField;
4655	5345	JLabel cameraLabel;
4656		- NumberSlider cameraField;
	5346	+ cNumberSlider cameraField;
4657	5347	JLabel selfshadowLabel;
4658		- NumberSlider selfshadowField;
	5348	+ cNumberSlider selfshadowField;
4659	5349	JLabel shadowLabel;
4660		- NumberSlider shadowField;
	5350	+ cNumberSlider shadowField;
4661	5351	JLabel textureLabel;
4662		- NumberSlider textureField;
	5352	+ cNumberSlider textureField;
4663	5353	JLabel opacityLabel;
4664		- NumberSlider opacityField;
	5354	+ cNumberSlider opacityField;
4665	5355	JLabel fakedepthLabel;
4666		- NumberSlider fakedepthField;
	5356	+ cNumberSlider fakedepthField;
4667	5357	JLabel shadowbiasLabel;
4668		- NumberSlider shadowbiasField;
	5358	+ cNumberSlider shadowbiasField;
4669	5359	JLabel bumpLabel;
4670		- NumberSlider bumpField;
	5360	+ cNumberSlider bumpField;
4671	5361	JLabel noiseLabel;
4672		- NumberSlider noiseField;
	5362	+ cNumberSlider noiseField;
4673	5363	JLabel powerLabel;
4674		- NumberSlider powerField;
	5364	+ cNumberSlider powerField;
4675	5365	JLabel borderfadeLabel;
4676		- NumberSlider borderfadeField;
	5366	+ cNumberSlider borderfadeField;
4677	5367	JLabel fogLabel;
4678		- NumberSlider fogField;
	5368	+ cNumberSlider fogField;
4679	5369	JLabel opacityPowerLabel;
4680		- NumberSlider opacityPowerField;
4681		- JTree jTree;
	5370	+ cNumberSlider opacityPowerField;
	5371	+ cTree jTree;
4682	5372	//ObjectUI parent;
4683	5373
4684		- NumberSlider normalpushField;
	5374	+ cNumberSlider normalpushField;
	5375	+
	5376	+ private MenuItem importGFDItem;
	5377	+ private MenuItem importVRMLX3DItem;
	5378	+ private MenuItem import3DSItem;
	5379	+ private MenuItem importOBJItem;
4685	5380	}