~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,240 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("default", "skycube", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("park", "Stairs", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("penguins", "wrath", row5);
	152	+ AddSkyboxButton("penguins", "yonder", row5);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "Greenlands", row6);
	160	+ AddSkyboxButton("daz", "MountainTrail", row6);
	161	+ AddSkyboxButton("daz", "Oasis", row6);
	162	+ /*
	163	+Autumn
	164	+Greenlands
	165	+MountainTrail
	166	+Oasis
	167	+TheRock
	168	+TopOfTheWorld
	169	+Winter
	170	+ */
	171	+
	172	+ tab0.add(row0);
	173	+ tab0.add(row1);
	174	+ tab0.add(row2);
	175	+ tab0.add(row3);
	176	+ tab0.add(row4);
	177	+ tab0.add(row5);
	178	+ tab0.add(row6);
	179	+
	180	+ for (int i=5; --i>=0;)
	181	+ {
	182	+ //oe.toolboxPanel.Return();
	183	+ //tab0.add(new cGridBag());
	184	+ }
	185	+ }
	186	+
	187	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	188	+ {
	189	+ cGridBag tab0 = new cGridBag().setVertical(true);
	190	+
	191	+ tab0.setName("Night");
	192	+ skyboxpanel.add(tab0);
	193	+
	194	+ cGridBag row0 = new cGridBag();
	195	+ cGridBag row1 = new cGridBag();
	196	+ cGridBag row2 = new cGridBag();
	197	+ cGridBag row3 = new cGridBag();
	198	+ cGridBag row4 = new cGridBag();
	199	+ cGridBag row5 = new cGridBag();
	200	+ cGridBag row6 = new cGridBag();
	201	+
	202	+ AddSkyboxButton("night", "NightPath", row0);
	203	+ AddSkyboxButton("night", "PondNight", row0);
	204	+ AddSkyboxButton("night", "Powerlines", row0);
	205	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	206	+
	207	+ AddSkyboxButton("urban", "CNTower", row1);
	208	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	209	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	210	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	211	+
	212	+ AddSkyboxButton("penguins", "kenon_star", row2);
	213	+ AddSkyboxButton("indoors", "DallasW", row2);
	214	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	215	+ AddSkyboxButton("indoors", "Vasa", row2);
	216	+
	217	+ AddSkyboxButton("winter", "Backyard", row3);
	218	+ AddSkyboxButton("winter", "Creek", row3);
	219	+ AddSkyboxButton("winter", "FootballField3", row3);
	220	+ AddSkyboxButton("winter", "Forest", row3);
	221	+
	222	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	223	+ AddSkyboxButton("winter", "House", row4);
	224	+ AddSkyboxButton("winter", "IceLake", row4);
	225	+ AddSkyboxButton("winter", "IceRiver", row4);
	226	+
	227	+ AddSkyboxButton("winter", "Park3", row5);
	228	+ AddSkyboxButton("winter", "PondWinter", row5);
	229	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	230	+ AddSkyboxButton("winter", "Vindelalven", row5);
	231	+
	232	+ AddSkyboxButton("daz", "TheRock", row6);
	233	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	234	+ AddSkyboxButton("daz", "Winter", row6);
	235	+ AddSkyboxButton("penguins", "desertdawn", row6);
	236	+
	237	+ tab0.add(row0);
	238	+ tab0.add(row1);
	239	+ tab0.add(row2);
	240	+ tab0.add(row3);
	241	+ tab0.add(row4);
	242	+ tab0.add(row5);
	243	+ tab0.add(row6);
	244	+
	245	+ for (int i=5; --i>=0;)
	246	+ {
	247	+ //oe.toolboxPanel.Return();
	248	+ //tab0.add(new cGridBag());
	249	+ }
	250	+ }
	251	+
	252	+ public void ChangeSkybox(String name)
	253	+ {
	254	+ //cameraView.envyoff = false;
	255	+ group.skyboxname = name;
	256	+ group.skyboxext = "jpg";
	257	+ cameraView.repaint();
	258	+ }
	259	+
26	260	//ObjEditor objEditor;
27	261	public void closeUI2()
28	262	{
..	..	@@ -60,6 +294,12 @@
60	294	this.copy = this.group = group;
61	295	//selectees = this.group.selectees;
62	296
	297	+ if (copy.versions == null)
	298	+ {
	299	+ copy.versions = new byte[100][];
	300	+ copy.versionindex = -1;
	301	+ }
	302	+
63	303	if(ui)
64	304	SetupUI(objEditor);
65	305	}
..	..	@@ -80,10 +320,22 @@
80	320	SetupViews(objEditor);
81	321
82	322	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	323	+
	324	+ if (copy.versions == null)
	325	+ {
	326	+ copy.versions = new byte[100][];
	327	+ copy.versionindex = -1;
	328	+
	329	+ Save(true);
	330	+ }
83	331	}
84	332
85	333	void CloneSelection(boolean supports)
86	334	{
	335	+ if (Globals.REPLACEONMAKE)
	336	+ Save();
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
87	339	// Object3D keep = GrafreeD.clipboard;
88	340	//Object3D obj;
89	341	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +346,7 @@
94	346
95	347	makeSomething(clone, i==group.selection.size()-1);
96	348	}
	349	+ Globals.REPLACEONMAKE = keep;
97	350	}
98	351
99	352	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +442,8 @@
189	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	443	// pasteExpandItem.addActionListener(this);
191	444	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
194	447
195	448	if (Globals.ADVANCED)
196	449	{
..	..	@@ -220,7 +473,7 @@
220	473	// toggleSwitchItem.addItemListener(this);
221	474	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	475
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	476	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	477	toggleHandleItem.addItemListener(this);
225	478	toggleHandleItem.setState(CameraPane.HANDLES);
226	479
..	..	@@ -380,13 +633,14 @@
380	633	shadowYItem.addActionListener(this);
381	634	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
383	639	if (Globals.ADVANCED)
384	640	{
385	641	menu.add("-");
386	642	linkerItem = menu.add(new MenuItem("Linker"));
387	643	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	644	templateItem = menu.add(new MenuItem("Template"));
391	645	templateItem.addActionListener(this);
392	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +669,7 @@
415	669	genNormalsMESHItem.addActionListener(this);
416	670	if (Globals.ADVANCED)
417	671	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	673	genNormalsMINEItem.addActionListener(this);
420	674	}
421	675	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +762,15 @@
508	762	attachBumpItem.addActionListener(this);
509	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
511	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	767	detachPigmentItem.addActionListener(this);
513	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	769	detachBumpItem.addActionListener(this);
	770	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	771	+ embedTexturesItem.addActionListener(this);
	772	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	773	+ deEmbedTexturesItem.addActionListener(this);
515	774	menu.add("-");
516	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	776	sortbysizeItem.addActionListener(this);
..	..	@@ -538,6 +797,7 @@
538	797	buildToolsMenu(menu);
539	798	}
540	799
	800	+
541	801	void SetupUI2(ObjEditor oe)
542	802	{
543	803	// June 2019
..	..	@@ -590,48 +850,66 @@
590	850	//minButton.setToolTipText("Minimize window");
591	851	//minButton.addActionListener(this);
592	852
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	853	+ if (Globals.ADVANCED)
	854	+ {
	855	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	856	+ maxButton.setToolTipText("Maximize window");
	857	+ maxButton.addActionListener(this);
	858	+ }
596	859
597	860	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	861	fullButton.setToolTipText("Full-screen window");
599	862	fullButton.addActionListener(this);
600	863
	864	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	865	+ screenfitButton.setToolTipText("Screen fit");
	866	+ screenfitButton.addActionListener(this);
	867	+
601	868	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	869	restoreCameraButton.setToolTipText("Restore viewpoint");
603	870	restoreCameraButton.addActionListener(this);
604	871
	872	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	873	+ saveButton.setToolTipText("New version");
	874	+ saveButton.addActionListener(this);
	875	+
605	876	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
	877	+ undoButton.setToolTipText("Previous version");
607	878	undoButton.addActionListener(this);
	879	+ undoButton.setEnabled(false);
	880	+
	881	+ cGridBag updown = new cGridBag().setVertical(true);
	882	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	883	+ restoreButton.setToolTipText("Restore current");
	884	+ restoreButton.addActionListener(this);
	885	+ restoreButton.setEnabled(false);
	886	+
	887	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	888	+ replaceButton.setToolTipText("Replace current");
	889	+ replaceButton.addActionListener(this);
	890	+ replaceButton.setEnabled(false);
	891	+
	892	+ copyOptionsPanel.add(updown);
608	893
609	894	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610		- redoButton.setToolTipText("Redo changes");
	895	+ redoButton.setToolTipText("Next version");
611	896	redoButton.addActionListener(this);
	897	+ redoButton.setEnabled(false);
612	898
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);
	899	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
618	900	liveCB.setToolTipText("Enable animation");
619	901	liveCB.addItemListener(this);
620	902
621		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	904	oneStepButton.setToolTipText("Animate one step forward");
623	905	oneStepButton.addActionListener(this);
624	906
625		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626	908	fastCB.setToolTipText("Fast mode");
627	909	fastCB.addItemListener(this);
628	910
629	911	//oe.toolboxPanel.Return();
630	912
631		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- screenfitButton.setToolTipText("Screen fit");
633		- screenfitButton.addActionListener(this);
634		-
635	913	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636	914	// trackCB.setToolTipText("Enable tracking");
637	915	// trackCB.addItemListener(this);
..	..	@@ -644,31 +922,32 @@
644	922	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645	923	snapobjectButton.addActionListener(this);
646	924	snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ fourButton.addActionListener(this);
	928	+ fourButton.setToolTipText("Show control panel only");
647	929	}
648	930
649	931	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
650	932
651		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- twoButton.setToolTipText("Show center view only");
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
653	935	twoButton.addActionListener(this);
654	936	this.fullscreenLayout = twoButton;
655	937
656		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- fourButton.addActionListener(this);
658		- fourButton.setToolTipText("Show left panel only");
659		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
660		- sixButton.setToolTipText("2-column layout left");
661		- sixButton.addActionListener(this);
662		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- threeButton.setToolTipText("2-column layout right");
	938	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ threeButton.setToolTipText("Show controls and 3D view");
664	940	threeButton.addActionListener(this);
665		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sevenButton.setToolTipText("3-column layout");
667		- sevenButton.addActionListener(this);
	941	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ sixButton.setToolTipText("Show 3D view and controls");
	943	+ sixButton.addActionListener(this);
	944	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+// sevenButton.setToolTipText("3-column layout");
	946	+// sevenButton.addActionListener(this);
668	947	//
669	948
670		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- rootButton.setToolTipText("Edit selection in new tab");
	949	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ rootButton.setToolTipText("Open selection in new tab");
672	951	rootButton.addActionListener(this);
673	952
674	953	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -677,28 +956,30 @@
677	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
678	957	//clearButton.addActionListener(this);
679	958
	959	+ cGridBag row1 = new cGridBag();
	960	+
680	961	// INSERT
681		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	963	gridButton.setToolTipText("Create grid");
683	964	gridButton.addActionListener(this);
684	965
685		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	966	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	967	boxButton.setToolTipText("Create box");
687	968	boxButton.addActionListener(this);
688	969
689		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	970	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
690	971	sphereButton.setToolTipText("Create sphere");
691	972	sphereButton.addActionListener(this);
692	973
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	975	coneButton.setToolTipText("Create cone");
695	976	coneButton.addActionListener(this);
696	977
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	978	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	979	torusButton.setToolTipText("Create torus");
699	980	torusButton.addActionListener(this);
700	981
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	983	superButton.setToolTipText("Create superellipsoid");
703	984	superButton.addActionListener(this);
704	985
..	..	@@ -709,51 +990,68 @@
709	990	kleinButton.addActionListener(this);
710	991	}
711	992
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	993	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	994	particlesButton.setToolTipText("Create particle system");
714	995	particlesButton.addActionListener(this);
715	996
716		- oe.toolboxPanel.Return();
	997	+ oe.toolboxPanel.add(row1);
717	998
718		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ cGridBag row2 = new cGridBag();
	1000	+
	1001	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1002	groupButton.setToolTipText("Create group");
720	1003	groupButton.addActionListener(this);
721	1004
722		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1005	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1006	compositeButton.setToolTipText("Create composite");
724	1007	compositeButton.addActionListener(this);
725	1008
726		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- switchButton.setToolTipText("Create switch");
	1009	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1010	+ switchButton.setToolTipText("Create item switcher");
728	1011	switchButton.addActionListener(this);
729	1012
730		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1014	loopButton.setToolTipText("Create loop");
732	1015	loopButton.addActionListener(this);
733	1016
734		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1017	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1018	textureButton.setToolTipText("Create texture");
736	1019	textureButton.addActionListener(this);
737	1020
738		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1022	overlayButton.setToolTipText("Create overlay");
740	1023	overlayButton.addActionListener(this);
741	1024
742		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	1026	lightButton.setToolTipText("Create light");
744	1027	lightButton.addActionListener(this);
745	1028
	1029	+ oe.toolboxPanel.add(row2);
	1030	+
	1031	+ // ENVYMAPS
	1032	+ cGridBag skyboxpane = new cGridBag();
	1033	+ skyboxpane.preferredHeight = 100;
	1034	+
	1035	+ oe.toolboxPanel.add(skyboxpane);
	1036	+
	1037	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1038	+ skyboxpane.add(skyboxpanel);
	1039	+
	1040	+ AddSkyboxTab0(skyboxpanel);
	1041	+ AddSkyboxTab1(skyboxpanel);
	1042	+ AddSkyboxTab2(skyboxpanel);
	1043	+
746	1044	// EDIT panel
747		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748		- editButton.setToolTipText("Edit selection");
	1045	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ editButton.setToolTipText("Pin selection controls");
749	1047	editButton.addActionListener(this);
750	1048
751		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752		- uneditButton.setToolTipText("Unedit selection");
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
753	1051	uneditButton.addActionListener(this);
754	1052
755	1053	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756		- allParamsButton.setToolTipText("Edit all params");
	1054	+ allParamsButton.setToolTipText("Show all controle");
757	1055	allParamsButton.addActionListener(this);
758	1056
759	1057	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -770,6 +1068,7 @@
770	1068
771	1069	editCommandsPanel.preferredHeight = 1;
772	1070
	1071	+ SetPinStates(false);
773	1072	// oe.treePanel.add(commandsPanel);
774	1073	// oe.treePanel.Return();
775	1074
..	..	@@ -796,9 +1095,12 @@
796	1095
797	1096	oe.treePanel.add(copyOptionsPanel);
798	1097	oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
799	1101
800		-// mainPanel.setDividerLocation(0.5); //1.0);
801		-// mainPanel.setResizeWeight(0.5);
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
802	1104
803	1105	//jList.addListSelectionListener(this);
804	1106	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -806,7 +1108,7 @@
806	1108	//jTree.setEditable(true);
807	1109	oe.jTree.setDragEnabled(true);
808	1110	//jTree.setPreferredSize(new Dimension(10,10));
809		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
810	1112
811	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
812	1114
..	..	@@ -818,7 +1120,7 @@
818	1120	dgr.addDragGestureListener(this);
819	1121	}catch(Exception e) {}
820	1122	*/
821		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
822	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
823	1125	}
824	1126
..	..	@@ -843,14 +1145,18 @@
843	1145	boxCB.addItemListener(this);
844	1146
845	1147	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
847	1149	zoomBoxCB.addItemListener(this);
848	1150
849	1151	if (true) // Globals.ADVANCED)
850	1152	{
851		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852		- supportCB.setToolTipText("Enable rigging");
853		- supportCB.addItemListener(this);
	1153	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1154	+// supportCB.setToolTipText("Enable rigging");
	1155	+// supportCB.addItemListener(this);
	1156	+
	1157	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1158	+ freezeCB.setToolTipText("Fast moving camera");
	1159	+ freezeCB.addItemListener(this);
854	1160
855	1161	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856	1162	// localCB.addItemListener(this);
..	..	@@ -905,7 +1211,7 @@
905	1211	oeilCB.addItemListener(this);
906	1212
907	1213	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908		- shadowCB.setToolTipText("Compute shadows when live");
	1214	+ shadowCB.setToolTipText("When live compute shadows");
909	1215	shadowCB.addItemListener(this);
910	1216
911	1217	panel.Return();
..	..	@@ -914,12 +1220,12 @@
914	1220	toggleTextureCB.addItemListener(this);
915	1221
916	1222	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917		- toggleSwitchCB.setToolTipText("Use switch");
	1223	+ toggleSwitchCB.setToolTipText("Choose a single item");
918	1224	toggleSwitchCB.addItemListener(this);
919	1225
920		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921		- autosaveCB.setToolTipText("Auto-save on structure change");
922		- autosaveCB.addItemListener(this);
	1226	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1227	+ autokeepCB.setToolTipText("On structure change");
	1228	+ autokeepCB.addItemListener(this);
923	1229
924	1230	panel.Return();
925	1231	if (Globals.ADVANCED)
..	..	@@ -948,7 +1254,7 @@
948	1254	{
949	1255	cRadio radioButton = new cRadio(obj.name);
950	1256
951		- // Patch to avoid bug with transparency.
	1257	+ // June 2019. Patch to avoid bug with transparency.
952	1258	radioButton.hadMaterial = obj.material != null;
953	1259	if (!radioButton.hadMaterial)
954	1260	{
..	..	@@ -956,7 +1262,7 @@
956	1262	}
957	1263
958	1264	radioButton.SetObject(obj);
959		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
960	1266	radioButton.SetCamera(cameraView.renderCamera, false);
961	1267	radioButton.addActionListener(this);
962	1268	radioPanel.add(radioButton);
..	..	@@ -985,6 +1291,7 @@
985	1291	cCheckBox slowCB;
986	1292	cCheckBox boxCB;
987	1293	cCheckBox zoomBoxCB;
	1294	+ cCheckBox freezeCB;
988	1295	//cToggleButton trackCB;
989	1296	cCheckBox trackCB;
990	1297	cCheckBox smoothfocusCB;
..	..	@@ -995,7 +1302,7 @@
995	1302
996	1303	cCheckBox oeilCB;
997	1304	cCheckBox shadowCB;
998		- cCheckBox autosaveCB;
	1305	+ cCheckBox autokeepCB;
999	1306	cCheckBox lookAtCB;
1000	1307
1001	1308	// static int COLOR = 1;
..	..	@@ -1103,9 +1410,13 @@
1103	1410	{
1104	1411	Globals.COMPUTESHADOWWHENLIVE ^= true;
1105	1412	}
1106		- else if(e.getSource() == autosaveCB)
	1413	+ else if(e.getSource() == freezeCB)
1107	1414	{
1108		- Globals.SAVEONMAKE ^= true;
	1415	+ Globals.FREEZEONMOVE ^= true;
	1416	+ }
	1417	+ else if(e.getSource() == autokeepCB)
	1418	+ {
	1419	+ Globals.REPLACEONMAKE ^= true;
1109	1420	}
1110	1421	else if(e.getSource() == lookAtCB)
1111	1422	{
..	..	@@ -1187,8 +1498,6 @@
1187	1498	}
1188	1499	}
1189	1500
1190		- String string = (String) object;
1191		-
1192	1501	System.out.println("Transfer = " + object + "; drop : " + target);
1193	1502	// if( object instanceof java.io.File[])
1194	1503	// {
..	..	@@ -1196,6 +1505,8 @@
1196	1505	// objEditor.DropFile((java.io.File[]) object, true);
1197	1506	// return;
1198	1507	// }
	1508	+
	1509	+ String string = object.toString();
1199	1510
1200	1511	// File path for Mac and Windows
1201	1512	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1445,6 +1756,9 @@
1445	1756	animationItem.addItemListener(this);
1446	1757	animationItem.setState(Globals.ANIMATION);
1447	1758
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
	1761	+
1448	1762	menu.add("-");
1449	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1450	1764	parseverticesItem.addActionListener(this);
..	..	@@ -1457,6 +1771,8 @@
1457	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1458	1772	reduce34MorphItem.addActionListener(this);
1459	1773	menu.add("-");
	1774	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1775	+ memoryItem.addActionListener(this);
1460	1776	menu.add(computeAOItem = new MenuItem("Compute AO"));
1461	1777	computeAOItem.addActionListener(this);
1462	1778
..	..	@@ -1465,8 +1781,6 @@
1465	1781	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1466	1782	mirrorItem.addActionListener(this);
1467	1783	menu.add("-");
1468		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1469		- memoryItem.addActionListener(this);
1470	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1471	1785	analyzeItem.addActionListener(this);
1472	1786	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1614,6 +1928,30 @@
1614	1928
1615	1929	makeSomething(shadow);
1616	1930	}
	1931	+
	1932	+ private void ClearUnpinned()
	1933	+ {
	1934	+ //for (Object3D obj : listUI)
	1935	+ for (int i=listUI.size(); --i>=0;)
	1936	+ {
	1937	+ Object3D obj = listUI.elementAt(i);
	1938	+ if (!obj.pinned)
	1939	+ {
	1940	+ obj.CloseUI();
	1941	+ listUI.remove(i);
	1942	+ }
	1943	+ }
	1944	+ }
	1945	+
	1946	+ private void EditElement(Object3D elem, boolean newWindow)
	1947	+ {
	1948	+ // if (!(elem instanceof Composite))
	1949	+ // newWindow = false;
	1950	+ listUI.add(elem);
	1951	+ elem.openEditWindow(this, newWindow); //, false);
	1952	+ System.out.println("edit : " + elem);
	1953	+ elem.editWindow.refreshContents(true); // ? new
	1954	+ }
1617	1955
1618	1956	/**
1619	1957	* applyExample
..	..	@@ -2042,6 +2380,23 @@
2042	2380	{
2043	2381	makeSomething(new Light());
2044	2382	} else
	2383	+// if (source == skybox1Button \|\|
	2384	+// source == skybox2Button \|\|
	2385	+// source == skybox3Button \|\|
	2386	+// source == skybox4Button \|\|
	2387	+// source == skybox5Button \|\|
	2388	+// source == skybox6Button \|\|
	2389	+// source == skybox7Button \|\|
	2390	+// source == skybox11Button \|\|
	2391	+// source == skybox12Button \|\|
	2392	+// source == skybox13Button \|\|
	2393	+// source == skybox14Button \|\|
	2394	+// source == skybox15Button \|\|
	2395	+// source == skybox16Button \|\|
	2396	+// source == skybox17Button)
	2397	+// {
	2398	+// ChangeSkybox(source);
	2399	+// } else
2045	2400	if (source == csgItem)
2046	2401	{
2047	2402	group(new CSG());
..	..	@@ -2093,25 +2448,25 @@
2093	2448	Composite csg = new GroupLeaf();
2094	2449	csg.count = 5;
2095	2450	group(csg);
2096		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
2097	2452	csg.addChild(child);
2098	2453	child.addChild(csg);
2099	2454	} else
2100	2455	if (source == doubleItem)
2101	2456	{
2102		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
2103	2458	csg.count = 5;
2104	2459	group(csg);
2105		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
2106	2461	csg.addChild(child);
2107	2462	child.addChild(csg);
2108		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
2109	2464	csg.addChild(child);
2110	2465	child.addChild(csg);
2111	2466	} else
2112	2467	if (source == tripleItem)
2113	2468	{
2114		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
2115	2470	csg.count = 4;
2116	2471	group(csg);
2117	2472	Composite child = new cGroup();
..	..	@@ -2127,7 +2482,7 @@
2127	2482	if (source == computeAOItem)
2128	2483	{
2129	2484	Globals.drawMode = CameraPane.OCCLUSION;
2130		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
2131	2486	} else
2132	2487	if (source == recompileItem)
2133	2488	{
..	..	@@ -2175,15 +2530,31 @@
2175	2530	} else
2176	2531	if (source == undoButton)
2177	2532	{
	2533	+ // Go to previous version
	2534	+ //if (!Undo())
	2535	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2178	2536	Undo();
	2537	+ } else
	2538	+ if (source == restoreButton)
	2539	+ {
	2540	+ // Restore current version
	2541	+ Restore();
	2542	+ } else
	2543	+ if (source == replaceButton)
	2544	+ {
	2545	+ // Overwrite current version
	2546	+ Replace();
2179	2547	} else
2180	2548	if (source == redoButton)
2181	2549	{
	2550	+ // Go to next version
2182	2551	Redo();
2183	2552	} else
2184	2553	if (source == saveButton)
2185	2554	{
2186		- Save();
	2555	+ // Save a new version
	2556	+ if (!Save(true))
	2557	+ java.awt.Toolkit.getDefaultToolkit().beep();
2187	2558	} else
2188	2559	if (source == oneStepButton)
2189	2560	{
..	..	@@ -2192,17 +2563,14 @@
2192	2563	} else
2193	2564	if (source == screenfitButton)
2194	2565	{
2195		- //Reload(lastConverter, lastFilename, true);
2196	2566	ScreenFit();
2197	2567	} else
2198	2568	if (source == screenfitpointButton)
2199	2569	{
2200		- //Reload(lastConverter, lastFilename, true);
2201	2570	ScreenFitPoint();
2202	2571	} else
2203	2572	if (source == snapobjectButton)
2204	2573	{
2205		- //Reload(lastConverter, lastFilename, true);
2206	2574	SnapObject();
2207	2575	} else
2208	2576	// if (event.getSource() == recompileButton)
..	..	@@ -2566,7 +2934,7 @@
2566	2934	{
2567	2935	StepAll();
2568	2936	} else
2569		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2570	2938	{
2571	2939	//int indices[] = jList.getSelectedIndices();
2572	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2726,15 +3094,28 @@
2726	3094	} else
2727	3095	if (source == ungroupItem \|\| source == ungroupButton)
2728	3096	{
2729		- //ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
2730	3099	for (int i=0; i<group.selection.size(); i++)
2731	3100	{
2732		- Ungroup(group.selection.get(i));
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
2733	3106	}
2734	3107
2735		- ClearSelection(false);
2736		-
2737		- refreshContents();
	3108	+ if (!hasRoot)
	3109	+ {
	3110	+ for (int i=0; i<group.selection.size(); i++)
	3111	+ {
	3112	+ Ungroup(group.selection.get(i));
	3113	+ }
	3114	+
	3115	+ ClearSelection(false);
	3116	+
	3117	+ refreshContents();
	3118	+ }
2738	3119	} else
2739	3120	if (source == genUVItem)
2740	3121	{
..	..	@@ -3035,7 +3416,7 @@
3035	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3036	3417	{
3037	3418	obj = (Object3D)e.nextElement();
3038		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
3039	3420	}
3040	3421
3041	3422	refreshContents();
..	..	@@ -3049,6 +3430,31 @@
3049	3430	obj.SetBumpTexture(obj.GetPigmentTexture());
3050	3431	}
3051	3432
	3433	+ refreshContents();
	3434	+ } else
	3435	+ if (source == embedTexturesItem)
	3436	+ {
	3437	+ Object3D obj;
	3438	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3439	+ {
	3440	+ obj = (Object3D)e.nextElement();
	3441	+ obj.EmbedTextures(true);
	3442	+ }
	3443	+
	3444	+ refreshContents();
	3445	+ } else
	3446	+ if (source == deEmbedTexturesItem)
	3447	+ {
	3448	+ Object3D obj;
	3449	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3450	+ {
	3451	+ obj = (Object3D)e.nextElement();
	3452	+ obj.EmbedTextures(false);
	3453	+ }
	3454	+
	3455	+ CameraPane.texturepigment.clear();
	3456	+ CameraPane.texturebump.clear();
	3457	+
3052	3458	refreshContents();
3053	3459	} else
3054	3460	if (source == flashSelectionButton)
..	..	@@ -3152,8 +3558,8 @@
3152	3558	// centralPanel.setVisible(true);
3153	3559	// XYZPanel.setVisible(true);
3154	3560	bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
3155	3562	bigThree.add(centralPanel);
3156		- bigThree.add(XYZPanel);
3157	3563	bigThree.FlushUI();
3158	3564
3159	3565	cameraView.requestFocusInWindow();
..	..	@@ -3233,8 +3639,8 @@
3233	3639	// centralPanel.setVisible(true);
3234	3640	// XYZPanel.setVisible(false);
3235	3641	bigThree.ClearUI();
3236		- bigThree.add(scenePanel);
3237	3642	bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
3238	3644	bigThree.FlushUI();
3239	3645
3240	3646	cameraView.requestFocusInWindow();
..	..	@@ -3326,6 +3732,12 @@
3326	3732	} else
3327	3733	if (source == editItem \|\| source == editButton)
3328	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
3329	3741	EditSelection(false);
3330	3742	} else
3331	3743	if (source == uneditButton)
..	..	@@ -3335,6 +3747,7 @@
3335	3747	Object3D child = (Object3D)e.nextElement();
3336	3748	if(child.editWindow != null)
3337	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
3338	3751	child.CloseUI();
3339	3752	listUI.remove(child);
3340	3753
..	..	@@ -3351,6 +3764,7 @@
3351	3764	//copy.ClearUI();
3352	3765	for (Object3D obj : listUI)
3353	3766	{
	3767	+ obj.pinned = false;
3354	3768	obj.CloseUI();
3355	3769	}
3356	3770	listUI.clear();
..	..	@@ -3360,7 +3774,7 @@
3360	3774	{
3361	3775	assert(copy == group);
3362	3776
3363		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3364	3778
3365	3779	for (Object3D obj : listUI)
3366	3780	{
..	..	@@ -3409,6 +3823,9 @@
3409	3823	}
3410	3824
3411	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
3412	3829	//Globals.theRenderer.object = group;
3413	3830	if(!useclient)
3414	3831	{
..	..	@@ -3435,6 +3852,13 @@
3435	3852	currentLayout = sevenButton;
3436	3853	*/
3437	3854	radio.layout.doClick();
	3855	+
	3856	+ ClearUnpinned();
	3857	+ //Grafreed.Assert(group != null);
	3858	+ //Grafreed.Assert(group.selection != null);
	3859	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3860	+ if (group.selection == null \|\| group.selection.size() == 1)
	3861	+ EditSelection(false);
3438	3862	keepparent = group.parent;
3439	3863	// PARENT = NULL or not???
3440	3864	//group.parent = null; // ROOT
..	..	@@ -4027,7 +4451,7 @@
4027	4451
4028	4452	try
4029	4453	{
4030		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4454	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4031	4455	}
4032	4456	catch (Exception e)
4033	4457	{
..	..	@@ -4502,12 +4926,14 @@
4502	4926	// }
4503	4927	// }
4504	4928
4505		- static boolean allparams = true;
4506		-
4507		- static Vector<Object3D> listUI = new Vector<Object3D>();
4508		-
4509	4929	void EditSelection(boolean newWindow)
4510	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
4511	4937	// aConstraints.gridy = 0;
4512	4938	for (int i=0; i<group.selection.size(); i++)
4513	4939	{
..	..	@@ -4518,12 +4944,7 @@
4518	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
4519	4945	if(elem != group \|\| !newWindow)
4520	4946	{
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
	4947	+ EditElement(elem, newWindow); // ? new
4527	4948	}
4528	4949	}
4529	4950	}
..	..	@@ -4598,7 +5019,8 @@
4598	5019	//new Exception().printStackTrace();
4599	5020
4600	5021	freezemodel = true;
4601		-
	5022	+ ClearUnpinned();
	5023	+
4602	5024	/**/
4603	5025	//switch (event.id)
4604	5026	{
..	..	@@ -4631,7 +5053,7 @@
4631	5053	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4632	5054	// a camera
4633	5055	{
4634		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5056	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4635	5057	{
4636	5058	CameraPane.camerachangeframe = 0; // don't refuse it
4637	5059	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4640,6 +5062,13 @@
4640	5062	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4641	5063	}
4642	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
4643	5072	refreshContents();
4644	5073	//return true;
4645	5074	}
..	..	@@ -4649,10 +5078,18 @@
4649	5078	freezemodel = false;
4650	5079	}
4651	5080
	5081	+ void SetPinStates(boolean enabled)
	5082	+ {
	5083	+ editButton.setEnabled(enabled);
	5084	+ uneditButton.setEnabled(enabled);
	5085	+ unselectButton.setEnabled(enabled);
	5086	+ flashSelectionButton.setEnabled(enabled);
	5087	+ }
	5088	+
4652	5089	void refreshContents(boolean cp)
4653	5090	{
4654		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5091	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5092	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4656	5093	{
4657	5094	objEditor.ClearInfo(); // .GetMaterial());
4658	5095
..	..	@@ -4751,8 +5188,8 @@
4751	5188
4752	5189	if (cut)
4753	5190	{
4754		- if (Globals.SAVEONMAKE)
4755		- Save();
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4756	5193	//int indices[] = jList.getSelectedIndices();
4757	5194	//for (int i = indices.length - 1; i >= 0; i--)
4758	5195	//jList.remove(indices[i]);
..	..	@@ -4855,6 +5292,10 @@
4855	5292
4856	5293	void paste(boolean expand)
4857	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4858	5299	// if (GrafreeD.clipboard == null)
4859	5300	// return;
4860	5301	boolean first = true;
..	..	@@ -4914,6 +5355,7 @@
4914	5355	Grafreed.clipboard.get(0).parent = keepparent;
4915	5356	}
4916	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4917	5359	ResetModel();
4918	5360	refreshContents();
4919	5361	}
..	..	@@ -5049,6 +5491,10 @@
5049	5491
5050	5492	void group(Object3D csg, boolean grab)
5051	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
5052	5498	if (//false) // why??
5053	5499	!group.selection.isEmpty())
5054	5500	{
..	..	@@ -5162,10 +5608,15 @@
5162	5608	//node.add(csg);
5163	5609	//makeSomething(node);
5164	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
5165	5612	}
5166	5613
5167	5614	void Ungroup(Object3D g)
5168	5615	{
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
5169	5620	if (g instanceof HiddenObject)
5170	5621	{
5171	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -5182,6 +5633,7 @@
5182	5633	objEditor.makeSomething(g.get(i), false);
5183	5634	}
5184	5635	}
	5636	+ Globals.REPLACEONMAKE = keep;
5185	5637	}
5186	5638
5187	5639	void ungroup()
..	..	@@ -5472,11 +5924,6 @@
5472	5924
5473	5925	cButton restoreCameraButton;
5474	5926
5475		- cButton minButton;
5476		- cButton maxButton;
5477		- cButton fullButton;
5478		- cButton undoButton;
5479		- cButton redoButton;
5480	5927	cButton saveButton;
5481	5928	cButton oneStepButton;
5482	5929
..	..	@@ -5486,6 +5933,22 @@
5486	5933	cButton switchButton;
5487	5934	cButton loopButton;
5488	5935	cButton textureButton;
	5936	+
	5937	+ cButton skybox1Button;
	5938	+ cButton skybox2Button;
	5939	+ cButton skybox3Button;
	5940	+ cButton skybox4Button;
	5941	+ cButton skybox5Button;
	5942	+ cButton skybox6Button;
	5943	+ cButton skybox7Button;
	5944	+
	5945	+ cButton skybox11Button;
	5946	+ cButton skybox12Button;
	5947	+ cButton skybox13Button;
	5948	+ cButton skybox14Button;
	5949	+ cButton skybox15Button;
	5950	+ cButton skybox16Button;
	5951	+ cButton skybox17Button;
5489	5952
5490	5953	cButton gridButton;
5491	5954	cButton boxButton;
..	..	@@ -5550,7 +6013,7 @@
5550	6013	private MenuItem pasteLinkItem;
5551	6014	private MenuItem pasteCloneItem;
5552	6015	private MenuItem pasteExpandItem;
5553		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
5554	6017	private MenuItem clearAllItem;
5555	6018	private MenuItem genUVItem;
5556	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -5634,6 +6097,8 @@
5634	6097	private MenuItem attachBumpItem;
5635	6098	private MenuItem detachBumpItem;
5636	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5637	6102
5638	6103	private MenuItem particleItem;
5639	6104	private MenuItem ragdollItem;