~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,335 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, final String t, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(f + "s");
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ cameraView.repaint();
	354	+ }
	355	+
26	356	//ObjEditor objEditor;
27	357	public void closeUI2()
28	358	{
..	..	@@ -60,6 +390,12 @@
60	390	this.copy = this.group = group;
61	391	//selectees = this.group.selectees;
62	392
	393	+ if (copy.versionlist == null)
	394	+ {
	395	+ copy.versionlist = new Object3D[100];
	396	+ copy.versionindex = -1;
	397	+ }
	398	+
63	399	if(ui)
64	400	SetupUI(objEditor);
65	401	}
..	..	@@ -80,10 +416,22 @@
80	416	SetupViews(objEditor);
81	417
82	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ Save(true);
	426	+ }
83	427	}
84	428
85	429	void CloneSelection(boolean supports)
86	430	{
	431	+ if (Globals.REPLACEONMAKE)
	432	+ Save();
	433	+ boolean keep = Globals.REPLACEONMAKE;
	434	+ Globals.REPLACEONMAKE = false;
87	435	// Object3D keep = GrafreeD.clipboard;
88	436	//Object3D obj;
89	437	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +442,7 @@
94	442
95	443	makeSomething(clone, i==group.selection.size()-1);
96	444	}
	445	+ Globals.REPLACEONMAKE = keep;
97	446	}
98	447
99	448	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +499,8 @@
150	499
151	500	void SetupMenu2(GroupEditor oe)
152	501	{
	502	+ oe.jTree = new cTree();
	503	+
153	504	Menu menu;
154	505	oe.menuBar.add(menu = new Menu("Edit"));
155	506	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +511,7 @@
160	511	// redoItem = menu.add(new MenuItem("Redo"));
161	512	// redoItem.addActionListener(this);
162	513	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	514	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	515	duplicateItem.addActionListener(this);
165	516	cloneItem = menu.add(new MenuItem("Clone"));
166	517	cloneItem.addActionListener(this);
..	..	@@ -176,7 +527,6 @@
176	527	copyItem.addActionListener(this);
177	528	pasteItem = menu.add(new MenuItem("Paste"));
178	529	pasteItem.addActionListener(this);
179		- menu.add("-");
180	530
181	531	menu.add("-");
182	532	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +538,8 @@
188	538	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	539	// pasteExpandItem.addActionListener(this);
190	540	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	541	+ deleteItem = menu.add(new MenuItem("Delete"));
	542	+ deleteItem.addActionListener(this);
193	543
194	544	if (Globals.ADVANCED)
195	545	{
..	..	@@ -203,23 +553,23 @@
203	553	//zBufferItem.addActionListener(this);
204	554	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	555	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	556	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	557	+ restoreCameraItem.addActionListener(this);
208	558
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	559	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	560	+// toggleFullScreenItem.addItemListener(this);
	561	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	562	+// cameraMenu.add("-");
	563	+//
	564	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	565	+// toggleTextureItem.addItemListener(this);
	566	+// toggleTextureItem.setState(CameraPane.textureon);
	567	+//
	568	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	569	+// toggleSwitchItem.addItemListener(this);
	570	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	571
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	572	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	573	toggleHandleItem.addItemListener(this);
224	574	toggleHandleItem.setState(CameraPane.HANDLES);
225	575
..	..	@@ -246,7 +596,7 @@
246	596
247	597	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	598	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	599	+ toggleDebugItem.setState(Globals.DEBUG);
250	600
251	601	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	602	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +624,7 @@
274	624	{
275	625	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	626	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	627	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	628	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	629	oe.cameraMenu.add("-");
280	630	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +632,7 @@
282	632	editLeafItem.addActionListener(this);
283	633	lookAtItem.addActionListener(this);
284	634	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	635	+ //switchViewItem.addActionListener(this);
286	636	}
287	637
288	638	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +677,29 @@
327	677	}
328	678
329	679	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	680	+// grabItem = menu.add(new MenuItem("Grab"));
	681	+// grabItem.addActionListener(this);
332	682	backItem = menu.add(new MenuItem("Back"));
333	683	backItem.addActionListener(this);
334	684	frontItem = menu.add(new MenuItem("Front"));
335	685	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	686	+// compositeItem = menu.add(new MenuItem("Composite"));
	687	+// compositeItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
338	691	hideItem = menu.add(new MenuItem("Hidden Group"));
339	692	hideItem.addActionListener(this);
	693	+ }
340	694	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	695	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	696	+
	697	+// menu.add("-");
	698	+//
	699	+// switchItem = menu.add(new MenuItem("Switch node"));
	700	+// switchItem.addActionListener(this);
	701	+ if (Globals.ADVANCED)
	702	+ {
345	703	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	704	switchGeoItem.addActionListener(this);
347	705	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +707,6 @@
349	707	morphItem = menu.add(new MenuItem("Morph Group"));
350	708	morphItem.addActionListener(this);
351	709
352		- if (Globals.ADVANCED)
353		- {
354	710	menu.add("-");
355	711	physicsItem = menu.add(new MenuItem("Physics"));
356	712	physicsItem.addActionListener(this);
..	..	@@ -358,30 +714,29 @@
358	714	frameselectorItem.addActionListener(this);
359	715	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	716	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	717	}
364	718
365	719	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	720	+// textureItem = menu.add(new MenuItem("Texture"));
	721	+// textureItem.addActionListener(this);
368	722	billboardItem = menu.add(new MenuItem("Billboard"));
369	723	billboardItem.addActionListener(this);
370	724	csgItem = menu.add(new MenuItem("CSG"));
371	725	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	726	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	727	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	728	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	729	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	730	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	731	shadowZItem.addActionListener(this);
	732	+ attributeItem = menu.add(new MenuItem("Attribute"));
	733	+ attributeItem.addActionListener(this);
	734	+
378	735	if (Globals.ADVANCED)
379	736	{
380	737	menu.add("-");
381	738	linkerItem = menu.add(new MenuItem("Linker"));
382	739	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	740	templateItem = menu.add(new MenuItem("Template"));
386	741	templateItem.addActionListener(this);
387	742	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +765,7 @@
410	765	genNormalsMESHItem.addActionListener(this);
411	766	if (Globals.ADVANCED)
412	767	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	768	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	769	genNormalsMINEItem.addActionListener(this);
415	770	}
416	771	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +858,15 @@
503	858	attachBumpItem.addActionListener(this);
504	859	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	860	pigmentBumpItem.addActionListener(this);
	861	+ //embedTexturesItem
506	862	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	863	detachPigmentItem.addActionListener(this);
508	864	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	865	detachBumpItem.addActionListener(this);
	866	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	867	+ embedTexturesItem.addActionListener(this);
	868	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	869	+ deEmbedTexturesItem.addActionListener(this);
510	870	menu.add("-");
511	871	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	872	sortbysizeItem.addActionListener(this);
..	..	@@ -533,8 +893,82 @@
533	893	buildToolsMenu(menu);
534	894	}
535	895
	896	+ JTabbedPane resourcecontainer;
	897	+ cGridBag currenttab;
	898	+ boolean added; // patch for jar
	899	+
	900	+ int tabcount = 0;
	901	+ int colcount = 0;
	902	+ int rowcount = 0;
	903	+
	904	+ int columns = 5;
	905	+ int rows = 7;
	906	+
	907	+ public void ResourceCallBack(String[] path)
	908	+ {
	909	+ for (int i = 0; i < path.length; i++)
	910	+ System.out.print(path[i] + "/");
	911	+ System.out.println();
	912	+ if (rowcount == 0)
	913	+ {
	914	+ currenttab = new cGridBag();
	915	+ added = false;
	916	+ String tabname = String.valueOf((char)('A'+tabcount));
	917	+ currenttab.setName(tabname);
	918	+ rowcount = 1;
	919	+ }
	920	+
	921	+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	922	+ {
	923	+ if (!added)
	924	+ {
	925	+ added = true;
	926	+ resourcecontainer.add(currenttab);
	927	+ String tabname = String.valueOf((char)('A'+tabcount));
	928	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	929	+ }
	930	+
	931	+ AddTextureButton(path[0], path[1], currenttab);
	932	+ if (++colcount >= columns)
	933	+ {
	934	+ colcount = 0;
	935	+ currenttab.Return();
	936	+
	937	+ if (rowcount++ >= rows)
	938	+ {
	939	+ rowcount = 0;
	940	+ }
	941	+ }
	942	+ }
	943	+ else
	944	+ {
	945	+// if (!path[path.length-1].equals("icons"))
	946	+// resourcecontainer.Return();
	947	+ }
	948	+ }
	949	+
	950	+ void CreateTexturePanel(cGridBag container)
	951	+ {
	952	+ resourcecontainer = new JTabbedPane();
	953	+ container.add(resourcecontainer);
	954	+
	955	+ Grafreed.ParseResources("textures", this);
	956	+ }
	957	+
536	958	void SetupUI2(ObjEditor oe)
537	959	{
	960	+ // June 2019
	961	+ if (oe == null)
	962	+ {
	963	+ //super.SetupUI2(this);
	964	+ //return;
	965	+ }
	966	+
	967	+ if (copy != group)
	968	+ {
	969	+ //super.SetupUI2(this);
	970	+ }
	971	+
538	972	//new Exception().printStackTrace();
539	973
540	974	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +997,83 @@
563	997	oe.radioPanel.add(dummyButton);
564	998	oe.buttonGroup.add(dummyButton);
565	999	*/
	1000	+ cGridBag copyOptionsPanel = new cGridBag();
	1001	+
	1002	+ copyOptionsPanel.preferredHeight = 2;
	1003	+
566	1004	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	1005
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	1006	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ //minButton.setToolTipText("Minimize window");
	1008	+ //minButton.addActionListener(this);
571	1009
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.addActionListener(this);
	1010	+ if (Globals.ADVANCED)
	1011	+ {
	1012	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ maxButton.setToolTipText("Maximize window");
	1014	+ maxButton.addActionListener(this);
	1015	+ }
575	1016
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
578		- saveButton.addActionListener(this);
	1017	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ fullButton.setToolTipText("Full-screen window");
	1019	+ fullButton.addActionListener(this);
579	1020
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	1021	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ screenfitButton.setToolTipText("Screen fit");
	1023	+ screenfitButton.addActionListener(this);
	1024	+
	1025	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1027	+ restoreCameraButton.addActionListener(this);
	1028	+
	1029	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ saveVersionButton.setToolTipText("Duplicate current version");
	1031	+ saveVersionButton.addActionListener(this);
	1032	+
	1033	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ deleteVersionButton.setToolTipText("Delete current version");
	1035	+ deleteVersionButton.addActionListener(this);
	1036	+
	1037	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ previousVersionButton.setToolTipText("Previous version");
	1039	+ previousVersionButton.addActionListener(this);
	1040	+ previousVersionButton.setEnabled(false);
	1041	+
	1042	+ cGridBag updown = new cGridBag().setVertical(true);
	1043	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
	1045	+ restoreButton.addActionListener(this);
	1046	+ //restoreButton.setEnabled(false);
	1047	+
	1048	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
	1050	+ replaceButton.addActionListener(this);
	1051	+ //replaceButton.setEnabled(false);
	1052	+
	1053	+ copyOptionsPanel.add(updown);
	1054	+
	1055	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ nextVersionButton.setToolTipText("Next version");
	1057	+ nextVersionButton.addActionListener(this);
	1058	+ nextVersionButton.setEnabled(false);
	1059	+
	1060	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
581	1061	liveCB.setToolTipText("Enable animation");
582	1062	liveCB.addItemListener(this);
583	1063
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	1065	oneStepButton.setToolTipText("Animate one step forward");
586	1066	oneStepButton.addActionListener(this);
587	1067
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1068	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	1069	fastCB.setToolTipText("Fast mode");
590	1070	fastCB.addItemListener(this);
591	1071
592		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
593		- trackCB.setToolTipText("Enable tracking");
594		- trackCB.addItemListener(this);
595		-
596		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- screenfitButton.setToolTipText("Screen fit");
598		- screenfitButton.addActionListener(this);
	1072	+ //oe.toolboxPanel.Return();
	1073	+
	1074	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1075	+// trackCB.setToolTipText("Enable tracking");
	1076	+// trackCB.addItemListener(this);
599	1077
600	1078	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	1079	// screenfitpointButton.addActionListener(this);
..	..	@@ -605,67 +1083,152 @@
605	1083	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606	1084	snapobjectButton.addActionListener(this);
607	1085	snapobjectButton.setToolTipText("Snap Object");
	1086	+
	1087	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ fourButton.addActionListener(this);
	1089	+ fourButton.setToolTipText("Show control panel only");
608	1090	}
609	1091
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	1092	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	1093
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- twoButton.setToolTipText("Show center view only");
	1094	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ twoButton.setToolTipText("Show 3D view only");
618	1096	twoButton.addActionListener(this);
619		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- fourButton.addActionListener(this);
621		- fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623		- sixButton.setToolTipText("2-column layout left");
624		- sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- threeButton.setToolTipText("2-column layout right");
	1097	+ this.fullscreenLayout = twoButton;
	1098	+
	1099	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ threeButton.setToolTipText("Show controls and 3D view");
627	1101	threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- sevenButton.setToolTipText("3-column layout");
630		- sevenButton.addActionListener(this);
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+// sevenButton.setToolTipText("3-column layout");
	1107	+// sevenButton.addActionListener(this);
631	1108	//
632	1109
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- rootButton.setToolTipText("Edit selection in new tab");
	1110	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ rootButton.setToolTipText("Open selection in new tab");
635	1112	rootButton.addActionListener(this);
636	1113
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	1115	closeButton.setToolTipText("Close tab");
639	1116	closeButton.addActionListener(this);
640	1117	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	1118	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	1119	+
	1120	+ cGridBag row1 = new cGridBag();
644	1121
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	1122	+ // INSERT
	1123	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ gridButton.setToolTipText("Create grid");
	1125	+ gridButton.addActionListener(this);
	1126	+
	1127	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ boxButton.setToolTipText("Create box");
	1129	+ boxButton.addActionListener(this);
	1130	+
	1131	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ sphereButton.setToolTipText("Create sphere");
	1133	+ sphereButton.addActionListener(this);
	1134	+
	1135	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ coneButton.setToolTipText("Create cone");
	1137	+ coneButton.addActionListener(this);
	1138	+
	1139	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ torusButton.setToolTipText("Create torus");
	1141	+ torusButton.addActionListener(this);
	1142	+
	1143	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ superButton.setToolTipText("Create superellipsoid");
	1145	+ superButton.addActionListener(this);
	1146	+
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ kleinButton.setToolTipText("Create Klein bottle");
	1151	+ kleinButton.addActionListener(this);
	1152	+ }
	1153	+
	1154	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ particlesButton.setToolTipText("Create particle system");
	1156	+ particlesButton.addActionListener(this);
	1157	+
	1158	+ oe.toolboxPanel.add(row1);
	1159	+
	1160	+ cGridBag row2 = new cGridBag();
	1161	+
	1162	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1163	+ groupButton.setToolTipText("Create group");
	1164	+ groupButton.addActionListener(this);
	1165	+
	1166	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ compositeButton.setToolTipText("Create composite");
	1168	+ compositeButton.addActionListener(this);
	1169	+
	1170	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ switchButton.setToolTipText("Create item switcher");
	1172	+ switchButton.addActionListener(this);
	1173	+
	1174	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ loopButton.setToolTipText("Create loop");
	1176	+ loopButton.addActionListener(this);
	1177	+
	1178	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ textureButton.setToolTipText("Create texture");
	1180	+ textureButton.addActionListener(this);
	1181	+
	1182	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ overlayButton.setToolTipText("Create overlay");
	1184	+ overlayButton.addActionListener(this);
	1185	+
	1186	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ lightButton.setToolTipText("Create light");
	1188	+ lightButton.addActionListener(this);
	1189	+
	1190	+ oe.toolboxPanel.add(row2);
	1191	+
	1192	+ cGridBag textures = new cGridBag();
	1193	+
	1194	+ CreateTexturePanel(textures);
	1195	+
	1196	+ oe.toolboxPanel.add(textures);
	1197	+
	1198	+ textures.preferredHeight = 100;
	1199	+
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
	1201	+
	1202	+ // EDIT panel
	1203	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ editButton.setToolTipText("Pin selection controls");
647	1205	editButton.addActionListener(this);
648	1206
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	1207	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
651	1209	uneditButton.addActionListener(this);
652	1210
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	1211	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1212	+ allParamsButton.setToolTipText("Show all controls");
655	1213	allParamsButton.addActionListener(this);
656	1214
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- clearPanelButton.setToolTipText("Clear edit panel");
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
659	1217	clearPanelButton.addActionListener(this);
660	1218
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- unselectButton.setToolTipText("Unselect");
663		- unselectButton.addActionListener(this);
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
664	1222
665		- commandsPanel.preferredHeight = 1;
	1223	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ flashSelectionButton.setToolTipText("Highlight selection");
	1225	+ flashSelectionButton.addActionListener(this);
666	1226
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	1227	+ editCommandsPanel.preferredHeight = 1;
	1228	+
	1229	+ SetPinStates(false);
	1230	+// oe.treePanel.add(commandsPanel);
	1231	+// oe.treePanel.Return();
669	1232
670	1233	// oe.aConstraints.gridx += 1;
671	1234	// oe.aConstraints.weighty = 0;
..	..	@@ -682,32 +1245,20 @@
682	1245
683	1246	JScrollPane jSP;
684	1247	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1248	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	1249	ResetModel();
687	1250
688	1251	oe.treePanel.add(jSPPanel);
689	1252	oe.treePanel.Return();
690	1253
691		- cGridBag copyOptionsPanel = new cGridBag();
692		-
693		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
694		- colorCB.setToolTipText("Copy color when dropped");
695		- colorCB.addItemListener(this);
696		-
697		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
698		- materialCB.setToolTipText("Copy material when dropped");
699		- materialCB.addItemListener(this);
700		-
701		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
702		- textureCB.setToolTipText("Copy texture when dropped");
703		- textureCB.addItemListener(this);
704		-
705		- copyOptionsPanel.preferredHeight = 1;
706	1254	oe.treePanel.add(copyOptionsPanel);
707	1255	oe.treePanel.Return();
	1256	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1257	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1258	+ sliderPane.preferredHeight = 1;
708	1259
709		-// mainPanel.setDividerLocation(0.5); //1.0);
710		-// mainPanel.setResizeWeight(0.5);
	1260	+// mainPanel.setDividerLocation(0.1); //1.0);
	1261	+ mainPanel.setResizeWeight(0.4);
711	1262
712	1263	//jList.addListSelectionListener(this);
713	1264	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -715,7 +1266,7 @@
715	1266	//jTree.setEditable(true);
716	1267	oe.jTree.setDragEnabled(true);
717	1268	//jTree.setPreferredSize(new Dimension(10,10));
718		- jSP.setPreferredSize(new Dimension(100,200));
	1269	+ //jSP.setPreferredSize(new Dimension(100,200));
719	1270
720	1271	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
721	1272
..	..	@@ -727,29 +1278,49 @@
727	1278	dgr.addDragGestureListener(this);
728	1279	}catch(Exception e) {}
729	1280	*/
730		- radio.layout = sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
731	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	1283	}
733	1284
734	1285	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	1286	{
	1287	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1288	+ colorCB.setToolTipText("Copy color when dropped");
	1289	+ colorCB.addItemListener(this);
	1290	+
	1291	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1292	+ materialCB.setToolTipText("Copy material when dropped");
	1293	+ materialCB.addItemListener(this);
	1294	+
	1295	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1296	+ textureCB.setToolTipText("Copy texture when dropped");
	1297	+ textureCB.addItemListener(this);
	1298	+
	1299	+ panel.Return();
	1300	+
736	1301	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	1302	boxCB.setToolTipText("Display bounding boxes");
738	1303	boxCB.addItemListener(this);
739	1304
740	1305	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1306	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	1307	zoomBoxCB.addItemListener(this);
743	1308
744	1309	if (true) // Globals.ADVANCED)
745	1310	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	1311	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1312	+// supportCB.setToolTipText("Enable rigging");
	1313	+// supportCB.addItemListener(this);
	1314	+
	1315	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1316	+ freezeCB.setToolTipText("Fast moving camera");
	1317	+ freezeCB.addItemListener(this);
749	1318
750	1319	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	1320	// localCB.addItemListener(this);
752	1321
	1322	+ panel.Return();
	1323	+
753	1324	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	1325	crowdCB.setToolTipText("Used for crowds");
755	1326	crowdCB.addItemListener(this);
..	..	@@ -758,14 +1329,19 @@
758	1329	smoothCB.setToolTipText("Snapping delay");
759	1330	smoothCB.addItemListener(this);
760	1331
761		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
762		- slowCB.setToolTipText("Smooth interpolation");
763		- slowCB.addItemListener(this);
	1332	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1333	+// slowCB.setToolTipText("Smooth interpolation");
	1334	+// slowCB.addItemListener(this);
	1335	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1336	+ minshaderCB.setToolTipText("Minimal fast shader");
	1337	+ minshaderCB.addItemListener(this);
764	1338
765	1339	// constraints.gridy += 1;
766	1340	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	1341	// speakerMocapCB.addItemListener(this);
768	1342
	1343	+ panel.Return();
	1344	+
769	1345	if (false)
770	1346	{
771	1347	// handled in scripts
..	..	@@ -780,34 +1356,74 @@
780	1356	//constraints.gridy += 1;
781	1357	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	1358	smoothfocusCB.addItemListener(this);
	1359	+ panel.Return();
783	1360	}
784	1361
785	1362	//constraints.gridx += 1;
786	1363	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	1364	// debugCB.addItemListener(this);
788	1365
	1366	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1367	+ trackCB.setToolTipText("Enable tracking target");
	1368	+ trackCB.addItemListener(this);
	1369	+
789	1370	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1371	+ oeilCB.setToolTipText("Move camera when tracking");
790	1372	oeilCB.addItemListener(this);
791	1373
	1374	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1375	+ shadowCB.setToolTipText("When live compute shadows");
	1376	+ shadowCB.addItemListener(this);
	1377	+
	1378	+ panel.Return();
	1379	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1380	+ toggleTextureCB.setToolTipText("Load textures");
	1381	+ toggleTextureCB.addItemListener(this);
	1382	+
	1383	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1384	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1385	+ toggleSwitchCB.addItemListener(this);
	1386	+
	1387	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1388	+ autokeepCB.setToolTipText("On structure change");
	1389	+ autokeepCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+ if (Globals.ADVANCED)
	1393	+ {
792	1394	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	1395	lookAtCB.setToolTipText("Look-at target");
794	1396	lookAtCB.addItemListener(this);
	1397	+ }
795	1398
796	1399	}
797	1400
798	1401	cGridBag fill = new cGridBag();
799		-
800	1402	fill.preferredHeight = 200;
	1403	+ cGridBag fill2 = new cGridBag();
	1404	+ fill2.preferredHeight = 200;
	1405	+ cGridBag fill3 = new cGridBag();
	1406	+ fill3.preferredHeight = 200;
801	1407
802	1408	panel.add(fill);
	1409	+ panel.add(fill2);
	1410	+ panel.add(fill3);
803	1411
804	1412	}
805	1413
806	1414	void EditObject(Object3D obj)
807	1415	{
808	1416	cRadio radioButton = new cRadio(obj.name);
	1417	+
	1418	+ // June 2019. Patch to avoid bug with transparency.
	1419	+ radioButton.hadMaterial = obj.material != null;
	1420	+ if (!radioButton.hadMaterial)
	1421	+ {
	1422	+ obj.material = new cMaterial();
	1423	+ }
	1424	+
809	1425	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1426	+ radioButton.layout = threeButton; // sixButton;
811	1427	radioButton.SetCamera(cameraView.renderCamera, false);
812	1428	radioButton.addActionListener(this);
813	1429	radioPanel.add(radioButton);
..	..	@@ -817,6 +1433,8 @@
817	1433
818	1434	void SetupViews(ObjEditor oe)
819	1435	{
	1436	+ theFrame = this;
	1437	+
820	1438	oe.SetupViews();
821	1439
822	1440	System.out.println("SetupViews");
..	..	@@ -825,23 +1443,30 @@
825	1443	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1444	}
827	1445
828		- JCheckBox liveCB;
829		- JCheckBox supportCB;
830		- JCheckBox localCB;
831		- JCheckBox crowdCB;
832		- JCheckBox smoothCB;
833		- JCheckBox fastCB;
834		- JCheckBox slowCB;
835		- JCheckBox boxCB;
836		- JCheckBox zoomBoxCB;
837		- JCheckBox trackCB;
838		- JCheckBox smoothfocusCB;
	1446	+ cToggleButton liveCB;
	1447	+ cCheckBox supportCB;
	1448	+ cCheckBox localCB;
	1449	+ cCheckBox crowdCB;
	1450	+ cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
	1453	+ cToggleButton fastCB;
	1454	+ cCheckBox slowCB;
	1455	+ cCheckBox boxCB;
	1456	+ cCheckBox zoomBoxCB;
	1457	+ cCheckBox freezeCB;
	1458	+ //cToggleButton trackCB;
	1459	+ cCheckBox trackCB;
	1460	+ cCheckBox smoothfocusCB;
839	1461	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1462	+ cCheckBox speakerCameraCB;
	1463	+ cCheckBox speakerFocusCB;
	1464	+ cCheckBox debugCB;
	1465	+
	1466	+ cCheckBox oeilCB;
	1467	+ cCheckBox shadowCB;
	1468	+ cCheckBox autokeepCB;
	1469	+ cCheckBox lookAtCB;
845	1470
846	1471	// static int COLOR = 1;
847	1472	// static int MATERIAL = 2;
..	..	@@ -849,9 +1474,9 @@
849	1474
850	1475	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1476
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1477	+ cCheckBox colorCB;
	1478	+ cCheckBox materialCB;
	1479	+ cCheckBox textureCB;
855	1480
856	1481	public void itemStateChanged(ItemEvent e)
857	1482	{
..	..	@@ -895,6 +1520,12 @@
895	1520	{
896	1521	cameraView.ToggleInertia();
897	1522	cameraView.repaint();
	1523	+ }
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
898	1529	}
899	1530	else if(e.getSource() == localCB)
900	1531	{
..	..	@@ -944,6 +1575,18 @@
944	1575	{
945	1576	cameraView.ToggleOeil();
946	1577	}
	1578	+ else if(e.getSource() == shadowCB)
	1579	+ {
	1580	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1581	+ }
	1582	+ else if(e.getSource() == freezeCB)
	1583	+ {
	1584	+ Globals.FREEZEONMOVE ^= true;
	1585	+ }
	1586	+ else if(e.getSource() == autokeepCB)
	1587	+ {
	1588	+ Globals.REPLACEONMAKE ^= true;
	1589	+ }
947	1590	else if(e.getSource() == lookAtCB)
948	1591	{
949	1592	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1603,8 @@
960	1603
961	1604	/**/
962	1605	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1606	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1607	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1608	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1609	// We can't move the root node or an empty selection
966	1610	return;
..	..	@@ -1023,8 +1667,6 @@
1023	1667	}
1024	1668	}
1025	1669
1026		- String string = (String) object;
1027		-
1028	1670	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1671	// if( object instanceof java.io.File[])
1030	1672	// {
..	..	@@ -1032,6 +1674,8 @@
1032	1674	// objEditor.DropFile((java.io.File[]) object, true);
1033	1675	// return;
1034	1676	// }
	1677	+
	1678	+ String string = object.toString();
1035	1679
1036	1680	// File path for Mac and Windows
1037	1681	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1721,33 @@
1077	1721
1078	1722	assert target == objEditor.jTree;
1079	1723	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1724	+ Object3D destinationLeaf;
1080	1725	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1726	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1727	} catch (Exception e) {
1083	1728	System.out.println("destinationPath : " + destinationPath);
1084	1729	return;
1085	1730	}
1086	1731
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1732	+ for (int i=group.selection.size(); --i>=0;)
1088	1733	{
	1734	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1735	+
	1736	+ // Cannot move into itself
	1737	+ if (child == destinationLeaf)
	1738	+ return;
	1739	+ }
	1740	+
	1741	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1742	+// {
1089	1743	loadClipboard(true);
1090	1744	objEditor.jTree.setSelectionPath(destinationPath);
1091	1745	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1746	+// } else {
	1747	+// loadClipboard(false);
	1748	+// objEditor.jTree.setSelectionPath(destinationPath);
	1749	+// pasteInto(false, false); // true); // ???
	1750	+// }
1097	1751	}
1098	1752	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1753	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1852,30 @@
1198	1852	{
1199	1853	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1854	//heightFieldItem.addActionListener(this);
1201		- gridItem = menu.add(new MenuItem("Grid"));
1202		- gridItem.addActionListener(this);
1203		- rectoidItem = menu.add(new MenuItem("Box"));
1204		- rectoidItem.addActionListener(this);
1205		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1206		- ellipsoidItem.addActionListener(this);
1207		- coneItem = menu.add(new MenuItem("Cone"));
1208		- coneItem.addActionListener(this);
1209		- torusItem = menu.add(new MenuItem("Torus"));
1210		- torusItem.addActionListener(this);
1211		- superItem = menu.add(new MenuItem("Superellipsoid"));
1212		- superItem.addActionListener(this);
	1855	+// gridItem = menu.add(new MenuItem("Grid"));
	1856	+// gridItem.addActionListener(this);
	1857	+// rectoidItem = menu.add(new MenuItem("Box"));
	1858	+// rectoidItem.addActionListener(this);
	1859	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1860	+// ellipsoidItem.addActionListener(this);
	1861	+// coneItem = menu.add(new MenuItem("Cone"));
	1862	+// coneItem.addActionListener(this);
	1863	+// torusItem = menu.add(new MenuItem("Torus"));
	1864	+// torusItem.addActionListener(this);
	1865	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1866	+// superItem.addActionListener(this);
	1867	+
	1868	+ cameraItem = menu.add(new MenuItem("Camera"));
	1869	+ cameraItem.addActionListener(this);
	1870	+
	1871	+ if (!Globals.ADVANCED)
	1872	+ {
1213	1873	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1874	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1875	+ }
	1876	+
	1877	+// particleItem = menu.add(new MenuItem("Particle system"));
	1878	+// particleItem.addActionListener(this);
1217	1879	if (Globals.ADVANCED)
1218	1880	{
1219	1881	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1901,15 @@
1239	1901	}
1240	1902	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1903	bezierItem.addActionListener(this);
1242		- overlayItem = menu.add(new MenuItem("Overlay"));
1243		- overlayItem.addActionListener(this);
1244		- lightItem = menu.add(new MenuItem("Light"));
1245		- lightItem.addActionListener(this);
	1904	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1905	+// overlayItem.addActionListener(this);
	1906	+// lightItem = menu.add(new MenuItem("Light"));
	1907	+// lightItem.addActionListener(this);
1246	1908	menu.add("-");
1247	1909	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1910	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1911	+// loopItem = menu.add(new MenuItem("Loop"));
	1912	+// loopItem.addActionListener(this);
1251	1913	doubleItem = menu.add(new MenuItem("Fork"));
1252	1914	doubleItem.addActionListener(this);
1253	1915	if (Globals.ADVANCED)
..	..	@@ -1263,6 +1925,9 @@
1263	1925	animationItem.addItemListener(this);
1264	1926	animationItem.setState(Globals.ANIMATION);
1265	1927
	1928	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1929	+ archiveItem.addActionListener(this);
	1930	+
1266	1931	menu.add("-");
1267	1932	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	1933	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +1940,8 @@
1275	1940	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	1941	reduce34MorphItem.addActionListener(this);
1277	1942	menu.add("-");
	1943	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1944	+ memoryItem.addActionListener(this);
1278	1945	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	1946	computeAOItem.addActionListener(this);
1280	1947
..	..	@@ -1283,8 +1950,6 @@
1283	1950	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	1951	mirrorItem.addActionListener(this);
1285	1952	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	1953	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	1954	analyzeItem.addActionListener(this);
1290	1955	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +2093,34 @@
1428	2093	shadow.material = new cMaterial(obj.material);
1429	2094	shadow.material.diffuse = 0.0001f;
1430	2095	shadow.material.specular = 0.0001f;
	2096	+ //shadow.projectedVertices[1].x = 300;
1431	2097
1432	2098	makeSomething(shadow);
1433	2099	}
	2100	+
	2101	+ private void ClearUnpinned()
	2102	+ {
	2103	+ //for (Object3D obj : listUI)
	2104	+ for (int i=listUI.size(); --i>=0;)
	2105	+ {
	2106	+ Object3D obj = listUI.elementAt(i);
	2107	+ if (!obj.pinned)
	2108	+ {
	2109	+ obj.CloseUI();
	2110	+ listUI.remove(i);
	2111	+ }
	2112	+ }
	2113	+ }
	2114	+
	2115	+ private void EditElement(Object3D elem, boolean newWindow)
	2116	+ {
	2117	+ // if (!(elem instanceof Composite))
	2118	+ // newWindow = false;
	2119	+ listUI.add(elem);
	2120	+ elem.openEditWindow(this, newWindow); //, false);
	2121	+ System.out.println("edit : " + elem);
	2122	+ elem.editWindow.refreshContents(true); // ? new
	2123	+ }
1434	2124
1435	2125	/**
1436	2126	* applyExample
..	..	@@ -1675,7 +2365,7 @@
1675	2365	{
1676	2366	ScreenFit();
1677	2367	} else
1678		- if (source == switchItem)
	2368	+ if (source == switchViewItem)
1679	2369	{
1680	2370	cVector v1 = new cVector();
1681	2371	cVector v2 = new cVector();
..	..	@@ -1684,11 +2374,11 @@
1684	2374	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	2375	objEditor.cameraView.repaint();
1686	2376	} else
1687		- if (source == rectoidItem)
	2377	+ if (source == rectoidItem \|\| source == boxButton)
1688	2378	{
1689	2379	makeSomething(new Box());
1690	2380	} else
1691		- if (source == particleItem)
	2381	+ if (source == particleItem \|\| source == particlesButton)
1692	2382	{
1693	2383	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	2384	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2457,27 @@
1767	2457
1768	2458	makeSomething(obj);
1769	2459	} else
1770		- if (source == gridItem)
	2460	+ if (source == gridItem \|\| source == gridButton)
1771	2461	{
1772	2462	makeSomething(new Grid());
1773	2463	} else
1774		- if (source == ellipsoidItem)
	2464	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2465	{
1776	2466	makeSomething(new Sphere());
1777	2467	} else
1778		- if (source == coneItem)
	2468	+ if (source == coneItem \|\| source == coneButton)
1779	2469	{
1780	2470	makeSomething(new Cone());
1781	2471	} else
1782		- if (source == torusItem)
	2472	+ if (source == torusItem \|\| source == torusButton)
1783	2473	{
1784	2474	makeSomething(new Torus());
1785	2475	} else
1786		- if (source == superItem)
	2476	+ if (source == superItem \|\| source == superButton)
1787	2477	{
1788	2478	makeSomething(new Superellipsoid());
1789	2479	} else
1790		- if (source == kleinItem)
	2480	+ if (source == kleinItem \|\| source == kleinButton)
1791	2481	{
1792	2482	makeSomething(new Klein());
1793	2483	} else
..	..	@@ -1807,7 +2497,7 @@
1807	2497	{
1808	2498	makeSomething(new BezierSurface());
1809	2499	} else
1810		- if (source == overlayItem)
	2500	+ if (source == overlayItem \|\| source == overlayButton)
1811	2501	{
1812	2502	/*
1813	2503	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,10 +2545,27 @@
1855	2545	s.setup();
1856	2546	makeSomething(s);
1857	2547	} else
1858		- if (source == lightItem)
	2548	+ if (source == lightItem \|\| source == lightButton)
1859	2549	{
1860	2550	makeSomething(new Light());
1861	2551	} else
	2552	+// if (source == skybox1Button \|\|
	2553	+// source == skybox2Button \|\|
	2554	+// source == skybox3Button \|\|
	2555	+// source == skybox4Button \|\|
	2556	+// source == skybox5Button \|\|
	2557	+// source == skybox6Button \|\|
	2558	+// source == skybox7Button \|\|
	2559	+// source == skybox11Button \|\|
	2560	+// source == skybox12Button \|\|
	2561	+// source == skybox13Button \|\|
	2562	+// source == skybox14Button \|\|
	2563	+// source == skybox15Button \|\|
	2564	+// source == skybox16Button \|\|
	2565	+// source == skybox17Button)
	2566	+// {
	2567	+// ChangeSkybox(source);
	2568	+// } else
1862	2569	if (source == csgItem)
1863	2570	{
1864	2571	group(new CSG());
..	..	@@ -1905,30 +2612,30 @@
1905	2612
1906	2613	group(g);
1907	2614	} else
1908		- if (source == loopItem)
	2615	+ if (source == loopItem \|\| source == loopButton)
1909	2616	{
1910	2617	Composite csg = new GroupLeaf();
1911	2618	csg.count = 5;
1912	2619	group(csg);
1913		- Composite child = new cGroup();
	2620	+ Composite child = new cGroup("Branch");
1914	2621	csg.addChild(child);
1915	2622	child.addChild(csg);
1916	2623	} else
1917	2624	if (source == doubleItem)
1918	2625	{
1919		- Composite csg = new GroupLeaf();
	2626	+ Composite csg = new GroupLeaf("Fork");
1920	2627	csg.count = 5;
1921	2628	group(csg);
1922		- Composite child = new cGroup();
	2629	+ Composite child = new cGroup("Branch A");
1923	2630	csg.addChild(child);
1924	2631	child.addChild(csg);
1925		- child = new cGroup();
	2632	+ child = new cGroup("Branch B");
1926	2633	csg.addChild(child);
1927	2634	child.addChild(csg);
1928	2635	} else
1929	2636	if (source == tripleItem)
1930	2637	{
1931		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Trident");
1932	2639	csg.count = 4;
1933	2640	group(csg);
1934	2641	Composite child = new cGroup();
..	..	@@ -1944,7 +2651,7 @@
1944	2651	if (source == computeAOItem)
1945	2652	{
1946	2653	Globals.drawMode = CameraPane.OCCLUSION;
1947		- Globals.theRenderer.repaint();
	2654	+ cameraView.repaint();
1948	2655	} else
1949	2656	if (source == recompileItem)
1950	2657	{
..	..	@@ -1959,7 +2666,7 @@
1959	2666	if (source == invariantsItem)
1960	2667	{
1961	2668	System.out.println("Invariants:");
1962		- Grafreed.grafreeD.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
1963	2670	} else
1964	2671	if (source == memoryItem)
1965	2672	{
..	..	@@ -1978,17 +2685,52 @@
1978	2685	{
1979	2686	DumpObject();
1980	2687	} else
1981		- if (source == undoButton)
	2688	+ if (source == minButton)
1982	2689	{
1983		- Undo();
	2690	+ Minimize();
1984	2691	} else
1985		- if (source == redoButton)
	2692	+ if (source == maxButton)
1986	2693	{
1987		- Redo();
	2694	+ Maximize();
1988	2695	} else
1989		- if (source == saveButton)
	2696	+ if (source == fullButton)
1990	2697	{
1991		- Save();
	2698	+ ToggleFullScreen();
	2699	+ } else
	2700	+ if (source == previousVersionButton)
	2701	+ {
	2702	+ // Go to previous version
	2703	+ //if (!Undo())
	2704	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2705	+ PreviousVersion();
	2706	+ } else
	2707	+ if (source == restoreButton)
	2708	+ {
	2709	+ // Restore current version
	2710	+ Restore();
	2711	+ //restoreButton.setEnabled(false);
	2712	+ } else
	2713	+ if (source == replaceButton)
	2714	+ {
	2715	+ // Overwrite current version
	2716	+ Replace();
	2717	+ //replaceButton.setEnabled(false);
	2718	+ } else
	2719	+ if (source == nextVersionButton)
	2720	+ {
	2721	+ // Go to next version
	2722	+ NextVersion();
	2723	+ } else
	2724	+ if (source == saveVersionButton)
	2725	+ {
	2726	+ // Save a new version
	2727	+ if (!Save(true))
	2728	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
1992	2734	} else
1993	2735	if (source == oneStepButton)
1994	2736	{
..	..	@@ -1997,17 +2739,14 @@
1997	2739	} else
1998	2740	if (source == screenfitButton)
1999	2741	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2742	ScreenFit();
2002	2743	} else
2003	2744	if (source == screenfitpointButton)
2004	2745	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2746	ScreenFitPoint();
2007	2747	} else
2008	2748	if (source == snapobjectButton)
2009	2749	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2750	SnapObject();
2012	2751	} else
2013	2752	// if (event.getSource() == recompileButton)
..	..	@@ -2046,11 +2785,11 @@
2046	2785	} else
2047	2786	if (source == undoItem)
2048	2787	{
2049		- Undo();
	2788	+ PreviousVersion();
2050	2789	} else
2051	2790	if (source == redoItem)
2052	2791	{
2053		- Redo();
	2792	+ NextVersion();
2054	2793	} else
2055	2794	if (source == duplicateItem)
2056	2795	{
..	..	@@ -2371,7 +3110,7 @@
2371	3110	{
2372	3111	StepAll();
2373	3112	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3113	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	3114	{
2376	3115	//int indices[] = jList.getSelectedIndices();
2377	3116	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +3122,9 @@
2383	3122	{
2384	3123	ClearSelection(true);
2385	3124	} else
2386		- if (source == grabItem)
	3125	+ if (source == grabItem \|\| source == groupButton)
2387	3126	{
2388		- group(new cGroup(), true);
	3127	+ group(new cGroup(), false); // true);
2389	3128	} else
2390	3129	if (source == hideItem)
2391	3130	{
..	..	@@ -2403,11 +3142,11 @@
2403	3142	{
2404	3143	makeSomething(new Camera());
2405	3144	} else
2406		- if (source == compositeItem)
	3145	+ if (source == compositeItem \|\| source == compositeButton)
2407	3146	{
2408	3147	group(new Composite());
2409	3148	} else
2410		- if (source == randomItem)
	3149	+ if (source == switchItem \|\| source == switchButton)
2411	3150	{
2412	3151	RandomNode random = new RandomNode();
2413	3152	group(random);
..	..	@@ -2509,7 +3248,7 @@
2509	3248	{
2510	3249	group(new cLinker());
2511	3250	} else
2512		- if (source == textureItem)
	3251	+ if (source == textureItem \|\| source == textureButton)
2513	3252	{
2514	3253	group(new TextureNode());
2515	3254	} else
..	..	@@ -2529,17 +3268,30 @@
2529	3268	{
2530	3269	CastShadow(2);
2531	3270	} else
2532		- if (source == ungroupItem)
	3271	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	3272	{
2534		- //ungroup();
	3273	+ boolean hasRoot = false;
	3274	+
2535	3275	for (int i=0; i<group.selection.size(); i++)
2536	3276	{
2537		- Ungroup(group.selection.get(i));
	3277	+ if (group.selection.get(i) == group)
	3278	+ {
	3279	+ hasRoot = true;
	3280	+ break;
	3281	+ }
2538	3282	}
2539	3283
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	3284	+ if (!hasRoot)
	3285	+ {
	3286	+ for (int i=0; i<group.selection.size(); i++)
	3287	+ {
	3288	+ Ungroup(group.selection.get(i));
	3289	+ }
	3290	+
	3291	+ ClearSelection(false);
	3292	+
	3293	+ refreshContents();
	3294	+ }
2543	3295	} else
2544	3296	if (source == genUVItem)
2545	3297	{
..	..	@@ -2840,7 +3592,7 @@
2840	3592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2841	3593	{
2842	3594	obj = (Object3D)e.nextElement();
2843		- obj.SetBumpTexture(null);
	3595	+ obj.ResetBumpTexture();
2844	3596	}
2845	3597
2846	3598	refreshContents();
..	..	@@ -2856,6 +3608,31 @@
2856	3608
2857	3609	refreshContents();
2858	3610	} else
	3611	+ if (source == embedTexturesItem)
	3612	+ {
	3613	+ Object3D obj;
	3614	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3615	+ {
	3616	+ obj = (Object3D)e.nextElement();
	3617	+ obj.EmbedTextures(true);
	3618	+ }
	3619	+
	3620	+ refreshContents();
	3621	+ } else
	3622	+ if (source == deEmbedTexturesItem)
	3623	+ {
	3624	+ Object3D obj;
	3625	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3626	+ {
	3627	+ obj = (Object3D)e.nextElement();
	3628	+ obj.EmbedTextures(false);
	3629	+ }
	3630	+
	3631	+ CameraPane.texturepigment.clear();
	3632	+ CameraPane.texturebump.clear();
	3633	+
	3634	+ refreshContents();
	3635	+ } else
2859	3636	if (source == flashSelectionButton)
2860	3637	{
2861	3638	CameraPane.flash = true;
..	..	@@ -2867,6 +3644,10 @@
2867	3644	if (source == twoButton)
2868	3645	{
2869	3646	radio.layout = twoButton;
	3647	+
	3648	+ if (CameraPane.FULLSCREEN)
	3649	+ fullscreenLayout = radio.layout;
	3650	+
2870	3651	// bug
2871	3652	//gridPanel.setDividerLocation(1.0);
2872	3653	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3680,31 @@
2899	3680	bigThree.ClearUI();
2900	3681	bigThree.add(centralPanel);
2901	3682	bigThree.FlushUI();
	3683	+
	3684	+ cameraView.requestFocusInWindow();
	3685	+
	3686	+// refreshContents(true);
	3687	+//
	3688	+// try
	3689	+// {
	3690	+// java.awt.Robot bot = new java.awt.Robot();
	3691	+// int mask = InputEvent.BUTTON1_MASK;
	3692	+// bot.mouseMove(100, 100);
	3693	+// bot.mousePress(mask);
	3694	+// bot.mouseRelease(mask);
	3695	+// }
	3696	+// catch (Exception e)
	3697	+// {
	3698	+//
	3699	+// }
	3700	+
2902	3701	} else
2903	3702	if (source == threeButton)
2904	3703	{
2905	3704	radio.layout = threeButton;
	3705	+
	3706	+ if (CameraPane.FULLSCREEN)
	3707	+ fullscreenLayout = radio.layout;
2906	3708
2907	3709	// bigThree.remove(scenePanel);
2908	3710	// bigThree.remove(centralPanel);
..	..	@@ -2932,13 +3734,18 @@
2932	3734	// centralPanel.setVisible(true);
2933	3735	// XYZPanel.setVisible(true);
2934	3736	bigThree.ClearUI();
	3737	+ bigThree.add(scenePanel);
2935	3738	bigThree.add(centralPanel);
2936		- bigThree.add(XYZPanel);
2937	3739	bigThree.FlushUI();
	3740	+
	3741	+ cameraView.requestFocusInWindow();
2938	3742	} else
2939	3743	if (source == fourButton)
2940	3744	{
2941	3745	radio.layout = fourButton;
	3746	+
	3747	+ if (CameraPane.FULLSCREEN)
	3748	+ fullscreenLayout = radio.layout;
2942	3749
2943	3750	// bigThree.remove(scenePanel);
2944	3751	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3777,15 @@
2970	3777	bigThree.ClearUI();
2971	3778	bigThree.add(scenePanel);
2972	3779	bigThree.FlushUI();
	3780	+
	3781	+ cameraView.requestFocusInWindow();
2973	3782	} else
2974	3783	if (source == sixButton)
2975	3784	{
2976	3785	radio.layout = sixButton;
	3786	+
	3787	+ if (CameraPane.FULLSCREEN)
	3788	+ fullscreenLayout = radio.layout;
2977	3789
2978	3790	// bigThree.remove(scenePanel);
2979	3791	// bigThree.remove(centralPanel);
..	..	@@ -3003,13 +3815,18 @@
3003	3815	// centralPanel.setVisible(true);
3004	3816	// XYZPanel.setVisible(false);
3005	3817	bigThree.ClearUI();
3006		- bigThree.add(scenePanel);
3007	3818	bigThree.add(centralPanel);
	3819	+ bigThree.add(scenePanel);
3008	3820	bigThree.FlushUI();
	3821	+
	3822	+ cameraView.requestFocusInWindow();
3009	3823	} else
3010	3824	if (source == sevenButton)
3011	3825	{
3012	3826	radio.layout = sevenButton;
	3827	+
	3828	+ if (CameraPane.FULLSCREEN)
	3829	+ fullscreenLayout = radio.layout;
3013	3830
3014	3831	// bigThree.remove(scenePanel);
3015	3832	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3860,8 @@
3043	3860	bigThree.add(centralPanel);
3044	3861	bigThree.add(XYZPanel);
3045	3862	bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
3046	3865	} else
3047	3866	if (source == rootButton)
3048	3867	{
..	..	@@ -3054,6 +3873,7 @@
3054	3873	EditObject(obj);
3055	3874	}
3056	3875
	3876	+ cameraView.requestFocusInWindow();
3057	3877	refreshContents(true);
3058	3878	} else
3059	3879	if (source == closeButton)
..	..	@@ -3063,22 +3883,37 @@
3063	3883	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3884	{
3065	3885	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3886	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3887	{
	3888	+ // Patch to avoid bug with transparency.
	3889	+ if (!ab.hadMaterial)
	3890	+ {
	3891	+ ab.object.material = null;
	3892	+ }
	3893	+
3068	3894	buttonGroup.remove(ab);
3069	3895	radioPanel.remove(ab);
3070	3896
3071		- ab.GetObject().editWindow = null;
	3897	+ //ab.GetObject().editWindow = null;
	3898	+ ab.GetObject().manipWindow = null;
3072	3899	// ab.GetObject().objectUI = null; // ?????????
3073	3900
3074	3901	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3902	break;
3076	3903	}
3077	3904	}
	3905	+
	3906	+ cameraView.requestFocusInWindow();
3078	3907	refreshContents(true);
3079	3908	} else
3080	3909	if (source == editItem \|\| source == editButton)
3081	3910	{
	3911	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3912	+ {
	3913	+ Object3D child = (Object3D)e.nextElement();
	3914	+ child.pinned = true;
	3915	+ }
	3916	+
3082	3917	EditSelection(false);
3083	3918	} else
3084	3919	if (source == uneditButton)
..	..	@@ -3087,9 +3922,10 @@
3087	3922	{
3088	3923	Object3D child = (Object3D)e.nextElement();
3089	3924	if(child.editWindow != null)
3090		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3925	+ child.pinned = false;
3091	3926	child.CloseUI();
3092	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	3929
3094	3930	//child.editWindow = null; // ???????????
3095	3931	}
..	..	@@ -3104,16 +3940,18 @@
3104	3940	//copy.ClearUI();
3105	3941	for (Object3D obj : listUI)
3106	3942	{
	3943	+ obj.pinned = false;
3107	3944	obj.CloseUI();
3108	3945	}
3109	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
3110	3948	refreshContents(true);
3111	3949	} else
3112	3950	if (source == allParamsButton)
3113	3951	{
3114	3952	assert(copy == group);
3115	3953
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3954	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3955
3118	3956	for (Object3D obj : listUI)
3119	3957	{
..	..	@@ -3162,6 +4000,9 @@
3162	4000	}
3163	4001
3164	4002	copy = group;
	4003	+
	4004	+ SetUndoStates();
	4005	+
3165	4006	//Globals.theRenderer.object = group;
3166	4007	if(!useclient)
3167	4008	{
..	..	@@ -3179,7 +4020,8 @@
3179	4020	}
3180	4021
3181	4022	// fix "+" issue
3182		- group.editWindow = this;
	4023	+ //group.editWindow = this;
	4024	+ group.manipWindow = this;
3183	4025
3184	4026	/*
3185	4027	currentLayout = radio.layout;
..	..	@@ -3187,20 +4029,32 @@
3187	4029	currentLayout = sevenButton;
3188	4030	*/
3189	4031	radio.layout.doClick();
	4032	+
	4033	+ ClearUnpinned();
	4034	+
	4035	+ //Grafreed.Assert(group != null);
	4036	+ //Grafreed.Assert(group.selection != null);
	4037	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4038	+ if (group.selection == null \|\| group.selection.size() == 1)
	4039	+ EditSelection(false);
3190	4040	keepparent = group.parent;
3191	4041	// PARENT = NULL or not???
3192	4042	//group.parent = null; // ROOT
3193	4043	//group.attributes = -1;
3194	4044	ResetModel();
	4045	+
	4046	+ cameraView.requestFocusInWindow();
3195	4047	refreshContents(true);
3196	4048	} else if (event.getSource() == editCameraItem)
3197	4049	{
3198	4050	cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
3199	4052	cameraView.repaint();
3200	4053	return;
3201		- } else if (event.getSource() == revertCameraItem)
	4054	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	4055	{
3203	4056	cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
3204	4058	cameraView.repaint();
3205	4059	return;
3206	4060	// } else if (event.getSource() == textureButton)
..	..	@@ -3215,7 +4069,6 @@
3215	4069	}
3216	4070
3217	4071	boolean useclient = false;
3218		- cRadio radio;
3219	4072
3220	4073	void ToggleRoot()
3221	4074	{
..	..	@@ -3778,7 +4631,7 @@
3778	4631
3779	4632	try
3780	4633	{
3781		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4634	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3782	4635	}
3783	4636	catch (Exception e)
3784	4637	{
..	..	@@ -4253,28 +5106,25 @@
4253	5106	// }
4254	5107	// }
4255	5108
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	5109	void EditSelection(boolean newWindow)
4261	5110	{
	5111	+ if (group.selection == null)
	5112	+ {
	5113	+ EditElement(group, newWindow); // ? new
	5114	+ return;
	5115	+ }
	5116	+
4262	5117	// aConstraints.gridy = 0;
4263	5118	for (int i=0; i<group.selection.size(); i++)
4264	5119	{
4265	5120	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	5121	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5122	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	5123
4269	5124	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	5125	if(elem != group \|\| !newWindow)
4271	5126	{
4272		- // if (!(elem instanceof Composite))
4273		- // newWindow = false;
4274		- listUI.add(elem);
4275		- elem.openEditWindow(this, newWindow); //, false);
4276		- System.out.println("edit : " + elem);
4277		- elem.editWindow.refreshContents(true); // ? new
	5127	+ EditElement(elem, newWindow); // ? new
4278	5128	}
4279	5129	}
4280	5130	}
..	..	@@ -4337,9 +5187,7 @@
4337	5187
4338	5188	freezemodel = false;
4339	5189	}
4340		-
4341		- boolean flashIt = true;
4342		-
	5190	+
4343	5191	public void valueChanged(TreeSelectionEvent e)
4344	5192	//public boolean handleEvent(Event event)
4345	5193	{
..	..	@@ -4349,7 +5197,8 @@
4349	5197	//new Exception().printStackTrace();
4350	5198
4351	5199	freezemodel = true;
4352		-
	5200	+ ClearUnpinned();
	5201	+
4353	5202	/**/
4354	5203	//switch (event.id)
4355	5204	{
..	..	@@ -4382,7 +5231,7 @@
4382	5231	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	5232	// a camera
4384	5233	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5234	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	5235	{
4387	5236	CameraPane.camerachangeframe = 0; // don't refuse it
4388	5237	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +5240,13 @@
4391	5240	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	5241	}
4393	5242
	5243	+ if (tps != null && tps.length == 1)
	5244	+ {
	5245	+ EditSelection(false);
	5246	+ }
	5247	+
	5248	+ SetPinStates(tps != null && tps.length > 0);
	5249	+
4394	5250	refreshContents();
4395	5251	//return true;
4396	5252	}
..	..	@@ -4400,9 +5256,20 @@
4400	5256	freezemodel = false;
4401	5257	}
4402	5258
	5259	+ void SetPinStates(boolean enabled)
	5260	+ {
	5261	+ editButton.setEnabled(enabled);
	5262	+ uneditButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
	5264	+ flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5267	+ }
	5268	+
4403	5269	void refreshContents(boolean cp)
4404	5270	{
4405		- if (!Globals.MOUSEDRAGGED)
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5272	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	5273	{
4407	5274	objEditor.ClearInfo(); // .GetMaterial());
4408	5275
..	..	@@ -4501,7 +5368,8 @@
4501	5368
4502	5369	if (cut)
4503	5370	{
4504		- Save();
	5371	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5372	+// Save();
4505	5373	//int indices[] = jList.getSelectedIndices();
4506	5374	//for (int i = indices.length - 1; i >= 0; i--)
4507	5375	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5472,10 @@
4604	5472
4605	5473	void paste(boolean expand)
4606	5474	{
	5475	+ if (Globals.REPLACEONMAKE)
	5476	+ Save();
	5477	+ boolean keep = Globals.REPLACEONMAKE;
	5478	+ Globals.REPLACEONMAKE = false;
4607	5479	// if (GrafreeD.clipboard == null)
4608	5480	// return;
4609	5481	boolean first = true;
..	..	@@ -4663,6 +5535,7 @@
4663	5535	Grafreed.clipboard.get(0).parent = keepparent;
4664	5536	}
4665	5537
	5538	+ Globals.REPLACEONMAKE = keep;
4666	5539	ResetModel();
4667	5540	refreshContents();
4668	5541	}
..	..	@@ -4798,6 +5671,10 @@
4798	5671
4799	5672	void group(Object3D csg, boolean grab)
4800	5673	{
	5674	+ if (Globals.REPLACEONMAKE)
	5675	+ Save();
	5676	+ boolean keep = Globals.REPLACEONMAKE;
	5677	+ Globals.REPLACEONMAKE = false;
4801	5678	if (//false) // why??
4802	5679	!group.selection.isEmpty())
4803	5680	{
..	..	@@ -4911,10 +5788,15 @@
4911	5788	//node.add(csg);
4912	5789	//makeSomething(node);
4913	5790	makeSomething(csg);
	5791	+ Globals.REPLACEONMAKE = keep;
4914	5792	}
4915	5793
4916	5794	void Ungroup(Object3D g)
4917	5795	{
	5796	+ if (Globals.REPLACEONMAKE)
	5797	+ Save();
	5798	+ boolean keep = Globals.REPLACEONMAKE;
	5799	+ Globals.REPLACEONMAKE = false;
4918	5800	if (g instanceof HiddenObject)
4919	5801	{
4920	5802	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5813,7 @@
4931	5813	objEditor.makeSomething(g.get(i), false);
4932	5814	}
4933	5815	}
	5816	+ Globals.REPLACEONMAKE = keep;
4934	5817	}
4935	5818
4936	5819	void ungroup()
..	..	@@ -5219,10 +6102,43 @@
5219	6102	cButton clearpanelButton;
5220	6103	cButton unselectButton;
5221	6104
5222		- cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
	6105	+ cButton restoreCameraButton;
	6106	+
5225	6107	cButton oneStepButton;
	6108	+
	6109	+ cButton groupButton;
	6110	+ cButton ungroupButton;
	6111	+ cButton compositeButton;
	6112	+ cButton switchButton;
	6113	+ cButton loopButton;
	6114	+ cButton textureButton;
	6115	+
	6116	+ cButton skybox1Button;
	6117	+ cButton skybox2Button;
	6118	+ cButton skybox3Button;
	6119	+ cButton skybox4Button;
	6120	+ cButton skybox5Button;
	6121	+ cButton skybox6Button;
	6122	+ cButton skybox7Button;
	6123	+
	6124	+ cButton skybox11Button;
	6125	+ cButton skybox12Button;
	6126	+ cButton skybox13Button;
	6127	+ cButton skybox14Button;
	6128	+ cButton skybox15Button;
	6129	+ cButton skybox16Button;
	6130	+ cButton skybox17Button;
	6131	+
	6132	+ cButton gridButton;
	6133	+ cButton boxButton;
	6134	+ cButton sphereButton;
	6135	+ cButton coneButton;
	6136	+ cButton torusButton;
	6137	+ cButton superButton;
	6138	+ cButton kleinButton;
	6139	+ cButton particlesButton;
	6140	+ cButton overlayButton;
	6141	+ cButton lightButton;
5226	6142
5227	6143	cButton screenfitButton;
5228	6144	cButton screenfitpointButton;
..	..	@@ -5235,14 +6151,6 @@
5235	6151
5236	6152	cButton setsupportButton;
5237	6153
5238		- cButton twoButton;
5239		- cButton sixButton;
5240		- cButton threeButton;
5241		- cButton sevenButton;
5242		- cButton fourButton; // full panel
5243		- cButton oneButton; // full XYZ
5244		- //cButton currentLayout;
5245		-
5246	6154	//
5247	6155	//Composite
5248	6156	Object3D // to do !!
..	..	@@ -5252,11 +6160,11 @@
5252	6160	//JTree jTree;
5253	6161	private MenuItem lookAtItem;
5254	6162	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	6163	+ private MenuItem switchViewItem;
5256	6164	private MenuItem cutItem;
5257	6165	private MenuItem undoItem;
5258	6166	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	6167	+ private JMenuItem duplicateItem;
5260	6168	private MenuItem cloneItem;
5261	6169	private MenuItem cloneSupportItem;
5262	6170	private MenuItem overwriteGeoItem;
..	..	@@ -5284,7 +6192,7 @@
5284	6192	private MenuItem pasteLinkItem;
5285	6193	private MenuItem pasteCloneItem;
5286	6194	private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	6195	+ private MenuItem deleteItem;
5288	6196	private MenuItem clearAllItem;
5289	6197	private MenuItem genUVItem;
5290	6198	private MenuItem genNormalsMESHItem;
..	..	@@ -5344,7 +6252,7 @@
5344	6252	private MenuItem frontItem;
5345	6253	private MenuItem cameraItem;
5346	6254	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	6255	+ private MenuItem switchItem;
5348	6256	private MenuItem physicsItem;
5349	6257	private MenuItem frameselectorItem;
5350	6258	private MenuItem scriptNodeItem;
..	..	@@ -5368,6 +6276,8 @@
5368	6276	private MenuItem attachBumpItem;
5369	6277	private MenuItem detachBumpItem;
5370	6278	private MenuItem pigmentBumpItem;
	6279	+ private MenuItem embedTexturesItem;
	6280	+ private MenuItem deEmbedTexturesItem;
5371	6281
5372	6282	private MenuItem particleItem;
5373	6283	private MenuItem ragdollItem;
..	..	@@ -5418,5 +6328,5 @@
5418	6328
5419	6329	Menu cameraMenu;
5420	6330	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	6331	+ MenuItem restoreCameraItem;
5422	6332	}