~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"));
..	..	@@ -508,10 +528,15 @@
508	528	attachBumpItem.addActionListener(this);
509	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
511	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	533	detachPigmentItem.addActionListener(this);
513	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
515	540	menu.add("-");
516	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	542	sortbysizeItem.addActionListener(this);
..	..	@@ -538,6 +563,7 @@
538	563	buildToolsMenu(menu);
539	564	}
540	565
	566	+
541	567	void SetupUI2(ObjEditor oe)
542	568	{
543	569	// June 2019
..	..	@@ -582,7 +608,7 @@
582	608	*/
583	609	cGridBag copyOptionsPanel = new cGridBag();
584	610
585		- copyOptionsPanel.preferredHeight = 2;
	611	+ copyOptionsPanel.preferredHeight = 1;
586	612
587	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	614
..	..	@@ -590,50 +616,66 @@
590	616	//minButton.setToolTipText("Minimize window");
591	617	//minButton.addActionListener(this);
592	618
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
596	625
597	626	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	627	fullButton.setToolTipText("Full-screen window");
599	628	fullButton.addActionListener(this);
600	629
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
601	634	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	635	restoreCameraButton.setToolTipText("Restore viewpoint");
603	636	restoreCameraButton.addActionListener(this);
604	637
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
	640	+ saveButton.addActionListener(this);
	641	+
605	642	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
	643	+ undoButton.setToolTipText("Previous version");
607	644	undoButton.addActionListener(this);
608	645	undoButton.setEnabled(false);
609	646
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
610	660	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
	661	+ redoButton.setToolTipText("Next version");
612	662	redoButton.addActionListener(this);
613	663	redoButton.setEnabled(false);
614	664
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
618		-
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620	666	liveCB.setToolTipText("Enable animation");
621	667	liveCB.addItemListener(this);
622	668
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	670	oneStepButton.setToolTipText("Animate one step forward");
625	671	oneStepButton.addActionListener(this);
626	672
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	674	fastCB.setToolTipText("Fast mode");
629	675	fastCB.addItemListener(this);
630	676
631	677	//oe.toolboxPanel.Return();
632	678
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	679	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	680	// trackCB.setToolTipText("Enable tracking");
639	681	// trackCB.addItemListener(this);
..	..	@@ -650,27 +692,28 @@
650	692
651	693	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	694
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
655		- twoButton.addActionListener(this);
656		- this.fullscreenLayout = twoButton;
657		-
658	695	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659	696	fourButton.addActionListener(this);
660	697	fourButton.setToolTipText("Show left panel only");
	698	+
	699	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show right view only");
	701	+ twoButton.addActionListener(this);
	702	+ this.fullscreenLayout = twoButton;
	703	+
661	704	oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
	705	+ sixButton.setToolTipText("Show left and right");
663	706	sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
666		- threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
	707	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+// threeButton.setToolTipText("2-column layout right");
	709	+// threeButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
670	713	//
671	714
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
674	717	rootButton.addActionListener(this);
675	718
676	719	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -726,7 +769,7 @@
726	769	compositeButton.addActionListener(this);
727	770
728	771	oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	772	+ switchButton.setToolTipText("Create item switcher");
730	773	switchButton.addActionListener(this);
731	774
732	775	oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -758,16 +801,16 @@
758	801	}
759	802
760	803	// EDIT panel
761		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762		- editButton.setToolTipText("Edit selection");
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
763	806	editButton.addActionListener(this);
764	807
765		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Unedit selection");
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
767	810	uneditButton.addActionListener(this);
768	811
769	812	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Edit all params");
	813	+ allParamsButton.setToolTipText("Show all controle");
771	814	allParamsButton.addActionListener(this);
772	815
773	816	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -784,6 +827,7 @@
784	827
785	828	editCommandsPanel.preferredHeight = 1;
786	829
	830	+ SetPinStates(false);
787	831	// oe.treePanel.add(commandsPanel);
788	832	// oe.treePanel.Return();
789	833
..	..	@@ -810,6 +854,9 @@
810	854
811	855	oe.treePanel.add(copyOptionsPanel);
812	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
813	860
814	861	// mainPanel.setDividerLocation(0.5); //1.0);
815	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -832,7 +879,7 @@
832	879	dgr.addDragGestureListener(this);
833	880	}catch(Exception e) {}
834	881	*/
835		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
836	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
837	884	}
838	885
..	..	@@ -857,14 +904,18 @@
857	904	boxCB.addItemListener(this);
858	905
859	906	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
861	908	zoomBoxCB.addItemListener(this);
862	909
863	910	if (true) // Globals.ADVANCED)
864	911	{
865		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866		- supportCB.setToolTipText("Enable rigging");
867		- supportCB.addItemListener(this);
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
868	919
869	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870	921	// localCB.addItemListener(this);
..	..	@@ -919,7 +970,7 @@
919	970	oeilCB.addItemListener(this);
920	971
921	972	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922		- shadowCB.setToolTipText("Compute shadows when live");
	973	+ shadowCB.setToolTipText("When live compute shadows");
923	974	shadowCB.addItemListener(this);
924	975
925	976	panel.Return();
..	..	@@ -928,12 +979,12 @@
928	979	toggleTextureCB.addItemListener(this);
929	980
930	981	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931		- toggleSwitchCB.setToolTipText("Use switch");
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
932	983	toggleSwitchCB.addItemListener(this);
933	984
934		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935		- autosaveCB.setToolTipText("Auto-save on structure change");
936		- autosaveCB.addItemListener(this);
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
937	988
938	989	panel.Return();
939	990	if (Globals.ADVANCED)
..	..	@@ -962,7 +1013,7 @@
962	1013	{
963	1014	cRadio radioButton = new cRadio(obj.name);
964	1015
965		- // Patch to avoid bug with transparency.
	1016	+ // June 2019. Patch to avoid bug with transparency.
966	1017	radioButton.hadMaterial = obj.material != null;
967	1018	if (!radioButton.hadMaterial)
968	1019	{
..	..	@@ -970,7 +1021,7 @@
970	1021	}
971	1022
972	1023	radioButton.SetObject(obj);
973		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
974	1025	radioButton.SetCamera(cameraView.renderCamera, false);
975	1026	radioButton.addActionListener(this);
976	1027	radioPanel.add(radioButton);
..	..	@@ -999,6 +1050,7 @@
999	1050	cCheckBox slowCB;
1000	1051	cCheckBox boxCB;
1001	1052	cCheckBox zoomBoxCB;
	1053	+ cCheckBox freezeCB;
1002	1054	//cToggleButton trackCB;
1003	1055	cCheckBox trackCB;
1004	1056	cCheckBox smoothfocusCB;
..	..	@@ -1009,7 +1061,7 @@
1009	1061
1010	1062	cCheckBox oeilCB;
1011	1063	cCheckBox shadowCB;
1012		- cCheckBox autosaveCB;
	1064	+ cCheckBox autokeepCB;
1013	1065	cCheckBox lookAtCB;
1014	1066
1015	1067	// static int COLOR = 1;
..	..	@@ -1117,9 +1169,13 @@
1117	1169	{
1118	1170	Globals.COMPUTESHADOWWHENLIVE ^= true;
1119	1171	}
1120		- else if(e.getSource() == autosaveCB)
	1172	+ else if(e.getSource() == freezeCB)
1121	1173	{
1122		- Globals.SAVEONMAKE ^= true;
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
1123	1179	}
1124	1180	else if(e.getSource() == lookAtCB)
1125	1181	{
..	..	@@ -1201,8 +1257,6 @@
1201	1257	}
1202	1258	}
1203	1259
1204		- String string = (String) object;
1205		-
1206	1260	System.out.println("Transfer = " + object + "; drop : " + target);
1207	1261	// if( object instanceof java.io.File[])
1208	1262	// {
..	..	@@ -1210,6 +1264,8 @@
1210	1264	// objEditor.DropFile((java.io.File[]) object, true);
1211	1265	// return;
1212	1266	// }
	1267	+
	1268	+ String string = object.toString();
1213	1269
1214	1270	// File path for Mac and Windows
1215	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1459,6 +1515,9 @@
1459	1515	animationItem.addItemListener(this);
1460	1516	animationItem.setState(Globals.ANIMATION);
1461	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1462	1521	menu.add("-");
1463	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1464	1523	parseverticesItem.addActionListener(this);
..	..	@@ -1471,6 +1530,8 @@
1471	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1472	1531	reduce34MorphItem.addActionListener(this);
1473	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1474	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1475	1536	computeAOItem.addActionListener(this);
1476	1537
..	..	@@ -1479,8 +1540,6 @@
1479	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480	1541	mirrorItem.addActionListener(this);
1481	1542	menu.add("-");
1482		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1483		- memoryItem.addActionListener(this);
1484	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1485	1544	analyzeItem.addActionListener(this);
1486	1545	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1628,6 +1687,30 @@
1628	1687
1629	1688	makeSomething(shadow);
1630	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1631	1714
1632	1715	/**
1633	1716	* applyExample
..	..	@@ -2107,25 +2190,25 @@
2107	2190	Composite csg = new GroupLeaf();
2108	2191	csg.count = 5;
2109	2192	group(csg);
2110		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
2111	2194	csg.addChild(child);
2112	2195	child.addChild(csg);
2113	2196	} else
2114	2197	if (source == doubleItem)
2115	2198	{
2116		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
2117	2200	csg.count = 5;
2118	2201	group(csg);
2119		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
2120	2203	csg.addChild(child);
2121	2204	child.addChild(csg);
2122		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
2123	2206	csg.addChild(child);
2124	2207	child.addChild(csg);
2125	2208	} else
2126	2209	if (source == tripleItem)
2127	2210	{
2128		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
2129	2212	csg.count = 4;
2130	2213	group(csg);
2131	2214	Composite child = new cGroup();
..	..	@@ -2189,15 +2272,31 @@
2189	2272	} else
2190	2273	if (source == undoButton)
2191	2274	{
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2192	2278	Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
2193	2289	} else
2194	2290	if (source == redoButton)
2195	2291	{
	2292	+ // Go to next version
2196	2293	Redo();
2197	2294	} else
2198	2295	if (source == saveButton)
2199	2296	{
2200		- Save();
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
2201	2300	} else
2202	2301	if (source == oneStepButton)
2203	2302	{
..	..	@@ -2206,17 +2305,14 @@
2206	2305	} else
2207	2306	if (source == screenfitButton)
2208	2307	{
2209		- //Reload(lastConverter, lastFilename, true);
2210	2308	ScreenFit();
2211	2309	} else
2212	2310	if (source == screenfitpointButton)
2213	2311	{
2214		- //Reload(lastConverter, lastFilename, true);
2215	2312	ScreenFitPoint();
2216	2313	} else
2217	2314	if (source == snapobjectButton)
2218	2315	{
2219		- //Reload(lastConverter, lastFilename, true);
2220	2316	SnapObject();
2221	2317	} else
2222	2318	// if (event.getSource() == recompileButton)
..	..	@@ -2580,7 +2676,7 @@
2580	2676	{
2581	2677	StepAll();
2582	2678	} else
2583		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2584	2680	{
2585	2681	//int indices[] = jList.getSelectedIndices();
2586	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2740,15 +2836,28 @@
2740	2836	} else
2741	2837	if (source == ungroupItem \|\| source == ungroupButton)
2742	2838	{
2743		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2744	2841	for (int i=0; i<group.selection.size(); i++)
2745	2842	{
2746		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2747	2848	}
2748	2849
2749		- ClearSelection(false);
2750		-
2751		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2752	2861	} else
2753	2862	if (source == genUVItem)
2754	2863	{
..	..	@@ -3049,7 +3158,7 @@
3049	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3050	3159	{
3051	3160	obj = (Object3D)e.nextElement();
3052		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
3053	3162	}
3054	3163
3055	3164	refreshContents();
..	..	@@ -3063,6 +3172,31 @@
3063	3172	obj.SetBumpTexture(obj.GetPigmentTexture());
3064	3173	}
3065	3174
	3175	+ refreshContents();
	3176	+ } else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
3066	3200	refreshContents();
3067	3201	} else
3068	3202	if (source == flashSelectionButton)
..	..	@@ -3372,7 +3506,7 @@
3372	3506	//copy.ClearUI();
3373	3507	for (Object3D obj : listUI)
3374	3508	{
3375		- obj.pinned = true;
	3509	+ obj.pinned = false;
3376	3510	obj.CloseUI();
3377	3511	}
3378	3512	listUI.clear();
..	..	@@ -3431,6 +3565,9 @@
3431	3565	}
3432	3566
3433	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3434	3571	//Globals.theRenderer.object = group;
3435	3572	if(!useclient)
3436	3573	{
..	..	@@ -3457,6 +3594,13 @@
3457	3594	currentLayout = sevenButton;
3458	3595	*/
3459	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
3460	3604	keepparent = group.parent;
3461	3605	// PARENT = NULL or not???
3462	3606	//group.parent = null; // ROOT
..	..	@@ -4049,7 +4193,7 @@
4049	4193
4050	4194	try
4051	4195	{
4052		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4053	4197	}
4054	4198	catch (Exception e)
4055	4199	{
..	..	@@ -4526,6 +4670,12 @@
4526	4670
4527	4671	void EditSelection(boolean newWindow)
4528	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4529	4679	// aConstraints.gridy = 0;
4530	4680	for (int i=0; i<group.selection.size(); i++)
4531	4681	{
..	..	@@ -4536,12 +4686,7 @@
4536	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4537	4687	if(elem != group \|\| !newWindow)
4538	4688	{
4539		- // if (!(elem instanceof Composite))
4540		- // newWindow = false;
4541		- listUI.add(elem);
4542		- elem.openEditWindow(this, newWindow); //, false);
4543		- System.out.println("edit : " + elem);
4544		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4545	4690	}
4546	4691	}
4547	4692	}
..	..	@@ -4616,17 +4761,7 @@
4616	4761	//new Exception().printStackTrace();
4617	4762
4618	4763	freezemodel = true;
4619		-
4620		- //for (Object3D obj : listUI)
4621		- for (int i=listUI.size(); --i>=0;)
4622		- {
4623		- Object3D obj = listUI.elementAt(i);
4624		- if (!obj.pinned)
4625		- {
4626		- obj.CloseUI();
4627		- listUI.remove(i);
4628		- }
4629		- }
	4764	+ ClearUnpinned();
4630	4765
4631	4766	/**/
4632	4767	//switch (event.id)
..	..	@@ -4689,12 +4824,14 @@
4689	4824	{
4690	4825	editButton.setEnabled(enabled);
4691	4826	uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
4692	4829	}
4693	4830
4694	4831	void refreshContents(boolean cp)
4695	4832	{
4696		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4698	4835	{
4699	4836	objEditor.ClearInfo(); // .GetMaterial());
4700	4837
..	..	@@ -4793,8 +4930,8 @@
4793	4930
4794	4931	if (cut)
4795	4932	{
4796		- if (Globals.SAVEONMAKE)
4797		- Save();
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4798	4935	//int indices[] = jList.getSelectedIndices();
4799	4936	//for (int i = indices.length - 1; i >= 0; i--)
4800	4937	//jList.remove(indices[i]);
..	..	@@ -4897,6 +5034,10 @@
4897	5034
4898	5035	void paste(boolean expand)
4899	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4900	5041	// if (GrafreeD.clipboard == null)
4901	5042	// return;
4902	5043	boolean first = true;
..	..	@@ -4956,6 +5097,7 @@
4956	5097	Grafreed.clipboard.get(0).parent = keepparent;
4957	5098	}
4958	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4959	5101	ResetModel();
4960	5102	refreshContents();
4961	5103	}
..	..	@@ -5091,6 +5233,10 @@
5091	5233
5092	5234	void group(Object3D csg, boolean grab)
5093	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
5094	5240	if (//false) // why??
5095	5241	!group.selection.isEmpty())
5096	5242	{
..	..	@@ -5204,10 +5350,15 @@
5204	5350	//node.add(csg);
5205	5351	//makeSomething(node);
5206	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
5207	5354	}
5208	5355
5209	5356	void Ungroup(Object3D g)
5210	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
5211	5362	if (g instanceof HiddenObject)
5212	5363	{
5213	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -5224,6 +5375,7 @@
5224	5375	objEditor.makeSomething(g.get(i), false);
5225	5376	}
5226	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
5227	5379	}
5228	5380
5229	5381	void ungroup()
..	..	@@ -5514,9 +5666,6 @@
5514	5666
5515	5667	cButton restoreCameraButton;
5516	5668
5517		- cButton minButton;
5518		- cButton maxButton;
5519		- cButton fullButton;
5520	5669	cButton saveButton;
5521	5670	cButton oneStepButton;
5522	5671
..	..	@@ -5590,7 +5739,7 @@
5590	5739	private MenuItem pasteLinkItem;
5591	5740	private MenuItem pasteCloneItem;
5592	5741	private MenuItem pasteExpandItem;
5593		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5594	5743	private MenuItem clearAllItem;
5595	5744	private MenuItem genUVItem;
5596	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5674,6 +5823,8 @@
5674	5823	private MenuItem attachBumpItem;
5675	5824	private MenuItem detachBumpItem;
5676	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5677	5828
5678	5829	private MenuItem particleItem;
5679	5830	private MenuItem ragdollItem;