~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,119 @@
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 cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
44	82
45	83	cButton GetButton(String name, boolean border)
46	84	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
56	93	}
57	94
58	95	cToggleButton GetToggleButton(String name, boolean border)
59	96	{
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		- }
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
69	99	}
70	100
71	101	cCheckBox GetCheckBox(String name, boolean border)
72	102	{
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
73	117	try
74	118	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
77	138	}
78	139	catch (Exception e)
79	140	{
80		- return new cCheckBox(name, border);
	141	+ //icons.put(name, null);
	142	+ return null;
81	143	}
82	144	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	145	+
	146	+ BufferedImage GetImage(String name)
85	147	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	148	+ try
89	149	{
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;
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
98	153	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
102	158	}
103	159
104	160	// SCRIPT
..	..	@@ -282,6 +338,14 @@
282	338	client = inClient;
283	339	copy = client;
284	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
285	349	// "this" is not called: SetupUI2(objEditor);
286	350	}
287	351
..	..	@@ -295,6 +359,14 @@
295	359	client = inClient;
296	360	copy = client;
297	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
298	370	SetupUI2(callee.GetEditor());
299	371	}
300	372
..	..	@@ -309,14 +381,15 @@
309	381	//localCopy.parent = null;
310	382
311	383	frame = new JFrame();
312		- frame.setUndecorated(true);
	384	+ frame.setUndecorated(false);
313	385	objEditor = this;
314	386	this.callee = callee;
315	387
316	388	//parent = p;
317	389
318	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320	393	//gd.setFullScreenWindow(this);
321	394	//setResizable(false);
322	395	//if (!isDisplayable())
..	..	@@ -327,6 +400,14 @@
327	400	copy = localCopy;
328	401	copy.editWindow = this;
329	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
330	411	SetupMenu();
331	412
332	413	//SetupName(objEditor); // new
..	..	@@ -350,7 +431,7 @@
350	431	frame.setMenuBar(menuBar = new MenuBar());
351	432	menuBar.add(fileMenu = new Menu("File"));
352	433	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	434	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	435
355	436	//oe.menuBar.add(menu = new Menu("Include"));
356	437	Menu menu = new Menu("Import");
..	..	@@ -382,7 +463,7 @@
382	463	}
383	464
384	465	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
386	467	saveItem.addActionListener(this);
387	468	saveAsItem.addActionListener(this);
388	469	exportAsItem.addActionListener(this);
..	..	@@ -394,6 +475,8 @@
394	475
395	476	ChangeListener changeListener = new ChangeListener()
396	477	{
	478	+ //String name;
	479	+
397	480	public void stateChanged(ChangeEvent changeEvent)
398	481	{
399	482	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +495,49 @@
412	495	// EditSelection(false);
413	496	// }
414	497
415		- refreshContents(false); // To refresh Info tab
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
416	529	}
417	530	};
418	531	objectPanel.addChangeListener(changeListener);
419	532
420	533	toolbarPanel = new JPanel();
421	534	toolbarPanel.setName("Toolbar");
	535	+
422	536	treePanel = new cGridBag();
423	537	treePanel.setName("Tree");
424	538
425	539	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	540	+ //editPanel.setName("Edit");
427	541
428	542	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	543
..	..	@@ -431,11 +545,13 @@
431	545	editPanel.add(editCommandsPanel);
432	546	editPanel.add(ctrlPanel);
433	547
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
436	550
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
439	555
440	556	/JTextPane/
441	557	infoarea = createTextPane();
..	..	@@ -443,14 +559,15 @@
443	559
444	560	infoarea.setEditable(true);
445	561	SetText();
	562	+
446	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	564	// infoarea.setOpaque(false);
448	565	// //infoarea.setForeground(textcolor);
449	566	// TEXTAREA infoarea.setLineWrap(true);
450	567	// TEXTAREA infoarea.setWrapStyleWord(true);
451	568	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");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
454	571	//infoPanel.setLayout(new BorderLayout());
455	572	//infoPanel.add(createTextPane());
456	573
..	..	@@ -699,8 +816,8 @@
699	816	}
700	817	}
701	818
702		-static GraphicsDevice device = GraphicsEnvironment
703		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	819	+//static GraphicsDevice device = GraphicsEnvironment
	820	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
704	821
705	822	Rectangle keeprect;
706	823	cRadio radio;
..	..	@@ -717,14 +834,24 @@
717	834	boolean maximized;
718	835
719	836	cButton fullscreenLayout;
	837	+ cButton expandedLayout;
720	838
721	839	void Minimize()
722	840	{
723	841	frame.setState(Frame.ICONIFIED);
	842	+ frame.validate();
724	843	}
725	844
	845	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	847	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
726	848	void Maximize()
727	849	{
	850	+ if (CameraPane.FULLSCREEN)
	851	+ {
	852	+ ToggleFullScreen();
	853	+ }
	854	+
728	855	if (maximized)
729	856	{
730	857	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -732,22 +859,38 @@
732	859	else
733	860	{
734	861	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);
	862	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	863	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	864	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
738	865	// frame.setState(Frame.MAXIMIZED_BOTH);
	866	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
739	867	}
740	868
741	869	maximized ^= true;
	870	+
	871	+ frame.validate();
742	872	}
	873	+
	874	+ cButton minButton;
	875	+ cButton maxButton;
	876	+ cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
743	879
744	880	void ToggleFullScreen()
745	881	{
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
746	884	cameraView.ToggleFullScreen();
747	885
748	886	if (!CameraPane.FULLSCREEN)
749	887	{
750	888	device.setFullScreenWindow(null);
	889	+ frame.dispose();
	890	+ frame.setUndecorated(false);
	891	+ frame.validate();
	892	+ frame.setVisible(true);
	893	+
751	894	//frame.setVisible(false);
752	895	// frame.removeNotify();
753	896	// frame.setUndecorated(false);
..	..	@@ -757,13 +900,13 @@
757	900	// X frame.getContentPane().remove(/"Center",/bigThree);
758	901	// X framePanel.add(bigThree);
759	902	// X frame.getContentPane().add(/"Center",/framePanel);
760		- framePanel.setDividerLocation(1);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
761	904
762	905	//frame.setVisible(true);
763		- radio.layout = keepButton;
	906	+// radio.layout = keepButton;
764	907	//theFrame = null;
765	908	keepButton = null;
766		- radio.layout.doClick();
	909	+// radio.layout.doClick();
767	910
768	911	} else
769	912	{
..	..	@@ -772,20 +915,65 @@
772	915	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773	916	// frame.getToolkit().getScreenSize().height);
774	917	//frame.setVisible(false);
	918	+
	919	+ frame.dispose();
	920	+ frame.setUndecorated(true);
775	921	device.setFullScreenWindow(frame);
	922	+ frame.validate();
	923	+ frame.setVisible(true);
776	924	// frame.removeNotify();
777	925	// frame.setUndecorated(true);
778	926	// frame.addNotify();
779	927	// X frame.getContentPane().remove(/"Center",/framePanel);
780	928	// X framePanel.remove(bigThree);
781	929	// X frame.getContentPane().add(/"Center",/bigThree);
782		- framePanel.setDividerLocation(0);
	930	+// framePanel.setDividerLocation(0);
783	931
784		- radio.layout = fullscreenLayout;
785		- radio.layout.doClick();
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
786	934	//frame.setVisible(true);
787	935	}
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
788	939	}
	940	+
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
	950	+ {
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ if (Grafreed.grafreed.universe.versiontable == null)
	955	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	956	+
	957	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	958	+ // if (copy == client)
	959	+
	960	+ Object3D versions[] = object.versionlist;
	961	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	962	+ object.versionlist = null;
	963	+ object.versiontable = null;
	964	+
	965	+ //byte[] compress = Compress(copy);
	966	+ Object3D compress = (Object3D)Grafreed.clone(object);
	967	+
	968	+ object.versionlist = versions;
	969	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	970	+
	971	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	972	+
	973	+ CameraPane.SWITCH = temp;
	974	+
	975	+ return compress;
	976	+ }
789	977
790	978	private JTextPane createTextPane()
791	979	{
..	..	@@ -908,6 +1096,7 @@
908	1096	{
909	1097	SetupMaterial(materialPanel);
910	1098	}
	1099	+
911	1100	//SetupName();
912	1101	//SetupViews();
913	1102	}
..	..	@@ -917,7 +1106,7 @@
917	1106	// NumberSlider vDivsField;
918	1107	// JCheckBox endcaps;
919	1108	JCheckBox liveCB;
920		- JCheckBox selectCB;
	1109	+ JCheckBox selectableCB;
921	1110	JCheckBox hideCB;
922	1111	JCheckBox link2masterCB;
923	1112	JCheckBox markCB;
..	..	@@ -1116,8 +1305,20 @@
1116	1305
1117	1306	namePanel = new cGridBag();
1118	1307
	1308	+ //if (copy.pinned)
	1309	+ {
	1310	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1311	+ pinButton.setSelected(copy.pinned);
	1312	+ cGridBag t = new cGridBag();
	1313	+ t.preferredWidth = 2;
	1314	+ t.add(pinButton);
	1315	+ namePanel.add(t);
	1316	+
	1317	+ pinButton.addItemListener(this);
	1318	+ }
	1319	+
1119	1320	nameField = AddText(namePanel, copy.GetName());
1120		- namePanel.add(nameField);
	1321	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1121	1322	oe.ctrlPanel.add(namePanel);
1122	1323
1123	1324	oe.ctrlPanel.Return();
..	..	@@ -1129,26 +1330,30 @@
1129	1330
1130	1331	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1131	1332	liveCB.setToolTipText("Animate object");
1132		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1133		- selectCB.setToolTipText("Make object selectable");
	1333	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1334	+ markCB.setToolTipText("Set target transform");
	1335	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1336	+ selectableCB.setToolTipText("Make object selectable");
1134	1337	// Return();
	1338	+
1135	1339	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1136	1340	hideCB.setToolTipText("Hide object");
1137		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1138		- markCB.setToolTipText("As animation target transform");
	1341	+
	1342	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1139	1343
1140	1344	setupPanel2 = new cGridBag().setVertical(false);
1141	1345
1142	1346	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1143	1347	rewindCB.setToolTipText("Rewind animation");
1144	1348
1145		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1349	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1146	1350	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1147	1351
	1352	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1353	+ link2masterCB.setToolTipText("Attach to support");
	1354	+
1148	1355	if (Globals.ADVANCED)
1149	1356	{
1150		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1151		- link2masterCB.setToolTipText("Attach to support");
1152	1357	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1153	1358	speedupCB.setToolTipText("Option motion capture");
1154	1359	}
..	..	@@ -1334,6 +1539,7 @@
1334	1539
1335	1540	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1336	1541	{
	1542	+ if (Globals.DEBUG)
1337	1543	System.out.println("CREATE CAMERAS");
1338	1544	cams = new cTemplate();
1339	1545	cams.name = "Cameras";
..	..	@@ -1422,6 +1628,7 @@
1422	1628	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1423	1629	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1424	1630	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1631	+ //XYZPanel.setName("XYZ");
1425	1632
1426	1633	/*
1427	1634	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1458,15 +1665,30 @@
1458	1665
1459	1666	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1460	1667	//tmp.setName("Edit");
	1668	+ objectPanel.add(toolboxPanel);
	1669	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1670	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1671	+
1461	1672	objectPanel.add(materialPanel);
	1673	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1674	+ objectPanel.setToolTipTextAt(1, "Material");
	1675	+
	1676	+ objectPanel.add(skyboxPanel);
	1677	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1678	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1679	+
1462	1680	// JPanel north = new JPanel(new BorderLayout());
1463	1681	// north.setName("Edit");
1464	1682	// north.add(ctrlPanel, BorderLayout.NORTH);
1465	1683	// objectPanel.add(north);
1466	1684	objectPanel.add(editPanel);
1467		- objectPanel.add(infoPanel);
1468		- objectPanel.add(toolboxPanel);
1469		-
	1685	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1686	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1687	+
	1688	+ objectPanel.add(XYZPanel);
	1689	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1690	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1691	+
1470	1692	/*
1471	1693	aConstraints.gridx = 0;
1472	1694	aConstraints.gridwidth = 1;
..	..	@@ -1486,7 +1708,7 @@
1486	1708	scrollpane.addMouseWheelListener(this); // Default not fast enough
1487	1709
1488	1710	/JTabbedPane/ scenePanel = new cGridBag();
1489		- scenePanel.preferredWidth = 6;
	1711	+ scenePanel.preferredWidth = 5;
1490	1712
1491	1713	JTabbedPane tabbedPane = new JTabbedPane();
1492	1714	tabbedPane.add(scrollpane);
..	..	@@ -1503,6 +1725,11 @@
1503	1725
1504	1726	scenePanel.add(tabbedPane);
1505	1727
	1728	+ //if (Globals.ADVANCED)
	1729	+// tabbedPane.add(infoPanel);
	1730	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1731	+// tabbedPane.setToolTipTextAt(3, "Information");
	1732	+
1506	1733	/*
1507	1734	cTree jTree = new cTree(null);
1508	1735	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1564,7 +1791,7 @@
1564	1791	bigThree = new cGridBag();
1565	1792	bigThree.addComponent(scenePanel);
1566	1793	bigThree.addComponent(centralPanel);
1567		- bigThree.addComponent(XYZPanel);
	1794	+ //bigThree.addComponent(XYZPanel);
1568	1795
1569	1796	// // SIDE EFFECT!!!
1570	1797	// aConstraints.gridx = 0;
..	..	@@ -1573,16 +1800,33 @@
1573	1800	// aConstraints.gridheight = 1;
1574	1801
1575	1802	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1576		- framePanel.setContinuousLayout(true);
1577		- framePanel.setOneTouchExpandable(true);
1578		- framePanel.setDividerLocation(0.8);
	1803	+
	1804	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1805	+ new java.beans.PropertyChangeListener()
	1806	+ {
	1807	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1808	+ {
	1809	+ if ((Integer)pce.getOldValue() == 1)
	1810	+ {
	1811	+ if (radio.layout != expandedLayout)
	1812	+ {
	1813	+ radio.layout = expandedLayout;
	1814	+ radio.layout.doClick();
	1815	+ }
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ framePanel.setContinuousLayout(false);
	1821	+ framePanel.setOneTouchExpandable(false);
	1822	+ //.setDividerLocation(0.8);
1579	1823	//framePanel.setDividerSize(15);
1580	1824	//framePanel.setResizeWeight(0.15);
1581	1825	framePanel.setName("Frame");
1582	1826
1583	1827	frame.getContentPane().setLayout(new BorderLayout());
1584	1828	/**/
1585		- JTabbedPane worldPane = new JTabbedPane();
	1829	+ //JTabbedPane worldPane = new JTabbedPane();
1586	1830	//worldPane.add(bigPanel);
1587	1831	//worldPane.add(worldPanel);
1588	1832	/**/
..	..	@@ -1594,17 +1838,17 @@
1594	1838
1595	1839	frame.setSize(1280, 860);
1596	1840
1597		- frame.validate();
1598		- frame.setVisible(true);
1599		-
1600	1841	cameraView.requestFocusInWindow();
1601	1842
1602	1843	gridPanel.setDividerLocation(1.0);
	1844	+
	1845	+ frame.validate();
	1846	+
	1847	+ frame.setVisible(true);
1603	1848
1604	1849	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1605	1850	frame.addWindowListener(new WindowAdapter()
1606	1851	{
1607		-
1608	1852	public void windowClosing(WindowEvent e)
1609	1853	{
1610	1854	Close();
..	..	@@ -1627,12 +1871,418 @@
1627	1871	ctrlPanel.removeAll();
1628	1872	}
1629	1873
1630		- void SetupMaterial(cGridBag panel)
	1874	+ void SetupMaterial(cGridBag materialpanel)
1631	1875	{
1632		- /*
	1876	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1877	+
	1878	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1879	+ skin.setToolTipText("Skin");
	1880	+ skin.addMouseListener(new MouseAdapter()
	1881	+ {
	1882	+ public void mouseClicked(MouseEvent e)
	1883	+ {
	1884	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1885	+ cMaterial material = object.material;
	1886	+
	1887	+ // Skin
	1888	+ colorField.setFloat(material.color);
	1889	+ saturationField.setFloat(material.modulation);
	1890	+ subsurfaceField.setFloat(material.subsurface);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+ diffusenessField.setFloat(material.factor);
	1893	+ shininessField.setFloat(material.shininess);
	1894	+ shadowbiasField.setFloat(material.shadowbias);
	1895	+ diffuseField.setFloat(material.diffuse);
	1896	+ specularField.setFloat(material.specular);
	1897	+
	1898	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1899	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1900	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1901	+
	1902	+ materialtouched = true;
	1903	+ applySelf();
	1904	+ }
	1905	+ });
	1906	+ presetpanel.add(skin);
	1907	+
	1908	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1909	+ lambert.setToolTipText("Diffuse");
	1910	+ lambert.addMouseListener(new MouseAdapter()
	1911	+ {
	1912	+ public void mouseClicked(MouseEvent e)
	1913	+ {
	1914	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1915	+ cMaterial material = object.material;
	1916	+
	1917	+ diffusenessField.setFloat(material.factor);
	1918	+ selfshadowField.setFloat(material.diffuseness);
	1919	+
	1920	+ materialtouched = true;
	1921	+ applySelf();
	1922	+ }
	1923	+ });
	1924	+ presetpanel.add(lambert);
	1925	+
	1926	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1927	+ diffuse2.setToolTipText("Diffuse2");
	1928	+ diffuse2.addMouseListener(new MouseAdapter()
	1929	+ {
	1930	+ public void mouseClicked(MouseEvent e)
	1931	+ {
	1932	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1933	+ cMaterial material = object.material;
	1934	+
	1935	+ diffusenessField.setFloat(material.factor);
	1936	+ selfshadowField.setFloat(material.diffuseness);
	1937	+
	1938	+ materialtouched = true;
	1939	+ applySelf();
	1940	+ }
	1941	+ });
	1942	+ presetpanel.add(diffuse2);
	1943	+
	1944	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1945	+ diffusemoon.setToolTipText("Moon");
	1946	+ diffusemoon.addMouseListener(new MouseAdapter()
	1947	+ {
	1948	+ public void mouseClicked(MouseEvent e)
	1949	+ {
	1950	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1951	+ cMaterial material = object.material;
	1952	+
	1953	+ diffusenessField.setFloat(material.factor);
	1954	+ selfshadowField.setFloat(material.diffuseness);
	1955	+
	1956	+ materialtouched = true;
	1957	+ applySelf();
	1958	+ }
	1959	+ });
	1960	+ presetpanel.add(diffusemoon);
	1961	+
	1962	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1963	+ diffusemoon2.setToolTipText("Moon2");
	1964	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1965	+ {
	1966	+ public void mouseClicked(MouseEvent e)
	1967	+ {
	1968	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1969	+ cMaterial material = object.material;
	1970	+
	1971	+ diffusenessField.setFloat(material.factor);
	1972	+ selfshadowField.setFloat(material.diffuseness);
	1973	+
	1974	+ materialtouched = true;
	1975	+ applySelf();
	1976	+ }
	1977	+ });
	1978	+ presetpanel.add(diffusemoon2);
	1979	+
	1980	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1981	+ diffusemoon3.setToolTipText("Moon3");
	1982	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1983	+ {
	1984	+ public void mouseClicked(MouseEvent e)
	1985	+ {
	1986	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1987	+ cMaterial material = object.material;
	1988	+
	1989	+ diffusenessField.setFloat(material.factor);
	1990	+ selfshadowField.setFloat(material.diffuseness);
	1991	+
	1992	+ materialtouched = true;
	1993	+ applySelf();
	1994	+ }
	1995	+ });
	1996	+ presetpanel.add(diffusemoon3);
	1997	+
	1998	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1999	+ diffusesheen.setToolTipText("Sheen");
	2000	+ diffusesheen.addMouseListener(new MouseAdapter()
	2001	+ {
	2002	+ public void mouseClicked(MouseEvent e)
	2003	+ {
	2004	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2005	+ cMaterial material = object.material;
	2006	+
	2007	+ sheenField.setFloat(material.sheen);
	2008	+
	2009	+ materialtouched = true;
	2010	+ applySelf();
	2011	+ }
	2012	+ });
	2013	+ presetpanel.add(diffusesheen);
	2014	+
	2015	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2016	+ rough.setToolTipText("Rough metal");
	2017	+ rough.addMouseListener(new MouseAdapter()
	2018	+ {
	2019	+ public void mouseClicked(MouseEvent e)
	2020	+ {
	2021	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2022	+ cMaterial material = object.material;
	2023	+
	2024	+ shininessField.setFloat(material.shininess);
	2025	+ velvetField.setFloat(material.velvet);
	2026	+
	2027	+ materialtouched = true;
	2028	+ applySelf();
	2029	+ }
	2030	+ });
	2031	+ presetpanel.add(rough);
	2032	+
	2033	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2034	+ rough2.setToolTipText("Medium metal");
	2035	+ rough2.addMouseListener(new MouseAdapter()
	2036	+ {
	2037	+ public void mouseClicked(MouseEvent e)
	2038	+ {
	2039	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2040	+ cMaterial material = object.material;
	2041	+
	2042	+ shininessField.setFloat(material.shininess);
	2043	+ lightareaField.setFloat(material.lightarea);
	2044	+
	2045	+ materialtouched = true;
	2046	+ applySelf();
	2047	+ }
	2048	+ });
	2049	+ presetpanel.add(rough2);
	2050	+
	2051	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2052	+ shini0.setToolTipText("Shiny");
	2053	+ shini0.addMouseListener(new MouseAdapter()
	2054	+ {
	2055	+ public void mouseClicked(MouseEvent e)
	2056	+ {
	2057	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2058	+ cMaterial material = object.material;
	2059	+
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ lightareaField.setFloat(material.lightarea);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(shini0);
	2068	+
	2069	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2070	+ shini1.setToolTipText("Shiny2");
	2071	+ shini1.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ shininessField.setFloat(material.shininess);
	2079	+ lightareaField.setFloat(material.lightarea);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(shini1);
	2086	+
	2087	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2088	+ shini2.setToolTipText("Shiny3");
	2089	+ shini2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ shininessField.setFloat(material.shininess);
	2097	+ lightareaField.setFloat(material.lightarea);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(shini2);
	2104	+
	2105	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2106	+ aniso.setToolTipText("AnisoU");
	2107	+ aniso.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ anisoField.setFloat(material.aniso);
	2115	+ anisoVField.setFloat(material.anisoV);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(aniso);
	2122	+
	2123	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2124	+ aniso2.setToolTipText("AnisoV");
	2125	+ aniso2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ anisoField.setFloat(material.aniso);
	2133	+ anisoVField.setFloat(material.anisoV);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(aniso2);
	2140	+
	2141	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2142	+ aniso3.setToolTipText("AnisoUV");
	2143	+ aniso3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ anisoField.setFloat(material.aniso);
	2151	+ anisoVField.setFloat(material.anisoV);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(aniso3);
	2158	+
	2159	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2160	+ velvet0.setToolTipText("Velvet");
	2161	+ velvet0.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ diffusenessField.setFloat(material.factor);
	2169	+ selfshadowField.setFloat(material.diffuseness);
	2170	+ sheenField.setFloat(material.sheen);
	2171	+ shininessField.setFloat(material.shininess);
	2172	+ velvetField.setFloat(material.velvet);
	2173	+ shiftField.setFloat(material.shift);
	2174	+
	2175	+ materialtouched = true;
	2176	+ applySelf();
	2177	+ }
	2178	+ });
	2179	+ presetpanel.add(velvet0);
	2180	+
	2181	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2182	+ bump0.setToolTipText("Bump texture");
	2183	+ bump0.addMouseListener(new MouseAdapter()
	2184	+ {
	2185	+ public void mouseClicked(MouseEvent e)
	2186	+ {
	2187	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2188	+ cMaterial material = object.material;
	2189	+
	2190	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2191	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2192	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(bump0);
	2199	+
	2200	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2201	+ borderShader.setToolTipText("Border fade");
	2202	+ borderShader.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ borderfadeField.setFloat(0.5);
	2207	+ opacityField.setFloat(0.75);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(borderShader);
	2214	+
	2215	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2216	+ halo.setToolTipText("Halo");
	2217	+ halo.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2222	+ cMaterial material = object.material;
	2223	+
	2224	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2225	+
	2226	+ materialtouched = true;
	2227	+ applySelf();
	2228	+ }
	2229	+ });
	2230	+ presetpanel.add(halo);
	2231	+
	2232	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2233	+ candle.setToolTipText("Candle");
	2234	+ candle.addMouseListener(new MouseAdapter()
	2235	+ {
	2236	+ public void mouseClicked(MouseEvent e)
	2237	+ {
	2238	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2239	+ cMaterial material = object.material;
	2240	+
	2241	+ subsurfaceField.setFloat(material.subsurface);
	2242	+ shadowbiasField.setFloat(material.shadowbias);
	2243	+ ambientField.setFloat(material.ambient);
	2244	+ specularField.setFloat(material.specular);
	2245	+ lightareaField.setFloat(material.lightarea);
	2246	+ shininessField.setFloat(material.shininess);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(candle);
	2253	+
	2254	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2255	+ shadowShader.setToolTipText("Shadow");
	2256	+ shadowShader.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ diffuseField.setFloat(0.001);
	2261	+ ambientField.setFloat(0.001);
	2262	+ cameraField.setFloat(0.001);
	2263	+ specularField.setFloat(0.001);
	2264	+ fakedepthField.setFloat(0.001);
	2265	+ opacityField.setFloat(0.6);
	2266	+
	2267	+ materialtouched = true;
	2268	+ applySelf();
	2269	+ }
	2270	+ });
	2271	+ presetpanel.add(shadowShader);
	2272	+
	2273	+ cGridBag panel = new cGridBag().setVertical(true);
	2274	+
	2275	+ presetpanel.preferredWidth = 1;
	2276	+
	2277	+ materialpanel.add(presetpanel);
	2278	+ materialpanel.add(panel);
	2279	+
	2280	+ panel.preferredWidth = 8;
	2281	+
	2282	+ /*
1633	2283	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1634	2284	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1635		- */
	2285	+ */
1636	2286
1637	2287	cGridBag editBar = new cGridBag().setVertical(false);
1638	2288
..	..	@@ -1666,45 +2316,61 @@
1666	2316	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1667	2317
1668	2318	cGridBag colorSection = new cGridBag().setVertical(true);
	2319	+
	2320	+ cGridBag huepanel = new cGridBag();
	2321	+ cGridBag huelabel = new cGridBag();
	2322	+ cLabel hue = GetLabel("icons/hue.png", false);
	2323	+ hue.fit = true;
	2324	+
	2325	+ hue.addMouseListener(new MouseAdapter()
	2326	+ {
	2327	+ public void mousePressed(MouseEvent e)
	2328	+ {
	2329	+ int x = e.getX();
	2330	+
	2331	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2332	+ }
	2333	+ });
	2334	+
	2335	+ huelabel.add(hue);
	2336	+ huelabel.preferredWidth = 20;
	2337	+ huepanel.add(new cGridBag()); // Label
	2338	+ huepanel.add(huelabel); // Field/slider
	2339	+
	2340	+ huepanel.preferredHeight = 7;
	2341	+
	2342	+ colorSection.add(huepanel);
1669	2343
1670	2344	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);
	2345	+
	2346	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2347	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2348	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2349	+
1674	2350	//colorField.preferredWidth = 200;
1675	2351	colorSection.add(color);
1676	2352
1677	2353	cGridBag modulation = new cGridBag();
1678	2354	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1679	2355	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2356	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1681	2357	colorSection.add(modulation);
1682	2358
	2359	+ cGridBag opacity = new cGridBag();
	2360	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2361	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2362	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2363	+ colorSection.add(opacity);
	2364	+
	2365	+ colorSection.add(GetSeparator());
	2366	+
1683	2367	cGridBag texture = new cGridBag();
1684	2368	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1685	2369	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1686	2370	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1687	2371	colorSection.add(texture);
1688	2372
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());
	2373	+ panel.add(GetSeparator());
1708	2374
1709	2375	panel.add(colorSection);
1710	2376
..	..	@@ -1754,7 +2420,13 @@
1754	2420	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1755	2421	diffuseSection.add(fakedepth);
1756	2422
1757		- panel.add(new JSeparator());
	2423	+ cGridBag shadowbias = new cGridBag();
	2424	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2425	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2426	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2427	+ diffuseSection.add(shadowbias);
	2428	+
	2429	+ panel.add(GetSeparator());
1758	2430
1759	2431	panel.add(diffuseSection);
1760	2432
..	..	@@ -1804,42 +2476,48 @@
1804	2476	// aConstraints.gridy += 1;
1805	2477	// aConstraints.gridwidth = 1;
1806	2478
	2479	+ cGridBag anisoU = new cGridBag();
	2480	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2481	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoU);
1807	2484
1808		- panel.add(new JSeparator());
	2485	+ cGridBag anisoV = new cGridBag();
	2486	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2487	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2488	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2489	+ specularSection.add(anisoV);
	2490	+
	2491	+
	2492	+ panel.add(GetSeparator());
1809	2493
1810	2494	panel.add(specularSection);
1811	2495
1812	2496	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1813	2497
1814		- cGridBag globalSection = new cGridBag().setVertical(true);
	2498	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1815	2499
1816	2500	cGridBag camera = new cGridBag();
1817	2501	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1818	2502	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1819	2503	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820		- globalSection.add(camera);
	2504	+ colorSection.add(camera);
1821	2505
1822	2506	cGridBag ambient = new cGridBag();
1823	2507	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1824	2508	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1825	2509	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826		- globalSection.add(ambient);
	2510	+ colorSection.add(ambient);
1827	2511
1828	2512	cGridBag backlit = new cGridBag();
1829	2513	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1830	2514	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831	2515	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832		- globalSection.add(backlit);
	2516	+ colorSection.add(backlit);
1833	2517
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());
	2518	+ //panel.add(new JSeparator());
1841	2519
1842		- panel.add(globalSection);
	2520	+ //panel.add(globalSection);
1843	2521
1844	2522	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1845	2523
..	..	@@ -1881,7 +2559,7 @@
1881	2559	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1882	2560	textureSection.add(opacityPower);
1883	2561
1884		- panel.add(new JSeparator());
	2562	+ panel.add(GetSeparator());
1885	2563
1886	2564	panel.add(textureSection);
1887	2565
..	..	@@ -1946,8 +2624,9 @@
1946	2624	// 3D models
1947	2625	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1948	2626	{
1949		- lastConverter = new com.jmex.model.converters.MaxToJme();
1950		- LoadFile(filename, lastConverter);
	2627	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2628	+ //LoadFile(filename, lastConverter);
	2629	+ LoadObjFile(filename); // New 3ds loader
1951	2630	continue;
1952	2631	}
1953	2632	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2673,6 +3352,7 @@
2673	3352	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2674	3353	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2675	3354	}
	3355	+
2676	3356	//cJME.count++;
2677	3357	//cJME.count %= 12;
2678	3358	if (gc)
..	..	@@ -2856,6 +3536,7 @@
2856	3536	}
2857	3537	}
2858	3538	}
	3539	+
2859	3540	cFileSystemPane FSPane;
2860	3541
2861	3542	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2865,7 +3546,7 @@
2865	3546
2866	3547	freezematerial = true;
2867	3548	colorField.setFloat(mat.color);
2868		- modulationField.setFloat(mat.modulation);
	3549	+ saturationField.setFloat(mat.modulation);
2869	3550	metalnessField.setFloat(mat.metalness);
2870	3551	diffuseField.setFloat(mat.diffuse);
2871	3552	specularField.setFloat(mat.specular);
..	..	@@ -2909,6 +3590,7 @@
2909	3590	}
2910	3591	}
2911	3592	}
	3593	+
2912	3594	freezematerial = false;
2913	3595	}
2914	3596
..	..	@@ -2926,32 +3608,8 @@
2926	3608
2927	3609	if (multiplyToggle != null)
2928	3610	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		- }
	3611	+
	3612	+ AllocProjectedVertices(object);
2955	3613
2956	3614	SetMaterial(mat, object.projectedVertices);
2957	3615	}
..	..	@@ -3071,6 +3729,17 @@
3071	3729	public void itemStateChanged(ItemEvent event)
3072	3730	{
3073	3731	// System.out.println("Propagate = " + propagate);
	3732	+ if (event.getSource() == pinButton)
	3733	+ {
	3734	+ copy.pinned ^= true;
	3735	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3736	+ {
	3737	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3738	+ copy.CloseUI();
	3739	+ //copy.editWindow.refreshContents();
	3740	+ }
	3741	+ }
	3742	+ else
3074	3743	if (event.getSource() == propagateToggle)
3075	3744	{
3076	3745	propagate ^= true;
..	..	@@ -3175,8 +3844,9 @@
3175	3844	} else if (event.getSource() == liveCB)
3176	3845	{
3177	3846	copy.live ^= true;
	3847	+ objEditor.refreshContents(true); // To show item colors
3178	3848	return;
3179		- } else if (event.getSource() == selectCB)
	3849	+ } else if (event.getSource() == selectableCB)
3180	3850	{
3181	3851	copy.dontselect ^= true;
3182	3852	return;
..	..	@@ -3184,7 +3854,7 @@
3184	3854	{
3185	3855	copy.hide ^= true;
3186	3856	copy.Touch(); // display list issue
3187		- objEditor.refreshContents();
	3857	+ objEditor.refreshContents(true); // To show item colors
3188	3858	return;
3189	3859	} else if (event.getSource() == link2masterCB)
3190	3860	{
..	..	@@ -3249,7 +3919,7 @@
3249	3919	//System.out.println("ObjEditor " + event);
3250	3920	applySelf0(true);
3251	3921	//parent.applySelf();
3252		- objEditor.refreshContents();
	3922	+ // conflicts with requestFocus objEditor.refreshContents();
3253	3923	} else if (source == resetButton)
3254	3924	{
3255	3925	CameraPane.fullreset = true;
..	..	@@ -3361,9 +4031,9 @@
3361	4031	{
3362	4032	Close();
3363	4033	//return true;
3364		- } else if (source == loadItem)
	4034	+ } else if (source == openItem)
3365	4035	{
3366		- load();
	4036	+ Open();
3367	4037	//return true;
3368	4038	} else if (source == newItem)
3369	4039	{
..	..	@@ -3388,6 +4058,10 @@
3388	4058	{
3389	4059	generatePOV();
3390	4060	//return true;
	4061	+ } else if (event.getSource() == archiveItem)
	4062	+ {
	4063	+ cTools.Archive(frame);
	4064	+ return;
3391	4065	} else if (source == zBufferItem)
3392	4066	{
3393	4067	try
..	..	@@ -3436,11 +4110,12 @@
3436	4110
3437	4111	static public byte[] Compress(Object3D o)
3438	4112	{
	4113	+ // Slower to actually compress.
3439	4114	try
3440	4115	{
3441	4116	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4117	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4118	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3444	4119
3445	4120	Object3D parent = o.parent;
3446	4121	o.parent = null;
..	..	@@ -3451,10 +4126,14 @@
3451	4126
3452	4127	out.flush();
3453	4128
3454		- zstream.close();
	4129	+ baos //zstream
	4130	+ .close();
3455	4131	out.close();
3456	4132
3457		- return baos.toByteArray();
	4133	+ byte[] bytes = baos.toByteArray();
	4134	+
	4135	+ System.out.println("save #bytes = " + bytes.length);
	4136	+ return bytes;
3458	4137	} catch (Exception e)
3459	4138	{
3460	4139	System.err.println(e);
..	..	@@ -3464,13 +4143,16 @@
3464	4143
3465	4144	static public Object Uncompress(byte[] bytes)
3466	4145	{
3467		- System.out.println("#bytes = " + bytes.length);
	4146	+ System.out.println("restore #bytes = " + bytes.length);
3468	4147	try
3469	4148	{
3470	4149	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472		- ObjectInputStream in = new ObjectInputStream(istream);
	4150	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4151	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3473	4152	Object obj = in.readObject();
	4153	+
	4154	+ bais //istream
	4155	+ .close();
3474	4156	in.close();
3475	4157
3476	4158	return obj;
..	..	@@ -3525,41 +4207,97 @@
3525	4207	return null;
3526	4208	}
3527	4209
3528		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3529	4210
3530	4211	public void Save()
3531	4212	{
	4213	+ //Save(true);
	4214	+ Replace();
	4215	+ SetVersionStates();
	4216	+ }
	4217	+
	4218	+ private boolean Equal(byte[] compress, byte[] name)
	4219	+ {
	4220	+ if (compress.length != name.length)
	4221	+ {
	4222	+ return false;
	4223	+ }
	4224	+
	4225	+ for (int i=compress.length; --i>=0;)
	4226	+ {
	4227	+ if (compress[i] != name[i])
	4228	+ return false;
	4229	+ }
	4230	+
	4231	+ return true;
	4232	+ }
	4233	+
	4234	+ void DeleteVersion()
	4235	+ {
	4236	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4237	+ {
	4238	+ copy.versionlist[i] = copy.versionlist[i+1];
	4239	+ }
	4240	+
	4241	+ if (copy.versionlist[copy.versionindex] == null)
	4242	+ copy.versionindex -= 1;
	4243	+
	4244	+ if (copy.versionindex != -1)
	4245	+ CopyChanged();
	4246	+
	4247	+ SetVersionStates();
	4248	+ }
	4249	+
	4250	+ public boolean Save(boolean user)
	4251	+ {
3532	4252	System.err.println("Save");
	4253	+ Replace();
3533	4254
3534		- cRadio tab = GetCurrentTab();
	4255	+ //cRadio tab = GetCurrentTab();
3535	4256
3536		- boolean temp = CameraPane.SWITCH;
3537		- CameraPane.SWITCH = false;
	4257	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3538	4258
3539		- copy.ExtractBigData(hashtable);
	4259	+ boolean thesame = false;
	4260	+
	4261	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4262	+// {
	4263	+// thesame = true;
	4264	+// }
3540	4265
3541	4266	//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++)
	4267	+ if (!thesame)
3551	4268	{
3552		- tab.graphs[i] = null;
	4269	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4270	+ {
	4271	+ copy.versionlist[i] = copy.versionlist[i-1];
	4272	+ }
	4273	+
	4274	+ //tab.user[tab.versionindex] = user;
	4275	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4276	+
	4277	+ copy.versionlist[++copy.versionindex] = compress;
	4278	+
	4279	+ // if (increment)
	4280	+ // tab.versionindex++;
3553	4281	}
3554	4282
3555		- SetUndoStates();
	4283	+ //copy.RestoreBigData(versiontable);
	4284	+
	4285	+ //assert(hashtable.isEmpty());
	4286	+
	4287	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4288	+// {
	4289	+// //tab.user[i] = false;
	4290	+// copy.versionlist[i] = null;
	4291	+// }
	4292	+
	4293	+ SetVersionStates();
3556	4294
3557	4295	// test save
3558	4296	if (false)
3559	4297	{
3560	4298	try
3561	4299	{
3562		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4300	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3563	4301	ObjectOutputStream p = new ObjectOutputStream(ostream);
3564	4302
3565	4303	p.writeObject(copy);
..	..	@@ -3572,28 +4310,68 @@
3572	4310	e.printStackTrace();
3573	4311	}
3574	4312	}
	4313	+
	4314	+ return !thesame;
	4315	+ }
	4316	+
	4317	+ boolean flashIt = true;
	4318	+
	4319	+ void RefreshSelection()
	4320	+ {
	4321	+ Object3D selection = new Object3D();
	4322	+
	4323	+ for (int i = 0; i < copy.selection.size(); i++)
	4324	+ {
	4325	+ Object3D elem = copy.selection.elementAt(i);
	4326	+
	4327	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4328	+
	4329	+ if (obj == null)
	4330	+ {
	4331	+ copy.selection.remove(i--);
	4332	+ }
	4333	+ else
	4334	+ {
	4335	+ selection.add(obj);
	4336	+ copy.selection.setElementAt(obj, i);
	4337	+ }
	4338	+ }
	4339	+
	4340	+ flashIt = false;
	4341	+ GetTree().clearSelection();
	4342	+ for (int i = 0; i < selection.size(); i++)
	4343	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4344	+ flashIt = true;
	4345	+
	4346	+ //refreshContents(false);
3575	4347	}
3576	4348
3577		- void CopyChanged(Object3D obj)
	4349	+ void CopyChanged()
3578	4350	{
3579		- SetUndoStates();
	4351	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4352	+
	4353	+ SetVersionStates();
3580	4354
3581	4355	boolean temp = CameraPane.SWITCH;
3582	4356	CameraPane.SWITCH = false;
3583	4357
3584		- copy.ExtractBigData(hashtable);
	4358	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3585	4359
3586	4360	copy.clear();
3587	4361
	4362	+ copy.skyboxname = obj.skyboxname;
	4363	+ copy.skyboxext = obj.skyboxext;
	4364	+
3588	4365	for (int i=0; i<obj.Size(); i++)
3589	4366	{
3590	4367	copy.add(obj.get(i));
3591	4368	}
3592	4369
3593		- copy.RestoreBigData(hashtable);
	4370	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3594	4371
3595	4372	CameraPane.SWITCH = temp;
3596	4373
	4374	+ RefreshSelection();
3597	4375	//assert(hashtable.isEmpty());
3598	4376
3599	4377	copy.Touch();
..	..	@@ -3614,56 +4392,144 @@
3614	4392	}
3615	4393	}
3616	4394
3617		- refreshContents();
	4395	+ refreshContents(true);
3618	4396	}
3619	4397
3620		- cButton undoButton;
3621		- cButton redoButton;
	4398	+ cButton previousVersionButton;
	4399	+ cButton restoreButton;
	4400	+ cButton replaceButton;
	4401	+ cButton nextVersionButton;
	4402	+ cButton saveVersionButton;
	4403	+ cButton deleteVersionButton;
3622	4404
3623		- void SetUndoStates()
	4405	+ boolean muteSlider;
	4406	+
	4407	+ int VersionCount()
3624	4408	{
3625		- cRadio tab = GetCurrentTab();
	4409	+ int count = 0;
3626	4410
3627		- undoButton.setEnabled(tab.undoindex > 0);
3628		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4411	+ for (int i = copy.versionlist.length; --i >= 0;)
	4412	+ {
	4413	+ if (copy.versionlist[i] != null)
	4414	+ count++;
	4415	+ }
	4416	+
	4417	+ return count;
3629	4418	}
3630	4419
3631		- public void Undo()
	4420	+ void SetVersionStates()
3632	4421	{
	4422	+ //if (true)
	4423	+ // return;
	4424	+
	4425	+ //cRadio tab = GetCurrentTab();
	4426	+
	4427	+ restoreButton.setEnabled(copy.versionindex != -1);
	4428	+ replaceButton.setEnabled(copy.versionindex != -1);
	4429	+
	4430	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4431	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4432	+
	4433	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4434	+ //copy.versionlist[copy.versionindex + 1] != null);
	4435	+
	4436	+ muteSlider = true;
	4437	+ versionSlider.setMinimum(0);
	4438	+ versionSlider.setMaximum(VersionCount() - 1);
	4439	+ versionSlider.setInteger(copy.versionindex);
	4440	+ versionSlider.setEnabled(copy.versionindex != -1);
	4441	+ muteSlider = false;
	4442	+ }
	4443	+
	4444	+ public boolean PreviousVersion()
	4445	+ {
	4446	+ // Option?
	4447	+ Replace();
	4448	+
3633	4449	System.err.println("Undo");
3634	4450
3635		- cRadio tab = GetCurrentTab();
	4451	+ //cRadio tab = GetCurrentTab();
3636	4452
3637		- if (tab.undoindex == 0)
	4453	+ if (copy.versionindex == 0)
3638	4454	{
3639	4455	java.awt.Toolkit.getDefaultToolkit().beep();
3640		- return;
	4456	+ return false;
3641	4457	}
3642	4458
3643		- if (tab.graphs[tab.undoindex] == null)
3644		- {
3645		- Save();
3646		- tab.undoindex -= 1;
3647		- }
	4459	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4460	+// {
	4461	+// if (Save(false))
	4462	+// tab.versionindex -= 1;
	4463	+// else
	4464	+// {
	4465	+// if (tab.versionindex <= 0)
	4466	+// return false;
	4467	+// else
	4468	+// tab.versionindex -= 1;
	4469	+// }
	4470	+// }
3648	4471
3649		- tab.undoindex -= 1;
	4472	+ copy.versionindex -= 1;
3650	4473
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4474	+ CopyChanged();
	4475	+
	4476	+ return true;
3652	4477	}
3653	4478
3654		- public void Redo()
	4479	+ public boolean Restore()
3655	4480	{
3656		- cRadio tab = GetCurrentTab();
	4481	+ System.err.println("Restore");
3657	4482
3658		- if (tab.graphs[tab.undoindex + 1] == null)
	4483	+ //cRadio tab = GetCurrentTab();
	4484	+
	4485	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4486	+ {
	4487	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4488	+ return false;
	4489	+ }
	4490	+
	4491	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4492	+ CopyChanged();
	4493	+
	4494	+ return true;
	4495	+ }
	4496	+
	4497	+ public boolean Replace()
	4498	+ {
	4499	+ //System.err.println("Replace");
	4500	+
	4501	+ //cRadio tab = GetCurrentTab();
	4502	+
	4503	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4504	+ {
	4505	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4506	+ return false;
	4507	+ }
	4508	+
	4509	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4510	+
	4511	+ return true;
	4512	+ }
	4513	+
	4514	+ public void NextVersion()
	4515	+ {
	4516	+ // Option?
	4517	+ Replace();
	4518	+
	4519	+ //cRadio tab = GetCurrentTab();
	4520	+
	4521	+ if (copy.versionlist[copy.versionindex + 1] == null)
3659	4522	{
3660	4523	java.awt.Toolkit.getDefaultToolkit().beep();
3661	4524	return;
3662	4525	}
3663	4526
3664		- tab.undoindex += 1;
	4527	+ copy.versionindex += 1;
3665	4528
3666		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4529	+ CopyChanged();
	4530	+
	4531	+ //if (!tab.user[tab.versionindex])
	4532	+ // tab.graphs[tab.versionindex] = null;
3667	4533	}
3668	4534
3669	4535	void ImportGFD()
..	..	@@ -3874,7 +4740,7 @@
3874	4740	//copy.material = new cMaterial(copy.GetMaterial());
3875	4741
3876	4742	current.color = (float) colorField.getFloat();
3877		- current.modulation = (float) modulationField.getFloat();
	4743	+ current.modulation = (float) saturationField.getFloat();
3878	4744	current.metalness = (float) metalnessField.getFloat();
3879	4745	current.diffuse = (float) diffuseField.getFloat();
3880	4746	current.specular = (float) specularField.getFloat();
..	..	@@ -3907,7 +4773,7 @@
3907	4773	cMaterial mat = copy.material;
3908	4774
3909	4775	colorField.SetToolTipValue((mat.color));
3910		- modulationField.SetToolTipValue((mat.modulation));
	4776	+ saturationField.SetToolTipValue((mat.modulation));
3911	4777	metalnessField.SetToolTipValue((mat.metalness));
3912	4778	diffuseField.SetToolTipValue((mat.diffuse));
3913	4779	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3959,9 +4825,28 @@
3959	4825	//copy.Touch();
3960	4826	}
3961	4827
	4828	+ cNumberSlider versionSlider;
	4829	+
3962	4830	public void stateChanged(ChangeEvent e)
3963	4831	{
3964	4832	// assert(false);
	4833	+ if (e.getSource() == versionSlider)
	4834	+ {
	4835	+ if (muteSlider)
	4836	+ return;
	4837	+
	4838	+ Replace();
	4839	+
	4840	+ int version = versionSlider.getInteger();
	4841	+
	4842	+ if (version != -1 && copy.versionlist[version] != null)
	4843	+ {
	4844	+ copy.versionindex = version;
	4845	+ CopyChanged();
	4846	+ }
	4847	+
	4848	+ return;
	4849	+ }
3965	4850
3966	4851	if (freezematerial)
3967	4852	{
..	..	@@ -3997,6 +4882,12 @@
3997	4882	{
3998	4883	//System.out.println("stateChanged = " + this);
3999	4884	materialtouched = true;
	4885	+
	4886	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4887	+ {
	4888	+ saturationField.setFloat(1);
	4889	+ }
	4890	+
4000	4891	applySelf();
4001	4892	//System.out.println("this = " + this);
4002	4893	//System.out.println("PARENT = " + parent);
..	..	@@ -4296,6 +5187,7 @@
4296	5187	{
4297	5188	if (GetTree() != null)
4298	5189	{
	5190	+ GetTree().revalidate();
4299	5191	GetTree().repaint();
4300	5192	}
4301	5193
..	..	@@ -4304,13 +5196,18 @@
4304	5196	ctrlPanel.validate(); // ? new
4305	5197	ctrlPanel.repaint();
4306	5198	}
	5199	+
	5200	+ if (previousVersionButton != null && copy.versionlist != null)
	5201	+ SetVersionStates();
	5202	+
	5203	+ cameraView.requestFocusInWindow();
4307	5204	}
4308	5205
4309	5206	static TweenManager tweenManager = new TweenManager();
4310	5207
4311	5208	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4312	5209	{
4313		- if (Globals.SAVEONMAKE) // && resetmodel)
	5210	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4314	5211	Save();
4315	5212	//Tween.set(thing, 0).target(1).start(tweenManager);
4316	5213	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4335,7 +5232,7 @@
4335	5232	// group = (Composite) group.get(0);
4336	5233	// }
4337	5234
4338		- System.out.println("makeSomething of " + thing);
	5235	+ //System.out.println("makeSomething of " + thing);
4339	5236
4340	5237	/*
4341	5238	if (deselect && jList != null)
..	..	@@ -4552,7 +5449,9 @@
4552	5449	readobj.ResetDisplayList();
4553	5450	} catch (Exception e)
4554	5451	{
4555		- //e.printStackTrace();
	5452	+ if (!e.toString().contains("GZIP"))
	5453	+ e.printStackTrace();
	5454	+
4556	5455	try
4557	5456	{
4558	5457	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4626,12 +5525,14 @@
4626	5525
4627	5526	if (readobj != null)
4628	5527	{
4629		- if (Globals.SAVEONMAKE)
4630		- Save();
	5528	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5529	+ // Save();
4631	5530	try
4632	5531	{
4633	5532	//readobj.deepCopySelf(copy);
4634	5533	copy.clear(); // june 2014
	5534	+ copy.skyboxname = readobj.skyboxname;
	5535	+ copy.skyboxext = readobj.skyboxext;
4635	5536	for (int i = 0; i < readobj.size(); i++)
4636	5537	{
4637	5538	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4672,6 +5573,7 @@
4672	5573	}
4673	5574	} catch (ClassCastException e)
4674	5575	{
	5576	+ e.printStackTrace();
4675	5577	assert (false);
4676	5578	Composite c = (Composite) copy;
4677	5579	c.children.clear();
..	..	@@ -4682,17 +5584,32 @@
4682	5584	c.addChild(csg);
4683	5585	}
4684	5586
	5587	+ copy.versionlist = readobj.versionlist;
	5588	+ copy.versionindex = readobj.versionindex;
	5589	+ copy.versiontable = readobj.versiontable;
	5590	+
	5591	+ if (copy.versionlist == null)
	5592	+ {
	5593	+ // Backward compatibility
	5594	+ copy.versionlist = new Object3D[100];
	5595	+ copy.versionindex = -1;
	5596	+
	5597	+ //Save(true);
	5598	+ }
	5599	+
	5600	+ //? SetUndoStates();
	5601	+
4685	5602	ResetModel();
4686	5603	copy.HardTouch(); // recompile?
4687	5604	refreshContents();
4688	5605	}
4689	5606	}
4690	5607
4691		- void load() // throws ClassNotFoundException
	5608	+ void Open() // throws ClassNotFoundException
4692	5609	{
4693	5610	if (Grafreed.standAlone)
4694	5611	{
4695		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5612	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4696	5613	browser.show();
4697	5614	String filename = browser.getFile();
4698	5615	if (filename != null && filename.length() > 0)
..	..	@@ -4769,6 +5686,8 @@
4769	5686
4770	5687	void save()
4771	5688	{
	5689	+ Replace();
	5690	+
4772	5691	if (lastname == null)
4773	5692	{
4774	5693	return;
..	..	@@ -4791,6 +5710,7 @@
4791	5710	//ps.print(buffer.toString());
4792	5711	} catch (IOException e)
4793	5712	{
	5713	+ e.printStackTrace();
4794	5714	}
4795	5715	}
4796	5716
..	..	@@ -4973,7 +5893,7 @@
4973	5893	MenuBar menuBar;
4974	5894	Menu fileMenu;
4975	5895	MenuItem newItem;
4976		- MenuItem loadItem;
	5896	+ MenuItem openItem;
4977	5897	MenuItem saveItem;
4978	5898	MenuItem saveAsItem;
4979	5899	MenuItem exportAsItem;
..	..	@@ -4996,6 +5916,7 @@
4996	5916	CheckboxMenuItem toggleSwitchItem;
4997	5917	CheckboxMenuItem toggleRootItem;
4998	5918	CheckboxMenuItem animationItem;
	5919	+ MenuItem archiveItem;
4999	5920	CheckboxMenuItem toggleHandleItem;
5000	5921	CheckboxMenuItem togglePaintItem;
5001	5922	JSplitPane mainPanel;
..	..	@@ -5009,6 +5930,7 @@
5009	5930	ButtonGroup buttonGroup;
5010	5931
5011	5932	cGridBag toolboxPanel;
	5933	+ cGridBag skyboxPanel;
5012	5934	cGridBag materialPanel;
5013	5935	cGridBag ctrlPanel;
5014	5936
..	..	@@ -5082,7 +6004,7 @@
5082	6004	JLabel colorLabel;
5083	6005	cNumberSlider colorField;
5084	6006	JLabel modulationLabel;
5085		- cNumberSlider modulationField;
	6007	+ cNumberSlider saturationField;
5086	6008	JLabel metalnessLabel;
5087	6009	cNumberSlider metalnessField;
5088	6010	JLabel diffuseLabel;
..	..	@@ -5113,6 +6035,7 @@
5113	6035	cNumberSlider anisoField;
5114	6036	JLabel anisoVLabel;
5115	6037	cNumberSlider anisoVField;
	6038	+
5116	6039	JLabel cameraLabel;
5117	6040	cNumberSlider cameraField;
5118	6041	JLabel selfshadowLabel;
..	..	@@ -5127,6 +6050,7 @@
5127	6050	cNumberSlider fakedepthField;
5128	6051	JLabel shadowbiasLabel;
5129	6052	cNumberSlider shadowbiasField;
	6053	+
5130	6054	JLabel bumpLabel;
5131	6055	cNumberSlider bumpField;
5132	6056	JLabel noiseLabel;