~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -31,6 +34,7 @@
31	34	iSendInfo
32	35	//KeyListener
33	36	{
	37	+ public cToggleButton pinButton;
34	38	boolean timeline;
35	39	boolean wasFullScreen;
36	40
..	..	@@ -38,64 +42,119 @@
38	42	JFrame frame;
39	43
40	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	+ }
41	82
42	83	cButton GetButton(String name, boolean border)
43	84	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	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);
53	93	}
54	94
55	95	cToggleButton GetToggleButton(String name, boolean border)
56	96	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
66	99	}
67	100
68	101	cCheckBox GetCheckBox(String name, boolean border)
69	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	+
70	117	try
71	118	{
72		- ImageIcon icon = GetIcon(name);
73		- 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;
74	138	}
75	139	catch (Exception e)
76	140	{
77		- return new cCheckBox(name, border);
	141	+ //icons.put(name, null);
	142	+ return null;
78	143	}
79	144	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	145	+
	146	+ BufferedImage GetImage(String name)
82	147	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	148	+ try
86	149	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
95	153	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
99	158	}
100	159
101	160	// SCRIPT
..	..	@@ -279,6 +338,14 @@
279	338	client = inClient;
280	339	copy = client;
281	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
282	349	// "this" is not called: SetupUI2(objEditor);
283	350	}
284	351
..	..	@@ -292,6 +359,14 @@
292	359	client = inClient;
293	360	copy = client;
294	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
295	370	SetupUI2(callee.GetEditor());
296	371	}
297	372
..	..	@@ -306,14 +381,15 @@
306	381	//localCopy.parent = null;
307	382
308	383	frame = new JFrame();
309		- frame.setUndecorated(true);
	384	+ frame.setUndecorated(false);
310	385	objEditor = this;
311	386	this.callee = callee;
312	387
313	388	//parent = p;
314	389
315	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
316		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
317	393	//gd.setFullScreenWindow(this);
318	394	//setResizable(false);
319	395	//if (!isDisplayable())
..	..	@@ -324,6 +400,14 @@
324	400	copy = localCopy;
325	401	copy.editWindow = this;
326	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
327	411	SetupMenu();
328	412
329	413	//SetupName(objEditor); // new
..	..	@@ -347,7 +431,7 @@
347	431	frame.setMenuBar(menuBar = new MenuBar());
348	432	menuBar.add(fileMenu = new Menu("File"));
349	433	fileMenu.add(newItem = new MenuItem("New"));
350		- fileMenu.add(loadItem = new MenuItem("Open..."));
	434	+ fileMenu.add(openItem = new MenuItem("Open..."));
351	435
352	436	//oe.menuBar.add(menu = new Menu("Include"));
353	437	Menu menu = new Menu("Import");
..	..	@@ -379,7 +463,7 @@
379	463	}
380	464
381	465	newItem.addActionListener(this);
382		- loadItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
383	467	saveItem.addActionListener(this);
384	468	saveAsItem.addActionListener(this);
385	469	exportAsItem.addActionListener(this);
..	..	@@ -391,6 +475,8 @@
391	475
392	476	ChangeListener changeListener = new ChangeListener()
393	477	{
	478	+ //String name;
	479	+
394	480	public void stateChanged(ChangeEvent changeEvent)
395	481	{
396	482	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -409,18 +495,49 @@
409	495	// EditSelection(false);
410	496	// }
411	497
412		- 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();
413	529	}
414	530	};
415	531	objectPanel.addChangeListener(changeListener);
416	532
417	533	toolbarPanel = new JPanel();
418	534	toolbarPanel.setName("Toolbar");
	535	+
419	536	treePanel = new cGridBag();
420	537	treePanel.setName("Tree");
421	538
422	539	editPanel = new cGridBag().setVertical(true);
423		- editPanel.setName("Edit");
	540	+ //editPanel.setName("Edit");
424	541
425	542	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426	543
..	..	@@ -428,11 +545,13 @@
428	545	editPanel.add(editCommandsPanel);
429	546	editPanel.add(ctrlPanel);
430	547
431		- toolboxPanel = new cGridBag().setVertical(false);
432		- toolboxPanel.setName("Toolbox");
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
433	550
434		- materialPanel = new cGridBag().setVertical(true);
435		- materialPanel.setName("Material");
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
436	555
437	556	/JTextPane/
438	557	infoarea = createTextPane();
..	..	@@ -440,14 +559,15 @@
440	559
441	560	infoarea.setEditable(true);
442	561	SetText();
	562	+
443	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444	564	// infoarea.setOpaque(false);
445	565	// //infoarea.setForeground(textcolor);
446	566	// TEXTAREA infoarea.setLineWrap(true);
447	567	// TEXTAREA infoarea.setWrapStyleWord(true);
448	568	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449		- infoPanel.setPreferredSize(new Dimension(50, 200));
450		- infoPanel.setName("Info");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
451	571	//infoPanel.setLayout(new BorderLayout());
452	572	//infoPanel.add(createTextPane());
453	573
..	..	@@ -458,7 +578,14 @@
458	578	mainPanel.setDividerSize(9);
459	579	mainPanel.setDividerLocation(0.5); //1.0);
460	580	mainPanel.setResizeWeight(0.5);
461		-
	581	+
	582	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	583	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	584	+ divider.setDividerSize(15);
	585	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	586	+
	587	+ mainPanel.setUI(new BasicSplitPaneUI());
	588	+
462	589	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463	590	//mainPanel.setLayout(new GridBagLayout());
464	591	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -689,8 +816,8 @@
689	816	}
690	817	}
691	818
692		-static GraphicsDevice device = GraphicsEnvironment
693		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	819	+//static GraphicsDevice device = GraphicsEnvironment
	820	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694	821
695	822	Rectangle keeprect;
696	823	cRadio radio;
..	..	@@ -707,14 +834,24 @@
707	834	boolean maximized;
708	835
709	836	cButton fullscreenLayout;
	837	+ cButton expandedLayout;
710	838
711	839	void Minimize()
712	840	{
713	841	frame.setState(Frame.ICONIFIED);
	842	+ frame.validate();
714	843	}
715	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={}
716	848	void Maximize()
717	849	{
	850	+ if (CameraPane.FULLSCREEN)
	851	+ {
	852	+ ToggleFullScreen();
	853	+ }
	854	+
718	855	if (maximized)
719	856	{
720	857	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -722,22 +859,38 @@
722	859	else
723	860	{
724	861	keeprect = frame.getBounds();
725		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726		- Dimension rect2 = frame.getToolkit().getScreenSize();
727		- 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);
728	865	// frame.setState(Frame.MAXIMIZED_BOTH);
	866	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729	867	}
730	868
731	869	maximized ^= true;
	870	+
	871	+ frame.validate();
732	872	}
	873	+
	874	+ cButton minButton;
	875	+ cButton maxButton;
	876	+ cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
733	879
734	880	void ToggleFullScreen()
735	881	{
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
736	884	cameraView.ToggleFullScreen();
737	885
738	886	if (!CameraPane.FULLSCREEN)
739	887	{
740	888	device.setFullScreenWindow(null);
	889	+ frame.dispose();
	890	+ frame.setUndecorated(false);
	891	+ frame.validate();
	892	+ frame.setVisible(true);
	893	+
741	894	//frame.setVisible(false);
742	895	// frame.removeNotify();
743	896	// frame.setUndecorated(false);
..	..	@@ -747,13 +900,13 @@
747	900	// X frame.getContentPane().remove(/"Center",/bigThree);
748	901	// X framePanel.add(bigThree);
749	902	// X frame.getContentPane().add(/"Center",/framePanel);
750		- framePanel.setDividerLocation(1);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
751	904
752	905	//frame.setVisible(true);
753		- radio.layout = keepButton;
	906	+// radio.layout = keepButton;
754	907	//theFrame = null;
755	908	keepButton = null;
756		- radio.layout.doClick();
	909	+// radio.layout.doClick();
757	910
758	911	} else
759	912	{
..	..	@@ -762,20 +915,59 @@
762	915	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763	916	// frame.getToolkit().getScreenSize().height);
764	917	//frame.setVisible(false);
	918	+
	919	+ frame.dispose();
	920	+ frame.setUndecorated(true);
765	921	device.setFullScreenWindow(frame);
	922	+ frame.validate();
	923	+ frame.setVisible(true);
766	924	// frame.removeNotify();
767	925	// frame.setUndecorated(true);
768	926	// frame.addNotify();
769	927	// X frame.getContentPane().remove(/"Center",/framePanel);
770	928	// X framePanel.remove(bigThree);
771	929	// X frame.getContentPane().add(/"Center",/bigThree);
772		- framePanel.setDividerLocation(0);
	930	+// framePanel.setDividerLocation(0);
773	931
774		- radio.layout = fullscreenLayout;
775		- radio.layout.doClick();
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
776	934	//frame.setVisible(true);
777	935	}
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
778	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	+ object.ExtractBigData(versiontable);
	955	+ // if (copy == client)
	956	+
	957	+ Object3D versions[] = object.versionlist;
	958	+ object.versionlist = null;
	959	+
	960	+ //byte[] compress = Compress(copy);
	961	+ Object3D compress = (Object3D)Grafreed.clone(object);
	962	+
	963	+ object.versionlist = versions;
	964	+
	965	+ object.RestoreBigData(versiontable);
	966	+
	967	+ CameraPane.SWITCH = temp;
	968	+
	969	+ return compress;
	970	+ }
779	971
780	972	private JTextPane createTextPane()
781	973	{
..	..	@@ -898,6 +1090,7 @@
898	1090	{
899	1091	SetupMaterial(materialPanel);
900	1092	}
	1093	+
901	1094	//SetupName();
902	1095	//SetupViews();
903	1096	}
..	..	@@ -907,7 +1100,7 @@
907	1100	// NumberSlider vDivsField;
908	1101	// JCheckBox endcaps;
909	1102	JCheckBox liveCB;
910		- JCheckBox selectCB;
	1103	+ JCheckBox selectableCB;
911	1104	JCheckBox hideCB;
912	1105	JCheckBox link2masterCB;
913	1106	JCheckBox markCB;
..	..	@@ -1106,8 +1299,20 @@
1106	1299
1107	1300	namePanel = new cGridBag();
1108	1301
	1302	+ //if (copy.pinned)
	1303	+ {
	1304	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1305	+ pinButton.setSelected(copy.pinned);
	1306	+ cGridBag t = new cGridBag();
	1307	+ t.preferredWidth = 2;
	1308	+ t.add(pinButton);
	1309	+ namePanel.add(t);
	1310	+
	1311	+ pinButton.addItemListener(this);
	1312	+ }
	1313	+
1109	1314	nameField = AddText(namePanel, copy.GetName());
1110		- namePanel.add(nameField);
	1315	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111	1316	oe.ctrlPanel.add(namePanel);
1112	1317
1113	1318	oe.ctrlPanel.Return();
..	..	@@ -1119,26 +1324,30 @@
1119	1324
1120	1325	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1121	1326	liveCB.setToolTipText("Animate object");
1122		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123		- selectCB.setToolTipText("Make object selectable");
	1327	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1328	+ markCB.setToolTipText("Set target transform");
	1329	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1330	+ selectableCB.setToolTipText("Make object selectable");
1124	1331	// Return();
	1332	+
1125	1333	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126	1334	hideCB.setToolTipText("Hide object");
1127		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128		- markCB.setToolTipText("Set the animation target transform");
	1335	+
	1336	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1129	1337
1130	1338	setupPanel2 = new cGridBag().setVertical(false);
1131	1339
1132	1340	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133	1341	rewindCB.setToolTipText("Rewind animation");
1134	1342
1135		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1343	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1344	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137	1345
	1346	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1347	+ link2masterCB.setToolTipText("Attach to support");
	1348	+
1138	1349	if (Globals.ADVANCED)
1139	1350	{
1140		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141		- link2masterCB.setToolTipText("Attach to support");
1142	1351	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1143	1352	speedupCB.setToolTipText("Option motion capture");
1144	1353	}
..	..	@@ -1324,6 +1533,7 @@
1324	1533
1325	1534	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1326	1535	{
	1536	+ if (Globals.DEBUG)
1327	1537	System.out.println("CREATE CAMERAS");
1328	1538	cams = new cTemplate();
1329	1539	cams.name = "Cameras";
..	..	@@ -1412,6 +1622,7 @@
1412	1622	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1413	1623	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1414	1624	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1625	+ //XYZPanel.setName("XYZ");
1415	1626
1416	1627	/*
1417	1628	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1449,14 +1660,29 @@
1449	1660	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1450	1661	//tmp.setName("Edit");
1451	1662	objectPanel.add(materialPanel);
	1663	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1664	+ objectPanel.setToolTipTextAt(0, "Material");
	1665	+
	1666	+ objectPanel.add(toolboxPanel);
	1667	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1668	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1669	+
	1670	+ objectPanel.add(skyboxPanel);
	1671	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1672	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1673	+
1452	1674	// JPanel north = new JPanel(new BorderLayout());
1453	1675	// north.setName("Edit");
1454	1676	// north.add(ctrlPanel, BorderLayout.NORTH);
1455	1677	// objectPanel.add(north);
1456	1678	objectPanel.add(editPanel);
1457		- objectPanel.add(infoPanel);
1458		- objectPanel.add(toolboxPanel);
1459		-
	1679	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1680	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1681	+
	1682	+ objectPanel.add(XYZPanel);
	1683	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1684	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1685	+
1460	1686	/*
1461	1687	aConstraints.gridx = 0;
1462	1688	aConstraints.gridwidth = 1;
..	..	@@ -1476,7 +1702,7 @@
1476	1702	scrollpane.addMouseWheelListener(this); // Default not fast enough
1477	1703
1478	1704	/JTabbedPane/ scenePanel = new cGridBag();
1479		- scenePanel.preferredWidth = 6;
	1705	+ scenePanel.preferredWidth = 5;
1480	1706
1481	1707	JTabbedPane tabbedPane = new JTabbedPane();
1482	1708	tabbedPane.add(scrollpane);
..	..	@@ -1493,6 +1719,11 @@
1493	1719
1494	1720	scenePanel.add(tabbedPane);
1495	1721
	1722	+ //if (Globals.ADVANCED)
	1723	+// tabbedPane.add(infoPanel);
	1724	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1725	+// tabbedPane.setToolTipTextAt(3, "Information");
	1726	+
1496	1727	/*
1497	1728	cTree jTree = new cTree(null);
1498	1729	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1554,7 +1785,7 @@
1554	1785	bigThree = new cGridBag();
1555	1786	bigThree.addComponent(scenePanel);
1556	1787	bigThree.addComponent(centralPanel);
1557		- bigThree.addComponent(XYZPanel);
	1788	+ //bigThree.addComponent(XYZPanel);
1558	1789
1559	1790	// // SIDE EFFECT!!!
1560	1791	// aConstraints.gridx = 0;
..	..	@@ -1563,16 +1794,33 @@
1563	1794	// aConstraints.gridheight = 1;
1564	1795
1565	1796	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566		- framePanel.setContinuousLayout(true);
1567		- framePanel.setOneTouchExpandable(true);
1568		- framePanel.setDividerLocation(0.8);
	1797	+
	1798	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1799	+ new java.beans.PropertyChangeListener()
	1800	+ {
	1801	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1802	+ {
	1803	+ if ((Integer)pce.getOldValue() == 1)
	1804	+ {
	1805	+ if (radio.layout != expandedLayout)
	1806	+ {
	1807	+ radio.layout = expandedLayout;
	1808	+ radio.layout.doClick();
	1809	+ }
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ framePanel.setContinuousLayout(false);
	1815	+ framePanel.setOneTouchExpandable(false);
	1816	+ //.setDividerLocation(0.8);
1569	1817	//framePanel.setDividerSize(15);
1570	1818	//framePanel.setResizeWeight(0.15);
1571	1819	framePanel.setName("Frame");
1572	1820
1573	1821	frame.getContentPane().setLayout(new BorderLayout());
1574	1822	/**/
1575		- JTabbedPane worldPane = new JTabbedPane();
	1823	+ //JTabbedPane worldPane = new JTabbedPane();
1576	1824	//worldPane.add(bigPanel);
1577	1825	//worldPane.add(worldPanel);
1578	1826	/**/
..	..	@@ -1584,17 +1832,17 @@
1584	1832
1585	1833	frame.setSize(1280, 860);
1586	1834
1587		- frame.validate();
1588		- frame.setVisible(true);
1589		-
1590	1835	cameraView.requestFocusInWindow();
1591	1836
1592	1837	gridPanel.setDividerLocation(1.0);
	1838	+
	1839	+ frame.validate();
	1840	+
	1841	+ frame.setVisible(true);
1593	1842
1594	1843	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1595	1844	frame.addWindowListener(new WindowAdapter()
1596	1845	{
1597		-
1598	1846	public void windowClosing(WindowEvent e)
1599	1847	{
1600	1848	Close();
..	..	@@ -1617,12 +1865,418 @@
1617	1865	ctrlPanel.removeAll();
1618	1866	}
1619	1867
1620		- void SetupMaterial(cGridBag panel)
	1868	+ void SetupMaterial(cGridBag materialpanel)
1621	1869	{
1622		- /*
	1870	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1871	+
	1872	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1873	+ skin.setToolTipText("Skin");
	1874	+ skin.addMouseListener(new MouseAdapter()
	1875	+ {
	1876	+ public void mouseClicked(MouseEvent e)
	1877	+ {
	1878	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1879	+ cMaterial material = object.material;
	1880	+
	1881	+ // Skin
	1882	+ colorField.setFloat(material.color);
	1883	+ saturationField.setFloat(material.modulation);
	1884	+ subsurfaceField.setFloat(material.subsurface);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+ diffusenessField.setFloat(material.factor);
	1887	+ shininessField.setFloat(material.shininess);
	1888	+ shadowbiasField.setFloat(material.shadowbias);
	1889	+ diffuseField.setFloat(material.diffuse);
	1890	+ specularField.setFloat(material.specular);
	1891	+
	1892	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1893	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1894	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1895	+
	1896	+ materialtouched = true;
	1897	+ applySelf();
	1898	+ }
	1899	+ });
	1900	+ presetpanel.add(skin);
	1901	+
	1902	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1903	+ lambert.setToolTipText("Diffuse");
	1904	+ lambert.addMouseListener(new MouseAdapter()
	1905	+ {
	1906	+ public void mouseClicked(MouseEvent e)
	1907	+ {
	1908	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1909	+ cMaterial material = object.material;
	1910	+
	1911	+ diffusenessField.setFloat(material.factor);
	1912	+ selfshadowField.setFloat(material.diffuseness);
	1913	+
	1914	+ materialtouched = true;
	1915	+ applySelf();
	1916	+ }
	1917	+ });
	1918	+ presetpanel.add(lambert);
	1919	+
	1920	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1921	+ diffuse2.setToolTipText("Diffuse2");
	1922	+ diffuse2.addMouseListener(new MouseAdapter()
	1923	+ {
	1924	+ public void mouseClicked(MouseEvent e)
	1925	+ {
	1926	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1927	+ cMaterial material = object.material;
	1928	+
	1929	+ diffusenessField.setFloat(material.factor);
	1930	+ selfshadowField.setFloat(material.diffuseness);
	1931	+
	1932	+ materialtouched = true;
	1933	+ applySelf();
	1934	+ }
	1935	+ });
	1936	+ presetpanel.add(diffuse2);
	1937	+
	1938	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1939	+ diffusemoon.setToolTipText("Moon");
	1940	+ diffusemoon.addMouseListener(new MouseAdapter()
	1941	+ {
	1942	+ public void mouseClicked(MouseEvent e)
	1943	+ {
	1944	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1945	+ cMaterial material = object.material;
	1946	+
	1947	+ diffusenessField.setFloat(material.factor);
	1948	+ selfshadowField.setFloat(material.diffuseness);
	1949	+
	1950	+ materialtouched = true;
	1951	+ applySelf();
	1952	+ }
	1953	+ });
	1954	+ presetpanel.add(diffusemoon);
	1955	+
	1956	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1957	+ diffusemoon2.setToolTipText("Moon2");
	1958	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1959	+ {
	1960	+ public void mouseClicked(MouseEvent e)
	1961	+ {
	1962	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1963	+ cMaterial material = object.material;
	1964	+
	1965	+ diffusenessField.setFloat(material.factor);
	1966	+ selfshadowField.setFloat(material.diffuseness);
	1967	+
	1968	+ materialtouched = true;
	1969	+ applySelf();
	1970	+ }
	1971	+ });
	1972	+ presetpanel.add(diffusemoon2);
	1973	+
	1974	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1975	+ diffusemoon3.setToolTipText("Moon3");
	1976	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1977	+ {
	1978	+ public void mouseClicked(MouseEvent e)
	1979	+ {
	1980	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1981	+ cMaterial material = object.material;
	1982	+
	1983	+ diffusenessField.setFloat(material.factor);
	1984	+ selfshadowField.setFloat(material.diffuseness);
	1985	+
	1986	+ materialtouched = true;
	1987	+ applySelf();
	1988	+ }
	1989	+ });
	1990	+ presetpanel.add(diffusemoon3);
	1991	+
	1992	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1993	+ diffusesheen.setToolTipText("Sheen");
	1994	+ diffusesheen.addMouseListener(new MouseAdapter()
	1995	+ {
	1996	+ public void mouseClicked(MouseEvent e)
	1997	+ {
	1998	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1999	+ cMaterial material = object.material;
	2000	+
	2001	+ sheenField.setFloat(material.sheen);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(diffusesheen);
	2008	+
	2009	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2010	+ rough.setToolTipText("Rough metal");
	2011	+ rough.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ shininessField.setFloat(material.shininess);
	2019	+ velvetField.setFloat(material.velvet);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(rough);
	2026	+
	2027	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2028	+ rough2.setToolTipText("Medium metal");
	2029	+ rough2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ shininessField.setFloat(material.shininess);
	2037	+ lightareaField.setFloat(material.lightarea);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(rough2);
	2044	+
	2045	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2046	+ shini0.setToolTipText("Shiny");
	2047	+ shini0.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ lightareaField.setFloat(material.lightarea);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(shini0);
	2062	+
	2063	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2064	+ shini1.setToolTipText("Shiny2");
	2065	+ shini1.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ shininessField.setFloat(material.shininess);
	2073	+ lightareaField.setFloat(material.lightarea);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(shini1);
	2080	+
	2081	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2082	+ shini2.setToolTipText("Shiny3");
	2083	+ shini2.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ lightareaField.setFloat(material.lightarea);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(shini2);
	2098	+
	2099	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2100	+ aniso.setToolTipText("AnisoU");
	2101	+ aniso.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ anisoField.setFloat(material.aniso);
	2109	+ anisoVField.setFloat(material.anisoV);
	2110	+
	2111	+ materialtouched = true;
	2112	+ applySelf();
	2113	+ }
	2114	+ });
	2115	+ presetpanel.add(aniso);
	2116	+
	2117	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2118	+ aniso2.setToolTipText("AnisoV");
	2119	+ aniso2.addMouseListener(new MouseAdapter()
	2120	+ {
	2121	+ public void mouseClicked(MouseEvent e)
	2122	+ {
	2123	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2124	+ cMaterial material = object.material;
	2125	+
	2126	+ anisoField.setFloat(material.aniso);
	2127	+ anisoVField.setFloat(material.anisoV);
	2128	+
	2129	+ materialtouched = true;
	2130	+ applySelf();
	2131	+ }
	2132	+ });
	2133	+ presetpanel.add(aniso2);
	2134	+
	2135	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2136	+ aniso3.setToolTipText("AnisoUV");
	2137	+ aniso3.addMouseListener(new MouseAdapter()
	2138	+ {
	2139	+ public void mouseClicked(MouseEvent e)
	2140	+ {
	2141	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2142	+ cMaterial material = object.material;
	2143	+
	2144	+ anisoField.setFloat(material.aniso);
	2145	+ anisoVField.setFloat(material.anisoV);
	2146	+
	2147	+ materialtouched = true;
	2148	+ applySelf();
	2149	+ }
	2150	+ });
	2151	+ presetpanel.add(aniso3);
	2152	+
	2153	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2154	+ velvet0.setToolTipText("Velvet");
	2155	+ velvet0.addMouseListener(new MouseAdapter()
	2156	+ {
	2157	+ public void mouseClicked(MouseEvent e)
	2158	+ {
	2159	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2160	+ cMaterial material = object.material;
	2161	+
	2162	+ diffusenessField.setFloat(material.factor);
	2163	+ selfshadowField.setFloat(material.diffuseness);
	2164	+ sheenField.setFloat(material.sheen);
	2165	+ shininessField.setFloat(material.shininess);
	2166	+ velvetField.setFloat(material.velvet);
	2167	+ shiftField.setFloat(material.shift);
	2168	+
	2169	+ materialtouched = true;
	2170	+ applySelf();
	2171	+ }
	2172	+ });
	2173	+ presetpanel.add(velvet0);
	2174	+
	2175	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2176	+ bump0.setToolTipText("Bump texture");
	2177	+ bump0.addMouseListener(new MouseAdapter()
	2178	+ {
	2179	+ public void mouseClicked(MouseEvent e)
	2180	+ {
	2181	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2182	+ cMaterial material = object.material;
	2183	+
	2184	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2185	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2186	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(bump0);
	2193	+
	2194	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2195	+ borderShader.setToolTipText("Border fade");
	2196	+ borderShader.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ borderfadeField.setFloat(0.5);
	2201	+ opacityField.setFloat(0.75);
	2202	+
	2203	+ materialtouched = true;
	2204	+ applySelf();
	2205	+ }
	2206	+ });
	2207	+ presetpanel.add(borderShader);
	2208	+
	2209	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2210	+ halo.setToolTipText("Halo");
	2211	+ halo.addMouseListener(new MouseAdapter()
	2212	+ {
	2213	+ public void mouseClicked(MouseEvent e)
	2214	+ {
	2215	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2216	+ cMaterial material = object.material;
	2217	+
	2218	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2219	+
	2220	+ materialtouched = true;
	2221	+ applySelf();
	2222	+ }
	2223	+ });
	2224	+ presetpanel.add(halo);
	2225	+
	2226	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2227	+ candle.setToolTipText("Candle");
	2228	+ candle.addMouseListener(new MouseAdapter()
	2229	+ {
	2230	+ public void mouseClicked(MouseEvent e)
	2231	+ {
	2232	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2233	+ cMaterial material = object.material;
	2234	+
	2235	+ subsurfaceField.setFloat(material.subsurface);
	2236	+ shadowbiasField.setFloat(material.shadowbias);
	2237	+ ambientField.setFloat(material.ambient);
	2238	+ specularField.setFloat(material.specular);
	2239	+ lightareaField.setFloat(material.lightarea);
	2240	+ shininessField.setFloat(material.shininess);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(candle);
	2247	+
	2248	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2249	+ shadowShader.setToolTipText("Shadow");
	2250	+ shadowShader.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ diffuseField.setFloat(0.001);
	2255	+ ambientField.setFloat(0.001);
	2256	+ cameraField.setFloat(0.001);
	2257	+ specularField.setFloat(0.001);
	2258	+ fakedepthField.setFloat(0.001);
	2259	+ opacityField.setFloat(0.6);
	2260	+
	2261	+ materialtouched = true;
	2262	+ applySelf();
	2263	+ }
	2264	+ });
	2265	+ presetpanel.add(shadowShader);
	2266	+
	2267	+ cGridBag panel = new cGridBag().setVertical(true);
	2268	+
	2269	+ presetpanel.preferredWidth = 1;
	2270	+
	2271	+ materialpanel.add(presetpanel);
	2272	+ materialpanel.add(panel);
	2273	+
	2274	+ panel.preferredWidth = 8;
	2275	+
	2276	+ /*
1623	2277	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1624	2278	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- */
	2279	+ */
1626	2280
1627	2281	cGridBag editBar = new cGridBag().setVertical(false);
1628	2282
..	..	@@ -1656,45 +2310,61 @@
1656	2310	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1657	2311
1658	2312	cGridBag colorSection = new cGridBag().setVertical(true);
	2313	+
	2314	+ cGridBag huepanel = new cGridBag();
	2315	+ cGridBag huelabel = new cGridBag();
	2316	+ cLabel hue = GetLabel("icons/hue.png", false);
	2317	+ hue.fit = true;
	2318	+
	2319	+ hue.addMouseListener(new MouseAdapter()
	2320	+ {
	2321	+ public void mousePressed(MouseEvent e)
	2322	+ {
	2323	+ int x = e.getX();
	2324	+
	2325	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2326	+ }
	2327	+ });
	2328	+
	2329	+ huelabel.add(hue);
	2330	+ huelabel.preferredWidth = 20;
	2331	+ huepanel.add(new cGridBag()); // Label
	2332	+ huepanel.add(huelabel); // Field/slider
	2333	+
	2334	+ huepanel.preferredHeight = 7;
	2335	+
	2336	+ colorSection.add(huepanel);
1659	2337
1660	2338	cGridBag color = new cGridBag();
1661		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1662		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2339	+
	2340	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2341	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2342	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2343	+
1664	2344	//colorField.preferredWidth = 200;
1665	2345	colorSection.add(color);
1666	2346
1667	2347	cGridBag modulation = new cGridBag();
1668	2348	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1669	2349	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2350	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1671	2351	colorSection.add(modulation);
1672	2352
	2353	+ cGridBag opacity = new cGridBag();
	2354	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2355	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2357	+ colorSection.add(opacity);
	2358	+
	2359	+ colorSection.add(GetSeparator());
	2360	+
1673	2361	cGridBag texture = new cGridBag();
1674	2362	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1675	2363	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	2364	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677	2365	colorSection.add(texture);
1678	2366
1679		- cGridBag anisoU = new cGridBag();
1680		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683		- colorSection.add(anisoU);
1684		-
1685		- cGridBag anisoV = new cGridBag();
1686		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689		- colorSection.add(anisoV);
1690		-
1691		- cGridBag shadowbias = new cGridBag();
1692		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695		- colorSection.add(shadowbias);
1696		-
1697		- panel.add(new JSeparator());
	2367	+ panel.add(GetSeparator());
1698	2368
1699	2369	panel.add(colorSection);
1700	2370
..	..	@@ -1744,7 +2414,13 @@
1744	2414	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745	2415	diffuseSection.add(fakedepth);
1746	2416
1747		- panel.add(new JSeparator());
	2417	+ cGridBag shadowbias = new cGridBag();
	2418	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2419	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2420	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2421	+ diffuseSection.add(shadowbias);
	2422	+
	2423	+ panel.add(GetSeparator());
1748	2424
1749	2425	panel.add(diffuseSection);
1750	2426
..	..	@@ -1794,42 +2470,48 @@
1794	2470	// aConstraints.gridy += 1;
1795	2471	// aConstraints.gridwidth = 1;
1796	2472
	2473	+ cGridBag anisoU = new cGridBag();
	2474	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2475	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2476	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2477	+ specularSection.add(anisoU);
1797	2478
1798		- panel.add(new JSeparator());
	2479	+ cGridBag anisoV = new cGridBag();
	2480	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2481	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoV);
	2484	+
	2485	+
	2486	+ panel.add(GetSeparator());
1799	2487
1800	2488	panel.add(specularSection);
1801	2489
1802	2490	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803	2491
1804		- cGridBag globalSection = new cGridBag().setVertical(true);
	2492	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1805	2493
1806	2494	cGridBag camera = new cGridBag();
1807	2495	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808	2496	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809	2497	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810		- globalSection.add(camera);
	2498	+ colorSection.add(camera);
1811	2499
1812	2500	cGridBag ambient = new cGridBag();
1813	2501	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814	2502	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815	2503	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816		- globalSection.add(ambient);
	2504	+ colorSection.add(ambient);
1817	2505
1818	2506	cGridBag backlit = new cGridBag();
1819	2507	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820	2508	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821	2509	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822		- globalSection.add(backlit);
	2510	+ colorSection.add(backlit);
1823	2511
1824		- cGridBag opacity = new cGridBag();
1825		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828		- globalSection.add(opacity);
1829		-
1830		- panel.add(new JSeparator());
	2512	+ //panel.add(new JSeparator());
1831	2513
1832		- panel.add(globalSection);
	2514	+ //panel.add(globalSection);
1833	2515
1834	2516	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835	2517
..	..	@@ -1871,7 +2553,7 @@
1871	2553	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1872	2554	textureSection.add(opacityPower);
1873	2555
1874		- panel.add(new JSeparator());
	2556	+ panel.add(GetSeparator());
1875	2557
1876	2558	panel.add(textureSection);
1877	2559
..	..	@@ -1936,8 +2618,9 @@
1936	2618	// 3D models
1937	2619	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1938	2620	{
1939		- lastConverter = new com.jmex.model.converters.MaxToJme();
1940		- LoadFile(filename, lastConverter);
	2621	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2622	+ //LoadFile(filename, lastConverter);
	2623	+ LoadObjFile(filename); // New 3ds loader
1941	2624	continue;
1942	2625	}
1943	2626	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2663,6 +3346,7 @@
2663	3346	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2664	3347	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2665	3348	}
	3349	+
2666	3350	//cJME.count++;
2667	3351	//cJME.count %= 12;
2668	3352	if (gc)
..	..	@@ -2846,6 +3530,7 @@
2846	3530	}
2847	3531	}
2848	3532	}
	3533	+
2849	3534	cFileSystemPane FSPane;
2850	3535
2851	3536	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2855,7 +3540,7 @@
2855	3540
2856	3541	freezematerial = true;
2857	3542	colorField.setFloat(mat.color);
2858		- modulationField.setFloat(mat.modulation);
	3543	+ saturationField.setFloat(mat.modulation);
2859	3544	metalnessField.setFloat(mat.metalness);
2860	3545	diffuseField.setFloat(mat.diffuse);
2861	3546	specularField.setFloat(mat.specular);
..	..	@@ -2899,6 +3584,7 @@
2899	3584	}
2900	3585	}
2901	3586	}
	3587	+
2902	3588	freezematerial = false;
2903	3589	}
2904	3590
..	..	@@ -2916,32 +3602,8 @@
2916	3602
2917	3603	if (multiplyToggle != null)
2918	3604	multiplyToggle.setSelected(mat.multiply);
2919		-
2920		- assert (object.projectedVertices != null);
2921		-
2922		- if (object.projectedVertices.length <= 2)
2923		- {
2924		- // Side effect...
2925		- Object3D.cVector2[] keep = object.projectedVertices;
2926		- object.projectedVertices = new Object3D.cVector2[3];
2927		- for (int i = 0; i < 3; i++)
2928		- {
2929		- if (i < keep.length)
2930		- {
2931		- object.projectedVertices[i] = keep[i];
2932		- } else
2933		- {
2934		- object.projectedVertices[i] = new Object3D.cVector2();
2935		- }
2936		- /*
2937		- if(keep.length == 0)
2938		- object.projectedVertices[0] = new Object3D.cVector2();
2939		- else
2940		- object.projectedVertices[0] = keep[0];
2941		- object.projectedVertices[1] = new Object3D.cVector2();
2942		- */
2943		- }
2944		- }
	3605	+
	3606	+ AllocProjectedVertices(object);
2945	3607
2946	3608	SetMaterial(mat, object.projectedVertices);
2947	3609	}
..	..	@@ -3017,12 +3679,17 @@
3017	3679	// }
3018	3680
3019	3681	/**/
3020		- if (deselect)
	3682	+ if (deselect \|\| child == null)
3021	3683	{
3022	3684	//group.deselectAll();
3023	3685	//freeze = true;
3024	3686	GetTree().clearSelection();
3025	3687	//freeze = false;
	3688	+
	3689	+ if (child == null)
	3690	+ {
	3691	+ return;
	3692	+ }
3026	3693	}
3027	3694
3028	3695	//group.addSelectee(child);
..	..	@@ -3056,6 +3723,17 @@
3056	3723	public void itemStateChanged(ItemEvent event)
3057	3724	{
3058	3725	// System.out.println("Propagate = " + propagate);
	3726	+ if (event.getSource() == pinButton)
	3727	+ {
	3728	+ copy.pinned ^= true;
	3729	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3730	+ {
	3731	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3732	+ copy.CloseUI();
	3733	+ //copy.editWindow.refreshContents();
	3734	+ }
	3735	+ }
	3736	+ else
3059	3737	if (event.getSource() == propagateToggle)
3060	3738	{
3061	3739	propagate ^= true;
..	..	@@ -3160,8 +3838,9 @@
3160	3838	} else if (event.getSource() == liveCB)
3161	3839	{
3162	3840	copy.live ^= true;
	3841	+ objEditor.refreshContents(true); // To show item colors
3163	3842	return;
3164		- } else if (event.getSource() == selectCB)
	3843	+ } else if (event.getSource() == selectableCB)
3165	3844	{
3166	3845	copy.dontselect ^= true;
3167	3846	return;
..	..	@@ -3169,7 +3848,7 @@
3169	3848	{
3170	3849	copy.hide ^= true;
3171	3850	copy.Touch(); // display list issue
3172		- objEditor.refreshContents();
	3851	+ objEditor.refreshContents(true); // To show item colors
3173	3852	return;
3174	3853	} else if (event.getSource() == link2masterCB)
3175	3854	{
..	..	@@ -3346,9 +4025,9 @@
3346	4025	{
3347	4026	Close();
3348	4027	//return true;
3349		- } else if (source == loadItem)
	4028	+ } else if (source == openItem)
3350	4029	{
3351		- load();
	4030	+ Open();
3352	4031	//return true;
3353	4032	} else if (source == newItem)
3354	4033	{
..	..	@@ -3373,6 +4052,10 @@
3373	4052	{
3374	4053	generatePOV();
3375	4054	//return true;
	4055	+ } else if (event.getSource() == archiveItem)
	4056	+ {
	4057	+ cTools.Archive(frame);
	4058	+ return;
3376	4059	} else if (source == zBufferItem)
3377	4060	{
3378	4061	try
..	..	@@ -3421,11 +4104,12 @@
3421	4104
3422	4105	static public byte[] Compress(Object3D o)
3423	4106	{
	4107	+ // Slower to actually compress.
3424	4108	try
3425	4109	{
3426	4110	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4111	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4112	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3429	4113
3430	4114	Object3D parent = o.parent;
3431	4115	o.parent = null;
..	..	@@ -3436,10 +4120,14 @@
3436	4120
3437	4121	out.flush();
3438	4122
3439		- zstream.close();
	4123	+ baos //zstream
	4124	+ .close();
3440	4125	out.close();
3441	4126
3442		- return baos.toByteArray();
	4127	+ byte[] bytes = baos.toByteArray();
	4128	+
	4129	+ System.out.println("save #bytes = " + bytes.length);
	4130	+ return bytes;
3443	4131	} catch (Exception e)
3444	4132	{
3445	4133	System.err.println(e);
..	..	@@ -3449,13 +4137,16 @@
3449	4137
3450	4138	static public Object Uncompress(byte[] bytes)
3451	4139	{
3452		- System.out.println("#bytes = " + bytes.length);
	4140	+ System.out.println("restore #bytes = " + bytes.length);
3453	4141	try
3454	4142	{
3455	4143	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457		- ObjectInputStream in = new ObjectInputStream(istream);
	4144	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4145	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3458	4146	Object obj = in.readObject();
	4147	+
	4148	+ bais //istream
	4149	+ .close();
3459	4150	in.close();
3460	4151
3461	4152	return obj;
..	..	@@ -3510,41 +4201,95 @@
3510	4201	return null;
3511	4202	}
3512	4203
3513		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514	4204
3515	4205	public void Save()
3516	4206	{
	4207	+ //Save(true);
	4208	+ Replace();
	4209	+ SetVersionStates();
	4210	+ }
	4211	+
	4212	+ private boolean Equal(byte[] compress, byte[] name)
	4213	+ {
	4214	+ if (compress.length != name.length)
	4215	+ {
	4216	+ return false;
	4217	+ }
	4218	+
	4219	+ for (int i=compress.length; --i>=0;)
	4220	+ {
	4221	+ if (compress[i] != name[i])
	4222	+ return false;
	4223	+ }
	4224	+
	4225	+ return true;
	4226	+ }
	4227	+
	4228	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4229	+
	4230	+ void DeleteVersion()
	4231	+ {
	4232	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4233	+ {
	4234	+ copy.versionlist[i] = copy.versionlist[i+1];
	4235	+ }
	4236	+
	4237	+ CopyChanged();
	4238	+
	4239	+ SetVersionStates();
	4240	+ }
	4241	+
	4242	+ public boolean Save(boolean user)
	4243	+ {
3517	4244	System.err.println("Save");
	4245	+ Replace();
3518	4246
3519		- cRadio tab = GetCurrentTab();
	4247	+ //cRadio tab = GetCurrentTab();
3520	4248
3521		- boolean temp = CameraPane.SWITCH;
3522		- CameraPane.SWITCH = false;
	4249	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3523	4250
3524		- copy.ExtractBigData(hashtable);
	4251	+ boolean thesame = false;
	4252	+
	4253	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4254	+// {
	4255	+// thesame = true;
	4256	+// }
3525	4257
3526	4258	//EditorFrame.m_MainFrame.requestFocusInWindow();
3527		- tab.graphs[tab.undoindex++] = Compress(copy);
3528		-
3529		- copy.RestoreBigData(hashtable);
3530		-
3531		- CameraPane.SWITCH = temp;
3532		-
3533		- //assert(hashtable.isEmpty());
3534		-
3535		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4259	+ if (!thesame)
3536	4260	{
3537		- tab.graphs[i] = null;
	4261	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4262	+ {
	4263	+ copy.versionlist[i] = copy.versionlist[i-1];
	4264	+ }
	4265	+
	4266	+ //tab.user[tab.versionindex] = user;
	4267	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4268	+
	4269	+ copy.versionlist[++copy.versionindex] = compress;
	4270	+
	4271	+ // if (increment)
	4272	+ // tab.versionindex++;
3538	4273	}
3539	4274
3540		- SetUndoStates();
	4275	+ //copy.RestoreBigData(versiontable);
	4276	+
	4277	+ //assert(hashtable.isEmpty());
	4278	+
	4279	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4280	+// {
	4281	+// //tab.user[i] = false;
	4282	+// copy.versionlist[i] = null;
	4283	+// }
	4284	+
	4285	+ SetVersionStates();
3541	4286
3542	4287	// test save
3543	4288	if (false)
3544	4289	{
3545	4290	try
3546	4291	{
3547		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4292	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3548	4293	ObjectOutputStream p = new ObjectOutputStream(ostream);
3549	4294
3550	4295	p.writeObject(copy);
..	..	@@ -3557,28 +4302,68 @@
3557	4302	e.printStackTrace();
3558	4303	}
3559	4304	}
	4305	+
	4306	+ return !thesame;
	4307	+ }
	4308	+
	4309	+ boolean flashIt = true;
	4310	+
	4311	+ void RefreshSelection()
	4312	+ {
	4313	+ Object3D selection = new Object3D();
	4314	+
	4315	+ for (int i = 0; i < copy.selection.size(); i++)
	4316	+ {
	4317	+ Object3D elem = copy.selection.elementAt(i);
	4318	+
	4319	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4320	+
	4321	+ if (obj == null)
	4322	+ {
	4323	+ copy.selection.remove(i--);
	4324	+ }
	4325	+ else
	4326	+ {
	4327	+ selection.add(obj);
	4328	+ copy.selection.setElementAt(obj, i);
	4329	+ }
	4330	+ }
	4331	+
	4332	+ flashIt = false;
	4333	+ GetTree().clearSelection();
	4334	+ for (int i = 0; i < selection.size(); i++)
	4335	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4336	+ flashIt = true;
	4337	+
	4338	+ //refreshContents(false);
3560	4339	}
3561	4340
3562		- void CopyChanged(Object3D obj)
	4341	+ void CopyChanged()
3563	4342	{
3564		- SetUndoStates();
	4343	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4344	+
	4345	+ SetVersionStates();
3565	4346
3566	4347	boolean temp = CameraPane.SWITCH;
3567	4348	CameraPane.SWITCH = false;
3568	4349
3569		- copy.ExtractBigData(hashtable);
	4350	+ copy.ExtractBigData(versiontable);
3570	4351
3571	4352	copy.clear();
3572	4353
	4354	+ copy.skyboxname = obj.skyboxname;
	4355	+ copy.skyboxext = obj.skyboxext;
	4356	+
3573	4357	for (int i=0; i<obj.Size(); i++)
3574	4358	{
3575	4359	copy.add(obj.get(i));
3576	4360	}
3577	4361
3578		- copy.RestoreBigData(hashtable);
	4362	+ copy.RestoreBigData(versiontable);
3579	4363
3580	4364	CameraPane.SWITCH = temp;
3581	4365
	4366	+ RefreshSelection();
3582	4367	//assert(hashtable.isEmpty());
3583	4368
3584	4369	copy.Touch();
..	..	@@ -3599,56 +4384,144 @@
3599	4384	}
3600	4385	}
3601	4386
3602		- refreshContents();
	4387	+ refreshContents(true);
3603	4388	}
3604	4389
3605		- cButton undoButton;
3606		- cButton redoButton;
	4390	+ cButton previousVersionButton;
	4391	+ cButton restoreButton;
	4392	+ cButton replaceButton;
	4393	+ cButton nextVersionButton;
	4394	+ cButton saveVersionButton;
	4395	+ cButton deleteVersionButton;
3607	4396
3608		- void SetUndoStates()
	4397	+ boolean muteSlider;
	4398	+
	4399	+ int VersionCount()
3609	4400	{
3610		- cRadio tab = GetCurrentTab();
	4401	+ int count = 0;
3611	4402
3612		- undoButton.setEnabled(tab.undoindex > 0);
3613		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4403	+ for (int i = copy.versionlist.length; --i >= 0;)
	4404	+ {
	4405	+ if (copy.versionlist[i] != null)
	4406	+ count++;
	4407	+ }
	4408	+
	4409	+ return count;
3614	4410	}
3615	4411
3616		- public void Undo()
	4412	+ void SetVersionStates()
3617	4413	{
	4414	+ //if (true)
	4415	+ // return;
	4416	+
	4417	+ //cRadio tab = GetCurrentTab();
	4418	+
	4419	+ restoreButton.setEnabled(copy.versionindex != -1);
	4420	+ replaceButton.setEnabled(copy.versionindex != -1);
	4421	+
	4422	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4423	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4424	+
	4425	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4426	+ copy.versionlist[copy.versionindex + 1] != null);
	4427	+
	4428	+ muteSlider = true;
	4429	+ versionSlider.setMinimum(0);
	4430	+ versionSlider.setMaximum(VersionCount() - 1);
	4431	+ versionSlider.setInteger(copy.versionindex);
	4432	+ versionSlider.setEnabled(copy.versionindex != -1);
	4433	+ muteSlider = false;
	4434	+ }
	4435	+
	4436	+ public boolean PreviousVersion()
	4437	+ {
	4438	+ // Option?
	4439	+ Replace();
	4440	+
3618	4441	System.err.println("Undo");
3619	4442
3620		- cRadio tab = GetCurrentTab();
	4443	+ //cRadio tab = GetCurrentTab();
3621	4444
3622		- if (tab.undoindex == 0)
	4445	+ if (copy.versionindex == 0)
3623	4446	{
3624	4447	java.awt.Toolkit.getDefaultToolkit().beep();
3625		- return;
	4448	+ return false;
3626	4449	}
3627	4450
3628		- if (tab.graphs[tab.undoindex] == null)
3629		- {
3630		- Save();
3631		- tab.undoindex -= 1;
3632		- }
	4451	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4452	+// {
	4453	+// if (Save(false))
	4454	+// tab.versionindex -= 1;
	4455	+// else
	4456	+// {
	4457	+// if (tab.versionindex <= 0)
	4458	+// return false;
	4459	+// else
	4460	+// tab.versionindex -= 1;
	4461	+// }
	4462	+// }
3633	4463
3634		- tab.undoindex -= 1;
	4464	+ copy.versionindex -= 1;
3635	4465
3636		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4466	+ CopyChanged();
	4467	+
	4468	+ return true;
3637	4469	}
3638	4470
3639		- public void Redo()
	4471	+ public boolean Restore()
3640	4472	{
3641		- cRadio tab = GetCurrentTab();
	4473	+ System.err.println("Restore");
3642	4474
3643		- if (tab.graphs[tab.undoindex + 1] == null)
	4475	+ //cRadio tab = GetCurrentTab();
	4476	+
	4477	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4478	+ {
	4479	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4480	+ return false;
	4481	+ }
	4482	+
	4483	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4484	+ CopyChanged();
	4485	+
	4486	+ return true;
	4487	+ }
	4488	+
	4489	+ public boolean Replace()
	4490	+ {
	4491	+ System.err.println("Replace");
	4492	+
	4493	+ //cRadio tab = GetCurrentTab();
	4494	+
	4495	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4496	+ {
	4497	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4498	+ return false;
	4499	+ }
	4500	+
	4501	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4502	+
	4503	+ return true;
	4504	+ }
	4505	+
	4506	+ public void NextVersion()
	4507	+ {
	4508	+ // Option?
	4509	+ Replace();
	4510	+
	4511	+ //cRadio tab = GetCurrentTab();
	4512	+
	4513	+ if (copy.versionlist[copy.versionindex + 1] == null)
3644	4514	{
3645	4515	java.awt.Toolkit.getDefaultToolkit().beep();
3646	4516	return;
3647	4517	}
3648	4518
3649		- tab.undoindex += 1;
	4519	+ copy.versionindex += 1;
3650	4520
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4521	+ CopyChanged();
	4522	+
	4523	+ //if (!tab.user[tab.versionindex])
	4524	+ // tab.graphs[tab.versionindex] = null;
3652	4525	}
3653	4526
3654	4527	void ImportGFD()
..	..	@@ -3859,7 +4732,7 @@
3859	4732	//copy.material = new cMaterial(copy.GetMaterial());
3860	4733
3861	4734	current.color = (float) colorField.getFloat();
3862		- current.modulation = (float) modulationField.getFloat();
	4735	+ current.modulation = (float) saturationField.getFloat();
3863	4736	current.metalness = (float) metalnessField.getFloat();
3864	4737	current.diffuse = (float) diffuseField.getFloat();
3865	4738	current.specular = (float) specularField.getFloat();
..	..	@@ -3892,7 +4765,7 @@
3892	4765	cMaterial mat = copy.material;
3893	4766
3894	4767	colorField.SetToolTipValue((mat.color));
3895		- modulationField.SetToolTipValue((mat.modulation));
	4768	+ saturationField.SetToolTipValue((mat.modulation));
3896	4769	metalnessField.SetToolTipValue((mat.metalness));
3897	4770	diffuseField.SetToolTipValue((mat.diffuse));
3898	4771	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3944,9 +4817,28 @@
3944	4817	//copy.Touch();
3945	4818	}
3946	4819
	4820	+ cNumberSlider versionSlider;
	4821	+
3947	4822	public void stateChanged(ChangeEvent e)
3948	4823	{
3949	4824	// assert(false);
	4825	+ if (e.getSource() == versionSlider)
	4826	+ {
	4827	+ if (muteSlider)
	4828	+ return;
	4829	+
	4830	+ Replace();
	4831	+
	4832	+ int version = versionSlider.getInteger();
	4833	+
	4834	+ if (version != -1 && copy.versionlist[version] != null)
	4835	+ {
	4836	+ copy.versionindex = version;
	4837	+ CopyChanged();
	4838	+ }
	4839	+
	4840	+ return;
	4841	+ }
3950	4842
3951	4843	if (freezematerial)
3952	4844	{
..	..	@@ -3982,6 +4874,12 @@
3982	4874	{
3983	4875	//System.out.println("stateChanged = " + this);
3984	4876	materialtouched = true;
	4877	+
	4878	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4879	+ {
	4880	+ saturationField.setFloat(1);
	4881	+ }
	4882	+
3985	4883	applySelf();
3986	4884	//System.out.println("this = " + this);
3987	4885	//System.out.println("PARENT = " + parent);
..	..	@@ -4281,6 +5179,7 @@
4281	5179	{
4282	5180	if (GetTree() != null)
4283	5181	{
	5182	+ GetTree().revalidate();
4284	5183	GetTree().repaint();
4285	5184	}
4286	5185
..	..	@@ -4289,13 +5188,18 @@
4289	5188	ctrlPanel.validate(); // ? new
4290	5189	ctrlPanel.repaint();
4291	5190	}
	5191	+
	5192	+ if (previousVersionButton != null && copy.versionlist != null)
	5193	+ SetVersionStates();
	5194	+
	5195	+ cameraView.requestFocusInWindow();
4292	5196	}
4293	5197
4294	5198	static TweenManager tweenManager = new TweenManager();
4295	5199
4296	5200	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4297	5201	{
4298		- if (Globals.SAVEONMAKE) // && resetmodel)
	5202	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4299	5203	Save();
4300	5204	//Tween.set(thing, 0).target(1).start(tweenManager);
4301	5205	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4320,7 +5224,7 @@
4320	5224	// group = (Composite) group.get(0);
4321	5225	// }
4322	5226
4323		- System.out.println("makeSomething of " + thing);
	5227	+ //System.out.println("makeSomething of " + thing);
4324	5228
4325	5229	/*
4326	5230	if (deselect && jList != null)
..	..	@@ -4537,7 +5441,9 @@
4537	5441	readobj.ResetDisplayList();
4538	5442	} catch (Exception e)
4539	5443	{
4540		- //e.printStackTrace();
	5444	+ if (!e.toString().contains("GZIP"))
	5445	+ e.printStackTrace();
	5446	+
4541	5447	try
4542	5448	{
4543	5449	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4611,12 +5517,14 @@
4611	5517
4612	5518	if (readobj != null)
4613	5519	{
4614		- if (Globals.SAVEONMAKE)
4615		- Save();
	5520	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5521	+ // Save();
4616	5522	try
4617	5523	{
4618	5524	//readobj.deepCopySelf(copy);
4619	5525	copy.clear(); // june 2014
	5526	+ copy.skyboxname = readobj.skyboxname;
	5527	+ copy.skyboxext = readobj.skyboxext;
4620	5528	for (int i = 0; i < readobj.size(); i++)
4621	5529	{
4622	5530	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4657,6 +5565,7 @@
4657	5565	}
4658	5566	} catch (ClassCastException e)
4659	5567	{
	5568	+ e.printStackTrace();
4660	5569	assert (false);
4661	5570	Composite c = (Composite) copy;
4662	5571	c.children.clear();
..	..	@@ -4667,17 +5576,31 @@
4667	5576	c.addChild(csg);
4668	5577	}
4669	5578
	5579	+ copy.versionlist = readobj.versionlist;
	5580	+ copy.versionindex = readobj.versionindex;
	5581	+
	5582	+ if (copy.versionlist == null)
	5583	+ {
	5584	+ // Backward compatibility
	5585	+ copy.versionlist = new Object3D[100];
	5586	+ copy.versionindex = -1;
	5587	+
	5588	+ //Save(true);
	5589	+ }
	5590	+
	5591	+ //? SetUndoStates();
	5592	+
4670	5593	ResetModel();
4671	5594	copy.HardTouch(); // recompile?
4672	5595	refreshContents();
4673	5596	}
4674	5597	}
4675	5598
4676		- void load() // throws ClassNotFoundException
	5599	+ void Open() // throws ClassNotFoundException
4677	5600	{
4678	5601	if (Grafreed.standAlone)
4679	5602	{
4680		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5603	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4681	5604	browser.show();
4682	5605	String filename = browser.getFile();
4683	5606	if (filename != null && filename.length() > 0)
..	..	@@ -4754,6 +5677,8 @@
4754	5677
4755	5678	void save()
4756	5679	{
	5680	+ Replace();
	5681	+
4757	5682	if (lastname == null)
4758	5683	{
4759	5684	return;
..	..	@@ -4776,6 +5701,7 @@
4776	5701	//ps.print(buffer.toString());
4777	5702	} catch (IOException e)
4778	5703	{
	5704	+ e.printStackTrace();
4779	5705	}
4780	5706	}
4781	5707
..	..	@@ -4958,7 +5884,7 @@
4958	5884	MenuBar menuBar;
4959	5885	Menu fileMenu;
4960	5886	MenuItem newItem;
4961		- MenuItem loadItem;
	5887	+ MenuItem openItem;
4962	5888	MenuItem saveItem;
4963	5889	MenuItem saveAsItem;
4964	5890	MenuItem exportAsItem;
..	..	@@ -4981,6 +5907,7 @@
4981	5907	CheckboxMenuItem toggleSwitchItem;
4982	5908	CheckboxMenuItem toggleRootItem;
4983	5909	CheckboxMenuItem animationItem;
	5910	+ MenuItem archiveItem;
4984	5911	CheckboxMenuItem toggleHandleItem;
4985	5912	CheckboxMenuItem togglePaintItem;
4986	5913	JSplitPane mainPanel;
..	..	@@ -4994,6 +5921,7 @@
4994	5921	ButtonGroup buttonGroup;
4995	5922
4996	5923	cGridBag toolboxPanel;
	5924	+ cGridBag skyboxPanel;
4997	5925	cGridBag materialPanel;
4998	5926	cGridBag ctrlPanel;
4999	5927
..	..	@@ -5067,7 +5995,7 @@
5067	5995	JLabel colorLabel;
5068	5996	cNumberSlider colorField;
5069	5997	JLabel modulationLabel;
5070		- cNumberSlider modulationField;
	5998	+ cNumberSlider saturationField;
5071	5999	JLabel metalnessLabel;
5072	6000	cNumberSlider metalnessField;
5073	6001	JLabel diffuseLabel;
..	..	@@ -5098,6 +6026,7 @@
5098	6026	cNumberSlider anisoField;
5099	6027	JLabel anisoVLabel;
5100	6028	cNumberSlider anisoVField;
	6029	+
5101	6030	JLabel cameraLabel;
5102	6031	cNumberSlider cameraField;
5103	6032	JLabel selfshadowLabel;
..	..	@@ -5112,6 +6041,7 @@
5112	6041	cNumberSlider fakedepthField;
5113	6042	JLabel shadowbiasLabel;
5114	6043	cNumberSlider shadowbiasField;
	6044	+
5115	6045	JLabel bumpLabel;
5116	6046	cNumberSlider bumpField;
5117	6047	JLabel noiseLabel;