~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,6 +80,12 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
77	89	SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +110,7 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +206,8 @@
189	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	207	// pasteExpandItem.addActionListener(this);
191	208	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
194	211
195	212	if (Globals.ADVANCED)
196	213	{
..	..	@@ -220,7 +237,7 @@
220	237	// toggleSwitchItem.addItemListener(this);
221	238	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	239
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	241	toggleHandleItem.addItemListener(this);
225	242	toggleHandleItem.setState(CameraPane.HANDLES);
226	243
..	..	@@ -380,13 +397,14 @@
380	397	shadowYItem.addActionListener(this);
381	398	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
383	403	if (Globals.ADVANCED)
384	404	{
385	405	menu.add("-");
386	406	linkerItem = menu.add(new MenuItem("Linker"));
387	407	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	408	templateItem = menu.add(new MenuItem("Template"));
391	409	templateItem.addActionListener(this);
392	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +433,7 @@
415	433	genNormalsMESHItem.addActionListener(this);
416	434	if (Globals.ADVANCED)
417	435	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	437	genNormalsMINEItem.addActionListener(this);
420	438	}
421	439	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -538,6 +556,7 @@
538	556	buildToolsMenu(menu);
539	557	}
540	558
	559	+
541	560	void SetupUI2(ObjEditor oe)
542	561	{
543	562	// June 2019
..	..	@@ -582,7 +601,7 @@
582	601	*/
583	602	cGridBag copyOptionsPanel = new cGridBag();
584	603
585		- copyOptionsPanel.preferredHeight = 2;
	604	+ copyOptionsPanel.preferredHeight = 1;
586	605
587	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	607
..	..	@@ -590,48 +609,66 @@
590	609	//minButton.setToolTipText("Minimize window");
591	610	//minButton.addActionListener(this);
592	611
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
596	618
597	619	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	620	fullButton.setToolTipText("Full-screen window");
599	621	fullButton.addActionListener(this);
600	622
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
601	627	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	628	restoreCameraButton.setToolTipText("Restore viewpoint");
603	629	restoreCameraButton.addActionListener(this);
604	630
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
605	635	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
	636	+ undoButton.setToolTipText("Previous version");
607	637	undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
608	652
609	653	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610		- redoButton.setToolTipText("Redo changes");
	654	+ redoButton.setToolTipText("Next version");
611	655	redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
612	657
613		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- saveButton.setToolTipText("Save changes");
615		- saveButton.addActionListener(this);
616		-
617		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
618	659	liveCB.setToolTipText("Enable animation");
619	660	liveCB.addItemListener(this);
620	661
621		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	663	oneStepButton.setToolTipText("Animate one step forward");
623	664	oneStepButton.addActionListener(this);
624	665
625		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626	667	fastCB.setToolTipText("Fast mode");
627	668	fastCB.addItemListener(this);
628	669
629	670	//oe.toolboxPanel.Return();
630	671
631		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- screenfitButton.setToolTipText("Screen fit");
633		- screenfitButton.addActionListener(this);
634		-
635	672	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636	673	// trackCB.setToolTipText("Enable tracking");
637	674	// trackCB.addItemListener(this);
..	..	@@ -648,27 +685,28 @@
648	685
649	686	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
650	687
651		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- twoButton.setToolTipText("Show center view only");
653		- twoButton.addActionListener(this);
654		- this.fullscreenLayout = twoButton;
655		-
656	688	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657	689	fourButton.addActionListener(this);
658	690	fourButton.setToolTipText("Show left panel only");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
659	697	oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
660		- sixButton.setToolTipText("2-column layout left");
	698	+ sixButton.setToolTipText("Show left and right");
661	699	sixButton.addActionListener(this);
662		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- threeButton.setToolTipText("2-column layout right");
664		- threeButton.addActionListener(this);
665		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sevenButton.setToolTipText("3-column layout");
667		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
668	706	//
669	707
670		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- rootButton.setToolTipText("Edit selection in new tab");
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
672	710	rootButton.addActionListener(this);
673	711
674	712	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -724,7 +762,7 @@
724	762	compositeButton.addActionListener(this);
725	763
726	764	oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- switchButton.setToolTipText("Create switch");
	765	+ switchButton.setToolTipText("Create item switcher");
728	766	switchButton.addActionListener(this);
729	767
730	768	oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -743,17 +781,29 @@
743	781	lightButton.setToolTipText("Create light");
744	782	lightButton.addActionListener(this);
745	783
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
746	796	// EDIT panel
747		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748		- editButton.setToolTipText("Edit selection");
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
749	799	editButton.addActionListener(this);
750	800
751		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
753	803	uneditButton.addActionListener(this);
754	804
755	805	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756		- allParamsButton.setToolTipText("Edit all params");
	806	+ allParamsButton.setToolTipText("Show all controle");
757	807	allParamsButton.addActionListener(this);
758	808
759	809	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -770,6 +820,7 @@
770	820
771	821	editCommandsPanel.preferredHeight = 1;
772	822
	823	+ SetPinStates(false);
773	824	// oe.treePanel.add(commandsPanel);
774	825	// oe.treePanel.Return();
775	826
..	..	@@ -796,6 +847,9 @@
796	847
797	848	oe.treePanel.add(copyOptionsPanel);
798	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
799	853
800	854	// mainPanel.setDividerLocation(0.5); //1.0);
801	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -818,7 +872,7 @@
818	872	dgr.addDragGestureListener(this);
819	873	}catch(Exception e) {}
820	874	*/
821		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
822	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
823	877	}
824	878
..	..	@@ -843,14 +897,18 @@
843	897	boxCB.addItemListener(this);
844	898
845	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
847	901	zoomBoxCB.addItemListener(this);
848	902
849	903	if (true) // Globals.ADVANCED)
850	904	{
851		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852		- supportCB.setToolTipText("Enable rigging");
853		- supportCB.addItemListener(this);
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
854	912
855	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856	914	// localCB.addItemListener(this);
..	..	@@ -905,7 +963,7 @@
905	963	oeilCB.addItemListener(this);
906	964
907	965	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908		- shadowCB.setToolTipText("Compute shadows when live");
	966	+ shadowCB.setToolTipText("When live compute shadows");
909	967	shadowCB.addItemListener(this);
910	968
911	969	panel.Return();
..	..	@@ -914,12 +972,12 @@
914	972	toggleTextureCB.addItemListener(this);
915	973
916	974	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917		- toggleSwitchCB.setToolTipText("Use switch");
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
918	976	toggleSwitchCB.addItemListener(this);
919	977
920		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921		- autosaveCB.setToolTipText("Auto-save on structure change");
922		- autosaveCB.addItemListener(this);
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
923	981
924	982	panel.Return();
925	983	if (Globals.ADVANCED)
..	..	@@ -948,7 +1006,7 @@
948	1006	{
949	1007	cRadio radioButton = new cRadio(obj.name);
950	1008
951		- // Patch to avoid bug with transparency.
	1009	+ // June 2019. Patch to avoid bug with transparency.
952	1010	radioButton.hadMaterial = obj.material != null;
953	1011	if (!radioButton.hadMaterial)
954	1012	{
..	..	@@ -956,7 +1014,7 @@
956	1014	}
957	1015
958	1016	radioButton.SetObject(obj);
959		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
960	1018	radioButton.SetCamera(cameraView.renderCamera, false);
961	1019	radioButton.addActionListener(this);
962	1020	radioPanel.add(radioButton);
..	..	@@ -985,6 +1043,7 @@
985	1043	cCheckBox slowCB;
986	1044	cCheckBox boxCB;
987	1045	cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
988	1047	//cToggleButton trackCB;
989	1048	cCheckBox trackCB;
990	1049	cCheckBox smoothfocusCB;
..	..	@@ -995,7 +1054,7 @@
995	1054
996	1055	cCheckBox oeilCB;
997	1056	cCheckBox shadowCB;
998		- cCheckBox autosaveCB;
	1057	+ cCheckBox autokeepCB;
999	1058	cCheckBox lookAtCB;
1000	1059
1001	1060	// static int COLOR = 1;
..	..	@@ -1103,9 +1162,13 @@
1103	1162	{
1104	1163	Globals.COMPUTESHADOWWHENLIVE ^= true;
1105	1164	}
1106		- else if(e.getSource() == autosaveCB)
	1165	+ else if(e.getSource() == freezeCB)
1107	1166	{
1108		- Globals.SAVEONMAKE ^= true;
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
1109	1172	}
1110	1173	else if(e.getSource() == lookAtCB)
1111	1174	{
..	..	@@ -1187,8 +1250,6 @@
1187	1250	}
1188	1251	}
1189	1252
1190		- String string = (String) object;
1191		-
1192	1253	System.out.println("Transfer = " + object + "; drop : " + target);
1193	1254	// if( object instanceof java.io.File[])
1194	1255	// {
..	..	@@ -1196,6 +1257,8 @@
1196	1257	// objEditor.DropFile((java.io.File[]) object, true);
1197	1258	// return;
1198	1259	// }
	1260	+
	1261	+ String string = object.toString();
1199	1262
1200	1263	// File path for Mac and Windows
1201	1264	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1445,6 +1508,9 @@
1445	1508	animationItem.addItemListener(this);
1446	1509	animationItem.setState(Globals.ANIMATION);
1447	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1448	1514	menu.add("-");
1449	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1450	1516	parseverticesItem.addActionListener(this);
..	..	@@ -1457,6 +1523,8 @@
1457	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1458	1524	reduce34MorphItem.addActionListener(this);
1459	1525	menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1460	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1461	1529	computeAOItem.addActionListener(this);
1462	1530
..	..	@@ -1465,8 +1533,6 @@
1465	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1466	1534	mirrorItem.addActionListener(this);
1467	1535	menu.add("-");
1468		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1469		- memoryItem.addActionListener(this);
1470	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1471	1537	analyzeItem.addActionListener(this);
1472	1538	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1614,6 +1680,30 @@
1614	1680
1615	1681	makeSomething(shadow);
1616	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1617	1707
1618	1708	/**
1619	1709	* applyExample
..	..	@@ -2093,25 +2183,25 @@
2093	2183	Composite csg = new GroupLeaf();
2094	2184	csg.count = 5;
2095	2185	group(csg);
2096		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
2097	2187	csg.addChild(child);
2098	2188	child.addChild(csg);
2099	2189	} else
2100	2190	if (source == doubleItem)
2101	2191	{
2102		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
2103	2193	csg.count = 5;
2104	2194	group(csg);
2105		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
2106	2196	csg.addChild(child);
2107	2197	child.addChild(csg);
2108		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
2109	2199	csg.addChild(child);
2110	2200	child.addChild(csg);
2111	2201	} else
2112	2202	if (source == tripleItem)
2113	2203	{
2114		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
2115	2205	csg.count = 4;
2116	2206	group(csg);
2117	2207	Composite child = new cGroup();
..	..	@@ -2175,15 +2265,31 @@
2175	2265	} else
2176	2266	if (source == undoButton)
2177	2267	{
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2178	2271	Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
2179	2282	} else
2180	2283	if (source == redoButton)
2181	2284	{
	2285	+ // Go to next version
2182	2286	Redo();
2183	2287	} else
2184	2288	if (source == saveButton)
2185	2289	{
2186		- Save();
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
2187	2293	} else
2188	2294	if (source == oneStepButton)
2189	2295	{
..	..	@@ -2192,17 +2298,14 @@
2192	2298	} else
2193	2299	if (source == screenfitButton)
2194	2300	{
2195		- //Reload(lastConverter, lastFilename, true);
2196	2301	ScreenFit();
2197	2302	} else
2198	2303	if (source == screenfitpointButton)
2199	2304	{
2200		- //Reload(lastConverter, lastFilename, true);
2201	2305	ScreenFitPoint();
2202	2306	} else
2203	2307	if (source == snapobjectButton)
2204	2308	{
2205		- //Reload(lastConverter, lastFilename, true);
2206	2309	SnapObject();
2207	2310	} else
2208	2311	// if (event.getSource() == recompileButton)
..	..	@@ -2566,7 +2669,7 @@
2566	2669	{
2567	2670	StepAll();
2568	2671	} else
2569		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2570	2673	{
2571	2674	//int indices[] = jList.getSelectedIndices();
2572	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2726,15 +2829,28 @@
2726	2829	} else
2727	2830	if (source == ungroupItem \|\| source == ungroupButton)
2728	2831	{
2729		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2730	2834	for (int i=0; i<group.selection.size(); i++)
2731	2835	{
2732		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2733	2841	}
2734	2842
2735		- ClearSelection(false);
2736		-
2737		- refreshContents();
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2738	2854	} else
2739	2855	if (source == genUVItem)
2740	2856	{
..	..	@@ -3326,6 +3442,12 @@
3326	3442	} else
3327	3443	if (source == editItem \|\| source == editButton)
3328	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
3329	3451	EditSelection(false);
3330	3452	} else
3331	3453	if (source == uneditButton)
..	..	@@ -3335,6 +3457,7 @@
3335	3457	Object3D child = (Object3D)e.nextElement();
3336	3458	if(child.editWindow != null)
3337	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
3338	3461	child.CloseUI();
3339	3462	listUI.remove(child);
3340	3463
..	..	@@ -3351,6 +3474,7 @@
3351	3474	//copy.ClearUI();
3352	3475	for (Object3D obj : listUI)
3353	3476	{
	3477	+ obj.pinned = false;
3354	3478	obj.CloseUI();
3355	3479	}
3356	3480	listUI.clear();
..	..	@@ -3360,7 +3484,7 @@
3360	3484	{
3361	3485	assert(copy == group);
3362	3486
3363		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3364	3488
3365	3489	for (Object3D obj : listUI)
3366	3490	{
..	..	@@ -3409,6 +3533,9 @@
3409	3533	}
3410	3534
3411	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3412	3539	//Globals.theRenderer.object = group;
3413	3540	if(!useclient)
3414	3541	{
..	..	@@ -3435,6 +3562,13 @@
3435	3562	currentLayout = sevenButton;
3436	3563	*/
3437	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
3438	3572	keepparent = group.parent;
3439	3573	// PARENT = NULL or not???
3440	3574	//group.parent = null; // ROOT
..	..	@@ -4502,12 +4636,14 @@
4502	4636	// }
4503	4637	// }
4504	4638
4505		- static boolean allparams = true;
4506		-
4507		- static Vector<Object3D> listUI = new Vector<Object3D>();
4508		-
4509	4639	void EditSelection(boolean newWindow)
4510	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4511	4647	// aConstraints.gridy = 0;
4512	4648	for (int i=0; i<group.selection.size(); i++)
4513	4649	{
..	..	@@ -4518,12 +4654,7 @@
4518	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4519	4655	if(elem != group \|\| !newWindow)
4520	4656	{
4521		- // if (!(elem instanceof Composite))
4522		- // newWindow = false;
4523		- listUI.add(elem);
4524		- elem.openEditWindow(this, newWindow); //, false);
4525		- System.out.println("edit : " + elem);
4526		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4527	4658	}
4528	4659	}
4529	4660	}
..	..	@@ -4598,7 +4729,8 @@
4598	4729	//new Exception().printStackTrace();
4599	4730
4600	4731	freezemodel = true;
4601		-
	4732	+ ClearUnpinned();
	4733	+
4602	4734	/**/
4603	4735	//switch (event.id)
4604	4736	{
..	..	@@ -4631,7 +4763,7 @@
4631	4763	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4632	4764	// a camera
4633	4765	{
4634		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4635	4767	{
4636	4768	CameraPane.camerachangeframe = 0; // don't refuse it
4637	4769	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4640,6 +4772,13 @@
4640	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4641	4773	}
4642	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4643	4782	refreshContents();
4644	4783	//return true;
4645	4784	}
..	..	@@ -4649,10 +4788,18 @@
4649	4788	freezemodel = false;
4650	4789	}
4651	4790
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
4652	4799	void refreshContents(boolean cp)
4653	4800	{
4654	4801	if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4656	4803	{
4657	4804	objEditor.ClearInfo(); // .GetMaterial());
4658	4805
..	..	@@ -4751,8 +4898,8 @@
4751	4898
4752	4899	if (cut)
4753	4900	{
4754		- if (Globals.SAVEONMAKE)
4755		- Save();
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4756	4903	//int indices[] = jList.getSelectedIndices();
4757	4904	//for (int i = indices.length - 1; i >= 0; i--)
4758	4905	//jList.remove(indices[i]);
..	..	@@ -4855,6 +5002,10 @@
4855	5002
4856	5003	void paste(boolean expand)
4857	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4858	5009	// if (GrafreeD.clipboard == null)
4859	5010	// return;
4860	5011	boolean first = true;
..	..	@@ -4914,6 +5065,7 @@
4914	5065	Grafreed.clipboard.get(0).parent = keepparent;
4915	5066	}
4916	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4917	5069	ResetModel();
4918	5070	refreshContents();
4919	5071	}
..	..	@@ -5049,6 +5201,10 @@
5049	5201
5050	5202	void group(Object3D csg, boolean grab)
5051	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
5052	5208	if (//false) // why??
5053	5209	!group.selection.isEmpty())
5054	5210	{
..	..	@@ -5162,10 +5318,15 @@
5162	5318	//node.add(csg);
5163	5319	//makeSomething(node);
5164	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
5165	5322	}
5166	5323
5167	5324	void Ungroup(Object3D g)
5168	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
5169	5330	if (g instanceof HiddenObject)
5170	5331	{
5171	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -5182,6 +5343,7 @@
5182	5343	objEditor.makeSomething(g.get(i), false);
5183	5344	}
5184	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
5185	5347	}
5186	5348
5187	5349	void ungroup()
..	..	@@ -5472,11 +5634,6 @@
5472	5634
5473	5635	cButton restoreCameraButton;
5474	5636
5475		- cButton minButton;
5476		- cButton maxButton;
5477		- cButton fullButton;
5478		- cButton undoButton;
5479		- cButton redoButton;
5480	5637	cButton saveButton;
5481	5638	cButton oneStepButton;
5482	5639
..	..	@@ -5550,7 +5707,7 @@
5550	5707	private MenuItem pasteLinkItem;
5551	5708	private MenuItem pasteCloneItem;
5552	5709	private MenuItem pasteExpandItem;
5553		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5554	5711	private MenuItem clearAllItem;
5555	5712	private MenuItem genUVItem;
5556	5713	private MenuItem genNormalsMESHItem;