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