~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,64 +42,143 @@
41	42	JFrame frame;
42	43
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	+ }
44	97
45	98	cButton GetButton(String name, boolean border)
46	99	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
50	102	return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
	103	+ else
54	104	return new cButton(name, border);
55		- }
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
56	111	}
57	112
58	113	cToggleButton GetToggleButton(String name, boolean border)
59	114	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
69	117	}
70	118
71	119	cCheckBox GetCheckBox(String name, boolean border)
72	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	+
73	135	try
74	136	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
77	162	}
78	163	catch (Exception e)
79	164	{
80		- return new cCheckBox(name, border);
	165	+ //icons.put(name, null);
	166	+ return null;
81	167	}
82	168	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	169	+
	170	+ BufferedImage GetImage(String name)
85	171	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	172	+ try
89	173	{
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
98	177	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
102	182	}
103	183
104	184	// SCRIPT
..	..	@@ -282,6 +362,14 @@
282	362	client = inClient;
283	363	copy = client;
284	364
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
	372	+
285	373	// "this" is not called: SetupUI2(objEditor);
286	374	}
287	375
..	..	@@ -309,14 +397,15 @@
309	397	//localCopy.parent = null;
310	398
311	399	frame = new JFrame();
312		- frame.setUndecorated(true);
	400	+ frame.setUndecorated(false);
313	401	objEditor = this;
314	402	this.callee = callee;
315	403
316	404	//parent = p;
317	405
318	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320	409	//gd.setFullScreenWindow(this);
321	410	//setResizable(false);
322	411	//if (!isDisplayable())
..	..	@@ -327,6 +416,14 @@
327	416	copy = localCopy;
328	417	copy.editWindow = this;
329	418
	419	+// if (copy.versionlist == null)
	420	+// {
	421	+// copy.versionlist = new Object3D[100];
	422	+// copy.versionindex = -1;
	423	+//
	424	+// Save(true);
	425	+// }
	426	+
330	427	SetupMenu();
331	428
332	429	//SetupName(objEditor); // new
..	..	@@ -345,12 +442,15 @@
345	442
346	443	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347	444
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
348	448	void SetupMenu()
349	449	{
350	450	frame.setMenuBar(menuBar = new MenuBar());
351	451	menuBar.add(fileMenu = new Menu("File"));
352	452	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	453	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	454
355	455	//oe.menuBar.add(menu = new Menu("Include"));
356	456	Menu menu = new Menu("Import");
..	..	@@ -358,8 +458,11 @@
358	458	importOBJItem.addActionListener(this);
359	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
360	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
361	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
362	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
363	466	menu.add("-");
364	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
365	468	importGFDItem.addActionListener(this);
..	..	@@ -382,7 +485,7 @@
382	485	}
383	486
384	487	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	488	+ openItem.addActionListener(this);
386	489	saveItem.addActionListener(this);
387	490	saveAsItem.addActionListener(this);
388	491	exportAsItem.addActionListener(this);
..	..	@@ -394,6 +497,8 @@
394	497
395	498	ChangeListener changeListener = new ChangeListener()
396	499	{
	500	+ //String name;
	501	+
397	502	public void stateChanged(ChangeEvent changeEvent)
398	503	{
399	504	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +517,49 @@
412	517	// EditSelection(false);
413	518	// }
414	519
415		- refreshContents(false); // To refresh Info tab
	520	+// if (objectPanel.getSelectedIndex() == 4)
	521	+// {
	522	+// name = copy.skyboxname;
	523	+//
	524	+// if (name == null)
	525	+// {
	526	+// name = "";
	527	+// }
	528	+//
	529	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	530	+// copy.skyboxext = "jpg";
	531	+// }
	532	+// else
	533	+// {
	534	+// if (name != null)
	535	+// {
	536	+// if (name.equals(""))
	537	+// {
	538	+// copy.skyboxname = null;
	539	+// copy.skyboxext = null;
	540	+// }
	541	+// else
	542	+// {
	543	+// copy.skyboxname = name;
	544	+// }
	545	+// }
	546	+// }
	547	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	548	+
	549	+// refreshContents(false); // To refresh Info tab
	550	+ cameraView.repaint();
416	551	}
417	552	};
418	553	objectPanel.addChangeListener(changeListener);
419	554
420	555	toolbarPanel = new JPanel();
421	556	toolbarPanel.setName("Toolbar");
	557	+
422	558	treePanel = new cGridBag();
423	559	treePanel.setName("Tree");
424	560
425	561	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	562	+ //editPanel.setName("Edit");
427	563
428	564	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	565
..	..	@@ -431,11 +567,13 @@
431	567	editPanel.add(editCommandsPanel);
432	568	editPanel.add(ctrlPanel);
433	569
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	570	+ toolboxPanel = new cGridBag().setVertical(true);
	571	+ //toolboxPanel.setName("Toolbox");
436	572
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	573	+ skyboxPanel = new cGridBag().setVertical(true);
	574	+
	575	+ materialPanel = new cGridBag().setVertical(false);
	576	+ //materialPanel.setName("Material");
439	577
440	578	/JTextPane/
441	579	infoarea = createTextPane();
..	..	@@ -443,14 +581,15 @@
443	581
444	582	infoarea.setEditable(true);
445	583	SetText();
	584	+
446	585	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	586	// infoarea.setOpaque(false);
448	587	// //infoarea.setForeground(textcolor);
449	588	// TEXTAREA infoarea.setLineWrap(true);
450	589	// TEXTAREA infoarea.setWrapStyleWord(true);
451	590	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452		- infoPanel.setPreferredSize(new Dimension(50, 200));
453		- infoPanel.setName("Info");
	591	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	592	+ //infoPanel.setName("Info");
454	593	//infoPanel.setLayout(new BorderLayout());
455	594	//infoPanel.add(createTextPane());
456	595
..	..	@@ -699,8 +838,8 @@
699	838	}
700	839	}
701	840
702		-static GraphicsDevice device = GraphicsEnvironment
703		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	841	+//static GraphicsDevice device = GraphicsEnvironment
	842	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
704	843
705	844	Rectangle keeprect;
706	845	cRadio radio;
..	..	@@ -717,14 +856,24 @@
717	856	boolean maximized;
718	857
719	858	cButton fullscreenLayout;
	859	+ cButton expandedLayout;
720	860
721	861	void Minimize()
722	862	{
723	863	frame.setState(Frame.ICONIFIED);
	864	+ frame.validate();
724	865	}
725	866
	867	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	868	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	869	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
726	870	void Maximize()
727	871	{
	872	+ if (CameraPane.FULLSCREEN)
	873	+ {
	874	+ ToggleFullScreen();
	875	+ }
	876	+
728	877	if (maximized)
729	878	{
730	879	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -732,22 +881,38 @@
732	881	else
733	882	{
734	883	keeprect = frame.getBounds();
735		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
736		- Dimension rect2 = frame.getToolkit().getScreenSize();
737		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	884	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	885	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	886	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
738	887	// frame.setState(Frame.MAXIMIZED_BOTH);
	888	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
739	889	}
740	890
741	891	maximized ^= true;
	892	+
	893	+ frame.validate();
742	894	}
	895	+
	896	+ cButton minButton;
	897	+ cButton maxButton;
	898	+ cButton fullButton;
	899	+ cButton collapseButton;
	900	+ cButton maximize3DButton;
743	901
744	902	void ToggleFullScreen()
745	903	{
	904	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	905	+
746	906	cameraView.ToggleFullScreen();
747	907
748	908	if (!CameraPane.FULLSCREEN)
749	909	{
750	910	device.setFullScreenWindow(null);
	911	+ frame.dispose();
	912	+ frame.setUndecorated(false);
	913	+ frame.validate();
	914	+ frame.setVisible(true);
	915	+
751	916	//frame.setVisible(false);
752	917	// frame.removeNotify();
753	918	// frame.setUndecorated(false);
..	..	@@ -757,13 +922,13 @@
757	922	// X frame.getContentPane().remove(/"Center",/bigThree);
758	923	// X framePanel.add(bigThree);
759	924	// X frame.getContentPane().add(/"Center",/framePanel);
760		- framePanel.setDividerLocation(1);
	925	+// framePanel.setDividerLocation(46); // icons are 24x24
761	926
762	927	//frame.setVisible(true);
763		- radio.layout = keepButton;
	928	+// radio.layout = keepButton;
764	929	//theFrame = null;
765	930	keepButton = null;
766		- radio.layout.doClick();
	931	+// radio.layout.doClick();
767	932
768	933	} else
769	934	{
..	..	@@ -772,20 +937,70 @@
772	937	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773	938	// frame.getToolkit().getScreenSize().height);
774	939	//frame.setVisible(false);
	940	+
	941	+ frame.dispose();
	942	+ frame.setUndecorated(true);
775	943	device.setFullScreenWindow(frame);
	944	+ frame.validate();
	945	+ frame.setVisible(true);
776	946	// frame.removeNotify();
777	947	// frame.setUndecorated(true);
778	948	// frame.addNotify();
779	949	// X frame.getContentPane().remove(/"Center",/framePanel);
780	950	// X framePanel.remove(bigThree);
781	951	// X frame.getContentPane().add(/"Center",/bigThree);
782		- framePanel.setDividerLocation(0);
	952	+// framePanel.setDividerLocation(0);
783	953
784		- radio.layout = fullscreenLayout;
785		- radio.layout.doClick();
	954	+// radio.layout = fullscreenLayout;
	955	+// radio.layout.doClick();
786	956	//frame.setVisible(true);
787	957	}
	958	+ frame.validate();
	959	+
	960	+ cameraView.requestFocusInWindow();
788	961	}
	962	+
	963	+ void CollapseToolbar()
	964	+ {
	965	+ framePanel.setDividerLocation(0);
	966	+ //frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
	969	+ }
	970	+
	971	+ private Object3D Duplicate(Object3D object)
	972	+ {
	973	+ boolean temp = CameraPane.SWITCH;
	974	+ CameraPane.SWITCH = false;
	975	+
	976	+ if (Grafreed.grafreed.universe.versiontable == null)
	977	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	978	+
	979	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	980	+ // if (copy == client)
	981	+
	982	+ Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	984	+ object.versionlist = null;
	985	+ object.versiontable = null;
	986	+
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
	989	+
	990	+ //byte[] compress = Compress(copy);
	991	+ Object3D compress = (Object3D)Grafreed.clone(object);
	992	+
	993	+ object.parent = parent;
	994	+
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	999	+
	1000	+ CameraPane.SWITCH = temp;
	1001	+
	1002	+ return compress;
	1003	+ }
789	1004
790	1005	private JTextPane createTextPane()
791	1006	{
..	..	@@ -908,6 +1123,7 @@
908	1123	{
909	1124	SetupMaterial(materialPanel);
910	1125	}
	1126	+
911	1127	//SetupName();
912	1128	//SetupViews();
913	1129	}
..	..	@@ -917,7 +1133,7 @@
917	1133	// NumberSlider vDivsField;
918	1134	// JCheckBox endcaps;
919	1135	JCheckBox liveCB;
920		- JCheckBox selectCB;
	1136	+ JCheckBox selectableCB;
921	1137	JCheckBox hideCB;
922	1138	JCheckBox link2masterCB;
923	1139	JCheckBox markCB;
..	..	@@ -1116,8 +1332,20 @@
1116	1332
1117	1333	namePanel = new cGridBag();
1118	1334
	1335	+ //if (copy.pinned)
	1336	+ {
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1338	+ pinButton.setSelected(copy.pinned);
	1339	+ cGridBag t = new cGridBag();
	1340	+ t.preferredWidth = 2;
	1341	+ t.add(pinButton);
	1342	+ namePanel.add(t);
	1343	+
	1344	+ pinButton.addItemListener(this);
	1345	+ }
	1346	+
1119	1347	nameField = AddText(namePanel, copy.GetName());
1120		- namePanel.add(nameField);
	1348	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1121	1349	oe.ctrlPanel.add(namePanel);
1122	1350
1123	1351	oe.ctrlPanel.Return();
..	..	@@ -1129,26 +1357,30 @@
1129	1357
1130	1358	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1131	1359	liveCB.setToolTipText("Animate object");
1132		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1133		- selectCB.setToolTipText("Make object selectable");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
	1362	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1363	+ selectableCB.setToolTipText("Make object selectable");
1134	1364	// Return();
	1365	+
1135	1366	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1136	1367	hideCB.setToolTipText("Hide object");
1137		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1138		- markCB.setToolTipText("As animation target transform");
	1368	+
	1369	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1139	1370
1140	1371	setupPanel2 = new cGridBag().setVertical(false);
1141	1372
1142	1373	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1143	1374	rewindCB.setToolTipText("Rewind animation");
1144	1375
1145		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1376	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1146	1377	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1147	1378
	1379	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1380	+ link2masterCB.setToolTipText("Attach to support");
	1381	+
1148	1382	if (Globals.ADVANCED)
1149	1383	{
1150		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1151		- link2masterCB.setToolTipText("Attach to support");
1152	1384	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1153	1385	speedupCB.setToolTipText("Option motion capture");
1154	1386	}
..	..	@@ -1334,22 +1566,9 @@
1334	1566
1335	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1336	1568	{
1337		- System.out.println("CREATE CAMERAS");
1338		- cams = new cTemplate();
1339		- cams.name = "Cameras";
1340		- copy.insertElementAt(cams, 0);
1341		- //cams.parent = copy;
1342		-
1343		- cam = new Camera(); // LA.newVector(3, 2, 1));
1344		- cams.addChild(cam);
1345		- cam = new Camera(1);
1346		- cams.addChild(cam);
1347		- cam = new Camera(2);
1348		- cams.addChild(cam);
1349		- cam = new Camera(3);
1350		- cams.addChild(cam);
1351		- cam = new Camera(4); // Light
1352		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1353	1572	} else
1354	1573	{
1355	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1415,6 +1634,45 @@
1415	1634	//frontView.object = copy;
1416	1635	//sideView.object = copy;
1417	1636
	1637	+ transformPanel = new cGridBag().setVertical(true);
	1638	+
	1639	+ cGridBag resetTransformPanel = new cGridBag();
	1640	+
	1641	+ resetTransformPanel.preferredHeight = 2;
	1642	+
	1643	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1644	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1645	+ resetTransform.addMouseListener(new MouseAdapter()
	1646	+ {
	1647	+ public void mouseClicked(MouseEvent e)
	1648	+ {
	1649	+ ResetTransform();
	1650	+ }
	1651	+ });
	1652	+ resetTransformPanel.add(resetTransform);
	1653	+
	1654	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1655	+ resetTransform.setToolTipText("Reset Translation only");
	1656	+ resetTransform.addMouseListener(new MouseAdapter()
	1657	+ {
	1658	+ public void mouseClicked(MouseEvent e)
	1659	+ {
	1660	+ ResetTransform(1);
	1661	+ }
	1662	+ });
	1663	+ resetTransformPanel.add(resetTransform);
	1664	+
	1665	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1666	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1667	+ resetTransform.addMouseListener(new MouseAdapter()
	1668	+ {
	1669	+ public void mouseClicked(MouseEvent e)
	1670	+ {
	1671	+ ResetTransform(2);
	1672	+ }
	1673	+ });
	1674	+ resetTransformPanel.add(resetTransform);
	1675	+
1418	1676	XYZPanel = new cGridBag().setVertical(true);
1419	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1420	1678
..	..	@@ -1422,7 +1680,11 @@
1422	1680	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1423	1681	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1424	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1683	+ //XYZPanel.setName("XYZ");
1425	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1426	1688	/*
1427	1689	gridPanel = new JPanel(); //new BorderLayout());
1428	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1430,12 +1692,12 @@
1430	1692	gridPanel.add(cameraView);
1431	1693	gridPanel.add(XYZPanel);
1432	1694	*/
1433		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1434		- gridPanel.setContinuousLayout(true);
1435		- gridPanel.setOneTouchExpandable(true);
1436		- gridPanel.setDividerLocation(1.0);
1437		- gridPanel.setDividerSize(9);
1438		- gridPanel.setResizeWeight(0.85);
	1695	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1696	+// gridPanel.setContinuousLayout(true);
	1697	+// gridPanel.setOneTouchExpandable(true);
	1698	+// gridPanel.setDividerLocation(1.0);
	1699	+// gridPanel.setDividerSize(9);
	1700	+// gridPanel.setResizeWeight(0.85);
1439	1701
1440	1702	// aConstraints.weighty = 0;
1441	1703	//System.out.println("THIS = " + this);
..	..	@@ -1458,15 +1720,34 @@
1458	1720
1459	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1460	1722	//tmp.setName("Edit");
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
	1727	+ objectPanel.add(toolboxPanel);
	1728	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1729	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1730	+
1461	1731	objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
1462	1735	// JPanel north = new JPanel(new BorderLayout());
1463	1736	// north.setName("Edit");
1464	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1465	1738	// objectPanel.add(north);
1466	1739	objectPanel.add(editPanel);
1467		- objectPanel.add(infoPanel);
1468		- objectPanel.add(toolboxPanel);
1469		-
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1741	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1742	+
	1743	+ objectPanel.add(transformPanel);
	1744	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1746	+
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1470	1751	/*
1471	1752	aConstraints.gridx = 0;
1472	1753	aConstraints.gridwidth = 1;
..	..	@@ -1497,11 +1778,108 @@
1497	1778
1498	1779	AddOptions(optionsPanel); //, aConstraints);
1499	1780
1500		- tabbedPane.add(optionsPanel);
1501		-
1502	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1503	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1504	1785	scenePanel.add(tabbedPane);
	1786	+
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
	1789	+
	1790	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1791	+ creditsPanel.add(ogaLabel);
	1792	+
	1793	+ cButton creditButton;
	1794	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1795	+ creditButton.setToolTipText("https://opengameart.org");
	1796	+
	1797	+ creditButton.addMouseListener(new MouseAdapter()
	1798	+ {
	1799	+ public void mouseClicked(MouseEvent e)
	1800	+ {
	1801	+ try
	1802	+ {
	1803	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1804	+ } catch (Exception e1)
	1805	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1806	+ {
	1807	+ e1.printStackTrace();
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1813	+ creditsPanel.add(ogaLabel);
	1814	+
	1815	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1816	+ creditButton.setToolTipText("https://3delicious.net");
	1817	+
	1818	+ creditButton.addMouseListener(new MouseAdapter()
	1819	+ {
	1820	+ public void mouseClicked(MouseEvent e)
	1821	+ {
	1822	+ try
	1823	+ {
	1824	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1825	+ } catch (Exception e1)
	1826	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1827	+ {
	1828	+ e1.printStackTrace();
	1829	+ }
	1830	+ }
	1831	+ });
	1832	+
	1833	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1834	+ creditButton.setToolTipText("https://archive3d.net");
	1835	+
	1836	+ creditButton.addMouseListener(new MouseAdapter()
	1837	+ {
	1838	+ public void mouseClicked(MouseEvent e)
	1839	+ {
	1840	+ try
	1841	+ {
	1842	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1843	+ } catch (Exception e1)
	1844	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1845	+ {
	1846	+ e1.printStackTrace();
	1847	+ }
	1848	+ }
	1849	+ });
	1850	+
	1851	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1852	+ creditButton.setToolTipText("https://turbosquid.com");
	1853	+
	1854	+ creditButton.addMouseListener(new MouseAdapter()
	1855	+ {
	1856	+ public void mouseClicked(MouseEvent e)
	1857	+ {
	1858	+ try
	1859	+ {
	1860	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1861	+ } catch (Exception e1)
	1862	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1863	+ {
	1864	+ e1.printStackTrace();
	1865	+ }
	1866	+ }
	1867	+ });
	1868	+
	1869	+ for (int i=6; --i>=0;)
	1870	+ {
	1871	+ creditsPanel.add(new cGridBag());
	1872	+ }
	1873	+
	1874	+ tabbedPane.add(creditsPanel);
	1875	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1876	+
	1877	+ if (Globals.ADVANCED)
	1878	+ {
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
	1882	+ }
1505	1883
1506	1884	/*
1507	1885	cTree jTree = new cTree(null);
..	..	@@ -1523,13 +1901,13 @@
1523	1901	jtp.add(tree);
1524	1902	*/
1525	1903
1526		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1527		- bigPanel.setContinuousLayout(true);
1528		- bigPanel.setOneTouchExpandable(true);
1529		- bigPanel.setDividerLocation(0.8);
1530		- bigPanel.setDividerSize(15);
1531		- bigPanel.setResizeWeight(0.15);
1532		- bigPanel.setName("Scene");
	1904	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1905	+// bigPanel.setContinuousLayout(true);
	1906	+// bigPanel.setOneTouchExpandable(true);
	1907	+// bigPanel.setDividerLocation(0.8);
	1908	+// bigPanel.setDividerSize(15);
	1909	+// bigPanel.setResizeWeight(0.15);
	1910	+// bigPanel.setName("Scene");
1533	1911
1534	1912	//bigPanel.setLayout(new BorderLayout());
1535	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1564,7 +1942,7 @@
1564	1942	bigThree = new cGridBag();
1565	1943	bigThree.addComponent(scenePanel);
1566	1944	bigThree.addComponent(centralPanel);
1567		- bigThree.addComponent(XYZPanel);
	1945	+ //bigThree.addComponent(XYZPanel);
1568	1946
1569	1947	// // SIDE EFFECT!!!
1570	1948	// aConstraints.gridx = 0;
..	..	@@ -1573,16 +1951,33 @@
1573	1951	// aConstraints.gridheight = 1;
1574	1952
1575	1953	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1576		- framePanel.setContinuousLayout(true);
1577		- framePanel.setOneTouchExpandable(true);
1578		- framePanel.setDividerLocation(0.8);
	1954	+
	1955	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1956	+ new java.beans.PropertyChangeListener()
	1957	+ {
	1958	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1959	+ {
	1960	+ if ((Integer)pce.getOldValue() == 1)
	1961	+ {
	1962	+ if (radio.layout != expandedLayout)
	1963	+ {
	1964	+ radio.layout = expandedLayout;
	1965	+ radio.layout.doClick();
	1966	+ }
	1967	+ }
	1968	+ }
	1969	+ });
	1970	+
	1971	+ framePanel.setContinuousLayout(false);
	1972	+ framePanel.setOneTouchExpandable(false);
	1973	+ //.setDividerLocation(0.8);
1579	1974	//framePanel.setDividerSize(15);
1580	1975	//framePanel.setResizeWeight(0.15);
1581	1976	framePanel.setName("Frame");
1582	1977
1583	1978	frame.getContentPane().setLayout(new BorderLayout());
1584	1979	/**/
1585		- JTabbedPane worldPane = new JTabbedPane();
	1980	+ //JTabbedPane worldPane = new JTabbedPane();
1586	1981	//worldPane.add(bigPanel);
1587	1982	//worldPane.add(worldPanel);
1588	1983	/**/
..	..	@@ -1594,17 +1989,17 @@
1594	1989
1595	1990	frame.setSize(1280, 860);
1596	1991
1597		- frame.validate();
1598		- frame.setVisible(true);
1599		-
1600	1992	cameraView.requestFocusInWindow();
1601	1993
1602		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
	1995	+
	1996	+ frame.validate();
	1997	+
	1998	+ frame.setVisible(true);
1603	1999
1604	2000	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1605	2001	frame.addWindowListener(new WindowAdapter()
1606	2002	{
1607		-
1608	2003	public void windowClosing(WindowEvent e)
1609	2004	{
1610	2005	Close();
..	..	@@ -1627,28 +2022,484 @@
1627	2022	ctrlPanel.removeAll();
1628	2023	}
1629	2024
1630		- void SetupMaterial(cGridBag panel)
	2025	+ void SetupMaterial(cGridBag materialpanel)
1631	2026	{
1632		- /*
	2027	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2028	+
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2030	+ skin.setToolTipText("Skin");
	2031	+ skin.addMouseListener(new MouseAdapter()
	2032	+ {
	2033	+ public void mouseClicked(MouseEvent e)
	2034	+ {
	2035	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2036	+ cMaterial material = object.material;
	2037	+
	2038	+ // Skin
	2039	+ colorField.setFloat(material.color);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
	2049	+ subsurfaceField.setFloat(material.subsurface);
	2050	+ selfshadowField.setFloat(material.diffuseness);
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ shadowbiasField.setFloat(material.shadowbias);
	2054	+ diffuseField.setFloat(material.diffuse);
	2055	+ specularField.setFloat(material.specular);
	2056	+
	2057	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2058	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2059	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2060	+
	2061	+ materialtouched = true;
	2062	+ applySelf();
	2063	+ }
	2064	+ });
	2065	+ presetpanel.add(skin);
	2066	+
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2068	+ lambert.setToolTipText("Diffuse");
	2069	+ lambert.addMouseListener(new MouseAdapter()
	2070	+ {
	2071	+ public void mouseClicked(MouseEvent e)
	2072	+ {
	2073	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2074	+ cMaterial material = object.material;
	2075	+
	2076	+ diffusenessField.setFloat(material.factor);
	2077	+ selfshadowField.setFloat(material.diffuseness);
	2078	+
	2079	+ materialtouched = true;
	2080	+ applySelf();
	2081	+ }
	2082	+ });
	2083	+ presetpanel.add(lambert);
	2084	+
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2086	+ diffuse2.setToolTipText("Diffuse2");
	2087	+ diffuse2.addMouseListener(new MouseAdapter()
	2088	+ {
	2089	+ public void mouseClicked(MouseEvent e)
	2090	+ {
	2091	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2092	+ cMaterial material = object.material;
	2093	+
	2094	+ diffusenessField.setFloat(material.factor);
	2095	+ selfshadowField.setFloat(material.diffuseness);
	2096	+
	2097	+ materialtouched = true;
	2098	+ applySelf();
	2099	+ }
	2100	+ });
	2101	+ presetpanel.add(diffuse2);
	2102	+
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2104	+ diffusemoon.setToolTipText("Moon");
	2105	+ diffusemoon.addMouseListener(new MouseAdapter()
	2106	+ {
	2107	+ public void mouseClicked(MouseEvent e)
	2108	+ {
	2109	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2110	+ cMaterial material = object.material;
	2111	+
	2112	+ diffusenessField.setFloat(material.factor);
	2113	+ selfshadowField.setFloat(material.diffuseness);
	2114	+
	2115	+ materialtouched = true;
	2116	+ applySelf();
	2117	+ }
	2118	+ });
	2119	+ presetpanel.add(diffusemoon);
	2120	+
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2122	+ diffusemoon2.setToolTipText("Moon2");
	2123	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2124	+ {
	2125	+ public void mouseClicked(MouseEvent e)
	2126	+ {
	2127	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2128	+ cMaterial material = object.material;
	2129	+
	2130	+ diffusenessField.setFloat(material.factor);
	2131	+ selfshadowField.setFloat(material.diffuseness);
	2132	+
	2133	+ materialtouched = true;
	2134	+ applySelf();
	2135	+ }
	2136	+ });
	2137	+ presetpanel.add(diffusemoon2);
	2138	+
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2140	+ diffusemoon3.setToolTipText("Moon3");
	2141	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2142	+ {
	2143	+ public void mouseClicked(MouseEvent e)
	2144	+ {
	2145	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2146	+ cMaterial material = object.material;
	2147	+
	2148	+ diffusenessField.setFloat(material.factor);
	2149	+ selfshadowField.setFloat(material.diffuseness);
	2150	+
	2151	+ materialtouched = true;
	2152	+ applySelf();
	2153	+ }
	2154	+ });
	2155	+ presetpanel.add(diffusemoon3);
	2156	+
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2158	+ diffusesheen.setToolTipText("Sheen");
	2159	+ diffusesheen.addMouseListener(new MouseAdapter()
	2160	+ {
	2161	+ public void mouseClicked(MouseEvent e)
	2162	+ {
	2163	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2164	+ cMaterial material = object.material;
	2165	+
	2166	+ sheenField.setFloat(material.sheen);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(diffusesheen);
	2173	+
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2175	+ rough.setToolTipText("Rough metal");
	2176	+ rough.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ shininessField.setFloat(material.shininess);
	2184	+ velvetField.setFloat(material.velvet);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(rough);
	2191	+
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2193	+ rough2.setToolTipText("Medium metal");
	2194	+ rough2.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2199	+ cMaterial material = object.material;
	2200	+
	2201	+ shininessField.setFloat(material.shininess);
	2202	+ lightareaField.setFloat(material.lightarea);
	2203	+
	2204	+ materialtouched = true;
	2205	+ applySelf();
	2206	+ }
	2207	+ });
	2208	+ presetpanel.add(rough2);
	2209	+
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2211	+ shini0.setToolTipText("Shiny");
	2212	+ shini0.addMouseListener(new MouseAdapter()
	2213	+ {
	2214	+ public void mouseClicked(MouseEvent e)
	2215	+ {
	2216	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2217	+ cMaterial material = object.material;
	2218	+
	2219	+ shininessField.setFloat(material.shininess);
	2220	+ lightareaField.setFloat(material.lightarea);
	2221	+
	2222	+ materialtouched = true;
	2223	+ applySelf();
	2224	+ }
	2225	+ });
	2226	+ presetpanel.add(shini0);
	2227	+
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2229	+ shini1.setToolTipText("Shiny2");
	2230	+ shini1.addMouseListener(new MouseAdapter()
	2231	+ {
	2232	+ public void mouseClicked(MouseEvent e)
	2233	+ {
	2234	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2235	+ cMaterial material = object.material;
	2236	+
	2237	+ shininessField.setFloat(material.shininess);
	2238	+ lightareaField.setFloat(material.lightarea);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(shini1);
	2245	+
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2247	+ shini2.setToolTipText("Shiny3");
	2248	+ shini2.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2253	+ cMaterial material = object.material;
	2254	+
	2255	+ shininessField.setFloat(material.shininess);
	2256	+ lightareaField.setFloat(material.lightarea);
	2257	+
	2258	+ materialtouched = true;
	2259	+ applySelf();
	2260	+ }
	2261	+ });
	2262	+ presetpanel.add(shini2);
	2263	+
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2265	+ aniso.setToolTipText("AnisoU");
	2266	+ aniso.addMouseListener(new MouseAdapter()
	2267	+ {
	2268	+ public void mouseClicked(MouseEvent e)
	2269	+ {
	2270	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2271	+ cMaterial material = object.material;
	2272	+
	2273	+ anisoField.setFloat(material.aniso);
	2274	+ anisoVField.setFloat(material.anisoV);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(aniso);
	2281	+
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2283	+ aniso2.setToolTipText("AnisoV");
	2284	+ aniso2.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ anisoField.setFloat(material.aniso);
	2292	+ anisoVField.setFloat(material.anisoV);
	2293	+
	2294	+ materialtouched = true;
	2295	+ applySelf();
	2296	+ }
	2297	+ });
	2298	+ presetpanel.add(aniso2);
	2299	+
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2301	+ aniso3.setToolTipText("AnisoUV");
	2302	+ aniso3.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2307	+ cMaterial material = object.material;
	2308	+
	2309	+ anisoField.setFloat(material.aniso);
	2310	+ anisoVField.setFloat(material.anisoV);
	2311	+
	2312	+ materialtouched = true;
	2313	+ applySelf();
	2314	+ }
	2315	+ });
	2316	+ presetpanel.add(aniso3);
	2317	+
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2319	+ velvet0.setToolTipText("Velvet");
	2320	+ velvet0.addMouseListener(new MouseAdapter()
	2321	+ {
	2322	+ public void mouseClicked(MouseEvent e)
	2323	+ {
	2324	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2325	+ cMaterial material = object.material;
	2326	+
	2327	+ diffusenessField.setFloat(material.factor);
	2328	+ selfshadowField.setFloat(material.diffuseness);
	2329	+ sheenField.setFloat(material.sheen);
	2330	+ shininessField.setFloat(material.shininess);
	2331	+ velvetField.setFloat(material.velvet);
	2332	+ shiftField.setFloat(material.shift);
	2333	+
	2334	+ materialtouched = true;
	2335	+ applySelf();
	2336	+ }
	2337	+ });
	2338	+ presetpanel.add(velvet0);
	2339	+
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2341	+ bump0.setToolTipText("Bump texture");
	2342	+ bump0.addMouseListener(new MouseAdapter()
	2343	+ {
	2344	+ public void mouseClicked(MouseEvent e)
	2345	+ {
	2346	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2347	+ cMaterial material = object.material;
	2348	+
	2349	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2350	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2351	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2352	+
	2353	+ materialtouched = true;
	2354	+ applySelf();
	2355	+ }
	2356	+ });
	2357	+ presetpanel.add(bump0);
	2358	+
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2360	+ borderShader.setToolTipText("Border fade");
	2361	+ borderShader.addMouseListener(new MouseAdapter()
	2362	+ {
	2363	+ public void mouseClicked(MouseEvent e)
	2364	+ {
	2365	+ borderfadeField.setFloat(0.4);
	2366	+ opacityField.setFloat(0.75);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(borderShader);
	2373	+
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2375	+ halo.setToolTipText("Halo");
	2376	+ halo.addMouseListener(new MouseAdapter()
	2377	+ {
	2378	+ public void mouseClicked(MouseEvent e)
	2379	+ {
	2380	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2381	+ cMaterial material = object.material;
	2382	+
	2383	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2384	+
	2385	+ materialtouched = true;
	2386	+ applySelf();
	2387	+ }
	2388	+ });
	2389	+ presetpanel.add(halo);
	2390	+
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2392	+ candle.setToolTipText("Candle");
	2393	+ candle.addMouseListener(new MouseAdapter()
	2394	+ {
	2395	+ public void mouseClicked(MouseEvent e)
	2396	+ {
	2397	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2398	+ cMaterial material = object.material;
	2399	+
	2400	+ subsurfaceField.setFloat(material.subsurface);
	2401	+ shadowbiasField.setFloat(material.shadowbias);
	2402	+ ambientField.setFloat(material.ambient);
	2403	+ specularField.setFloat(material.specular);
	2404	+ lightareaField.setFloat(material.lightarea);
	2405	+ shininessField.setFloat(material.shininess);
	2406	+
	2407	+ materialtouched = true;
	2408	+ applySelf();
	2409	+ }
	2410	+ });
	2411	+ presetpanel.add(candle);
	2412	+
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2414	+ shadowShader.setToolTipText("Shadow");
	2415	+ shadowShader.addMouseListener(new MouseAdapter()
	2416	+ {
	2417	+ public void mouseClicked(MouseEvent e)
	2418	+ {
	2419	+ diffuseField.setFloat(0.001);
	2420	+ ambientField.setFloat(0.001);
	2421	+ cameraField.setFloat(0.001);
	2422	+ specularField.setFloat(0.001);
	2423	+ fakedepthField.setFloat(0.001);
	2424	+ opacityField.setFloat(0.6);
	2425	+
	2426	+ materialtouched = true;
	2427	+ applySelf();
	2428	+ }
	2429	+ });
	2430	+ presetpanel.add(shadowShader);
	2431	+
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
	2473	+
	2474	+ cGridBag panel = new cGridBag().setVertical(true);
	2475	+
	2476	+ presetpanel.preferredWidth = 1;
	2477	+
	2478	+ materialpanel.add(presetpanel);
	2479	+ materialpanel.add(panel);
	2480	+
	2481	+ panel.preferredWidth = 8;
	2482	+
	2483	+ /*
1633	2484	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1634	2485	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1635		- */
	2486	+ */
1636	2487
1637	2488	cGridBag editBar = new cGridBag().setVertical(false);
1638	2489
1639		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1640	2491	createMaterialButton.setToolTipText("Create material");
1641	2492
1642	2493	/*
1643	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1644	2495	*/
1645	2496
1646		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1647	2498	clearMaterialButton.setToolTipText("Clear material");
1648	2499
1649	2500	if (Globals.ADVANCED)
1650	2501	{
1651		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1652	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1653	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1654	2505	}
..	..	@@ -1666,45 +2517,61 @@
1666	2517	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1667	2518
1668	2519	cGridBag colorSection = new cGridBag().setVertical(true);
	2520	+
	2521	+ cGridBag huepanel = new cGridBag();
	2522	+ cGridBag huelabel = new cGridBag();
	2523	+ cLabel hue = GetLabel("icons/hue.png", false);
	2524	+ hue.fit = true;
	2525	+
	2526	+ hue.addMouseListener(new MouseAdapter()
	2527	+ {
	2528	+ public void mousePressed(MouseEvent e)
	2529	+ {
	2530	+ int x = e.getX();
	2531	+
	2532	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2533	+ }
	2534	+ });
	2535	+
	2536	+ huelabel.add(hue);
	2537	+ huelabel.preferredWidth = 20;
	2538	+ huepanel.add(new cGridBag()); // Label
	2539	+ huepanel.add(huelabel); // Field/slider
	2540	+
	2541	+ huepanel.preferredHeight = 7;
	2542	+
	2543	+ colorSection.add(huepanel);
1669	2544
1670	2545	cGridBag color = new cGridBag();
1671		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1672		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2546	+
	2547	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2548	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2549	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2550	+
1674	2551	//colorField.preferredWidth = 200;
1675	2552	colorSection.add(color);
1676	2553
1677	2554	cGridBag modulation = new cGridBag();
1678	2555	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1679	2556	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2557	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1681	2558	colorSection.add(modulation);
1682	2559
	2560	+ cGridBag opacity = new cGridBag();
	2561	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2562	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2563	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2564	+ colorSection.add(opacity);
	2565	+
	2566	+ colorSection.add(GetSeparator());
	2567	+
1683	2568	cGridBag texture = new cGridBag();
1684	2569	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1685	2570	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1686	2571	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1687	2572	colorSection.add(texture);
1688	2573
1689		- cGridBag anisoU = new cGridBag();
1690		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1691		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1693		- colorSection.add(anisoU);
1694		-
1695		- cGridBag anisoV = new cGridBag();
1696		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1697		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1699		- colorSection.add(anisoV);
1700		-
1701		- cGridBag shadowbias = new cGridBag();
1702		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1703		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1705		- colorSection.add(shadowbias);
1706		-
1707		- panel.add(new JSeparator());
	2574	+ panel.add(GetSeparator());
1708	2575
1709	2576	panel.add(colorSection);
1710	2577
..	..	@@ -1754,7 +2621,13 @@
1754	2621	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1755	2622	diffuseSection.add(fakedepth);
1756	2623
1757		- panel.add(new JSeparator());
	2624	+ cGridBag shadowbias = new cGridBag();
	2625	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2626	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2627	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2628	+ diffuseSection.add(shadowbias);
	2629	+
	2630	+ panel.add(GetSeparator());
1758	2631
1759	2632	panel.add(diffuseSection);
1760	2633
..	..	@@ -1804,42 +2677,54 @@
1804	2677	// aConstraints.gridy += 1;
1805	2678	// aConstraints.gridwidth = 1;
1806	2679
	2680	+ cGridBag anisoU = new cGridBag();
	2681	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2682	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2683	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2684	+ specularSection.add(anisoU);
1807	2685
1808		- panel.add(new JSeparator());
	2686	+ cGridBag anisoV = new cGridBag();
	2687	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2688	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2689	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2690	+ specularSection.add(anisoV);
	2691	+
	2692	+
	2693	+ panel.add(GetSeparator());
1809	2694
1810	2695	panel.add(specularSection);
1811	2696
1812	2697	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1813	2698
1814		- cGridBag globalSection = new cGridBag().setVertical(true);
	2699	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1815	2700
1816	2701	cGridBag camera = new cGridBag();
1817	2702	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1818	2703	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1819	2704	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820		- globalSection.add(camera);
	2705	+ colorSection.add(camera);
1821	2706
1822	2707	cGridBag ambient = new cGridBag();
1823	2708	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1824	2709	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1825	2710	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826		- globalSection.add(ambient);
	2711	+ colorSection.add(ambient);
1827	2712
1828	2713	cGridBag backlit = new cGridBag();
1829	2714	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1830	2715	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832		- globalSection.add(backlit);
	2717	+ colorSection.add(backlit);
1833	2718
1834		- cGridBag opacity = new cGridBag();
1835		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1836		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1837		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838		- globalSection.add(opacity);
1839		-
1840		- panel.add(new JSeparator());
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
1841	2724
1842		- panel.add(globalSection);
	2725	+ //panel.add(new JSeparator());
	2726	+
	2727	+ //panel.add(globalSection);
1843	2728
1844	2729	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1845	2730
..	..	@@ -1881,7 +2766,7 @@
1881	2766	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1882	2767	textureSection.add(opacityPower);
1883	2768
1884		- panel.add(new JSeparator());
	2769	+ panel.add(GetSeparator());
1885	2770
1886	2771	panel.add(textureSection);
1887	2772
..	..	@@ -1946,8 +2831,9 @@
1946	2831	// 3D models
1947	2832	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1948	2833	{
1949		- lastConverter = new com.jmex.model.converters.MaxToJme();
1950		- LoadFile(filename, lastConverter);
	2834	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2835	+ //LoadFile(filename, lastConverter);
	2836	+ LoadObjFile(filename); // New 3ds loader
1951	2837	continue;
1952	2838	}
1953	2839	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2673,6 +3559,7 @@
2673	3559	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2674	3560	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2675	3561	}
	3562	+
2676	3563	//cJME.count++;
2677	3564	//cJME.count %= 12;
2678	3565	if (gc)
..	..	@@ -2856,6 +3743,7 @@
2856	3743	}
2857	3744	}
2858	3745	}
	3746	+
2859	3747	cFileSystemPane FSPane;
2860	3748
2861	3749	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2865,7 +3753,7 @@
2865	3753
2866	3754	freezematerial = true;
2867	3755	colorField.setFloat(mat.color);
2868		- modulationField.setFloat(mat.modulation);
	3756	+ saturationField.setFloat(mat.modulation);
2869	3757	metalnessField.setFloat(mat.metalness);
2870	3758	diffuseField.setFloat(mat.diffuse);
2871	3759	specularField.setFloat(mat.specular);
..	..	@@ -2885,6 +3773,7 @@
2885	3773	shadowField.setFloat(mat.shadow);
2886	3774	textureField.setFloat(mat.texture);
2887	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
2888	3777	fakedepthField.setFloat(mat.fakedepth);
2889	3778	shadowbiasField.setFloat(mat.shadowbias);
2890	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -2909,6 +3798,7 @@
2909	3798	}
2910	3799	}
2911	3800	}
	3801	+
2912	3802	freezematerial = false;
2913	3803	}
2914	3804
..	..	@@ -2926,32 +3816,8 @@
2926	3816
2927	3817	if (multiplyToggle != null)
2928	3818	multiplyToggle.setSelected(mat.multiply);
2929		-
2930		- assert (object.projectedVertices != null);
2931		-
2932		- if (object.projectedVertices.length <= 2)
2933		- {
2934		- // Side effect...
2935		- Object3D.cVector2[] keep = object.projectedVertices;
2936		- object.projectedVertices = new Object3D.cVector2[3];
2937		- for (int i = 0; i < 3; i++)
2938		- {
2939		- if (i < keep.length)
2940		- {
2941		- object.projectedVertices[i] = keep[i];
2942		- } else
2943		- {
2944		- object.projectedVertices[i] = new Object3D.cVector2();
2945		- }
2946		- /*
2947		- if(keep.length == 0)
2948		- object.projectedVertices[0] = new Object3D.cVector2();
2949		- else
2950		- object.projectedVertices[0] = keep[0];
2951		- object.projectedVertices[1] = new Object3D.cVector2();
2952		- */
2953		- }
2954		- }
	3819	+
	3820	+ AllocProjectedVertices(object);
2955	3821
2956	3822	SetMaterial(mat, object.projectedVertices);
2957	3823	}
..	..	@@ -3071,6 +3937,17 @@
3071	3937	public void itemStateChanged(ItemEvent event)
3072	3938	{
3073	3939	// System.out.println("Propagate = " + propagate);
	3940	+ if (event.getSource() == pinButton)
	3941	+ {
	3942	+ copy.pinned ^= true;
	3943	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3944	+ {
	3945	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3946	+ copy.CloseUI();
	3947	+ //copy.editWindow.refreshContents();
	3948	+ }
	3949	+ }
	3950	+ else
3074	3951	if (event.getSource() == propagateToggle)
3075	3952	{
3076	3953	propagate ^= true;
..	..	@@ -3175,8 +4052,9 @@
3175	4052	} else if (event.getSource() == liveCB)
3176	4053	{
3177	4054	copy.live ^= true;
	4055	+ objEditor.refreshContents(true); // To show item colors
3178	4056	return;
3179		- } else if (event.getSource() == selectCB)
	4057	+ } else if (event.getSource() == selectableCB)
3180	4058	{
3181	4059	copy.dontselect ^= true;
3182	4060	return;
..	..	@@ -3184,7 +4062,7 @@
3184	4062	{
3185	4063	copy.hide ^= true;
3186	4064	copy.Touch(); // display list issue
3187		- objEditor.refreshContents();
	4065	+ objEditor.refreshContents(true); // To show item colors
3188	4066	return;
3189	4067	} else if (event.getSource() == link2masterCB)
3190	4068	{
..	..	@@ -3249,7 +4127,7 @@
3249	4127	//System.out.println("ObjEditor " + event);
3250	4128	applySelf0(true);
3251	4129	//parent.applySelf();
3252		- objEditor.refreshContents();
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
3253	4131	} else if (source == resetButton)
3254	4132	{
3255	4133	CameraPane.fullreset = true;
..	..	@@ -3361,9 +4239,9 @@
3361	4239	{
3362	4240	Close();
3363	4241	//return true;
3364		- } else if (source == loadItem)
	4242	+ } else if (source == openItem)
3365	4243	{
3366		- load();
	4244	+ Open();
3367	4245	//return true;
3368	4246	} else if (source == newItem)
3369	4247	{
..	..	@@ -3388,6 +4266,10 @@
3388	4266	{
3389	4267	generatePOV();
3390	4268	//return true;
	4269	+ } else if (event.getSource() == archiveItem)
	4270	+ {
	4271	+ cTools.Archive(frame);
	4272	+ return;
3391	4273	} else if (source == zBufferItem)
3392	4274	{
3393	4275	try
..	..	@@ -3425,22 +4307,30 @@
3425	4307
3426	4308	void New()
3427	4309	{
3428		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
3429	4311	{
3430		- copy.remove(1);
	4312	+ copy.remove(0);
3431	4313	}
3432	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
3433	4322	ResetModel();
3434	4323	objEditor.refreshContents();
3435	4324	}
3436	4325
3437	4326	static public byte[] Compress(Object3D o)
3438	4327	{
	4328	+ // Slower to actually compress.
3439	4329	try
3440	4330	{
3441	4331	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4332	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4333	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3444	4334
3445	4335	Object3D parent = o.parent;
3446	4336	o.parent = null;
..	..	@@ -3451,10 +4341,14 @@
3451	4341
3452	4342	out.flush();
3453	4343
3454		- zstream.close();
	4344	+ baos //zstream
	4345	+ .close();
3455	4346	out.close();
3456	4347
3457		- return baos.toByteArray();
	4348	+ byte[] bytes = baos.toByteArray();
	4349	+
	4350	+ System.out.println("save #bytes = " + bytes.length);
	4351	+ return bytes;
3458	4352	} catch (Exception e)
3459	4353	{
3460	4354	System.err.println(e);
..	..	@@ -3464,13 +4358,16 @@
3464	4358
3465	4359	static public Object Uncompress(byte[] bytes)
3466	4360	{
3467		- System.out.println("#bytes = " + bytes.length);
	4361	+ System.out.println("restore #bytes = " + bytes.length);
3468	4362	try
3469	4363	{
3470	4364	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472		- ObjectInputStream in = new ObjectInputStream(istream);
	4365	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4366	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3473	4367	Object obj = in.readObject();
	4368	+
	4369	+ bais //istream
	4370	+ .close();
3474	4371	in.close();
3475	4372
3476	4373	return obj;
..	..	@@ -3525,41 +4422,101 @@
3525	4422	return null;
3526	4423	}
3527	4424
3528		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3529	4425
3530	4426	public void Save()
3531	4427	{
	4428	+ //Save(true);
	4429	+ Replace();
	4430	+ SetVersionStates();
	4431	+ }
	4432	+
	4433	+ private boolean Equal(byte[] compress, byte[] name)
	4434	+ {
	4435	+ if (compress.length != name.length)
	4436	+ {
	4437	+ return false;
	4438	+ }
	4439	+
	4440	+ for (int i=compress.length; --i>=0;)
	4441	+ {
	4442	+ if (compress[i] != name[i])
	4443	+ return false;
	4444	+ }
	4445	+
	4446	+ return true;
	4447	+ }
	4448	+
	4449	+ void DeleteVersion()
	4450	+ {
	4451	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4452	+ {
	4453	+ copy.versionlist[i] = copy.versionlist[i+1];
	4454	+ }
	4455	+
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
	4458	+
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
	4461	+
	4462	+ SetVersionStates();
	4463	+ }
	4464	+
	4465	+ public boolean Save(boolean user)
	4466	+ {
3532	4467	System.err.println("Save");
	4468	+ Replace();
3533	4469
3534		- cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
3535	4475
3536		- boolean temp = CameraPane.SWITCH;
3537		- CameraPane.SWITCH = false;
	4476	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3538	4477
3539		- copy.ExtractBigData(hashtable);
	4478	+ boolean thesame = false;
	4479	+
	4480	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4481	+// {
	4482	+// thesame = true;
	4483	+// }
3540	4484
3541	4485	//EditorFrame.m_MainFrame.requestFocusInWindow();
3542		- tab.graphs[tab.undoindex++] = Compress(copy);
3543		-
3544		- copy.RestoreBigData(hashtable);
3545		-
3546		- CameraPane.SWITCH = temp;
3547		-
3548		- //assert(hashtable.isEmpty());
3549		-
3550		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4486	+ if (!thesame)
3551	4487	{
3552		- tab.graphs[i] = null;
	4488	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4489	+ {
	4490	+ copy.versionlist[i] = copy.versionlist[i-1];
	4491	+ }
	4492	+
	4493	+ //tab.user[tab.versionindex] = user;
	4494	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4495	+
	4496	+ copy.versionlist[++copy.versionindex] = compress;
	4497	+
	4498	+ // if (increment)
	4499	+ // tab.versionindex++;
3553	4500	}
3554	4501
3555		- SetUndoStates();
	4502	+ //copy.RestoreBigData(versiontable);
	4503	+
	4504	+ //assert(hashtable.isEmpty());
	4505	+
	4506	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4507	+// {
	4508	+// //tab.user[i] = false;
	4509	+// copy.versionlist[i] = null;
	4510	+// }
	4511	+
	4512	+ SetVersionStates();
3556	4513
3557	4514	// test save
3558	4515	if (false)
3559	4516	{
3560	4517	try
3561	4518	{
3562		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4519	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3563	4520	ObjectOutputStream p = new ObjectOutputStream(ostream);
3564	4521
3565	4522	p.writeObject(copy);
..	..	@@ -3572,28 +4529,68 @@
3572	4529	e.printStackTrace();
3573	4530	}
3574	4531	}
	4532	+
	4533	+ return !thesame;
	4534	+ }
	4535	+
	4536	+ boolean flashIt = true;
	4537	+
	4538	+ void RefreshSelection()
	4539	+ {
	4540	+ Object3D selection = new Object3D();
	4541	+
	4542	+ for (int i = 0; i < copy.selection.size(); i++)
	4543	+ {
	4544	+ Object3D elem = copy.selection.elementAt(i);
	4545	+
	4546	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4547	+
	4548	+ if (obj == null)
	4549	+ {
	4550	+ copy.selection.remove(i--);
	4551	+ }
	4552	+ else
	4553	+ {
	4554	+ selection.add(obj);
	4555	+ copy.selection.setElementAt(obj, i);
	4556	+ }
	4557	+ }
	4558	+
	4559	+ flashIt = false;
	4560	+ GetTree().clearSelection();
	4561	+ for (int i = 0; i < selection.size(); i++)
	4562	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4563	+ flashIt = true;
	4564	+
	4565	+ //refreshContents(false);
3575	4566	}
3576	4567
3577		- void CopyChanged(Object3D obj)
	4568	+ void CopyChanged()
3578	4569	{
3579		- SetUndoStates();
	4570	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4571	+
	4572	+ SetVersionStates();
3580	4573
3581	4574	boolean temp = CameraPane.SWITCH;
3582	4575	CameraPane.SWITCH = false;
3583	4576
3584		- copy.ExtractBigData(hashtable);
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3585	4578
3586	4579	copy.clear();
3587	4580
	4581	+ copy.skyboxname = obj.skyboxname;
	4582	+ copy.skyboxext = obj.skyboxext;
	4583	+
3588	4584	for (int i=0; i<obj.Size(); i++)
3589	4585	{
3590	4586	copy.add(obj.get(i));
3591	4587	}
3592	4588
3593		- copy.RestoreBigData(hashtable);
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3594	4590
3595	4591	CameraPane.SWITCH = temp;
3596	4592
	4593	+ RefreshSelection();
3597	4594	//assert(hashtable.isEmpty());
3598	4595
3599	4596	copy.Touch();
..	..	@@ -3614,56 +4611,161 @@
3614	4611	}
3615	4612	}
3616	4613
3617		- refreshContents();
	4614	+ refreshContents(true);
3618	4615	}
3619	4616
3620		- cButton undoButton;
3621		- cButton redoButton;
	4617	+ cButton previousVersionButton;
	4618	+ cButton restoreButton;
	4619	+ cButton replaceButton;
	4620	+ cButton nextVersionButton;
	4621	+ cButton saveVersionButton;
	4622	+ cButton deleteVersionButton;
3622	4623
3623		- void SetUndoStates()
	4624	+ boolean muteSlider;
	4625	+
	4626	+ int VersionCount()
3624	4627	{
3625		- cRadio tab = GetCurrentTab();
	4628	+ int count = 0;
3626	4629
3627		- undoButton.setEnabled(tab.undoindex > 0);
3628		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4630	+ for (int i = copy.versionlist.length; --i >= 0;)
	4631	+ {
	4632	+ if (copy.versionlist[i] != null)
	4633	+ count++;
	4634	+ }
	4635	+
	4636	+ return count;
3629	4637	}
3630	4638
3631		- public void Undo()
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
3632	4642	{
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
	4647	+
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
	4678	+ }
	4679	+
	4680	+ public boolean PreviousVersion()
	4681	+ {
	4682	+ // Option?
	4683	+ Replace();
	4684	+
3633	4685	System.err.println("Undo");
3634	4686
3635		- cRadio tab = GetCurrentTab();
	4687	+ //cRadio tab = GetCurrentTab();
3636	4688
3637		- if (tab.undoindex == 0)
	4689	+ if (copy.versionindex == 0)
3638	4690	{
3639	4691	java.awt.Toolkit.getDefaultToolkit().beep();
3640		- return;
	4692	+ return false;
3641	4693	}
3642	4694
3643		- if (tab.graphs[tab.undoindex] == null)
3644		- {
3645		- Save();
3646		- tab.undoindex -= 1;
3647		- }
	4695	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4696	+// {
	4697	+// if (Save(false))
	4698	+// tab.versionindex -= 1;
	4699	+// else
	4700	+// {
	4701	+// if (tab.versionindex <= 0)
	4702	+// return false;
	4703	+// else
	4704	+// tab.versionindex -= 1;
	4705	+// }
	4706	+// }
3648	4707
3649		- tab.undoindex -= 1;
	4708	+ copy.versionindex -= 1;
3650	4709
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4710	+ CopyChanged();
	4711	+
	4712	+ return true;
3652	4713	}
3653	4714
3654		- public void Redo()
	4715	+ public boolean Restore()
3655	4716	{
3656		- cRadio tab = GetCurrentTab();
	4717	+ System.err.println("Restore");
3657	4718
3658		- if (tab.graphs[tab.undoindex + 1] == null)
	4719	+ //cRadio tab = GetCurrentTab();
	4720	+
	4721	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4722	+ {
	4723	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4724	+ return false;
	4725	+ }
	4726	+
	4727	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4728	+ CopyChanged();
	4729	+
	4730	+ return true;
	4731	+ }
	4732	+
	4733	+ public boolean Replace()
	4734	+ {
	4735	+ //System.err.println("Replace");
	4736	+
	4737	+ //cRadio tab = GetCurrentTab();
	4738	+
	4739	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4740	+ {
	4741	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4742	+ return false;
	4743	+ }
	4744	+
	4745	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4746	+
	4747	+ return true;
	4748	+ }
	4749	+
	4750	+ public void NextVersion()
	4751	+ {
	4752	+ // Option?
	4753	+ Replace();
	4754	+
	4755	+ //cRadio tab = GetCurrentTab();
	4756	+
	4757	+ if (copy.versionlist[copy.versionindex + 1] == null)
3659	4758	{
3660	4759	java.awt.Toolkit.getDefaultToolkit().beep();
3661	4760	return;
3662	4761	}
3663	4762
3664		- tab.undoindex += 1;
	4763	+ copy.versionindex += 1;
3665	4764
3666		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4765	+ CopyChanged();
	4766	+
	4767	+ //if (!tab.user[tab.versionindex])
	4768	+ // tab.graphs[tab.versionindex] = null;
3667	4769	}
3668	4770
3669	4771	void ImportGFD()
..	..	@@ -3857,6 +4959,12 @@
3857	4959	// else
3858	4960	// applySelf(true);
3859	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
3860	4968	void applySelf0(boolean name)
3861	4969	{
3862	4970	if (name)
..	..	@@ -3874,7 +4982,7 @@
3874	4982	//copy.material = new cMaterial(copy.GetMaterial());
3875	4983
3876	4984	current.color = (float) colorField.getFloat();
3877		- current.modulation = (float) modulationField.getFloat();
	4985	+ current.modulation = (float) saturationField.getFloat();
3878	4986	current.metalness = (float) metalnessField.getFloat();
3879	4987	current.diffuse = (float) diffuseField.getFloat();
3880	4988	current.specular = (float) specularField.getFloat();
..	..	@@ -3894,6 +5002,7 @@
3894	5002	current.shadow = (float) shadowField.getFloat();
3895	5003	current.texture = (float) textureField.getFloat();
3896	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
3897	5006	current.fakedepth = (float) fakedepthField.getFloat();
3898	5007	current.shadowbias = (float) shadowbiasField.getFloat();
3899	5008
..	..	@@ -3906,29 +5015,54 @@
3906	5015	{
3907	5016	cMaterial mat = copy.material;
3908	5017
3909		- colorField.SetToolTipValue((mat.color));
3910		- modulationField.SetToolTipValue((mat.modulation));
3911		- metalnessField.SetToolTipValue((mat.metalness));
3912		- diffuseField.SetToolTipValue((mat.diffuse));
3913		- specularField.SetToolTipValue((mat.specular));
3914		- shininessField.SetToolTipValue((mat.shininess));
3915		- shiftField.SetToolTipValue((mat.shift));
3916		- ambientField.SetToolTipValue((mat.ambient));
3917		- lightareaField.SetToolTipValue((mat.lightarea));
3918		- diffusenessField.SetToolTipValue((mat.factor));
3919		- velvetField.SetToolTipValue((mat.velvet));
3920		- sheenField.SetToolTipValue((mat.sheen));
3921		- subsurfaceField.SetToolTipValue((mat.subsurface));
3922		- backlitField.SetToolTipValue((mat.bump));
3923		- anisoField.SetToolTipValue((mat.aniso));
3924		- anisoVField.SetToolTipValue((mat.anisoV));
3925		- cameraField.SetToolTipValue((mat.cameralight));
3926		- selfshadowField.SetToolTipValue((mat.diffuseness));
3927		- shadowField.SetToolTipValue((mat.shadow));
3928		- textureField.SetToolTipValue((mat.texture));
3929		- opacityField.SetToolTipValue((mat.opacity));
3930		- fakedepthField.SetToolTipValue((mat.fakedepth));
3931		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5018	+ if (!Equal(colorField.getFloat(), mat.color))
	5019	+ colorField.SetToolTipValue((mat.color));
	5020	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5021	+ saturationField.SetToolTipValue((mat.modulation));
	5022	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5023	+ metalnessField.SetToolTipValue((mat.metalness));
	5024	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5025	+ diffuseField.SetToolTipValue((mat.diffuse));
	5026	+ if (!Equal(specularField.getFloat(), mat.specular))
	5027	+ specularField.SetToolTipValue((mat.specular));
	5028	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5029	+ shininessField.SetToolTipValue((mat.shininess));
	5030	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5031	+ shiftField.SetToolTipValue((mat.shift));
	5032	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5033	+ ambientField.SetToolTipValue((mat.ambient));
	5034	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5035	+ lightareaField.SetToolTipValue((mat.lightarea));
	5036	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5037	+ diffusenessField.SetToolTipValue((mat.factor));
	5038	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5039	+ velvetField.SetToolTipValue((mat.velvet));
	5040	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5041	+ sheenField.SetToolTipValue((mat.sheen));
	5042	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5043	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5044	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5045	+ backlitField.SetToolTipValue((mat.bump));
	5046	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5047	+ anisoField.SetToolTipValue((mat.aniso));
	5048	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5049	+ anisoVField.SetToolTipValue((mat.anisoV));
	5050	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5051	+ cameraField.SetToolTipValue((mat.cameralight));
	5052	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5053	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5054	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5055	+ shadowField.SetToolTipValue((mat.shadow));
	5056	+ if (!Equal(textureField.getFloat(), mat.texture))
	5057	+ textureField.SetToolTipValue((mat.texture));
	5058	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5059	+ opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
	5062	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5063	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5064	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5065	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3932	5066	}
3933	5067
3934	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3959,9 +5093,28 @@
3959	5093	//copy.Touch();
3960	5094	}
3961	5095
	5096	+ cNumberSlider versionSlider;
	5097	+
3962	5098	public void stateChanged(ChangeEvent e)
3963	5099	{
3964		- // assert(false);
	5100	+ // assert(false);
	5101	+ if (e.getSource() == versionSlider)
	5102	+ {
	5103	+ if (muteSlider)
	5104	+ return;
	5105	+
	5106	+ Replace();
	5107	+
	5108	+ int version = versionSlider.getInteger();
	5109	+
	5110	+ if (version != -1 && copy.versionlist[version] != null)
	5111	+ {
	5112	+ copy.versionindex = version;
	5113	+ CopyChanged();
	5114	+ }
	5115	+
	5116	+ return;
	5117	+ }
3965	5118
3966	5119	if (freezematerial)
3967	5120	{
..	..	@@ -3997,6 +5150,12 @@
3997	5150	{
3998	5151	//System.out.println("stateChanged = " + this);
3999	5152	materialtouched = true;
	5153	+
	5154	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5155	+ {
	5156	+ saturationField.setFloat(1);
	5157	+ }
	5158	+
4000	5159	applySelf();
4001	5160	//System.out.println("this = " + this);
4002	5161	//System.out.println("PARENT = " + parent);
..	..	@@ -4296,6 +5455,7 @@
4296	5455	{
4297	5456	if (GetTree() != null)
4298	5457	{
	5458	+ GetTree().revalidate();
4299	5459	GetTree().repaint();
4300	5460	}
4301	5461
..	..	@@ -4304,13 +5464,18 @@
4304	5464	ctrlPanel.validate(); // ? new
4305	5465	ctrlPanel.repaint();
4306	5466	}
	5467	+
	5468	+ if (previousVersionButton != null && copy.versionlist != null)
	5469	+ SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
4307	5472	}
4308	5473
4309	5474	static TweenManager tweenManager = new TweenManager();
4310	5475
4311	5476	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4312	5477	{
4313		- if (Globals.SAVEONMAKE) // && resetmodel)
	5478	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4314	5479	Save();
4315	5480	//Tween.set(thing, 0).target(1).start(tweenManager);
4316	5481	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4335,7 +5500,7 @@
4335	5500	// group = (Composite) group.get(0);
4336	5501	// }
4337	5502
4338		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
4339	5504
4340	5505	/*
4341	5506	if (deselect && jList != null)
..	..	@@ -4552,7 +5717,9 @@
4552	5717	readobj.ResetDisplayList();
4553	5718	} catch (Exception e)
4554	5719	{
4555		- //e.printStackTrace();
	5720	+ if (!e.toString().contains("GZIP"))
	5721	+ e.printStackTrace();
	5722	+
4556	5723	try
4557	5724	{
4558	5725	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4626,12 +5793,14 @@
4626	5793
4627	5794	if (readobj != null)
4628	5795	{
4629		- if (Globals.SAVEONMAKE)
4630		- Save();
	5796	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5797	+ // Save();
4631	5798	try
4632	5799	{
4633	5800	//readobj.deepCopySelf(copy);
4634	5801	copy.clear(); // june 2014
	5802	+ copy.skyboxname = readobj.skyboxname;
	5803	+ copy.skyboxext = readobj.skyboxext;
4635	5804	for (int i = 0; i < readobj.size(); i++)
4636	5805	{
4637	5806	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4672,6 +5841,7 @@
4672	5841	}
4673	5842	} catch (ClassCastException e)
4674	5843	{
	5844	+ e.printStackTrace();
4675	5845	assert (false);
4676	5846	Composite c = (Composite) copy;
4677	5847	c.children.clear();
..	..	@@ -4682,17 +5852,32 @@
4682	5852	c.addChild(csg);
4683	5853	}
4684	5854
	5855	+ copy.versionlist = readobj.versionlist;
	5856	+ copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
	5858	+
	5859	+ if (copy.versionlist == null)
	5860	+ {
	5861	+ // Backward compatibility
	5862	+ copy.versionlist = new Object3D[100];
	5863	+ copy.versionindex = -1;
	5864	+
	5865	+ //Save(true);
	5866	+ }
	5867	+
	5868	+ //? SetUndoStates();
	5869	+
4685	5870	ResetModel();
4686	5871	copy.HardTouch(); // recompile?
4687	5872	refreshContents();
4688	5873	}
4689	5874	}
4690	5875
4691		- void load() // throws ClassNotFoundException
	5876	+ void Open() // throws ClassNotFoundException
4692	5877	{
4693	5878	if (Grafreed.standAlone)
4694	5879	{
4695		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5880	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4696	5881	browser.show();
4697	5882	String filename = browser.getFile();
4698	5883	if (filename != null && filename.length() > 0)
..	..	@@ -4769,6 +5954,8 @@
4769	5954
4770	5955	void save()
4771	5956	{
	5957	+ Replace();
	5958	+
4772	5959	if (lastname == null)
4773	5960	{
4774	5961	return;
..	..	@@ -4791,6 +5978,7 @@
4791	5978	//ps.print(buffer.toString());
4792	5979	} catch (IOException e)
4793	5980	{
	5981	+ e.printStackTrace();
4794	5982	}
4795	5983	}
4796	5984
..	..	@@ -4973,7 +6161,7 @@
4973	6161	MenuBar menuBar;
4974	6162	Menu fileMenu;
4975	6163	MenuItem newItem;
4976		- MenuItem loadItem;
	6164	+ MenuItem openItem;
4977	6165	MenuItem saveItem;
4978	6166	MenuItem saveAsItem;
4979	6167	MenuItem exportAsItem;
..	..	@@ -4996,6 +6184,7 @@
4996	6184	CheckboxMenuItem toggleSwitchItem;
4997	6185	CheckboxMenuItem toggleRootItem;
4998	6186	CheckboxMenuItem animationItem;
	6187	+ MenuItem archiveItem;
4999	6188	CheckboxMenuItem toggleHandleItem;
5000	6189	CheckboxMenuItem togglePaintItem;
5001	6190	JSplitPane mainPanel;
..	..	@@ -5009,6 +6198,7 @@
5009	6198	ButtonGroup buttonGroup;
5010	6199
5011	6200	cGridBag toolboxPanel;
	6201	+ cGridBag skyboxPanel;
5012	6202	cGridBag materialPanel;
5013	6203	cGridBag ctrlPanel;
5014	6204
..	..	@@ -5020,6 +6210,7 @@
5020	6210	boolean materialFlushed;
5021	6211	Object3D latestObject;
5022	6212
	6213	+ cGridBag transformPanel;
5023	6214	cGridBag XYZPanel;
5024	6215
5025	6216	JSplitPane gridPanel;
..	..	@@ -5082,7 +6273,7 @@
5082	6273	JLabel colorLabel;
5083	6274	cNumberSlider colorField;
5084	6275	JLabel modulationLabel;
5085		- cNumberSlider modulationField;
	6276	+ cNumberSlider saturationField;
5086	6277	JLabel metalnessLabel;
5087	6278	cNumberSlider metalnessField;
5088	6279	JLabel diffuseLabel;
..	..	@@ -5113,6 +6304,7 @@
5113	6304	cNumberSlider anisoField;
5114	6305	JLabel anisoVLabel;
5115	6306	cNumberSlider anisoVField;
	6307	+
5116	6308	JLabel cameraLabel;
5117	6309	cNumberSlider cameraField;
5118	6310	JLabel selfshadowLabel;
..	..	@@ -5123,10 +6315,13 @@
5123	6315	cNumberSlider textureField;
5124	6316	JLabel opacityLabel;
5125	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
5126	6320	JLabel fakedepthLabel;
5127	6321	cNumberSlider fakedepthField;
5128	6322	JLabel shadowbiasLabel;
5129	6323	cNumberSlider shadowbiasField;
	6324	+
5130	6325	JLabel bumpLabel;
5131	6326	cNumberSlider bumpField;
5132	6327	JLabel noiseLabel;