~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,7 +34,147 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
	38	+ boolean timeline;
	39	+ boolean wasFullScreen;
31	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
	97	+
	98	+ cButton GetButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
	111	+ }
	112	+
	113	+ cToggleButton GetToggleButton(String name, boolean border)
	114	+ {
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
	117	+ }
	118	+
	119	+ cCheckBox GetCheckBox(String name, boolean border)
	120	+ {
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
	135	+ try
	136	+ {
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	138	+
	139	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	140	+// {
	141	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	142	+// Graphics2D g = resized.createGraphics();
	143	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	144	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	145	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	146	+// g.dispose();
	147	+//
	148	+// image = resized;
	149	+// }
	150	+
	151	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
	155	+ return icon;
	156	+ }
	157	+ catch (Exception e)
	158	+ {
	159	+ //icons.put(name, null);
	160	+ return null;
	161	+ }
	162	+ }
	163	+
	164	+ BufferedImage GetImage(String name)
	165	+ {
	166	+ try
	167	+ {
	168	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	169	+
	170	+ return image;
	171	+ }
	172	+ catch (Exception e)
	173	+ {
	174	+ return null;
	175	+ }
	176	+ }
	177	+
32	178	// SCRIPT
33	179
34	180	transient JFrame textpanel = null;
..	..	@@ -119,51 +265,62 @@
119	265	void keyPressed(int key, int modifiers)
120	266	{
121	267	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	268	+ Globals.theRenderer.keyPressed(key, modifiers);
123	269	}
124	270	*/
125	271
126	272	static GridBagConstraints aConstraints;
127	273	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	274	+
130	275	static int GRIDWIDTH = 100; // 4;
131	276
132	277	public void closeUI()
133	278	{
134	279	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	280	+// System.out.println("this = " + this);
	281	+// System.out.println("objEditor = " + objEditor);
137	282	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	283	+// objEditor.ctrlPanel.remove(nameField);
139	284
140		- if (!GroupEditor.allparams)
	285	+ objEditor.ctrlPanel.remove(namePanel);
	286	+
	287	+ if (!allparams)
141	288	return;
142	289
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	290	+// objEditor.ctrlPanel.remove(liveCB);
	291	+// objEditor.ctrlPanel.remove(hideCB);
	292	+// objEditor.ctrlPanel.remove(markCB);
	293	+//
	294	+// objEditor.ctrlPanel.remove(randomCB);
	295	+// objEditor.ctrlPanel.remove(speedupCB);
	296	+// objEditor.ctrlPanel.remove(rewindCB);
	297	+//
	298	+// objEditor.ctrlPanel.remove(resetButton);
	299	+// objEditor.ctrlPanel.remove(stepButton);
	300	+//// objEditor.ctrlPanel.remove(stepAllButton);
	301	+//// objEditor.ctrlPanel.remove(resetAllButton);
	302	+// objEditor.ctrlPanel.remove(link2masterCB);
	303	+// //objEditor.ctrlPanel.remove(flipVCB);
	304	+// //objEditor.ctrlPanel.remove(texresMenu);
	305	+// objEditor.ctrlPanel.remove(slowerButton);
	306	+// objEditor.ctrlPanel.remove(fasterButton);
	307	+// objEditor.ctrlPanel.remove(remarkButton);
	308	+
	309	+ objEditor.ctrlPanel.remove(setupPanel);
	310	+ objEditor.ctrlPanel.remove(setupPanel2);
	311	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	312	+ objEditor.ctrlPanel.remove(pushPanel);
	313	+ //objEditor.ctrlPanel.remove(fillPanel);
	314	+
	315	+ //Remove(normalpushField);
161	316	}
162	317
163	318	public ObjEditor GetEditor()
164	319	{
165	320	return objEditor; //.GetEditor();
166	321	}
	322	+
	323	+ // Sometimes myself, sometimes my callee's.
167	324	ObjEditor objEditor;
168	325
169	326	/*
..	..	@@ -199,6 +356,14 @@
199	356	client = inClient;
200	357	copy = client;
201	358
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
	366	+
202	367	// "this" is not called: SetupUI2(objEditor);
203	368	}
204	369
..	..	@@ -212,6 +377,14 @@
212	377	client = inClient;
213	378	copy = client;
214	379
	380	+ if (copy.versionlist == null)
	381	+ {
	382	+ copy.versionlist = new Object3D[100];
	383	+ copy.versionindex = -1;
	384	+
	385	+// Save(true);
	386	+ }
	387	+
215	388	SetupUI2(callee.GetEditor());
216	389	}
217	390
..	..	@@ -226,23 +399,33 @@
226	399	//localCopy.parent = null;
227	400
228	401	frame = new JFrame();
	402	+ frame.setUndecorated(false);
229	403	objEditor = this;
230	404	this.callee = callee;
231	405
232	406	//parent = p;
233	407
234	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
235		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
236	411	//gd.setFullScreenWindow(this);
237	412	//setResizable(false);
238	413	//if (!isDisplayable())
239	414	//setUndecorated(true);
240	415
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	416	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	417	client = inClient;
243	418	copy = localCopy;
244	419	copy.editWindow = this;
245	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
246	429	SetupMenu();
247	430
248	431	//SetupName(objEditor); // new
..	..	@@ -256,28 +439,55 @@
256	439	return frame.action(event, obj);
257	440	}
258	441
	442	+ // Cannot work without static
	443	+ static boolean allparams = true;
	444	+
	445	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	446	+
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
259	450	void SetupMenu()
260	451	{
261	452	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	453	+ menuBar.add(fileMenu = new Menu("File"));
	454	+ fileMenu.add(newItem = new MenuItem("New"));
	455	+ fileMenu.add(openItem = new MenuItem("Open..."));
	456	+
	457	+ //oe.menuBar.add(menu = new Menu("Include"));
	458	+ Menu menu = new Menu("Import");
	459	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	460	+ importOBJItem.addActionListener(this);
	461	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	462	+ import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	466	+ importVRMLX3DItem.addActionListener(this);
	467	+ }
	468	+ menu.add("-");
	469	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	470	+ importGFDItem.addActionListener(this);
	471	+ fileMenu.add(menu);
	472	+ fileMenu.add("-");
	473	+
	474	+ fileMenu.add(saveItem = new MenuItem("Save"));
	475	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	476	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	477	+ fileMenu.add("-");
	478	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	479	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	480	+ fileMenu.add("-");
272	481	if (client.parent != null)
273	482	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	483	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	484	} else
276	485	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	486	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	487	}
279	488
280		- loadItem.addActionListener(this);
	489	+ newItem.addActionListener(this);
	490	+ openItem.addActionListener(this);
281	491	saveItem.addActionListener(this);
282	492	saveAsItem.addActionListener(this);
283	493	exportAsItem.addActionListener(this);
..	..	@@ -285,80 +495,103 @@
285	495	//povItem.addActionListener(this);
286	496	closeItem.addActionListener(this);
287	497
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add("-");
299		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300		- toggleTextureItem.addItemListener(this);
301		- toggleTextureItem.setState(CameraPane.textureon);
302		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303		- toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
305		- cameraMenu.add(stepItem = new MenuItem("Step"));
306		- stepItem.addActionListener(this);
307		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308		-// toggleDLItem.addItemListener(this);
309		-// toggleDLItem.setState(false);
310		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311		- toggleRenderItem.addItemListener(this);
312		- toggleRenderItem.setState(!CameraPane.frozen);
313		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314		- toggleDebugItem.addItemListener(this);
315		- toggleDebugItem.setState(CameraPane.DEBUG);
316		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317		- toggleFrustumItem.addItemListener(this);
318		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320		- toggleFootContactItem.addItemListener(this);
321		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323		- toggleRandomItem.addItemListener(this);
324		- toggleRandomItem.setState(CameraPane.RANDOM);
325		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326		- toggleHandleItem.addItemListener(this);
327		- toggleHandleItem.setState(CameraPane.HANDLES);
328		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329		- togglePaintItem.addItemListener(this);
330		- togglePaintItem.setState(CameraPane.PAINTMODE);
331		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332		-// toggleRootItem.addItemListener(this);
333		-// toggleRootItem.setState(false);
334		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335		-// animationItem.addItemListener(this);
336		-// animationItem.setState(CameraPane.ANIMATION);
337		- cameraMenu.add("-");
338		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339		- editCameraItem.addActionListener(this);
340		-
341	498	objectPanel = new JTabbedPane();
	499	+
	500	+ ChangeListener changeListener = new ChangeListener()
	501	+ {
	502	+ //String name;
	503	+
	504	+ public void stateChanged(ChangeEvent changeEvent)
	505	+ {
	506	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	507	+// {
	508	+// if (latestObject != null)
	509	+// {
	510	+// refreshContents(true);
	511	+// SetMaterial(latestObject);
	512	+// }
	513	+//
	514	+// materialFlushed = true;
	515	+// }
	516	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	517	+// {
	518	+// if (listUI.size() == 0)
	519	+// EditSelection(false);
	520	+// }
	521	+
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
	553	+ }
	554	+ };
	555	+ objectPanel.addChangeListener(changeListener);
	556	+
342	557	toolbarPanel = new JPanel();
343	558	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	559	+
	560	+ treePanel = new cGridBag();
345	561	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
349		- materialPanel.setName("Material");
	562	+
	563	+ editPanel = new cGridBag().setVertical(true);
	564	+ //editPanel.setName("Edit");
	565	+
	566	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	567	+
	568	+ editCommandsPanel = new cGridBag();
	569	+ editPanel.add(editCommandsPanel);
	570	+ editPanel.add(ctrlPanel);
	571	+
	572	+ toolboxPanel = new cGridBag().setVertical(true);
	573	+ //toolboxPanel.setName("Toolbox");
	574	+
	575	+ skyboxPanel = new cGridBag().setVertical(true);
	576	+
	577	+ materialPanel = new cGridBag().setVertical(false);
	578	+ //materialPanel.setName("Material");
	579	+
350	580	/JTextPane/
351	581	infoarea = createTextPane();
	582	+ doc = infoarea.getStyledDocument();
	583	+
352	584	infoarea.setEditable(true);
353	585	SetText();
	586	+
354	587	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	588	// infoarea.setOpaque(false);
356	589	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	590	+// TEXTAREA infoarea.setLineWrap(true);
	591	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	592	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360		- infoPanel.setPreferredSize(new Dimension(50, 200));
361		- infoPanel.setName("Info");
	593	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	594	+ //infoPanel.setName("Info");
362	595	//infoPanel.setLayout(new BorderLayout());
363	596	//infoPanel.add(createTextPane());
364	597
..	..	@@ -366,16 +599,23 @@
366	599	mainPanel.setName("Main");
367	600	mainPanel.setContinuousLayout(true);
368	601	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	602	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	603	+ mainPanel.setDividerLocation(0.5); //1.0);
	604	+ mainPanel.setResizeWeight(0.5);
	605	+
	606	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	607	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	608	+ divider.setDividerSize(15);
	609	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	610	+
	611	+ mainPanel.setUI(new BasicSplitPaneUI());
	612	+
373	613	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	614	//mainPanel.setLayout(new GridBagLayout());
375	615	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	616	+// treePanel.setLayout(new GridBagLayout());
	617	+ //ctrlPanel.setLayout(new GridBagLayout());
	618	+ //materialPanel.setLayout(new GridBagLayout());
379	619
380	620	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	621	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +654,7 @@
414	654	static String newline = "\n";
415	655	protected static final String buttonString = "JButton";
416	656	StyledDocument doc;
417		- JTextArea infoarea;
	657	+ JTextPane infoarea;
418	658
419	659	void ClearInfo()
420	660	{
..	..	@@ -437,10 +677,10 @@
437	677	e.printStackTrace();
438	678	}
439	679
440		- String selection = infoarea.getText();
441		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442		- java.awt.datatransfer.Clipboard clipboard =
443		- Toolkit.getDefaultToolkit().getSystemClipboard();
	680	+// String selection = infoarea.getText();
	681	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	682	+// java.awt.datatransfer.Clipboard clipboard =
	683	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	684	//clipboard.setContents(data, data);
445	685	}
446	686
..	..	@@ -463,13 +703,13 @@
463	703	//SendInfo("Name:", "bold");
464	704	if (sel.GetTextures() != null \|\| debug)
465	705	{
466		- si.SendInfo(sel.toString(), "bold");
	706	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	707	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	708	if (sel.Size() > 0)
469	709	{
470	710	si.SendInfo("#children = " + sel.Size(), "regular");
471	711	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	712	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	713	if (debug)
474	714	{
475	715	try
..	..	@@ -481,7 +721,10 @@
481	721	}
482	722
483	723	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	724	+ {
	725	+ si.SendInfo(" BBox min: " + minima, "regular");
	726	+ si.SendInfo(" BBox max: " + maxima, "regular");
	727	+ }
485	728
486	729	if (sel.bRep != null)
487	730	{
..	..	@@ -508,7 +751,7 @@
508	751	}
509	752	if (sel.support != null)
510	753	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	754	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	755	}
513	756	if (sel.scriptnode != null)
514	757	{
..	..	@@ -522,18 +765,18 @@
522	765	maxima.y = sel.toParent[3][1];
523	766	maxima.z = sel.toParent[3][2];
524	767	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	768	maxima.x = sel.toParent[0][0];
531	769	maxima.y = sel.toParent[1][1];
532	770	maxima.z = sel.toParent[2][2];
533	771	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	772	+ maxima.x = sel.globalTransform[3][0];
	773	+ maxima.y = sel.globalTransform[3][1];
	774	+ maxima.z = sel.globalTransform[3][2];
	775	+ if (full)
	776	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	777	+ maxima.x = sel.globalTransform[0][0];
	778	+ maxima.y = sel.globalTransform[1][1];
	779	+ maxima.z = sel.globalTransform[2][2];
537	780	if (full)
538	781	si.SendInfo(" Global Scale: " + maxima, "regular");
539	782	}
..	..	@@ -579,6 +822,9 @@
579	822	{
580	823	CameraPane.pointflow = (PointFlow) sel;
581	824	}
	825	+
	826	+ si.SendInfo("_____________________", "regular");
	827	+ si.SendInfo("", "regular");
582	828	}
583	829	}
584	830
..	..	@@ -594,52 +840,216 @@
594	840	}
595	841	}
596	842
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
600		- {
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
	843	+//static GraphicsDevice device = GraphicsEnvironment
	844	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	845
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	846	+ Rectangle keeprect;
	847	+ cRadio radio;
	848	+
	849	+cButton keepButton;
	850	+ cButton twoButton; // Full 3D
	851	+ cButton sixButton;
	852	+ cButton threeButton;
	853	+ cButton sevenButton;
	854	+ cButton fourButton; // full panel
	855	+ cButton oneButton; // full XYZ
	856	+ //cButton currentLayout;
	857	+
	858	+ boolean maximized;
	859	+
	860	+ cButton fullscreenLayout;
	861	+ cButton expandedLayout;
621	862
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	863	+ void Minimize()
628	864	{
629		- for (int j = 0; j < 2; j++)
	865	+ frame.setState(Frame.ICONIFIED);
	866	+ frame.validate();
	867	+ }
	868	+
	869	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	870	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	871	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	872	+ void Maximize()
	873	+ {
	874	+ if (CameraPane.FULLSCREEN)
630	875	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	876	+ ToggleFullScreen();
636	877	}
637		- } catch (BadLocationException ble)
	878	+
	879	+ if (maximized)
	880	+ {
	881	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	882	+ }
	883	+ else
	884	+ {
	885	+ keeprect = frame.getBounds();
	886	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	887	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	888	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	889	+// frame.setState(Frame.MAXIMIZED_BOTH);
	890	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	891	+ }
	892	+
	893	+ maximized ^= true;
	894	+
	895	+ frame.validate();
	896	+ }
	897	+
	898	+ cButton minButton;
	899	+ cButton maxButton;
	900	+ cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
	903	+
	904	+ void ToggleFullScreen()
638	905	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	907	+
	908	+ cameraView.ToggleFullScreen();
	909	+
	910	+ if (!CameraPane.FULLSCREEN)
	911	+ {
	912	+ device.setFullScreenWindow(null);
	913	+ frame.dispose();
	914	+ frame.setUndecorated(false);
	915	+ frame.validate();
	916	+ frame.setVisible(true);
	917	+
	918	+ //frame.setVisible(false);
	919	+// frame.removeNotify();
	920	+// frame.setUndecorated(false);
	921	+// frame.addNotify();
	922	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	923	+
	924	+// X frame.getContentPane().remove(/"Center",/bigThree);
	925	+// X framePanel.add(bigThree);
	926	+// X frame.getContentPane().add(/"Center",/framePanel);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
	928	+
	929	+ //frame.setVisible(true);
	930	+// radio.layout = keepButton;
	931	+ //theFrame = null;
	932	+ keepButton = null;
	933	+// radio.layout.doClick();
	934	+
	935	+ } else
	936	+ {
	937	+ keepButton = radio.layout;
	938	+ //keeprect = frame.getBounds();
	939	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	940	+// frame.getToolkit().getScreenSize().height);
	941	+ //frame.setVisible(false);
	942	+
	943	+ frame.dispose();
	944	+ frame.setUndecorated(true);
	945	+ device.setFullScreenWindow(frame);
	946	+ frame.validate();
	947	+ frame.setVisible(true);
	948	+// frame.removeNotify();
	949	+// frame.setUndecorated(true);
	950	+// frame.addNotify();
	951	+// X frame.getContentPane().remove(/"Center",/framePanel);
	952	+// X framePanel.remove(bigThree);
	953	+// X frame.getContentPane().add(/"Center",/bigThree);
	954	+// framePanel.setDividerLocation(0);
	955	+
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
	958	+ //frame.setVisible(true);
	959	+ }
	960	+ frame.validate();
	961	+
	962	+ cameraView.requestFocusInWindow();
640	963	}
641	964
642		- return new JTextArea(); // textPane;
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
	974	+ {
	975	+ boolean temp = CameraPane.SWITCH;
	976	+ CameraPane.SWITCH = false;
	977	+
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	982	+ // if (copy == client)
	983	+
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
	992	+ //byte[] compress = Compress(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
	996	+
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1001	+
	1002	+ CameraPane.SWITCH = temp;
	1003	+
	1004	+ return compress;
	1005	+ }
	1006	+
	1007	+ private JTextPane createTextPane()
	1008	+ {
	1009	+// TEXTAREA String[] initString =
	1010	+// {
	1011	+// "This is an editable JTextPane, ", //regular
	1012	+// "another ", //italic
	1013	+// "styled ", //bold
	1014	+// "text ", //small
	1015	+// "component, ", //large
	1016	+// "which supports embedded components..." + newline,//regular
	1017	+// " " + newline, //button
	1018	+// "...and embedded icons..." + newline, //regular
	1019	+// " ", //icon
	1020	+// newline + "JTextPane is a subclass of JEditorPane that "
	1021	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1022	+// + "cover methods for interacting with those objects."
	1023	+// };
	1024	+//
	1025	+// String[] initStyles =
	1026	+// {
	1027	+// "regular", "italic", "bold", "small", "large",
	1028	+// "regular", "button", "regular", "icon",
	1029	+// "regular"
	1030	+// };
	1031	+//
	1032	+// JTextPane textPane = new JTextPane();
	1033	+// textPane.setEditable(true);
	1034	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1035	+// addStylesToDocument(doc);
	1036	+//
	1037	+// try
	1038	+// {
	1039	+// for (int j = 0; j < 2; j++)
	1040	+// {
	1041	+// for (int i = 0; i < initString.length; i++)
	1042	+// {
	1043	+// doc.insertString(doc.getLength(), initString[i],
	1044	+// doc.getStyle(initStyles[i]));
	1045	+// }
	1046	+// }
	1047	+// } catch (BadLocationException ble)
	1048	+// {
	1049	+// System.err.println("Couldn't insert initial text into text pane.");
	1050	+// }
	1051	+
	1052	+ return new JTextPane(); // textPane;
643	1053	}
644	1054
645	1055	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +1102,7 @@
692	1102	protected static ImageIcon createImageIcon(String path,
693	1103	String description)
694	1104	{
695		- java.net.URL imgURL = GraphreeD.class.getResource(path);
	1105	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	1106	if (imgURL != null)
697	1107	{
698	1108	return new ImageIcon(imgURL, description);
..	..	@@ -715,6 +1125,7 @@
715	1125	{
716	1126	SetupMaterial(materialPanel);
717	1127	}
	1128	+
718	1129	//SetupName();
719	1130	//SetupViews();
720	1131	}
..	..	@@ -724,6 +1135,7 @@
724	1135	// NumberSlider vDivsField;
725	1136	// JCheckBox endcaps;
726	1137	JCheckBox liveCB;
	1138	+ JCheckBox selectableCB;
727	1139	JCheckBox hideCB;
728	1140	JCheckBox link2masterCB;
729	1141	JCheckBox markCB;
..	..	@@ -731,7 +1143,12 @@
731	1143	JCheckBox speedupCB;
732	1144	JCheckBox rewindCB;
733	1145	JCheckBox flipVCB;
	1146	+
	1147	+ cCheckBox toggleTextureCB;
	1148	+ cCheckBox toggleSwitchCB;
	1149	+
734	1150	JComboBox texresMenu;
	1151	+
735	1152	JButton resetButton;
736	1153	JButton stepButton;
737	1154	JButton stepAllButton;
..	..	@@ -739,115 +1156,87 @@
739	1156	JButton slowerButton;
740	1157	JButton fasterButton;
741	1158	JButton remarkButton;
	1159	+
	1160	+ cGridBag editPanel;
	1161	+ cGridBag editCommandsPanel;
	1162	+
	1163	+ cGridBag namePanel;
	1164	+ cGridBag setupPanel;
	1165	+ cGridBag setupPanel2;
	1166	+ cGridBag objectCommandsPanel;
	1167	+ cGridBag pushPanel;
	1168	+ cGridBag fillPanel;
742	1169
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1170	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1171	{
745	1172	JCheckBox cb;
746	1173
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1174	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1175	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1176
757	1177	return cb;
758	1178	}
759	1179
760		- cButton AddButton(ObjEditor oe, String label)
	1180	+ cButton AddButton(cGridBag panel, String label)
761	1181	{
762	1182	cButton cb;
763	1183
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1184	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1185	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1186
774	1187	return cb;
775	1188	}
776	1189
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1190	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1191	{
779	1192	JComboBox combo;
780	1193
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	1194	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1195	combo.addActionListener(this);
785	1196
786	1197	return combo;
787	1198	}
788	1199
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1200	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1201	{
791		- NumberSlider combo;
	1202	+ cGridBag control = new cGridBag();
	1203	+
	1204	+ cNumberSlider combo;
792	1205
793	1206	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1207	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	1208	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1209	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1210	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1211	+
	1212	+ panel.add(control);
	1213	+
	1214	+ return control;
813	1215	}
814	1216
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1217	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1218	{
817		- NumberSlider combo;
	1219	+ cGridBag control = new cGridBag();
	1220	+
	1221	+ cNumberSlider combo;
818	1222
819	1223	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1224	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1225	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1226	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1227	combo.setInteger(current);
833	1228
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1229	+ panel.add(control);
	1230	+
	1231	+ return control;
839	1232	}
840	1233
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1234	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1235	{
843	1236	JTextArea text;
844	1237
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1238	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1239	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1240
852	1241	return text;
853	1242	}
..	..	@@ -877,9 +1266,16 @@
877	1266	objEditor.ctrlPanel.remove(j);
878	1267	}
879	1268
	1269	+ void Remove(cNumberSlider j)
	1270	+ {
	1271	+ j.removeChangeListener(this);
	1272	+ //objEditor.ctrlPanel.remove(j.label);
	1273	+ objEditor.ctrlPanel.remove(j);
	1274	+ }
	1275	+
880	1276	/*
881	1277	*/
882		- void Return() // ObjEditor oe)
	1278	+ void Return0() // ObjEditor oe)
883	1279	{
884	1280	aConstraints.gridy += 1;
885	1281	aConstraints.gridx = 0;
..	..	@@ -934,35 +1330,93 @@
934	1330
935	1331	void SetupUI2(ObjEditor oe)
936	1332	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1333	+ //SetupName(oe);
942	1334
943		- if (!GroupEditor.allparams)
	1335	+ namePanel = new cGridBag();
	1336	+
	1337	+ //if (copy.pinned)
	1338	+ {
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1340	+ pinButton.setSelected(copy.pinned);
	1341	+ cGridBag t = new cGridBag();
	1342	+ t.preferredWidth = 2;
	1343	+ t.add(pinButton);
	1344	+ namePanel.add(t);
	1345	+
	1346	+ pinButton.addItemListener(this);
	1347	+ }
	1348	+
	1349	+ nameField = AddText(namePanel, copy.GetName());
	1350	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1351	+ oe.ctrlPanel.add(namePanel);
	1352	+
	1353	+ oe.ctrlPanel.Return();
	1354	+
	1355	+ if (!allparams)
944	1356	return;
945	1357
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1358	+ setupPanel = new cGridBag().setVertical(false);
	1359	+
	1360	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1361	+ liveCB.setToolTipText("Animate object");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
	1364	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1365	+ selectableCB.setToolTipText("Make object selectable");
949	1366	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- stepButton = AddButton(oe, "Step");
	1367	+
	1368	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1369	+ hideCB.setToolTipText("Hide object");
	1370	+
	1371	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1372	+
	1373	+ setupPanel2 = new cGridBag().setVertical(false);
	1374	+
	1375	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1376	+ rewindCB.setToolTipText("Rewind animation");
	1377	+
	1378	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1379	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1380	+
	1381	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1382	+ link2masterCB.setToolTipText("Attach to support");
	1383	+
	1384	+ if (Globals.ADVANCED)
	1385	+ {
	1386	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1387	+ speedupCB.setToolTipText("Option motion capture");
	1388	+ }
	1389	+
	1390	+ oe.ctrlPanel.add(setupPanel);
	1391	+ oe.ctrlPanel.Return();
	1392	+ oe.ctrlPanel.add(setupPanel2);
	1393	+ oe.ctrlPanel.Return();
	1394	+
	1395	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1396	+
	1397	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1398	+ resetButton.setToolTipText("Jump to frame zero");
	1399	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1400	+ stepButton.setToolTipText("Step one frame");
956	1401	// resetAllButton = AddButton(oe, "Reset All");
957	1402	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1403	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1404	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1405	+ slowerButton.setToolTipText("Decrease animation speed");
	1406	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1407	+ fasterButton.setToolTipText("Increase animation speed");
	1408	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1409	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1410
964		- Return();
	1411	+ oe.ctrlPanel.add(objectCommandsPanel);
	1412	+ oe.ctrlPanel.Return();
965	1413
	1414	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1415	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1416	+ //Return();
	1417	+
	1418	+ oe.ctrlPanel.Return();
	1419	+
966	1420	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1421	// ObjEditor.aConstraints.gridx += 1;
968	1422
..	..	@@ -1056,7 +1510,7 @@
1056	1510	oe.aConstraints.gridwidth = 1;
1057	1511	/**/
1058	1512	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1513	+ oe.ctrlPanel.Return();
1060	1514
1061	1515	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1516	//textureButton.setEnabled(false);
..	..	@@ -1107,29 +1561,16 @@
1107	1561	//frontScroll.setLabel("------------------------------ XZ (front) ---------------------------------------------------");
1108	1562	//sideScroll.setLabel("------------------------------- YZ (side) ---------------------------------------------------");
1109	1563
1110		-// GridBagConstraints gbc = (GridBagConstraints) GraphreeD.clone(aConstraints);
	1564	+// GridBagConstraints gbc = (GridBagConstraints) GrafreeD.clone(aConstraints);
1111	1565	Camera cam = GetCamera(copy, 0);
1112	1566
1113	1567	Composite cams = null;
1114	1568
1115	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1116	1570	{
1117		- System.out.println("CREATE CAMERAS");
1118		- cams = new cTemplate();
1119		- cams.name = "Cameras";
1120		- copy.insertElementAt(cams, 0);
1121		- //cams.parent = copy;
1122		-
1123		- cam = new Camera(); // LA.newVector(3, 2, 1));
1124		- cams.addChild(cam);
1125		- cam = new Camera(1);
1126		- cams.addChild(cam);
1127		- cam = new Camera(2);
1128		- cams.addChild(cam);
1129		- cam = new Camera(3);
1130		- cams.addChild(cam);
1131		- cam = new Camera(4); // Light
1132		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1133	1574	} else
1134	1575	{
1135	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1158,10 +1599,28 @@
1158	1599	//JPanel worldPanel =
1159	1600	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1601	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1602	+ centralPanel = new cGridBag();
	1603	+ centralPanel.preferredWidth = 20;
	1604	+
	1605	+ if (Globals.ADVANCED)
	1606	+ {
	1607	+ timelinePanel = new JPanel(new BorderLayout());
	1608	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1609
	1610	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1611	+ cameraPanel.setContinuousLayout(true);
	1612	+ cameraPanel.setOneTouchExpandable(true);
	1613	+// cameraPanel.setDividerLocation(0.9);
	1614	+// cameraPanel.setDividerSize(9);
	1615	+ cameraPanel.setResizeWeight(1.0);
	1616	+
	1617	+ }
	1618	+
	1619	+ centralPanel.add(cameraView);
	1620	+ centralPanel.setFocusable(true);
	1621	+ //frame.setJMenuBar(timelineMenubar);
	1622	+ //centralPanel.add(timelinePanel);
	1623	+
1165	1624	//topView.camera = ;
1166	1625	//frontView.camera = new Camera(2);
1167	1626	//sideView.camera = new Camera(3);
..	..	@@ -1177,13 +1636,57 @@
1177	1636	//frontView.object = copy;
1178	1637	//sideView.object = copy;
1179	1638
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1639	+ transformPanel = new cGridBag().setVertical(true);
	1640	+
	1641	+ cGridBag resetTransformPanel = new cGridBag();
	1642	+
	1643	+ resetTransformPanel.preferredHeight = 2;
	1644	+
	1645	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1646	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1647	+ resetTransform.addMouseListener(new MouseAdapter()
	1648	+ {
	1649	+ public void mouseClicked(MouseEvent e)
	1650	+ {
	1651	+ ResetTransform();
	1652	+ }
	1653	+ });
	1654	+ resetTransformPanel.add(resetTransform);
	1655	+
	1656	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1657	+ resetTransform.setToolTipText("Reset Translation only");
	1658	+ resetTransform.addMouseListener(new MouseAdapter()
	1659	+ {
	1660	+ public void mouseClicked(MouseEvent e)
	1661	+ {
	1662	+ ResetTransform(1);
	1663	+ }
	1664	+ });
	1665	+ resetTransformPanel.add(resetTransform);
	1666	+
	1667	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1668	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1669	+ resetTransform.addMouseListener(new MouseAdapter()
	1670	+ {
	1671	+ public void mouseClicked(MouseEvent e)
	1672	+ {
	1673	+ ResetTransform(2);
	1674	+ }
	1675	+ });
	1676	+ resetTransformPanel.add(resetTransform);
	1677	+
	1678	+ XYZPanel = new cGridBag().setVertical(true);
	1679	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1680
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1681	+ XYZPanel.preferredWidth = 5;
	1682	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1683	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1684	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1685	+ //XYZPanel.setName("XYZ");
1186	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1187	1690	/*
1188	1691	gridPanel = new JPanel(); //new BorderLayout());
1189	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1191,12 +1694,12 @@
1191	1694	gridPanel.add(cameraView);
1192	1695	gridPanel.add(XYZPanel);
1193	1696	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1195		- gridPanel.setContinuousLayout(true);
1196		- gridPanel.setOneTouchExpandable(true);
1197		- gridPanel.setDividerLocation(1.0);
1198		- gridPanel.setDividerSize(9);
1199		- gridPanel.setResizeWeight(0.85);
	1697	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1698	+// gridPanel.setContinuousLayout(true);
	1699	+// gridPanel.setOneTouchExpandable(true);
	1700	+// gridPanel.setDividerLocation(1.0);
	1701	+// gridPanel.setDividerSize(9);
	1702	+// gridPanel.setResizeWeight(0.85);
1200	1703
1201	1704	// aConstraints.weighty = 0;
1202	1705	//System.out.println("THIS = " + this);
..	..	@@ -1219,13 +1722,34 @@
1219	1722
1220	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1724	//tmp.setName("Edit");
1222		- objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
1227		- objectPanel.add(infoPanel);
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
	1729	+ objectPanel.add(toolboxPanel);
	1730	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1731	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1228	1732
	1733	+ objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
	1737	+// JPanel north = new JPanel(new BorderLayout());
	1738	+// north.setName("Edit");
	1739	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1740	+// objectPanel.add(north);
	1741	+ objectPanel.add(editPanel);
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1743	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1744	+
	1745	+ objectPanel.add(transformPanel);
	1746	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1748	+
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1229	1753	/*
1230	1754	aConstraints.gridx = 0;
1231	1755	aConstraints.gridwidth = 1;
..	..	@@ -1233,7 +1757,7 @@
1233	1757	aConstraints.gridy += 1;
1234	1758	aConstraints.gridwidth = 1;
1235	1759	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1760	+ */
1237	1761
1238	1762	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1763	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1768,120 @@
1244	1768	scrollpane.setWheelScrollingEnabled(true);
1245	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1770
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1771	+ /JTabbedPane/ scenePanel = new cGridBag();
	1772	+ scenePanel.preferredWidth = 6;
	1773	+
	1774	+ JTabbedPane tabbedPane = new JTabbedPane();
	1775	+ tabbedPane.add(scrollpane);
1249	1776
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1777	+ optionsPanel = new cGridBag().setVertical(false);
1253	1778
1254	1779	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1780	+
	1781	+ AddOptions(optionsPanel); //, aConstraints);
	1782	+
	1783	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
	1787	+ scenePanel.add(tabbedPane);
	1788	+
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
	1791	+
	1792	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1793	+ creditsPanel.add(ogaLabel);
	1794	+
	1795	+ cButton creditButton;
	1796	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1797	+ creditButton.setToolTipText("https://opengameart.org");
	1798	+
	1799	+ creditButton.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ try
	1804	+ {
	1805	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1806	+ } catch (Exception e1)
	1807	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1808	+ {
	1809	+ e1.printStackTrace();
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1815	+ creditsPanel.add(ogaLabel);
	1816	+
	1817	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1818	+ creditButton.setToolTipText("https://3delicious.net");
	1819	+
	1820	+ creditButton.addMouseListener(new MouseAdapter()
	1821	+ {
	1822	+ public void mouseClicked(MouseEvent e)
	1823	+ {
	1824	+ try
	1825	+ {
	1826	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1827	+ } catch (Exception e1)
	1828	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1829	+ {
	1830	+ e1.printStackTrace();
	1831	+ }
	1832	+ }
	1833	+ });
	1834	+
	1835	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1836	+ creditButton.setToolTipText("https://archive3d.net");
	1837	+
	1838	+ creditButton.addMouseListener(new MouseAdapter()
	1839	+ {
	1840	+ public void mouseClicked(MouseEvent e)
	1841	+ {
	1842	+ try
	1843	+ {
	1844	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1845	+ } catch (Exception e1)
	1846	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1847	+ {
	1848	+ e1.printStackTrace();
	1849	+ }
	1850	+ }
	1851	+ });
	1852	+
	1853	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1854	+ creditButton.setToolTipText("https://turbosquid.com");
	1855	+
	1856	+ creditButton.addMouseListener(new MouseAdapter()
	1857	+ {
	1858	+ public void mouseClicked(MouseEvent e)
	1859	+ {
	1860	+ try
	1861	+ {
	1862	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1863	+ } catch (Exception e1)
	1864	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1865	+ {
	1866	+ e1.printStackTrace();
	1867	+ }
	1868	+ }
	1869	+ });
	1870	+
	1871	+ for (int i=6; --i>=0;)
	1872	+ {
	1873	+ creditsPanel.add(new cGridBag());
	1874	+ }
	1875	+
	1876	+ tabbedPane.add(creditsPanel);
	1877	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1878	+
	1879	+ if (Globals.ADVANCED)
	1880	+ {
	1881	+ tabbedPane.add(infoPanel);
	1882	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1883	+ tabbedPane.setToolTipTextAt(4, "Information");
	1884	+ }
1257	1885
1258	1886	/*
1259	1887	cTree jTree = new cTree(null);
..	..	@@ -1275,18 +1903,19 @@
1275	1903	jtp.add(tree);
1276	1904	*/
1277	1905
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1279		- bigPanel.setContinuousLayout(true);
1280		- bigPanel.setOneTouchExpandable(true);
1281		- bigPanel.setDividerLocation(0.8);
1282		- bigPanel.setDividerSize(15);
1283		- bigPanel.setResizeWeight(0.15);
1284		- bigPanel.setName("Scene");
	1906	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1907	+// bigPanel.setContinuousLayout(true);
	1908	+// bigPanel.setOneTouchExpandable(true);
	1909	+// bigPanel.setDividerLocation(0.8);
	1910	+// bigPanel.setDividerSize(15);
	1911	+// bigPanel.setResizeWeight(0.15);
	1912	+// bigPanel.setName("Scene");
1285	1913
1286	1914	//bigPanel.setLayout(new BorderLayout());
1287	1915	//bigPanel.setSize(new Dimension(10,10));
1288	1916	//bigPanel.add(ctrlPanel);
1289	1917	//bigPanel.add(gridPanel);
	1918	+ /**
1290	1919	bigThree = new JPanel();
1291	1920	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1921	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1926,26 @@
1297	1926	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1927	aWindowConstraints.weightx = 0;
1299	1928	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1929	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1930	aWindowConstraints.weightx = 1;
1302	1931	aWindowConstraints.gridwidth = 3;
1303	1932	// aConstraints.gridheight = 3;
1304	1933	aWindowConstraints.gridx = 1;
1305	1934	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1935	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1936	aWindowConstraints.weightx = 0;
1308	1937	aWindowConstraints.gridx = 4;
1309	1938	aWindowConstraints.gridwidth = 1;
1310	1939	// aConstraints.gridheight = 3;
1311	1940	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1941	bigThree.add(XYZPanel, aWindowConstraints);
	1942	+ /**/
1313	1943
	1944	+ bigThree = new cGridBag();
	1945	+ bigThree.addComponent(scenePanel);
	1946	+ bigThree.addComponent(centralPanel);
	1947	+ //bigThree.addComponent(XYZPanel);
	1948	+
1314	1949	// // SIDE EFFECT!!!
1315	1950	// aConstraints.gridx = 0;
1316	1951	// aConstraints.gridy = 0;
..	..	@@ -1318,33 +1953,55 @@
1318	1953	// aConstraints.gridheight = 1;
1319	1954
1320	1955	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1956	+
	1957	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1958	+ new java.beans.PropertyChangeListener()
	1959	+ {
	1960	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1961	+ {
	1962	+ if ((Integer)pce.getOldValue() == 1)
	1963	+ {
	1964	+ if (radio.layout != expandedLayout)
	1965	+ {
	1966	+ radio.layout = expandedLayout;
	1967	+ radio.layout.doClick();
	1968	+ }
	1969	+ }
	1970	+ }
	1971	+ });
	1972	+
	1973	+ framePanel.setContinuousLayout(false);
	1974	+ framePanel.setOneTouchExpandable(false);
	1975	+ //.setDividerLocation(0.8);
1324	1976	//framePanel.setDividerSize(15);
1325	1977	//framePanel.setResizeWeight(0.15);
1326	1978	framePanel.setName("Frame");
1327	1979
1328	1980	frame.getContentPane().setLayout(new BorderLayout());
1329	1981	/**/
1330		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1331	1983	//worldPane.add(bigPanel);
1332	1984	//worldPane.add(worldPanel);
1333	1985	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1986	+ //frame.getContentPane().add(/"Center",/framePanel);
	1987	+ frame.add(/"Center",/framePanel);
1335	1988	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1989
1337		-// aConstraints = gbc; // (GridBagConstraints) GraphreeD.clone(gbc);
	1990	+// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1991
1339		- frame.setSize(800, 600);
1340		- frame.show();
	1992	+ frame.setSize(1280, 860);
	1993	+
	1994	+ cameraView.requestFocusInWindow();
	1995	+
	1996	+// gridPanel.setDividerLocation(1.0);
	1997	+
	1998	+ frame.validate();
1341	1999
1342		- gridPanel.setDividerLocation(1.0);
	2000	+ frame.setVisible(true);
1343	2001
1344	2002	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	2003	frame.addWindowListener(new WindowAdapter()
1346	2004	{
1347		-
1348	2005	public void windowClosing(WindowEvent e)
1349	2006	{
1350	2007	Close();
..	..	@@ -1352,6 +2009,10 @@
1352	2009	});
1353	2010	}
1354	2011
	2012	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	2013	+ {
	2014	+ }
	2015	+
1355	2016	JTree GetTree()
1356	2017	{
1357	2018	return objEditor.jTree;
..	..	@@ -1363,260 +2024,609 @@
1363	2024	ctrlPanel.removeAll();
1364	2025	}
1365	2026
1366		- void SetupMaterial(JPanel ctrlPanel)
	2027	+ void SetupMaterial(cGridBag materialpanel)
1367	2028	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	2029	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2030	+
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2032	+ skin.setToolTipText("Skin");
	2033	+ skin.addMouseListener(new MouseAdapter()
	2034	+ {
	2035	+ public void mouseClicked(MouseEvent e)
	2036	+ {
	2037	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2038	+ cMaterial material = object.material;
	2039	+
	2040	+ // Skin
	2041	+ colorField.setFloat(material.color);
	2042	+ float saturation = material.modulation;
	2043	+
	2044	+ if (!cameraView.Skinshader)
	2045	+ {
	2046	+ saturation /= 1.5;
	2047	+ }
	2048	+
	2049	+ saturationField.setFloat(saturation);
	2050	+
	2051	+ subsurfaceField.setFloat(material.subsurface);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+ diffusenessField.setFloat(material.factor);
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ shadowbiasField.setFloat(material.shadowbias);
	2056	+ diffuseField.setFloat(material.diffuse);
	2057	+ specularField.setFloat(material.specular);
	2058	+
	2059	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2060	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2061	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(skin);
	2068	+
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2070	+ lambert.setToolTipText("Diffuse");
	2071	+ lambert.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ diffusenessField.setFloat(material.factor);
	2079	+ selfshadowField.setFloat(material.diffuseness);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(lambert);
	2086	+
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2088	+ diffuse2.setToolTipText("Diffuse2");
	2089	+ diffuse2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ diffusenessField.setFloat(material.factor);
	2097	+ selfshadowField.setFloat(material.diffuseness);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(diffuse2);
	2104	+
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2106	+ diffusemoon.setToolTipText("Moon");
	2107	+ diffusemoon.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ diffusenessField.setFloat(material.factor);
	2115	+ selfshadowField.setFloat(material.diffuseness);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(diffusemoon);
	2122	+
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2124	+ diffusemoon2.setToolTipText("Moon2");
	2125	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ diffusenessField.setFloat(material.factor);
	2133	+ selfshadowField.setFloat(material.diffuseness);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(diffusemoon2);
	2140	+
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2142	+ diffusemoon3.setToolTipText("Moon3");
	2143	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ diffusenessField.setFloat(material.factor);
	2151	+ selfshadowField.setFloat(material.diffuseness);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(diffusemoon3);
	2158	+
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2160	+ diffusesheen.setToolTipText("Sheen");
	2161	+ diffusesheen.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ sheenField.setFloat(material.sheen);
	2169	+
	2170	+ materialtouched = true;
	2171	+ applySelf();
	2172	+ }
	2173	+ });
	2174	+ presetpanel.add(diffusesheen);
	2175	+
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2177	+ rough.setToolTipText("Rough metal");
	2178	+ rough.addMouseListener(new MouseAdapter()
	2179	+ {
	2180	+ public void mouseClicked(MouseEvent e)
	2181	+ {
	2182	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2183	+ cMaterial material = object.material;
	2184	+
	2185	+ shininessField.setFloat(material.shininess);
	2186	+ velvetField.setFloat(material.velvet);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(rough);
	2193	+
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2195	+ rough2.setToolTipText("Medium metal");
	2196	+ rough2.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2201	+ cMaterial material = object.material;
	2202	+
	2203	+ shininessField.setFloat(material.shininess);
	2204	+ lightareaField.setFloat(material.lightarea);
	2205	+
	2206	+ materialtouched = true;
	2207	+ applySelf();
	2208	+ }
	2209	+ });
	2210	+ presetpanel.add(rough2);
	2211	+
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2213	+ shini0.setToolTipText("Shiny");
	2214	+ shini0.addMouseListener(new MouseAdapter()
	2215	+ {
	2216	+ public void mouseClicked(MouseEvent e)
	2217	+ {
	2218	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2219	+ cMaterial material = object.material;
	2220	+
	2221	+ shininessField.setFloat(material.shininess);
	2222	+ lightareaField.setFloat(material.lightarea);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(shini0);
	2229	+
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2231	+ shini1.setToolTipText("Shiny2");
	2232	+ shini1.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ shininessField.setFloat(material.shininess);
	2240	+ lightareaField.setFloat(material.lightarea);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(shini1);
	2247	+
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2249	+ shini2.setToolTipText("Shiny3");
	2250	+ shini2.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2255	+ cMaterial material = object.material;
	2256	+
	2257	+ shininessField.setFloat(material.shininess);
	2258	+ lightareaField.setFloat(material.lightarea);
	2259	+
	2260	+ materialtouched = true;
	2261	+ applySelf();
	2262	+ }
	2263	+ });
	2264	+ presetpanel.add(shini2);
	2265	+
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2267	+ aniso.setToolTipText("AnisoU");
	2268	+ aniso.addMouseListener(new MouseAdapter()
	2269	+ {
	2270	+ public void mouseClicked(MouseEvent e)
	2271	+ {
	2272	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2273	+ cMaterial material = object.material;
	2274	+
	2275	+ anisoField.setFloat(material.aniso);
	2276	+ anisoVField.setFloat(material.anisoV);
	2277	+
	2278	+ materialtouched = true;
	2279	+ applySelf();
	2280	+ }
	2281	+ });
	2282	+ presetpanel.add(aniso);
	2283	+
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2285	+ aniso2.setToolTipText("AnisoV");
	2286	+ aniso2.addMouseListener(new MouseAdapter()
	2287	+ {
	2288	+ public void mouseClicked(MouseEvent e)
	2289	+ {
	2290	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2291	+ cMaterial material = object.material;
	2292	+
	2293	+ anisoField.setFloat(material.aniso);
	2294	+ anisoVField.setFloat(material.anisoV);
	2295	+
	2296	+ materialtouched = true;
	2297	+ applySelf();
	2298	+ }
	2299	+ });
	2300	+ presetpanel.add(aniso2);
	2301	+
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2303	+ aniso3.setToolTipText("AnisoUV");
	2304	+ aniso3.addMouseListener(new MouseAdapter()
	2305	+ {
	2306	+ public void mouseClicked(MouseEvent e)
	2307	+ {
	2308	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2309	+ cMaterial material = object.material;
	2310	+
	2311	+ anisoField.setFloat(material.aniso);
	2312	+ anisoVField.setFloat(material.anisoV);
	2313	+
	2314	+ materialtouched = true;
	2315	+ applySelf();
	2316	+ }
	2317	+ });
	2318	+ presetpanel.add(aniso3);
	2319	+
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2321	+ velvet0.setToolTipText("Velvet");
	2322	+ velvet0.addMouseListener(new MouseAdapter()
	2323	+ {
	2324	+ public void mouseClicked(MouseEvent e)
	2325	+ {
	2326	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2327	+ cMaterial material = object.material;
	2328	+
	2329	+ diffusenessField.setFloat(material.factor);
	2330	+ selfshadowField.setFloat(material.diffuseness);
	2331	+ sheenField.setFloat(material.sheen);
	2332	+ shininessField.setFloat(material.shininess);
	2333	+ velvetField.setFloat(material.velvet);
	2334	+ shiftField.setFloat(material.shift);
	2335	+
	2336	+ materialtouched = true;
	2337	+ applySelf();
	2338	+ }
	2339	+ });
	2340	+ presetpanel.add(velvet0);
	2341	+
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2343	+ bump0.setToolTipText("Bump texture");
	2344	+ bump0.addMouseListener(new MouseAdapter()
	2345	+ {
	2346	+ public void mouseClicked(MouseEvent e)
	2347	+ {
	2348	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2349	+ cMaterial material = object.material;
	2350	+
	2351	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2352	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2353	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2354	+
	2355	+ materialtouched = true;
	2356	+ applySelf();
	2357	+ }
	2358	+ });
	2359	+ presetpanel.add(bump0);
	2360	+
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2362	+ borderShader.setToolTipText("Border fade");
	2363	+ borderShader.addMouseListener(new MouseAdapter()
	2364	+ {
	2365	+ public void mouseClicked(MouseEvent e)
	2366	+ {
	2367	+ borderfadeField.setFloat(0.5);
	2368	+ opacityField.setFloat(0.75);
	2369	+
	2370	+ materialtouched = true;
	2371	+ applySelf();
	2372	+ }
	2373	+ });
	2374	+ presetpanel.add(borderShader);
	2375	+
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2377	+ halo.setToolTipText("Halo");
	2378	+ halo.addMouseListener(new MouseAdapter()
	2379	+ {
	2380	+ public void mouseClicked(MouseEvent e)
	2381	+ {
	2382	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2383	+ cMaterial material = object.material;
	2384	+
	2385	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2386	+
	2387	+ materialtouched = true;
	2388	+ applySelf();
	2389	+ }
	2390	+ });
	2391	+ presetpanel.add(halo);
	2392	+
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2394	+ candle.setToolTipText("Candle");
	2395	+ candle.addMouseListener(new MouseAdapter()
	2396	+ {
	2397	+ public void mouseClicked(MouseEvent e)
	2398	+ {
	2399	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2400	+ cMaterial material = object.material;
	2401	+
	2402	+ subsurfaceField.setFloat(material.subsurface);
	2403	+ shadowbiasField.setFloat(material.shadowbias);
	2404	+ ambientField.setFloat(material.ambient);
	2405	+ specularField.setFloat(material.specular);
	2406	+ lightareaField.setFloat(material.lightarea);
	2407	+ shininessField.setFloat(material.shininess);
	2408	+
	2409	+ materialtouched = true;
	2410	+ applySelf();
	2411	+ }
	2412	+ });
	2413	+ presetpanel.add(candle);
	2414	+
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2416	+ shadowShader.setToolTipText("Shadow");
	2417	+ shadowShader.addMouseListener(new MouseAdapter()
	2418	+ {
	2419	+ public void mouseClicked(MouseEvent e)
	2420	+ {
	2421	+ diffuseField.setFloat(0.001);
	2422	+ ambientField.setFloat(0.001);
	2423	+ cameraField.setFloat(0.001);
	2424	+ specularField.setFloat(0.001);
	2425	+ fakedepthField.setFloat(0.001);
	2426	+ opacityField.setFloat(0.6);
	2427	+
	2428	+ materialtouched = true;
	2429	+ applySelf();
	2430	+ }
	2431	+ });
	2432	+ presetpanel.add(shadowShader);
	2433	+
	2434	+ cGridBag panel = new cGridBag().setVertical(true);
	2435	+
	2436	+ presetpanel.preferredWidth = 1;
	2437	+
	2438	+ materialpanel.add(presetpanel);
	2439	+ materialpanel.add(panel);
	2440	+
	2441	+ panel.preferredWidth = 8;
	2442	+
	2443	+ /*
1371	2444	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	2445	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375		- */
	2446	+ */
1376	2447
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	2448	+ cGridBag editBar = new cGridBag().setVertical(false);
	2449	+
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2451	+ createMaterialButton.setToolTipText("Create material");
1382	2452
1383	2453	/*
1384	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	2455	*/
1389	2456
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
	2458	+ clearMaterialButton.setToolTipText("Clear material");
	2459	+
	2460	+ if (Globals.ADVANCED)
	2461	+ {
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2464	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2465	+ }
1392	2466
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	2467	+ editBar.preferredHeight = 15;
	2468	+
	2469	+ panel.add(editBar);
	2470	+
1407	2471	/**/
1408	2472	//aConstraints.weighty = 0;
1409	2473	////aConstraints.weightx = 1;
1410	2474	//aConstraints.weighty = 1;
1411	2475	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	2476	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	2477	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	2478
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- aConstraints.gridwidth = 1;
	2479	+ cGridBag colorSection = new cGridBag().setVertical(true);
1429	2480
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- aConstraints.gridwidth = 1;
	2481	+ cGridBag huepanel = new cGridBag();
	2482	+ cGridBag huelabel = new cGridBag();
	2483	+ cLabel hue = GetLabel("icons/hue.png", false);
	2484	+ hue.fit = true;
	2485	+
	2486	+ hue.addMouseListener(new MouseAdapter()
	2487	+ {
	2488	+ public void mousePressed(MouseEvent e)
	2489	+ {
	2490	+ int x = e.getX();
	2491	+
	2492	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2493	+ }
	2494	+ });
	2495	+
	2496	+ huelabel.add(hue);
	2497	+ huelabel.preferredWidth = 20;
	2498	+ huepanel.add(new cGridBag()); // Label
	2499	+ huepanel.add(huelabel); // Field/slider
	2500	+
	2501	+ huepanel.preferredHeight = 7;
1439	2502
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	2503	+ colorSection.add(huepanel);
	2504	+
	2505	+ cGridBag color = new cGridBag();
	2506	+
	2507	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2508	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2509	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1449	2510
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	2511	+ //colorField.preferredWidth = 200;
	2512	+ colorSection.add(color);
1459	2513
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.gridwidth = 1;
	2514	+ cGridBag modulation = new cGridBag();
	2515	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2516	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2517	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2518	+ colorSection.add(modulation);
1469	2519
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- aConstraints.gridwidth = 1;
	2520	+ cGridBag opacity = new cGridBag();
	2521	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2522	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2523	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2524	+ colorSection.add(opacity);
1479	2525
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- aConstraints.gridwidth = 1;
	2526	+ colorSection.add(GetSeparator());
	2527	+
	2528	+ cGridBag texture = new cGridBag();
	2529	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2530	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2531	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2532	+ colorSection.add(texture);
1488	2533
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- aConstraints.gridwidth = 1;
	2534	+ panel.add(GetSeparator());
	2535	+
	2536	+ panel.add(colorSection);
	2537	+
	2538	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2539	+
	2540	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2541	+
	2542	+ cGridBag diffuse = new cGridBag();
	2543	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2544	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2545	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2546	+ diffuseSection.add(diffuse);
1498	2547
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- aConstraints.gridwidth = 1;
	2548	+ cGridBag diffuseness = new cGridBag();
	2549	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2550	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2551	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2552	+ diffuseSection.add(diffuseness);
1508	2553
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- aConstraints.gridwidth = 1;
	2554	+ cGridBag selfshadow = new cGridBag();
	2555	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2556	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2558	+ diffuseSection.add(selfshadow);
1518	2559
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- aConstraints.gridwidth = 1;
	2560	+ cGridBag sheen = new cGridBag();
	2561	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2562	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2563	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2564	+ diffuseSection.add(sheen);
1528	2565
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- aConstraints.gridwidth = 1;
	2566	+ cGridBag subsurface = new cGridBag();
	2567	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2568	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2569	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2570	+ diffuseSection.add(subsurface);
1538	2571
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- aConstraints.gridwidth = 1;
	2572	+ cGridBag shadow = new cGridBag();
	2573	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2574	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2575	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2576	+ diffuseSection.add(shadow);
1548	2577
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- aConstraints.gridwidth = 1;
	2578	+ cGridBag fakedepth = new cGridBag();
	2579	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2580	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2581	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2582	+ diffuseSection.add(fakedepth);
1558	2583
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- aConstraints.gridwidth = 1;
	2584	+ cGridBag shadowbias = new cGridBag();
	2585	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2586	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2587	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2588	+ diffuseSection.add(shadowbias);
1567	2589
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- aConstraints.gridwidth = 1;
	2590	+ panel.add(GetSeparator());
	2591	+
	2592	+ panel.add(diffuseSection);
	2593	+
	2594	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2595	+
	2596	+ cGridBag specularSection = new cGridBag().setVertical(true);
1577	2597
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- aConstraints.gridwidth = 1;
	2598	+ cGridBag specular = new cGridBag();
	2599	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2600	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2601	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2602	+ specularSection.add(specular);
1587	2603
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- aConstraints.gridwidth = 1;
	2604	+ cGridBag lightarea = new cGridBag();
	2605	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2606	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2607	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2608	+ specularSection.add(lightarea);
1597	2609
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- aConstraints.gridwidth = 1;
	2610	+ cGridBag shininess = new cGridBag();
	2611	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2612	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2613	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2614	+ specularSection.add(shininess);
1607	2615
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
	2616	+ cGridBag metalness = new cGridBag();
	2617	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2618	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2619	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2620	+ specularSection.add(metalness);
1617	2621
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	2622	+ cGridBag velvet = new cGridBag();
	2623	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2624	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2625	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2626	+ specularSection.add(velvet);
	2627	+
	2628	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2629	+ //Return();
1620	2630	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	2631	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	2632	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +2637,99 @@
1627	2637	// aConstraints.gridy += 1;
1628	2638	// aConstraints.gridwidth = 1;
1629	2639
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	2640	+ cGridBag anisoU = new cGridBag();
	2641	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2642	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2643	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2644	+ specularSection.add(anisoU);
1638	2645
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	2646	+ cGridBag anisoV = new cGridBag();
	2647	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2648	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2650	+ specularSection.add(anisoV);
1648	2651
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
1658	2652
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- aConstraints.gridwidth = 1;
	2653	+ panel.add(GetSeparator());
	2654	+
	2655	+ panel.add(specularSection);
	2656	+
	2657	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2658	+
	2659	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	2660
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- aConstraints.weighty = 0;
	2661	+ cGridBag camera = new cGridBag();
	2662	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2663	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2664	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2665	+ colorSection.add(camera);
1679	2666
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	2667	+ cGridBag ambient = new cGridBag();
	2668	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2669	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2670	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2671	+ colorSection.add(ambient);
1689	2672
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	2673	+ cGridBag backlit = new cGridBag();
	2674	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2675	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2676	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2677	+ colorSection.add(backlit);
1699	2678
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	2679	+ //panel.add(new JSeparator());
	2680	+
	2681	+ //panel.add(globalSection);
	2682	+
	2683	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2684	+
	2685	+ cGridBag textureSection = new cGridBag().setVertical(true);
1709	2686
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
	2687	+ cGridBag bump = new cGridBag();
	2688	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2689	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2690	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2691	+ textureSection.add(bump);
1719	2692
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- aConstraints.gridwidth = 1;
	2693	+ cGridBag noise = new cGridBag();
	2694	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2695	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2696	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2697	+ textureSection.add(noise);
1729	2698
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- aConstraints.gridwidth = 1;
	2699	+ cGridBag power = new cGridBag();
	2700	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2701	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2702	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2703	+ textureSection.add(power);
1739	2704
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	2705	+ cGridBag borderfade = new cGridBag();
	2706	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2707	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2708	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2709	+ textureSection.add(borderfade);
1745	2710
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	2711	+ cGridBag fog = new cGridBag();
	2712	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2713	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2714	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2715	+ textureSection.add(fog);
	2716	+
	2717	+ cGridBag opacityPower = new cGridBag();
	2718	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2719	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2720	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2721	+ textureSection.add(opacityPower);
	2722	+
	2723	+ panel.add(GetSeparator());
	2724	+
	2725	+ panel.add(textureSection);
	2726	+
	2727	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	2728
1750	2729	SetMaterial(copy); // .GetMaterial());
1751	2730
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	2731	+ //colorField.addChangeListener(this);
	2732	+// modulationField.addChangeListener(this);
1754	2733	metalnessField.addChangeListener(this);
1755	2734	diffuseField.addChangeListener(this);
1756	2735	specularField.addChangeListener(this);
..	..	@@ -1780,12 +2759,15 @@
1780	2759	opacityPowerField.addChangeListener(this);
1781	2760	/**/
1782	2761
1783		- resetSlidersButton.addActionListener(this);
1784	2762	clearMaterialButton.addActionListener(this);
1785	2763	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	2764	+
	2765	+ if (Globals.ADVANCED)
	2766	+ {
	2767	+ resetSlidersButton.addActionListener(this);
	2768	+ propagateToggle.addItemListener(this);
	2769	+ multiplyToggle.addItemListener(this);
	2770	+ }
1789	2771	}
1790	2772
1791	2773	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1803,8 +2785,9 @@
1803	2785	// 3D models
1804	2786	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1805	2787	{
1806		- lastConverter = new com.jmex.model.converters.MaxToJme();
1807		- LoadFile(filename, lastConverter);
	2788	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2789	+ //LoadFile(filename, lastConverter);
	2790	+ LoadObjFile(filename); // New 3ds loader
1808	2791	continue;
1809	2792	}
1810	2793	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1859,19 +2842,21 @@
1859	2842	}
1860	2843
1861	2844	// Images/textures
1862		- if (textures
1863		- && (filename.toLowerCase().endsWith(".jpg")
1864		- \|\| filename.toLowerCase().endsWith(".jpeg")
1865		- \|\| filename.toLowerCase().endsWith(".gif")
1866		- \|\| filename.toLowerCase().endsWith(".png")
1867		- \|\| filename.toLowerCase().endsWith(".tre")
1868		- \|\| filename.toLowerCase().endsWith(".bmp")
1869		- \|\| filename.toLowerCase().endsWith(".tga")
1870		- \|\| filename.toLowerCase().endsWith(".sgi")
1871		- \|\| filename.toLowerCase().endsWith(".tif")
1872		- \|\| filename.toLowerCase().endsWith(".tiff")))
	2845	+ if (filename.toLowerCase().endsWith(".jpg")
	2846	+ \|\| filename.toLowerCase().endsWith(".jpeg")
	2847	+ \|\| filename.toLowerCase().endsWith(".gif")
	2848	+ \|\| filename.toLowerCase().endsWith(".png")
	2849	+ \|\| filename.toLowerCase().endsWith(".tre")
	2850	+ \|\| filename.toLowerCase().endsWith(".bmp")
	2851	+ \|\| filename.toLowerCase().endsWith(".tga")
	2852	+ \|\| filename.toLowerCase().endsWith(".sgi")
	2853	+ \|\| filename.toLowerCase().endsWith(".tif")
	2854	+ \|\| filename.toLowerCase().endsWith(".tiff"))
1873	2855	{
1874		- DropTexture(filename);
	2856	+ if (textures)
	2857	+ DropTexture(filename);
	2858	+ else
	2859	+ CreateBillboard(filename);
1875	2860	continue;
1876	2861	}
1877	2862
..	..	@@ -1880,6 +2865,60 @@
1880	2865	}
1881	2866
1882	2867	ResetModel();
	2868	+ }
	2869	+
	2870	+ void CreateBillboard(String filename)
	2871	+ {
	2872	+ Object3D source = null;
	2873	+ Object3D group = copy;
	2874	+
	2875	+ if (group.selection.size() > 0)
	2876	+ {
	2877	+ source = group.selection.get(0);
	2878	+ }
	2879	+
	2880	+ Grid grid = new Grid(1,1);
	2881	+ grid.material = null;
	2882	+
	2883	+ grid.toParent = LA.newMatrix();
	2884	+ grid.fromParent = LA.newMatrix();
	2885	+ LA.matYRotate(grid.toParent, Math.PI/2);
	2886	+ LA.matXRotate(grid.toParent, -Math.PI/2);
	2887	+ LA.matXRotate(grid.fromParent, Math.PI/2);
	2888	+ LA.matYRotate(grid.fromParent, -Math.PI/2);
	2889	+
	2890	+ BillboardNode bb = new BillboardNode();
	2891	+ bb.addChild(grid);
	2892	+
	2893	+ Object3D newgroup = new Object3D();
	2894	+ newgroup.CreateMaterial();
	2895	+
	2896	+ File file = new File(filename);
	2897	+ newgroup.name = file.getName();
	2898	+ newgroup.addChild(bb);
	2899	+
	2900	+ Object3D main = newgroup;
	2901	+
	2902	+ main.SetPigmentTexture(filename);
	2903	+
	2904	+ if (source != null)
	2905	+ {
	2906	+ main.material = new cMaterial(source.material);
	2907	+ if (main.projectedVertices.length < source.projectedVertices.length)
	2908	+ {
	2909	+ main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
	2910	+ }
	2911	+
	2912	+ for (int i=0; i<source.projectedVertices.length; i++)
	2913	+ {
	2914	+ main.projectedVertices[i].x = source.projectedVertices[i].x;
	2915	+ main.projectedVertices[i].y = source.projectedVertices[i].y;
	2916	+ }
	2917	+
	2918	+ main.texres = source.texres;
	2919	+ }
	2920	+
	2921	+ makeSomething(newgroup, false);
1883	2922	}
1884	2923
1885	2924	Point location;
..	..	@@ -1900,7 +2939,7 @@
1900	2939
1901	2940	//? flashIt = false;
1902	2941	CameraPane pane = (CameraPane) cameraView;
1903		- pane.clickStart(location.x, location.y, 0);
	2942	+ pane.clickStart(location.x, location.y, 0, 0);
1904	2943	pane.clickEnd(location.x, location.y, 0, true);
1905	2944
1906	2945	if (group.selection.size() == 1)
..	..	@@ -1949,6 +2988,7 @@
1949	2988	e2.printStackTrace();
1950	2989	}
1951	2990	}
	2991	+
1952	2992	LoadJMEThread loadThread;
1953	2993
1954	2994	class LoadJMEThread extends Thread
..	..	@@ -2006,6 +3046,7 @@
2006	3046	//LoadFile0(filename, converter);
2007	3047	}
2008	3048	}
	3049	+
2009	3050	LoadOBJThread loadObjThread;
2010	3051
2011	3052	class LoadOBJThread extends Thread
..	..	@@ -2084,19 +3125,19 @@
2084	3125
2085	3126	void LoadObjFile(String fullname)
2086	3127	{
2087		- /*
	3128	+ System.out.println("Loading " + fullname);
	3129	+ /**/
2088	3130	//lastFilename = fullname;
2089	3131	if(loadObjThread == null)
2090	3132	{
2091		- loadObjThread = new LoadOBJThread();
2092		- loadObjThread.start();
	3133	+ loadObjThread = new LoadOBJThread();
	3134	+ loadObjThread.start();
2093	3135	}
2094	3136
2095	3137	loadObjThread.add(fullname);
2096		- */
	3138	+ /**/
2097	3139
2098		- System.out.println("Loading " + fullname);
2099		- makeSomething(new FileObject(fullname, true), true);
	3140	+ //makeSomething(new FileObject(fullname, true), true);
2100	3141	}
2101	3142
2102	3143	void LoadGFDFile(String fullname)
..	..	@@ -2138,6 +3179,8 @@
2138	3179	{
2139	3180	Mocap sel = (Mocap) copy.selection.get(0);
2140	3181
	3182	+ sel.SetCurrentBones(sel.frame);
	3183	+
2141	3184	sel.fullname = fullname;
2142	3185
2143	3186	if (changename)
..	..	@@ -2151,14 +3194,18 @@
2151	3194	sel.smoothed = false;
2152	3195
2153	3196	// if (!changename)
2154		- sel.SetPositionDelta(false, true, true, true/?/); // false
	3197	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	3198	+ sel.SetGlobalTransform();
	3199	+ sel.LoadData();
	3200	+ sel.Rewind();
	3201	+ sel.Fade();
2155	3202	// sel.setPose(0);
2156	3203	refreshContents();
2157	3204	} else
2158	3205	{
2159	3206	mocap.Reset();
2160	3207	// new skeleton
2161		- makeSomething(mocap, false); // true);
	3208	+ makeSomething(mocap, true); // true);
2162	3209	}
2163	3210	} catch (Exception e)
2164	3211	{
..	..	@@ -2185,6 +3232,8 @@
2185	3232	{
2186	3233	Mocap sel = (Mocap) select;
2187	3234
	3235	+ sel.SetCurrentBones(sel.frame);
	3236	+
2188	3237	File file = new File(fullname);
2189	3238
2190	3239	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2251,7 +3300,11 @@
2251	3300
2252	3301	if (!changename)
2253	3302	{
2254		- sel.SetPositionDelta(false, true, true, true/?/);
	3303	+ //sel.SetPositionDelta(false, true, true, true/?/);
	3304	+ sel.SetGlobalTransform();
	3305	+ sel.LoadData();
	3306	+ sel.Rewind();
	3307	+ sel.Fade();
2255	3308	}
2256	3309
2257	3310	// sel.setPose(0);
..	..	@@ -2345,11 +3398,11 @@
2345	3398
2346	3399	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3400	{
2348		- if (GraphreeD.standAlone)
	3401	+ if (Grafreed.standAlone)
2349	3402	{
2350	3403	/**/
2351	3404	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3405	+ browser.setVisible(true);
2353	3406	String filename = browser.getFile();
2354	3407	if (filename != null && filename.length() > 0)
2355	3408	{
..	..	@@ -2460,6 +3513,7 @@
2460	3513	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3514	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3515	}
	3516	+
2463	3517	//cJME.count++;
2464	3518	//cJME.count %= 12;
2465	3519	if (gc)
..	..	@@ -2494,6 +3548,7 @@
2494	3548	}
2495	3549	if (input == null)
2496	3550	{
	3551	+ new Exception().printStackTrace();
2497	3552	System.exit(0);
2498	3553	}
2499	3554
..	..	@@ -2642,6 +3697,7 @@
2642	3697	}
2643	3698	}
2644	3699	}
	3700	+
2645	3701	cFileSystemPane FSPane;
2646	3702
2647	3703	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2651,7 +3707,7 @@
2651	3707
2652	3708	freezematerial = true;
2653	3709	colorField.setFloat(mat.color);
2654		- modulationField.setFloat(mat.modulation);
	3710	+ saturationField.setFloat(mat.modulation);
2655	3711	metalnessField.setFloat(mat.metalness);
2656	3712	diffuseField.setFloat(mat.diffuse);
2657	3713	specularField.setFloat(mat.specular);
..	..	@@ -2695,11 +3751,14 @@
2695	3751	}
2696	3752	}
2697	3753	}
	3754	+
2698	3755	freezematerial = false;
2699	3756	}
2700	3757
2701	3758	void SetMaterial(Object3D object)
2702	3759	{
	3760	+ latestObject = object;
	3761	+
2703	3762	cMaterial mat = object.material;
2704	3763
2705	3764	if (mat == null)
..	..	@@ -2708,33 +3767,10 @@
2708	3767	return;
2709	3768	}
2710	3769
2711		- multiplyToggle.setSelected(mat.multiply);
2712		-
2713		- assert (object.projectedVertices != null);
2714		-
2715		- if (object.projectedVertices.length <= 2)
2716		- {
2717		- // Side effect...
2718		- Object3D.cVector2[] keep = object.projectedVertices;
2719		- object.projectedVertices = new Object3D.cVector2[3];
2720		- for (int i = 0; i < 3; i++)
2721		- {
2722		- if (i < keep.length)
2723		- {
2724		- object.projectedVertices[i] = keep[i];
2725		- } else
2726		- {
2727		- object.projectedVertices[i] = new Object3D.cVector2();
2728		- }
2729		- /*
2730		- if(keep.length == 0)
2731		- object.projectedVertices[0] = new Object3D.cVector2();
2732		- else
2733		- object.projectedVertices[0] = keep[0];
2734		- object.projectedVertices[1] = new Object3D.cVector2();
2735		- */
2736		- }
2737		- }
	3770	+ if (multiplyToggle != null)
	3771	+ multiplyToggle.setSelected(mat.multiply);
	3772	+
	3773	+ AllocProjectedVertices(object);
2738	3774
2739	3775	SetMaterial(mat, object.projectedVertices);
2740	3776	}
..	..	@@ -2810,12 +3846,17 @@
2810	3846	// }
2811	3847
2812	3848	/**/
2813		- if (deselect)
	3849	+ if (deselect \|\| child == null)
2814	3850	{
2815	3851	//group.deselectAll();
2816	3852	//freeze = true;
2817	3853	GetTree().clearSelection();
2818	3854	//freeze = false;
	3855	+
	3856	+ if (child == null)
	3857	+ {
	3858	+ return;
	3859	+ }
2819	3860	}
2820	3861
2821	3862	//group.addSelectee(child);
..	..	@@ -2849,6 +3890,17 @@
2849	3890	public void itemStateChanged(ItemEvent event)
2850	3891	{
2851	3892	// System.out.println("Propagate = " + propagate);
	3893	+ if (event.getSource() == pinButton)
	3894	+ {
	3895	+ copy.pinned ^= true;
	3896	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3897	+ {
	3898	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3899	+ copy.CloseUI();
	3900	+ //copy.editWindow.refreshContents();
	3901	+ }
	3902	+ }
	3903	+ else
2852	3904	if (event.getSource() == propagateToggle)
2853	3905	{
2854	3906	propagate ^= true;
..	..	@@ -2884,31 +3936,48 @@
2884	3936	cameraView.ToggleDL();
2885	3937	cameraView.repaint();
2886	3938	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3939	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3940	{
2889	3941	cameraView.ToggleTexture();
2890	3942	// june 2013 copy.HardTouch();
2891	3943	cameraView.repaint();
2892	3944	return;
2893		- } else if (event.getSource() == toggleFullItem)
	3945	+ } else if (event.getSource() == toggleTimelineItem)
2894	3946	{
2895		- if (CameraPane.FULLSCREEN)
	3947	+ timeline ^= true;
	3948	+
	3949	+ if (timeline)
2896	3950	{
2897		- frame.getContentPane().remove(/"Center",/bigThree);
2898		- framePanel.add(bigThree);
2899		- frame.getContentPane().add(/"Center",/framePanel);
2900		- } else
2901		- {
2902		- frame.getContentPane().remove(/"Center",/framePanel);
2903		- frame.getContentPane().add(/"Center",/bigThree);
	3951	+ centralPanel.remove(cameraView);
	3952	+ cameraPanel.add(cameraView);
	3953	+ centralPanel.add(cameraPanel);
	3954	+ frame.setJMenuBar(timelineMenubar);
	3955	+ wasFullScreen = CameraPane.FULLSCREEN;
	3956	+ if (!CameraPane.FULLSCREEN)
	3957	+ ToggleFullScreen();
	3958	+ toggleFullScreenItem.setEnabled(false);
2904	3959	}
	3960	+ else
	3961	+ {
	3962	+ centralPanel.remove(cameraPanel);
	3963	+ centralPanel.add(cameraView);
	3964	+ frame.setJMenuBar(null);
	3965	+ if (!wasFullScreen)
	3966	+ ToggleFullScreen();
	3967	+ toggleFullScreenItem.setEnabled(true);
	3968	+ }
	3969	+
2905	3970	frame.validate();
2906		- cameraView.ToggleFullScreen();
	3971	+ return;
	3972	+ } else if (event.getSource() == toggleFullScreenItem)
	3973	+ {
	3974	+ ToggleFullScreen();
	3975	+ frame.validate();
2907	3976
2908	3977	return;
2909		- } else if (event.getSource() == toggleRandomItem)
	3978	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2910	3979	{
2911		- cameraView.ToggleRandom();
	3980	+ cameraView.ToggleSwitch();
2912	3981	cameraView.repaint();
2913	3982	return;
2914	3983	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2936,12 +4005,17 @@
2936	4005	} else if (event.getSource() == liveCB)
2937	4006	{
2938	4007	copy.live ^= true;
	4008	+ objEditor.refreshContents(true); // To show item colors
	4009	+ return;
	4010	+ } else if (event.getSource() == selectableCB)
	4011	+ {
	4012	+ copy.dontselect ^= true;
2939	4013	return;
2940	4014	} else if (event.getSource() == hideCB)
2941	4015	{
2942	4016	copy.hide ^= true;
2943	4017	copy.Touch(); // display list issue
2944		- objEditor.refreshContents();
	4018	+ objEditor.refreshContents(true); // To show item colors
2945	4019	return;
2946	4020	} else if (event.getSource() == link2masterCB)
2947	4021	{
..	..	@@ -2951,6 +4025,7 @@
2951	4025	if (event.getSource() == randomCB)
2952	4026	{
2953	4027	copy.random ^= true;
	4028	+ objEditor.refreshContents();
2954	4029	return;
2955	4030	}
2956	4031	if (event.getSource() == speedupCB)
..	..	@@ -2974,8 +4049,9 @@
2974	4049
2975	4050	public void actionPerformed(ActionEvent event)
2976	4051	{
	4052	+ Object source = event.getSource();
2977	4053	// SCRIPT DIALOG
2978		- if (event.getSource() == okbutton)
	4054	+ if (source == okbutton)
2979	4055	{
2980	4056	textpanel.setVisible(false);
2981	4057	textpanel.remove(textarea);
..	..	@@ -2987,7 +4063,7 @@
2987	4063	textarea = null;
2988	4064	textpanel = null;
2989	4065	}
2990		- if (event.getSource() == cancelbutton)
	4066	+ if (source == cancelbutton)
2991	4067	{
2992	4068	textpanel.setVisible(false);
2993	4069	textpanel.remove(textarea);
..	..	@@ -2999,49 +4075,50 @@
2999	4075	//applySelf();
3000	4076	//client.refreshEditWindow();
3001	4077	//refreshContents();
3002		- if (event.getSource() == nameField)
	4078	+ if (source == nameField)
3003	4079	{
3004	4080	//System.out.println("ObjEditor " + event);
3005	4081	applySelf0(true);
3006	4082	//parent.applySelf();
3007		- objEditor.refreshContents();
3008		- } else if (event.getSource() == resetButton)
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
	4084	+ } else if (source == resetButton)
3009	4085	{
3010	4086	CameraPane.fullreset = true;
3011	4087	copy.Reset(); // ResetMeshes();
3012	4088	copy.Touch();
3013	4089	objEditor.refreshContents();
3014		- } else if (event.getSource() == stepItem)
	4090	+ } else if (source == stepItem)
3015	4091	{
3016		- cameraView.ONESTEP = true;
	4092	+ //cameraView.ONESTEP = true;
	4093	+ Globals.ONESTEP = true;
3017	4094	cameraView.repaint();
3018	4095	return;
3019		- } else if (event.getSource() == stepButton)
	4096	+ } else if (source == stepButton)
3020	4097	{
3021	4098	copy.Step();
3022	4099	copy.Touch();
3023	4100	objEditor.refreshContents();
3024		- } else if (event.getSource() == slowerButton)
	4101	+ } else if (source == slowerButton)
3025	4102	{
3026	4103	copy.Slower();
3027	4104	copy.Touch();
3028	4105	objEditor.refreshContents();
3029		- } else if (event.getSource() == fasterButton)
	4106	+ } else if (source == fasterButton)
3030	4107	{
3031	4108	copy.Faster();
3032	4109	copy.Touch();
3033	4110	objEditor.refreshContents();
3034		- } else if (event.getSource() == remarkButton)
	4111	+ } else if (source == remarkButton)
3035	4112	{
3036	4113	copy.Remark();
3037	4114	copy.Touch();
3038	4115	objEditor.refreshContents();
3039		- } else if (event.getSource() == stepAllButton)
	4116	+ } else if (source == stepAllButton)
3040	4117	{
3041	4118	copy.StepAll();
3042	4119	copy.Touch();
3043	4120	objEditor.refreshContents();
3044		- } else if (event.getSource() == resetAllButton)
	4121	+ } else if (source == resetAllButton)
3045	4122	{
3046	4123	//CameraPane.fullreset = true;
3047	4124	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3074,53 +4151,79 @@
3074	4151	// Close();
3075	4152	// }
3076	4153	// else
3077		- if (event.getSource() == resetSlidersButton)
	4154	+ if (source == resetSlidersButton)
3078	4155	{
3079	4156	ResetSliders();
3080		- } else if (event.getSource() == clearMaterialButton)
	4157	+ } else if (source == clearMaterialButton)
3081	4158	{
3082	4159	ClearMaterial();
3083		- } else if (event.getSource() == createMaterialButton)
	4160	+ } else if (source == createMaterialButton)
3084	4161	{
3085	4162	CreateMaterial();
3086		- } else if (event.getSource() == clearPanelButton)
	4163	+ } else if (source == clearPanelButton)
3087	4164	{
3088	4165	copy.ClearUI();
3089	4166	refreshContents(true);
3090		- } /*
3091		- }
3092		-
3093		- public boolean action(Event event, Object arg)
3094		- {
3095		- */ else if (event.getSource() == closeItem)
	4167	+ } else if (source == importGFDItem)
	4168	+ {
	4169	+ ImportGFD();
	4170	+ } else
	4171	+ if (source == importVRMLX3DItem)
	4172	+ {
	4173	+ ImportVRMLX3D();
	4174	+ } else
	4175	+ if (source == import3DSItem)
	4176	+ {
	4177	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4178	+ } else
	4179	+ if (source == importOBJItem)
	4180	+ {
	4181	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4182	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4183	+ browser.setVisible(true);
	4184	+ String filename = browser.getFile();
	4185	+ if (filename != null && filename.length() > 0)
	4186	+ {
	4187	+ String fullname = browser.getDirectory() + filename;
	4188	+ makeSomething(ReadOBJ(fullname), true);
	4189	+ }
	4190	+ } else
	4191	+ if (source == closeItem)
3096	4192	{
3097	4193	Close();
3098	4194	//return true;
3099		- } else if (event.getSource() == loadItem)
	4195	+ } else if (source == openItem)
3100	4196	{
3101		- load();
	4197	+ Open();
3102	4198	//return true;
3103		- } else if (event.getSource() == saveItem)
	4199	+ } else if (source == newItem)
	4200	+ {
	4201	+ New();
	4202	+ } else if (source == saveItem)
3104	4203	{
3105	4204	save();
3106	4205	//return true;
3107		- } else if (event.getSource() == saveAsItem)
	4206	+ } else if (source == saveAsItem)
3108	4207	{
3109	4208	saveAs();
3110	4209	//return true;
3111		- } else if (event.getSource() == reexportItem)
	4210	+ } else if (source == reexportItem)
3112	4211	{
3113	4212	reexport();
3114	4213	//return true;
3115		- } else if (event.getSource() == exportAsItem)
	4214	+ } else if (source == exportAsItem)
3116	4215	{
3117	4216	export();
3118	4217	//return true;
3119		- } else if (event.getSource() == povItem)
	4218	+ } else if (source == povItem)
3120	4219	{
3121	4220	generatePOV();
3122	4221	//return true;
3123		- } else if (event.getSource() == zBufferItem)
	4222	+ } else if (event.getSource() == archiveItem)
	4223	+ {
	4224	+ cTools.Archive(frame);
	4225	+ return;
	4226	+ } else if (source == zBufferItem)
3124	4227	{
3125	4228	try
3126	4229	{
..	..	@@ -3142,21 +4245,8 @@
3142	4245	cameraView.repaint();
3143	4246	//return true;
3144	4247	}
3145		- */ else if (event.getSource() == editCameraItem)
3146		- {
3147		- cameraView.ProtectCamera();
3148		- cameraView.repaint();
3149		- return;
3150		- } else if (event.getSource() == revertCameraItem)
3151		- {
3152		- cameraView.RevertCamera();
3153		- cameraView.repaint();
3154		- return;
3155		- } else if (event.getSource() == textureButton)
3156		- {
3157		- return; // true;
3158		- } else // combos...
3159		- if (event.getSource() == texresMenu)
	4248	+ */ else // combos...
	4249	+ if (source == texresMenu)
3160	4250	{
3161	4251	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3162	4252	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3168,27 +4258,518 @@
3168	4258	}
3169	4259	}
3170	4260
3171		- void ToggleAnimation()
	4261	+ void New()
3172	4262	{
3173		- if (!CameraPane.ANIMATION)
	4263	+ while (copy.Size() > 0)
3174	4264	{
3175		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4265	+ copy.remove(0);
	4266	+ }
	4267	+
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
	4275	+ ResetModel();
	4276	+ objEditor.refreshContents();
	4277	+ }
	4278	+
	4279	+ static public byte[] Compress(Object3D o)
	4280	+ {
	4281	+ // Slower to actually compress.
	4282	+ try
	4283	+ {
	4284	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4285	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4286	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4287	+
	4288	+ Object3D parent = o.parent;
	4289	+ o.parent = null;
	4290	+
	4291	+ out.writeObject(o);
	4292	+
	4293	+ o.parent = parent;
	4294	+
	4295	+ out.flush();
	4296	+
	4297	+ baos //zstream
	4298	+ .close();
	4299	+ out.close();
	4300	+
	4301	+ byte[] bytes = baos.toByteArray();
	4302	+
	4303	+ System.out.println("save #bytes = " + bytes.length);
	4304	+ return bytes;
	4305	+ } catch (Exception e)
	4306	+ {
	4307	+ System.err.println(e);
	4308	+ return null;
	4309	+ }
	4310	+ }
	4311	+
	4312	+ static public Object Uncompress(byte[] bytes)
	4313	+ {
	4314	+ System.out.println("restore #bytes = " + bytes.length);
	4315	+ try
	4316	+ {
	4317	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4318	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4319	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4320	+ Object obj = in.readObject();
	4321	+
	4322	+ bais //istream
	4323	+ .close();
	4324	+ in.close();
	4325	+
	4326	+ return obj;
	4327	+ } catch (Exception e)
	4328	+ {
	4329	+ System.err.println(e);
	4330	+ return null;
	4331	+ }
	4332	+ }
	4333	+
	4334	+ static public Object clone(Object o)
	4335	+ {
	4336	+ try
	4337	+ {
	4338	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4339	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4340	+
	4341	+ out.writeObject(o);
	4342	+
	4343	+ out.flush();
	4344	+ out.close();
	4345	+
	4346	+ byte[] bytes = baos.toByteArray();
	4347	+
	4348	+ System.out.println("clone = " + bytes.length);
	4349	+
	4350	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4351	+ ObjectInputStream in = new ObjectInputStream(bais);
	4352	+ Object obj = in.readObject();
	4353	+ in.close();
	4354	+
	4355	+ return obj;
	4356	+ } catch (Exception e)
	4357	+ {
	4358	+ System.err.println(e);
	4359	+ return null;
	4360	+ }
	4361	+ }
	4362	+
	4363	+ cRadio GetCurrentTab()
	4364	+ {
	4365	+ cRadio ab;
	4366	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4367	+ {
	4368	+ ab = (cRadio)e.nextElement();
	4369	+ if(ab.GetObject() == copy)
	4370	+ {
	4371	+ return ab;
	4372	+ }
	4373	+ }
	4374	+
	4375	+ return null;
	4376	+ }
	4377	+
	4378	+
	4379	+ public void Save()
	4380	+ {
	4381	+ //Save(true);
	4382	+ Replace();
	4383	+ SetVersionStates();
	4384	+ }
	4385	+
	4386	+ private boolean Equal(byte[] compress, byte[] name)
	4387	+ {
	4388	+ if (compress.length != name.length)
	4389	+ {
	4390	+ return false;
	4391	+ }
	4392	+
	4393	+ for (int i=compress.length; --i>=0;)
	4394	+ {
	4395	+ if (compress[i] != name[i])
	4396	+ return false;
	4397	+ }
	4398	+
	4399	+ return true;
	4400	+ }
	4401	+
	4402	+ void DeleteVersion()
	4403	+ {
	4404	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4405	+ {
	4406	+ copy.versionlist[i] = copy.versionlist[i+1];
	4407	+ }
	4408	+
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
	4411	+
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
	4414	+
	4415	+ SetVersionStates();
	4416	+ }
	4417	+
	4418	+ public boolean Save(boolean user)
	4419	+ {
	4420	+ System.err.println("Save");
	4421	+ Replace();
	4422	+
	4423	+ //cRadio tab = GetCurrentTab();
	4424	+
	4425	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4426	+
	4427	+ boolean thesame = false;
	4428	+
	4429	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4430	+// {
	4431	+// thesame = true;
	4432	+// }
	4433	+
	4434	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4435	+ if (!thesame)
	4436	+ {
	4437	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4438	+ {
	4439	+ copy.versionlist[i] = copy.versionlist[i-1];
	4440	+ }
	4441	+
	4442	+ //tab.user[tab.versionindex] = user;
	4443	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4444	+
	4445	+ copy.versionlist[++copy.versionindex] = compress;
	4446	+
	4447	+ // if (increment)
	4448	+ // tab.versionindex++;
	4449	+ }
	4450	+
	4451	+ //copy.RestoreBigData(versiontable);
	4452	+
	4453	+ //assert(hashtable.isEmpty());
	4454	+
	4455	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4456	+// {
	4457	+// //tab.user[i] = false;
	4458	+// copy.versionlist[i] = null;
	4459	+// }
	4460	+
	4461	+ SetVersionStates();
	4462	+
	4463	+ // test save
	4464	+ if (false)
	4465	+ {
	4466	+ try
	4467	+ {
	4468	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4469	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4470	+
	4471	+ p.writeObject(copy);
	4472	+
	4473	+ p.flush();
	4474	+
	4475	+ ostream.close();
	4476	+ } catch (Exception e)
	4477	+ {
	4478	+ e.printStackTrace();
	4479	+ }
	4480	+ }
	4481	+
	4482	+ return !thesame;
	4483	+ }
	4484	+
	4485	+ boolean flashIt = true;
	4486	+
	4487	+ void RefreshSelection()
	4488	+ {
	4489	+ Object3D selection = new Object3D();
	4490	+
	4491	+ for (int i = 0; i < copy.selection.size(); i++)
	4492	+ {
	4493	+ Object3D elem = copy.selection.elementAt(i);
	4494	+
	4495	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4496	+
	4497	+ if (obj == null)
	4498	+ {
	4499	+ copy.selection.remove(i--);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ selection.add(obj);
	4504	+ copy.selection.setElementAt(obj, i);
	4505	+ }
	4506	+ }
	4507	+
	4508	+ flashIt = false;
	4509	+ GetTree().clearSelection();
	4510	+ for (int i = 0; i < selection.size(); i++)
	4511	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4512	+ flashIt = true;
	4513	+
	4514	+ //refreshContents(false);
	4515	+ }
	4516	+
	4517	+ void CopyChanged()
	4518	+ {
	4519	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4520	+
	4521	+ SetVersionStates();
	4522	+
	4523	+ boolean temp = CameraPane.SWITCH;
	4524	+ CameraPane.SWITCH = false;
	4525	+
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4527	+
	4528	+ copy.clear();
	4529	+
	4530	+ copy.skyboxname = obj.skyboxname;
	4531	+ copy.skyboxext = obj.skyboxext;
	4532	+
	4533	+ for (int i=0; i<obj.Size(); i++)
	4534	+ {
	4535	+ copy.add(obj.get(i));
	4536	+ }
	4537	+
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4539	+
	4540	+ CameraPane.SWITCH = temp;
	4541	+
	4542	+ RefreshSelection();
	4543	+ //assert(hashtable.isEmpty());
	4544	+
	4545	+ copy.Touch();
	4546	+
	4547	+ ResetModel();
	4548	+ copy.HardTouch(); // recompile?
	4549	+
	4550	+ cRadio ab;
	4551	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4552	+ {
	4553	+ ab = (cRadio)e.nextElement();
	4554	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4555	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4556	+ if (test != null)
	4557	+ {
	4558	+ test.editWindow = ab.object.editWindow;
	4559	+ ab.object = test;
	4560	+ }
	4561	+ }
	4562	+
	4563	+ refreshContents(true);
	4564	+ }
	4565	+
	4566	+ cButton previousVersionButton;
	4567	+ cButton restoreButton;
	4568	+ cButton replaceButton;
	4569	+ cButton nextVersionButton;
	4570	+ cButton saveVersionButton;
	4571	+ cButton deleteVersionButton;
	4572	+
	4573	+ boolean muteSlider;
	4574	+
	4575	+ int VersionCount()
	4576	+ {
	4577	+ int count = 0;
	4578	+
	4579	+ for (int i = copy.versionlist.length; --i >= 0;)
	4580	+ {
	4581	+ if (copy.versionlist[i] != null)
	4582	+ count++;
	4583	+ }
	4584	+
	4585	+ return count;
	4586	+ }
	4587	+
	4588	+ public cGridBag versionSliderPane;
	4589	+
	4590	+ void SetVersionStates()
	4591	+ {
	4592	+ //if (true)
	4593	+ // return;
	4594	+
	4595	+ //cRadio tab = GetCurrentTab();
	4596	+
	4597	+ if (copy.versionlist == null)
	4598	+ {
	4599	+ saveVersionButton.setEnabled(false);
	4600	+ restoreButton.setEnabled(false);
	4601	+ replaceButton.setEnabled(false);
	4602	+ previousVersionButton.setEnabled(false);
	4603	+ nextVersionButton.setEnabled(false);
	4604	+ deleteVersionButton.setEnabled(false);
	4605	+ versionSliderPane.setVisible(false);
	4606	+ }
	4607	+ else
	4608	+ {
	4609	+ restoreButton.setEnabled(copy.versionindex != -1);
	4610	+ replaceButton.setEnabled(copy.versionindex != -1);
	4611	+
	4612	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4613	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4614	+
	4615	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4616	+ //copy.versionlist[copy.versionindex + 1] != null);
	4617	+
	4618	+ muteSlider = true;
	4619	+ versionSlider.setMinimum(0);
	4620	+ versionSlider.setMaximum(VersionCount() - 1);
	4621	+ versionSlider.setInteger(copy.versionindex);
	4622	+ versionSlider.setEnabled(copy.versionindex != -1);
	4623	+ muteSlider = false;
	4624	+
	4625	+ versionSliderPane.setVisible(true);
	4626	+ }
	4627	+ }
	4628	+
	4629	+ public boolean PreviousVersion()
	4630	+ {
	4631	+ // Option?
	4632	+ Replace();
	4633	+
	4634	+ System.err.println("Undo");
	4635	+
	4636	+ //cRadio tab = GetCurrentTab();
	4637	+
	4638	+ if (copy.versionindex == 0)
	4639	+ {
	4640	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4641	+ return false;
	4642	+ }
	4643	+
	4644	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4645	+// {
	4646	+// if (Save(false))
	4647	+// tab.versionindex -= 1;
	4648	+// else
	4649	+// {
	4650	+// if (tab.versionindex <= 0)
	4651	+// return false;
	4652	+// else
	4653	+// tab.versionindex -= 1;
	4654	+// }
	4655	+// }
	4656	+
	4657	+ copy.versionindex -= 1;
	4658	+
	4659	+ CopyChanged();
	4660	+
	4661	+ return true;
	4662	+ }
	4663	+
	4664	+ public boolean Restore()
	4665	+ {
	4666	+ System.err.println("Restore");
	4667	+
	4668	+ //cRadio tab = GetCurrentTab();
	4669	+
	4670	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4671	+ {
	4672	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4673	+ return false;
	4674	+ }
	4675	+
	4676	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4677	+ CopyChanged();
	4678	+
	4679	+ return true;
	4680	+ }
	4681	+
	4682	+ public boolean Replace()
	4683	+ {
	4684	+ //System.err.println("Replace");
	4685	+
	4686	+ //cRadio tab = GetCurrentTab();
	4687	+
	4688	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4689	+ {
	4690	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4691	+ return false;
	4692	+ }
	4693	+
	4694	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4695	+
	4696	+ return true;
	4697	+ }
	4698	+
	4699	+ public void NextVersion()
	4700	+ {
	4701	+ // Option?
	4702	+ Replace();
	4703	+
	4704	+ //cRadio tab = GetCurrentTab();
	4705	+
	4706	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4707	+ {
	4708	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4709	+ return;
	4710	+ }
	4711	+
	4712	+ copy.versionindex += 1;
	4713	+
	4714	+ CopyChanged();
	4715	+
	4716	+ //if (!tab.user[tab.versionindex])
	4717	+ // tab.graphs[tab.versionindex] = null;
	4718	+ }
	4719	+
	4720	+ void ImportGFD()
	4721	+ {
	4722	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3176	4723	browser.show();
3177	4724	String filename = browser.getFile();
3178	4725	if (filename != null && filename.length() > 0)
3179	4726	{
3180		- CameraPane.filename = browser.getDirectory() + filename;
	4727	+ String fullname = browser.getDirectory() + filename;
	4728	+
	4729	+ //Object3D readobj =
	4730	+ objEditor.ReadGFD(fullname, objEditor);
	4731	+ //makeSomething(readobj);
	4732	+ }
	4733	+ }
	4734	+
	4735	+ void ImportVRMLX3D()
	4736	+ {
	4737	+ if (Grafreed.standAlone)
	4738	+ {
	4739	+ /**/
	4740	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4741	+ browser.show();
	4742	+ String filename = browser.getFile();
	4743	+ if (filename != null && filename.length() > 0)
	4744	+ {
	4745	+ String fullname = browser.getDirectory() + filename;
	4746	+ LoadVRMLX3D(fullname);
	4747	+ }
	4748	+ /**/
	4749	+ }
	4750	+ }
	4751	+
	4752	+ void ToggleAnimation()
	4753	+ {
	4754	+ if (!Globals.ANIMATION)
	4755	+ {
	4756	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4757	+ browser.setVisible(true);
	4758	+ String filename = browser.getFile();
	4759	+ if (filename != null && filename.length() > 0)
	4760	+ {
	4761	+ Globals.filename = browser.getDirectory() + filename;
3181	4762	//CameraPane.framecount = 0;
3182		- CameraPane.imagecount = 0;
	4763	+ Globals.imagecount = 0;
3183	4764
3184		- CameraPane.ANIMATION ^= true;
	4765	+ Globals.ANIMATION ^= true;
3185	4766
3186		- GraphreeD.wav.cursor = 0;
3187		- GraphreeD.wav.loop = 0;
	4767	+ Grafreed.wav.cursor = 0;
	4768	+ Grafreed.wav.loop = 0;
3188	4769	}
3189	4770	} else
3190	4771	{
3191		- CameraPane.ANIMATION ^= true;
	4772	+ Globals.ANIMATION ^= true;
3192	4773	}
3193	4774	}
3194	4775
..	..	@@ -3234,7 +4815,7 @@
3234	4815	void CreateMaterial()
3235	4816	{
3236	4817	//copy.ClearMaterial(); // PATCH
3237		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4818	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3238	4819	if (copy.selection.size() > 0)
3239	4820	//SetMaterial(copy);
3240	4821	{
..	..	@@ -3285,7 +4866,7 @@
3285	4866	assert false;
3286	4867	}
3287	4868
3288		- void EditSelection()
	4869	+ void EditSelection(boolean newWindow)
3289	4870	{
3290	4871	}
3291	4872
..	..	@@ -3293,11 +4874,11 @@
3293	4874	{
3294	4875	copy.ResetBlockLoop(); // temporary problem
3295	4876
3296		- boolean random = CameraPane.RANDOM;
3297		- CameraPane.RANDOM = false; // parse everything
	4877	+ boolean random = CameraPane.SWITCH;
	4878	+ CameraPane.SWITCH = false; // parse everything
3298	4879	copy.ResetDisplayList();
3299	4880	copy.HardTouch();
3300		- CameraPane.RANDOM = random;
	4881	+ CameraPane.SWITCH = random;
3301	4882	}
3302	4883
3303	4884	// public void applySelf()
..	..	@@ -3327,6 +4908,12 @@
3327	4908	// else
3328	4909	// applySelf(true);
3329	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
3330	4917	void applySelf0(boolean name)
3331	4918	{
3332	4919	if (name)
..	..	@@ -3344,7 +4931,7 @@
3344	4931	//copy.material = new cMaterial(copy.GetMaterial());
3345	4932
3346	4933	current.color = (float) colorField.getFloat();
3347		- current.modulation = (float) modulationField.getFloat();
	4934	+ current.modulation = (float) saturationField.getFloat();
3348	4935	current.metalness = (float) metalnessField.getFloat();
3349	4936	current.diffuse = (float) diffuseField.getFloat();
3350	4937	current.specular = (float) specularField.getFloat();
..	..	@@ -3367,10 +4954,63 @@
3367	4954	current.fakedepth = (float) fakedepthField.getFloat();
3368	4955	current.shadowbias = (float) shadowbiasField.getFloat();
3369	4956
3370		- if (!NumberSlider.frozen)
	4957	+ if (!cNumberSlider.frozen)
3371	4958	{
3372	4959	//System.out.println("Propagate = " + propagate);
3373	4960	copy.UpdateMaterial(anchor, current, propagate);
	4961	+
	4962	+ if (copy.material != null)
	4963	+ {
	4964	+ cMaterial mat = copy.material;
	4965	+
	4966	+ if (!Equal(colorField.getFloat(), mat.color))
	4967	+ colorField.SetToolTipValue((mat.color));
	4968	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4969	+ saturationField.SetToolTipValue((mat.modulation));
	4970	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4971	+ metalnessField.SetToolTipValue((mat.metalness));
	4972	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4973	+ diffuseField.SetToolTipValue((mat.diffuse));
	4974	+ if (!Equal(specularField.getFloat(), mat.specular))
	4975	+ specularField.SetToolTipValue((mat.specular));
	4976	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4977	+ shininessField.SetToolTipValue((mat.shininess));
	4978	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4979	+ shiftField.SetToolTipValue((mat.shift));
	4980	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4981	+ ambientField.SetToolTipValue((mat.ambient));
	4982	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4983	+ lightareaField.SetToolTipValue((mat.lightarea));
	4984	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4985	+ diffusenessField.SetToolTipValue((mat.factor));
	4986	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4987	+ velvetField.SetToolTipValue((mat.velvet));
	4988	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4989	+ sheenField.SetToolTipValue((mat.sheen));
	4990	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4991	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4992	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4993	+ backlitField.SetToolTipValue((mat.bump));
	4994	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4995	+ anisoField.SetToolTipValue((mat.aniso));
	4996	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4997	+ anisoVField.SetToolTipValue((mat.anisoV));
	4998	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4999	+ cameraField.SetToolTipValue((mat.cameralight));
	5000	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5001	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5002	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5003	+ shadowField.SetToolTipValue((mat.shadow));
	5004	+ if (!Equal(textureField.getFloat(), mat.texture))
	5005	+ textureField.SetToolTipValue((mat.texture));
	5006	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5007	+ opacityField.SetToolTipValue((mat.opacity));
	5008	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5009	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5010	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5011	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5012	+ }
	5013	+
3374	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3375	5015	{
3376	5016	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3399,9 +5039,28 @@
3399	5039	//copy.Touch();
3400	5040	}
3401	5041
	5042	+ cNumberSlider versionSlider;
	5043	+
3402	5044	public void stateChanged(ChangeEvent e)
3403	5045	{
3404		- // assert(false);
	5046	+ // assert(false);
	5047	+ if (e.getSource() == versionSlider)
	5048	+ {
	5049	+ if (muteSlider)
	5050	+ return;
	5051	+
	5052	+ Replace();
	5053	+
	5054	+ int version = versionSlider.getInteger();
	5055	+
	5056	+ if (version != -1 && copy.versionlist[version] != null)
	5057	+ {
	5058	+ copy.versionindex = version;
	5059	+ CopyChanged();
	5060	+ }
	5061	+
	5062	+ return;
	5063	+ }
3405	5064
3406	5065	if (freezematerial)
3407	5066	{
..	..	@@ -3415,6 +5074,7 @@
3415	5074	\|\| e.getSource() == apertureField
3416	5075	\|\| e.getSource() == shadowblurField)
3417	5076	{
	5077	+ new Exception().printStackTrace();
3418	5078	System.exit(0);
3419	5079	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3420	5080	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3436,12 +5096,24 @@
3436	5096	{
3437	5097	//System.out.println("stateChanged = " + this);
3438	5098	materialtouched = true;
	5099	+
	5100	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5101	+ {
	5102	+ saturationField.setFloat(1);
	5103	+ }
	5104	+
3439	5105	applySelf();
3440	5106	//System.out.println("this = " + this);
3441	5107	//System.out.println("PARENT = " + parent);
3442	5108	//if (parent != null)
3443	5109	// parent.applySelf();
3444		- refreshContents();
	5110	+ if (e.getSource() == normalpushField)
	5111	+ {
	5112	+ objEditor.refreshContents();
	5113	+ //Refresh();
	5114	+ }
	5115	+ else
	5116	+ refreshContents();
3445	5117	// ??? client.refreshEditWindow();
3446	5118	}
3447	5119	//else
..	..	@@ -3453,7 +5125,7 @@
3453	5125	//group.name = nameField.getText();
3454	5126	//objEditor.applySelf();
3455	5127
3456		- assert (objEditor == this);
	5128	+ // OCT2018: assert (objEditor == this);
3457	5129	if (copy.selection == null \|\| copy.selection.size() == 0)
3458	5130	//super.applySelf()
3459	5131	; else
..	..	@@ -3477,12 +5149,18 @@
3477	5149	objEditor.copy = keep;
3478	5150	}
3479	5151	}
	5152	+
	5153	+ if (normalpushField != null)
	5154	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3480	5155	}
3481	5156
3482	5157	void SnapObject()
3483	5158	{
3484		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3485		- SnapObject(obj);
	5159	+ if (copy.selection.size() > 0)
	5160	+ {
	5161	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	5162	+ SnapObject(obj);
	5163	+ }
3486	5164	}
3487	5165
3488	5166	void SnapObject(Object3D obj)
..	..	@@ -3596,7 +5274,7 @@
3596	5274
3597	5275	if (obj.parent != null)
3598	5276	{
3599		- obj.parent.TransformToWorld(interest);
	5277	+// obj.parent.TransformToWorld(interest);
3600	5278	}
3601	5279
3602	5280	if (!CameraPane.TRACK)
..	..	@@ -3723,20 +5401,28 @@
3723	5401	{
3724	5402	if (GetTree() != null)
3725	5403	{
	5404	+ GetTree().revalidate();
3726	5405	GetTree().repaint();
3727	5406	}
3728	5407
3729	5408	radioPanel.revalidate();
3730	5409	radioPanel.repaint();
3731		- ctrlPanel.revalidate(); // ? new
	5410	+ ctrlPanel.validate(); // ? new
3732	5411	ctrlPanel.repaint();
3733	5412	}
	5413	+
	5414	+ if (previousVersionButton != null && copy.versionlist != null)
	5415	+ SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
3734	5418	}
3735	5419
3736	5420	static TweenManager tweenManager = new TweenManager();
3737	5421
3738	5422	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3739	5423	{
	5424	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5425	+ Save();
3740	5426	//Tween.set(thing, 0).target(1).start(tweenManager);
3741	5427	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3742	5428	// if (thing instanceof GenericJointDemo)
..	..	@@ -3760,7 +5446,7 @@
3760	5446	// group = (Composite) group.get(0);
3761	5447	// }
3762	5448
3763		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
3764	5450
3765	5451	/*
3766	5452	if (deselect && jList != null)
..	..	@@ -3823,6 +5509,12 @@
3823	5509	{
3824	5510	ResetModel();
3825	5511	Select(thing.GetTreePath(), true, false); // unselect... false);
	5512	+
	5513	+ if (thing.Size() == 0)
	5514	+ {
	5515	+ //EditSelection(false);
	5516	+ }
	5517	+
3826	5518	refreshContents();
3827	5519	}
3828	5520
..	..	@@ -3940,6 +5632,7 @@
3940	5632	}
3941	5633	}
3942	5634	}
	5635	+
3943	5636	LoadGFDThread loadGFDThread;
3944	5637
3945	5638	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3959,8 +5652,10 @@
3959	5652
3960	5653	try
3961	5654	{
	5655	+ // Try compressed version first.
3962	5656	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3963		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5657	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5658	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3964	5659
3965	5660	readobj = (Object3D) p.readObject();
3966	5661	istream.close();
..	..	@@ -3968,7 +5663,22 @@
3968	5663	readobj.ResetDisplayList();
3969	5664	} catch (Exception e)
3970	5665	{
3971		- e.printStackTrace();
	5666	+ if (!e.toString().contains("GZIP"))
	5667	+ e.printStackTrace();
	5668	+
	5669	+ try
	5670	+ {
	5671	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5672	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5673	+
	5674	+ readobj = (Object3D) p.readObject();
	5675	+ istream.close();
	5676	+
	5677	+ readobj.ResetDisplayList();
	5678	+ } catch (Exception e2)
	5679	+ {
	5680	+ e2.printStackTrace();
	5681	+ }
3972	5682	}
3973	5683	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3974	5684	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4014,6 +5724,12 @@
4014	5724
4015	5725	void LoadIt(Object obj)
4016	5726	{
	5727	+ if (obj == null)
	5728	+ {
	5729	+ // Invalid file
	5730	+ return;
	5731	+ }
	5732	+
4017	5733	System.out.println("Loaded " + obj);
4018	5734	//new Exception().printStackTrace();
4019	5735	Object3D readobj = (Object3D) obj;
..	..	@@ -4023,10 +5739,14 @@
4023	5739
4024	5740	if (readobj != null)
4025	5741	{
	5742	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5743	+ // Save();
4026	5744	try
4027	5745	{
4028	5746	//readobj.deepCopySelf(copy);
4029	5747	copy.clear(); // june 2014
	5748	+ copy.skyboxname = readobj.skyboxname;
	5749	+ copy.skyboxext = readobj.skyboxext;
4030	5750	for (int i = 0; i < readobj.size(); i++)
4031	5751	{
4032	5752	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4067,6 +5787,7 @@
4067	5787	}
4068	5788	} catch (ClassCastException e)
4069	5789	{
	5790	+ e.printStackTrace();
4070	5791	assert (false);
4071	5792	Composite c = (Composite) copy;
4072	5793	c.children.clear();
..	..	@@ -4077,17 +5798,32 @@
4077	5798	c.addChild(csg);
4078	5799	}
4079	5800
	5801	+ copy.versionlist = readobj.versionlist;
	5802	+ copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
	5804	+
	5805	+ if (copy.versionlist == null)
	5806	+ {
	5807	+ // Backward compatibility
	5808	+ copy.versionlist = new Object3D[100];
	5809	+ copy.versionindex = -1;
	5810	+
	5811	+ //Save(true);
	5812	+ }
	5813	+
	5814	+ //? SetUndoStates();
	5815	+
4080	5816	ResetModel();
4081	5817	copy.HardTouch(); // recompile?
4082	5818	refreshContents();
4083	5819	}
4084	5820	}
4085	5821
4086		- void load() // throws ClassNotFoundException
	5822	+ void Open() // throws ClassNotFoundException
4087	5823	{
4088		- if (GraphreeD.standAlone)
	5824	+ if (Grafreed.standAlone)
4089	5825	{
4090		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5826	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4091	5827	browser.show();
4092	5828	String filename = browser.getFile();
4093	5829	if (filename != null && filename.length() > 0)
..	..	@@ -4164,6 +5900,8 @@
4164	5900
4165	5901	void save()
4166	5902	{
	5903	+ Replace();
	5904	+
4167	5905	if (lastname == null)
4168	5906	{
4169	5907	return;
..	..	@@ -4172,11 +5910,13 @@
4172	5910	try
4173	5911	{
4174	5912	FileOutputStream ostream = new FileOutputStream(lastname);
4175		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5913	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5914	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4176	5915
4177	5916	p.writeObject(copy);
4178	5917	p.flush();
4179	5918
	5919	+ zstream.close();
4180	5920	ostream.close();
4181	5921
4182	5922	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4184,19 +5924,23 @@
4184	5924	//ps.print(buffer.toString());
4185	5925	} catch (IOException e)
4186	5926	{
	5927	+ e.printStackTrace();
4187	5928	}
4188	5929	}
	5930	+
4189	5931	String lastname;
4190	5932
4191	5933	void saveAs()
4192	5934	{
4193		- if (GraphreeD.standAlone)
	5935	+ if (Grafreed.standAlone)
4194	5936	{
4195	5937	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196	5938	browser.setVisible(true);
4197	5939	String filename = browser.getFile();
4198	5940	if (filename != null && filename.length() > 0)
4199	5941	{
	5942	+ if (!filename.endsWith(".gfd"))
	5943	+ filename += ".gfd";
4200	5944	lastname = browser.getDirectory() + filename;
4201	5945	save();
4202	5946	}
..	..	@@ -4213,10 +5957,20 @@
4213	5957
4214	5958	Object3D object = copy.selection.get(0);
4215	5959
	5960	+ FileObject fileobj = null;
	5961	+
	5962	+ if (object instanceof FileObject)
	5963	+ fileobj = (FileObject)object;
	5964	+
4216	5965	if (object.fileparent != null)
4217	5966	{
4218		- FileObject fileobj = (FileObject) object.fileparent;
	5967	+ assert(fileobj == null);
4219	5968
	5969	+ fileobj = (FileObject) object.fileparent;
	5970	+ }
	5971	+
	5972	+ if (fileobj != null)
	5973	+ {
4220	5974	System.out.println("WriteObject " + object + " : " + fileobj.name);
4221	5975	WriteObject(object, fileobj.name);
4222	5976	}
..	..	@@ -4259,7 +6013,7 @@
4259	6013	}
4260	6014	}
4261	6015	else
4262		- //if (GraphreeD.standAlone)
	6016	+ //if (GrafreeD.standAlone)
4263	6017	{
4264	6018	FileDialog browser = new FileDialog(frame, "Export", FileDialog.SAVE);
4265	6019	browser.setVisible(true);
..	..	@@ -4285,13 +6039,13 @@
4285	6039	try
4286	6040	{
4287	6041	FileOutputStream ostream = new FileOutputStream(filename);
4288		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4289		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6042	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6043	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4290	6044
4291	6045	Object3D objectparent = obj.parent;
4292	6046	obj.parent = null;
4293	6047
4294		- Object3D object = (Object3D) GraphreeD.clone(obj);
	6048	+ Object3D object = (Object3D) Grafreed.clone(obj);
4295	6049
4296	6050	obj.parent = objectparent;
4297	6051
..	..	@@ -4303,8 +6057,8 @@
4303	6057	p.writeObject(object);
4304	6058	p.flush();
4305	6059
	6060	+ zstream.close();
4306	6061	ostream.close();
4307		- // zstream.close();
4308	6062
4309	6063	// group.selection.get(0).parent = parent;
4310	6064	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4325,7 +6079,7 @@
4325	6079	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4326	6080	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4327	6081	copy.generatePOV(buffer);
4328		- if (GraphreeD.standAlone)
	6082	+ if (Grafreed.standAlone)
4329	6083	{
4330	6084	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4331	6085	browser.show();
..	..	@@ -4351,53 +6105,72 @@
4351	6105	Object3D client;
4352	6106	Object3D copy;
4353	6107	MenuBar menuBar;
4354		- Menu windowMenu;
4355		- MenuItem loadItem;
	6108	+ Menu fileMenu;
	6109	+ MenuItem newItem;
	6110	+ MenuItem openItem;
4356	6111	MenuItem saveItem;
4357	6112	MenuItem saveAsItem;
4358	6113	MenuItem exportAsItem;
4359	6114	MenuItem reexportItem;
4360	6115	MenuItem povItem;
4361	6116	MenuItem closeItem;
4362		- Menu cameraMenu;
	6117	+
4363	6118	CheckboxMenuItem zBufferItem;
4364	6119	//MenuItem normalLensItem;
4365		- MenuItem editCameraItem;
4366		- MenuItem revertCameraItem;
4367		- CheckboxMenuItem toggleLiveItem;
4368	6120	MenuItem stepItem;
4369		- CheckboxMenuItem toggleFullItem;
	6121	+ CheckboxMenuItem toggleLiveItem;
	6122	+ CheckboxMenuItem toggleFullScreenItem;
	6123	+ CheckboxMenuItem toggleTimelineItem;
4370	6124	CheckboxMenuItem toggleRenderItem;
4371	6125	CheckboxMenuItem toggleDebugItem;
4372	6126	CheckboxMenuItem toggleFrustumItem;
4373	6127	CheckboxMenuItem toggleFootContactItem;
4374	6128	CheckboxMenuItem toggleDLItem;
4375	6129	CheckboxMenuItem toggleTextureItem;
4376		- CheckboxMenuItem toggleRandomItem;
	6130	+ CheckboxMenuItem toggleSwitchItem;
4377	6131	CheckboxMenuItem toggleRootItem;
4378	6132	CheckboxMenuItem animationItem;
	6133	+ MenuItem archiveItem;
4379	6134	CheckboxMenuItem toggleHandleItem;
4380	6135	CheckboxMenuItem togglePaintItem;
4381	6136	JSplitPane mainPanel;
4382	6137	JScrollPane scrollpane;
	6138	+
4383	6139	JPanel toolbarPanel;
4384		- JPanel treePanel;
	6140	+
	6141	+ cGridBag treePanel;
	6142	+
4385	6143	JPanel radioPanel;
4386	6144	ButtonGroup buttonGroup;
4387		- JPanel ctrlPanel;
4388		- JPanel materialPanel;
	6145	+
	6146	+ cGridBag toolboxPanel;
	6147	+ cGridBag skyboxPanel;
	6148	+ cGridBag materialPanel;
	6149	+ cGridBag ctrlPanel;
	6150	+
4389	6151	JScrollPane infoPanel;
4390		- JPanel optionsPanel;
	6152	+
	6153	+ cGridBag optionsPanel;
	6154	+
4391	6155	JTabbedPane objectPanel;
4392		- JPanel XYZPanel;
	6156	+ boolean materialFlushed;
	6157	+ Object3D latestObject;
	6158	+
	6159	+ cGridBag transformPanel;
	6160	+ cGridBag XYZPanel;
	6161	+
4393	6162	JSplitPane gridPanel;
4394	6163	JSplitPane bigPanel;
4395		- JPanel bigThree;
4396		- JTabbedPane jtp;
4397		- JPanel cameraPanel;
	6164	+
	6165	+ cGridBag bigThree;
	6166	+ cGridBag scenePanel;
	6167	+ cGridBag centralPanel;
	6168	+ JSplitPane cameraPanel;
	6169	+ JPanel timelinePanel;
	6170	+ JMenuBar timelineMenubar;
4398	6171	JSplitPane framePanel;
4399	6172	JTextArea/Field/ nameField;
4400		- cButton textureButton;
	6173	+ //cButton textureButton;
4401	6174	cButton okButton;
4402	6175	cButton applyButton;
4403	6176	cButton cancelButton;
..	..	@@ -4444,65 +6217,74 @@
4444	6217	// MATERIAL
4445	6218	JLabel materialLabel;
4446	6219	JLabel colorLabel;
4447		- NumberSlider colorField;
	6220	+ cNumberSlider colorField;
4448	6221	JLabel modulationLabel;
4449		- NumberSlider modulationField;
	6222	+ cNumberSlider saturationField;
4450	6223	JLabel metalnessLabel;
4451		- NumberSlider metalnessField;
	6224	+ cNumberSlider metalnessField;
4452	6225	JLabel diffuseLabel;
4453		- NumberSlider diffuseField;
	6226	+ cNumberSlider diffuseField;
4454	6227	JLabel specularLabel;
4455		- NumberSlider specularField;
	6228	+ cNumberSlider specularField;
4456	6229	JLabel shininessLabel;
4457		- NumberSlider shininessField;
	6230	+ cNumberSlider shininessField;
4458	6231	JLabel shiftLabel;
4459		- NumberSlider shiftField;
	6232	+ cNumberSlider shiftField;
4460	6233	JLabel ambientLabel;
4461		- NumberSlider ambientField;
	6234	+ cNumberSlider ambientField;
4462	6235	JLabel lightareaLabel;
4463		- NumberSlider lightareaField;
	6236	+ cNumberSlider lightareaField;
4464	6237	JLabel diffusenessLabel;
4465		- NumberSlider diffusenessField;
	6238	+ cNumberSlider diffusenessField;
4466	6239	JLabel velvetLabel;
4467		- NumberSlider velvetField;
	6240	+ cNumberSlider velvetField;
4468	6241	JLabel sheenLabel;
4469		- NumberSlider sheenField;
	6242	+ cNumberSlider sheenField;
4470	6243	JLabel subsurfaceLabel;
4471		- NumberSlider subsurfaceField;
	6244	+ cNumberSlider subsurfaceField;
4472	6245	//JLabel bumpLabel;
4473	6246	//NumberSlider bumpField;
4474	6247	JLabel backlitLabel;
4475		- NumberSlider backlitField;
	6248	+ cNumberSlider backlitField;
4476	6249	JLabel anisoLabel;
4477		- NumberSlider anisoField;
	6250	+ cNumberSlider anisoField;
4478	6251	JLabel anisoVLabel;
4479		- NumberSlider anisoVField;
	6252	+ cNumberSlider anisoVField;
	6253	+
4480	6254	JLabel cameraLabel;
4481		- NumberSlider cameraField;
	6255	+ cNumberSlider cameraField;
4482	6256	JLabel selfshadowLabel;
4483		- NumberSlider selfshadowField;
	6257	+ cNumberSlider selfshadowField;
4484	6258	JLabel shadowLabel;
4485		- NumberSlider shadowField;
	6259	+ cNumberSlider shadowField;
4486	6260	JLabel textureLabel;
4487		- NumberSlider textureField;
	6261	+ cNumberSlider textureField;
4488	6262	JLabel opacityLabel;
4489		- NumberSlider opacityField;
	6263	+ cNumberSlider opacityField;
4490	6264	JLabel fakedepthLabel;
4491		- NumberSlider fakedepthField;
	6265	+ cNumberSlider fakedepthField;
4492	6266	JLabel shadowbiasLabel;
4493		- NumberSlider shadowbiasField;
	6267	+ cNumberSlider shadowbiasField;
	6268	+
4494	6269	JLabel bumpLabel;
4495		- NumberSlider bumpField;
	6270	+ cNumberSlider bumpField;
4496	6271	JLabel noiseLabel;
4497		- NumberSlider noiseField;
	6272	+ cNumberSlider noiseField;
4498	6273	JLabel powerLabel;
4499		- NumberSlider powerField;
	6274	+ cNumberSlider powerField;
4500	6275	JLabel borderfadeLabel;
4501		- NumberSlider borderfadeField;
	6276	+ cNumberSlider borderfadeField;
4502	6277	JLabel fogLabel;
4503		- NumberSlider fogField;
	6278	+ cNumberSlider fogField;
4504	6279	JLabel opacityPowerLabel;
4505		- NumberSlider opacityPowerField;
4506		- JTree jTree;
	6280	+ cNumberSlider opacityPowerField;
	6281	+ cTree jTree;
4507	6282	//ObjectUI parent;
	6283	+
	6284	+ cNumberSlider normalpushField;
	6285	+
	6286	+ private MenuItem importGFDItem;
	6287	+ private MenuItem importVRMLX3DItem;
	6288	+ private MenuItem import3DSItem;
	6289	+ private MenuItem importOBJItem;
4508	6290	}