~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,314 @@
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 AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -80,10 +395,22 @@
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
87	414	// Object3D keep = GrafreeD.clipboard;
88	415	//Object3D obj;
89	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +421,7 @@
94	421
95	422	makeSomething(clone, i==group.selection.size()-1);
96	423	}
	424	+ Globals.REPLACEONMAKE = keep;
97	425	}
98	426
99	427	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +478,8 @@
150	478
151	479	void SetupMenu2(GroupEditor oe)
152	480	{
	481	+ oe.jTree = new cTree();
	482	+
153	483	Menu menu;
154	484	oe.menuBar.add(menu = new Menu("Edit"));
155	485	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +490,7 @@
160	490	// redoItem = menu.add(new MenuItem("Redo"));
161	491	// redoItem.addActionListener(this);
162	492	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	493	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	494	duplicateItem.addActionListener(this);
165	495	cloneItem = menu.add(new MenuItem("Clone"));
166	496	cloneItem.addActionListener(this);
..	..	@@ -176,7 +506,6 @@
176	506	copyItem.addActionListener(this);
177	507	pasteItem = menu.add(new MenuItem("Paste"));
178	508	pasteItem.addActionListener(this);
179		- menu.add("-");
180	509
181	510	menu.add("-");
182	511	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +517,8 @@
188	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	518	// pasteExpandItem.addActionListener(this);
190	519	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
193	522
194	523	if (Globals.ADVANCED)
195	524	{
..	..	@@ -203,23 +532,23 @@
203	532	//zBufferItem.addActionListener(this);
204	533	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	534	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	535	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	536	+ restoreCameraItem.addActionListener(this);
208	537
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	538	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	539	+// toggleFullScreenItem.addItemListener(this);
	540	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	541	+// cameraMenu.add("-");
	542	+//
	543	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	544	+// toggleTextureItem.addItemListener(this);
	545	+// toggleTextureItem.setState(CameraPane.textureon);
	546	+//
	547	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	548	+// toggleSwitchItem.addItemListener(this);
	549	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	550
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"));
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	552	toggleHandleItem.addItemListener(this);
224	553	toggleHandleItem.setState(CameraPane.HANDLES);
225	554
..	..	@@ -246,7 +575,7 @@
246	575
247	576	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	577	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	578	+ toggleDebugItem.setState(Globals.DEBUG);
250	579
251	580	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	581	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +603,7 @@
274	603	{
275	604	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	605	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	606	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	607	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	608	oe.cameraMenu.add("-");
280	609	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +611,7 @@
282	611	editLeafItem.addActionListener(this);
283	612	lookAtItem.addActionListener(this);
284	613	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	614	+ //switchViewItem.addActionListener(this);
286	615	}
287	616
288	617	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +656,29 @@
327	656	}
328	657
329	658	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	659	+// grabItem = menu.add(new MenuItem("Grab"));
	660	+// grabItem.addActionListener(this);
332	661	backItem = menu.add(new MenuItem("Back"));
333	662	backItem.addActionListener(this);
334	663	frontItem = menu.add(new MenuItem("Front"));
335	664	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	665	+// compositeItem = menu.add(new MenuItem("Composite"));
	666	+// compositeItem.addActionListener(this);
	667	+
	668	+ if (Globals.ADVANCED)
	669	+ {
338	670	hideItem = menu.add(new MenuItem("Hidden Group"));
339	671	hideItem.addActionListener(this);
	672	+ }
340	673	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	674	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	675	+
	676	+// menu.add("-");
	677	+//
	678	+// switchItem = menu.add(new MenuItem("Switch node"));
	679	+// switchItem.addActionListener(this);
	680	+ if (Globals.ADVANCED)
	681	+ {
345	682	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	683	switchGeoItem.addActionListener(this);
347	684	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +686,6 @@
349	686	morphItem = menu.add(new MenuItem("Morph Group"));
350	687	morphItem.addActionListener(this);
351	688
352		- if (Globals.ADVANCED)
353		- {
354	689	menu.add("-");
355	690	physicsItem = menu.add(new MenuItem("Physics"));
356	691	physicsItem.addActionListener(this);
..	..	@@ -358,30 +693,29 @@
358	693	frameselectorItem.addActionListener(this);
359	694	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	695	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	696	}
364	697
365	698	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	699	+// textureItem = menu.add(new MenuItem("Texture"));
	700	+// textureItem.addActionListener(this);
368	701	billboardItem = menu.add(new MenuItem("Billboard"));
369	702	billboardItem.addActionListener(this);
370	703	csgItem = menu.add(new MenuItem("CSG"));
371	704	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	705	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	706	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	707	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	708	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	709	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
378	714	if (Globals.ADVANCED)
379	715	{
380	716	menu.add("-");
381	717	linkerItem = menu.add(new MenuItem("Linker"));
382	718	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	719	templateItem = menu.add(new MenuItem("Template"));
386	720	templateItem.addActionListener(this);
387	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +744,7 @@
410	744	genNormalsMESHItem.addActionListener(this);
411	745	if (Globals.ADVANCED)
412	746	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	748	genNormalsMINEItem.addActionListener(this);
415	749	}
416	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +837,15 @@
503	837	attachBumpItem.addActionListener(this);
504	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
506	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	842	detachPigmentItem.addActionListener(this);
508	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
510	849	menu.add("-");
511	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	851	sortbysizeItem.addActionListener(this);
..	..	@@ -533,8 +872,21 @@
533	872	buildToolsMenu(menu);
534	873	}
535	874
	875	+
536	876	void SetupUI2(ObjEditor oe)
537	877	{
	878	+ // June 2019
	879	+ if (oe == null)
	880	+ {
	881	+ //super.SetupUI2(this);
	882	+ //return;
	883	+ }
	884	+
	885	+ if (copy != group)
	886	+ {
	887	+ //super.SetupUI2(this);
	888	+ }
	889	+
538	890	//new Exception().printStackTrace();
539	891
540	892	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +915,83 @@
563	915	oe.radioPanel.add(dummyButton);
564	916	oe.buttonGroup.add(dummyButton);
565	917	*/
	918	+ cGridBag copyOptionsPanel = new cGridBag();
	919	+
	920	+ copyOptionsPanel.preferredHeight = 2;
	921	+
566	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	923
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	924	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	925	+ //minButton.setToolTipText("Minimize window");
	926	+ //minButton.addActionListener(this);
571	927
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.addActionListener(this);
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
575	934
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
578		- saveButton.addActionListener(this);
	935	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ fullButton.setToolTipText("Full-screen window");
	937	+ fullButton.addActionListener(this);
579	938
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	940	+ screenfitButton.setToolTipText("Screen fit");
	941	+ screenfitButton.addActionListener(this);
	942	+
	943	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	944	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	945	+ restoreCameraButton.addActionListener(this);
	946	+
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
	959	+
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
	965	+
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
	970	+
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
581	979	liveCB.setToolTipText("Enable animation");
582	980	liveCB.addItemListener(this);
583	981
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	983	oneStepButton.setToolTipText("Animate one step forward");
586	984	oneStepButton.addActionListener(this);
587	985
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	987	fastCB.setToolTipText("Fast mode");
590	988	fastCB.addItemListener(this);
591	989
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);
	990	+ //oe.toolboxPanel.Return();
	991	+
	992	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	993	+// trackCB.setToolTipText("Enable tracking");
	994	+// trackCB.addItemListener(this);
599	995
600	996	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	997	// screenfitpointButton.addActionListener(this);
..	..	@@ -605,67 +1001,156 @@
605	1001	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606	1002	snapobjectButton.addActionListener(this);
607	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
608	1008	}
609	1009
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	1010	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	1011
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");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
618	1014	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");
	1015	+ this.fullscreenLayout = twoButton;
	1016	+
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
627	1019	threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- sevenButton.setToolTipText("3-column layout");
630		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
631	1026	//
632	1027
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
635	1030	rootButton.addActionListener(this);
636	1031
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	1033	closeButton.setToolTipText("Close tab");
639	1034	closeButton.addActionListener(this);
640	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	1036	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	1037	+
	1038	+ cGridBag row1 = new cGridBag();
644	1039
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	1040	+ // INSERT
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ gridButton.setToolTipText("Create grid");
	1043	+ gridButton.addActionListener(this);
	1044	+
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ boxButton.setToolTipText("Create box");
	1047	+ boxButton.addActionListener(this);
	1048	+
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ sphereButton.setToolTipText("Create sphere");
	1051	+ sphereButton.addActionListener(this);
	1052	+
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ coneButton.setToolTipText("Create cone");
	1055	+ coneButton.addActionListener(this);
	1056	+
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ torusButton.setToolTipText("Create torus");
	1059	+ torusButton.addActionListener(this);
	1060	+
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ superButton.setToolTipText("Create superellipsoid");
	1063	+ superButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ kleinButton.setToolTipText("Create Klein bottle");
	1069	+ kleinButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ particlesButton.setToolTipText("Create particle system");
	1074	+ particlesButton.addActionListener(this);
	1075	+
	1076	+ oe.toolboxPanel.add(row1);
	1077	+
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ groupButton.setToolTipText("Create group");
	1082	+ groupButton.addActionListener(this);
	1083	+
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ compositeButton.setToolTipText("Create composite");
	1086	+ compositeButton.addActionListener(this);
	1087	+
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
	1090	+ switchButton.addActionListener(this);
	1091	+
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ loopButton.setToolTipText("Create loop");
	1094	+ loopButton.addActionListener(this);
	1095	+
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ textureButton.setToolTipText("Create texture");
	1098	+ textureButton.addActionListener(this);
	1099	+
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ overlayButton.setToolTipText("Create overlay");
	1102	+ overlayButton.addActionListener(this);
	1103	+
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ lightButton.setToolTipText("Create light");
	1106	+ lightButton.addActionListener(this);
	1107	+
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.skyboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
	1124	+ // EDIT panel
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
647	1127	editButton.addActionListener(this);
648	1128
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
651	1131	uneditButton.addActionListener(this);
652	1132
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	1133	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1134	+ allParamsButton.setToolTipText("Show all controle");
655	1135	allParamsButton.addActionListener(this);
656	1136
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	1138	clearPanelButton.setToolTipText("Clear edit panel");
659	1139	clearPanelButton.addActionListener(this);
660	1140
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- unselectButton.setToolTipText("Unselect");
663		- unselectButton.addActionListener(this);
	1141	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ //unselectButton.setToolTipText("Unselect");
	1143	+ //unselectButton.addActionListener(this);
664	1144
665		- commandsPanel.preferredHeight = 1;
	1145	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ flashSelectionButton.setToolTipText("Highlight selection");
	1147	+ flashSelectionButton.addActionListener(this);
666	1148
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	1149	+ editCommandsPanel.preferredHeight = 1;
	1150	+
	1151	+ SetPinStates(false);
	1152	+// oe.treePanel.add(commandsPanel);
	1153	+// oe.treePanel.Return();
669	1154
670	1155	// oe.aConstraints.gridx += 1;
671	1156	// oe.aConstraints.weighty = 0;
..	..	@@ -682,32 +1167,20 @@
682	1167
683	1168	JScrollPane jSP;
684	1169	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1170	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	1171	ResetModel();
687	1172
688	1173	oe.treePanel.add(jSPPanel);
689	1174	oe.treePanel.Return();
690	1175
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	1176	oe.treePanel.add(copyOptionsPanel);
707	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
708	1181
709		-// mainPanel.setDividerLocation(0.5); //1.0);
710		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
711	1184
712	1185	//jList.addListSelectionListener(this);
713	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -715,7 +1188,7 @@
715	1188	//jTree.setEditable(true);
716	1189	oe.jTree.setDragEnabled(true);
717	1190	//jTree.setPreferredSize(new Dimension(10,10));
718		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
719	1192
720	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
721	1194
..	..	@@ -727,29 +1200,49 @@
727	1200	dgr.addDragGestureListener(this);
728	1201	}catch(Exception e) {}
729	1202	*/
730		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
731	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	1205	}
733	1206
734	1207	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	1208	{
	1209	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1210	+ colorCB.setToolTipText("Copy color when dropped");
	1211	+ colorCB.addItemListener(this);
	1212	+
	1213	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1214	+ materialCB.setToolTipText("Copy material when dropped");
	1215	+ materialCB.addItemListener(this);
	1216	+
	1217	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1218	+ textureCB.setToolTipText("Copy texture when dropped");
	1219	+ textureCB.addItemListener(this);
	1220	+
	1221	+ panel.Return();
	1222	+
736	1223	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	1224	boxCB.setToolTipText("Display bounding boxes");
738	1225	boxCB.addItemListener(this);
739	1226
740	1227	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	1229	zoomBoxCB.addItemListener(this);
743	1230
744	1231	if (true) // Globals.ADVANCED)
745	1232	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
749	1240
750	1241	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	1242	// localCB.addItemListener(this);
752	1243
	1244	+ panel.Return();
	1245	+
753	1246	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	1247	crowdCB.setToolTipText("Used for crowds");
755	1248	crowdCB.addItemListener(this);
..	..	@@ -758,14 +1251,19 @@
758	1251	smoothCB.setToolTipText("Snapping delay");
759	1252	smoothCB.addItemListener(this);
760	1253
761		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
762		- slowCB.setToolTipText("Smooth interpolation");
763		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
764	1260
765	1261	// constraints.gridy += 1;
766	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	1263	// speakerMocapCB.addItemListener(this);
768	1264
	1265	+ panel.Return();
	1266	+
769	1267	if (false)
770	1268	{
771	1269	// handled in scripts
..	..	@@ -780,34 +1278,74 @@
780	1278	//constraints.gridy += 1;
781	1279	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	1280	smoothfocusCB.addItemListener(this);
	1281	+ panel.Return();
783	1282	}
784	1283
785	1284	//constraints.gridx += 1;
786	1285	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	1286	// debugCB.addItemListener(this);
788	1287
	1288	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1289	+ trackCB.setToolTipText("Enable tracking target");
	1290	+ trackCB.addItemListener(this);
	1291	+
789	1292	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1293	+ oeilCB.setToolTipText("Move camera when tracking");
790	1294	oeilCB.addItemListener(this);
791	1295
	1296	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1297	+ shadowCB.setToolTipText("When live compute shadows");
	1298	+ shadowCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1302	+ toggleTextureCB.setToolTipText("Load textures");
	1303	+ toggleTextureCB.addItemListener(this);
	1304	+
	1305	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1307	+ toggleSwitchCB.addItemListener(this);
	1308	+
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
	1312	+
	1313	+ panel.Return();
	1314	+ if (Globals.ADVANCED)
	1315	+ {
792	1316	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	1317	lookAtCB.setToolTipText("Look-at target");
794	1318	lookAtCB.addItemListener(this);
	1319	+ }
795	1320
796	1321	}
797	1322
798	1323	cGridBag fill = new cGridBag();
799		-
800	1324	fill.preferredHeight = 200;
	1325	+ cGridBag fill2 = new cGridBag();
	1326	+ fill2.preferredHeight = 200;
	1327	+ cGridBag fill3 = new cGridBag();
	1328	+ fill3.preferredHeight = 200;
801	1329
802	1330	panel.add(fill);
	1331	+ panel.add(fill2);
	1332	+ panel.add(fill3);
803	1333
804	1334	}
805	1335
806	1336	void EditObject(Object3D obj)
807	1337	{
808	1338	cRadio radioButton = new cRadio(obj.name);
	1339	+
	1340	+ // June 2019. Patch to avoid bug with transparency.
	1341	+ radioButton.hadMaterial = obj.material != null;
	1342	+ if (!radioButton.hadMaterial)
	1343	+ {
	1344	+ obj.material = new cMaterial();
	1345	+ }
	1346	+
809	1347	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
811	1349	radioButton.SetCamera(cameraView.renderCamera, false);
812	1350	radioButton.addActionListener(this);
813	1351	radioPanel.add(radioButton);
..	..	@@ -817,6 +1355,8 @@
817	1355
818	1356	void SetupViews(ObjEditor oe)
819	1357	{
	1358	+ theFrame = this;
	1359	+
820	1360	oe.SetupViews();
821	1361
822	1362	System.out.println("SetupViews");
..	..	@@ -825,23 +1365,30 @@
825	1365	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1366	}
827	1367
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;
	1368	+ cToggleButton liveCB;
	1369	+ cCheckBox supportCB;
	1370	+ cCheckBox localCB;
	1371	+ cCheckBox crowdCB;
	1372	+ cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
	1375	+ cToggleButton fastCB;
	1376	+ cCheckBox slowCB;
	1377	+ cCheckBox boxCB;
	1378	+ cCheckBox zoomBoxCB;
	1379	+ cCheckBox freezeCB;
	1380	+ //cToggleButton trackCB;
	1381	+ cCheckBox trackCB;
	1382	+ cCheckBox smoothfocusCB;
839	1383	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1384	+ cCheckBox speakerCameraCB;
	1385	+ cCheckBox speakerFocusCB;
	1386	+ cCheckBox debugCB;
	1387	+
	1388	+ cCheckBox oeilCB;
	1389	+ cCheckBox shadowCB;
	1390	+ cCheckBox autokeepCB;
	1391	+ cCheckBox lookAtCB;
845	1392
846	1393	// static int COLOR = 1;
847	1394	// static int MATERIAL = 2;
..	..	@@ -849,9 +1396,9 @@
849	1396
850	1397	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1398
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1399	+ cCheckBox colorCB;
	1400	+ cCheckBox materialCB;
	1401	+ cCheckBox textureCB;
855	1402
856	1403	public void itemStateChanged(ItemEvent e)
857	1404	{
..	..	@@ -895,6 +1442,12 @@
895	1442	{
896	1443	cameraView.ToggleInertia();
897	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
898	1451	}
899	1452	else if(e.getSource() == localCB)
900	1453	{
..	..	@@ -944,6 +1497,18 @@
944	1497	{
945	1498	cameraView.ToggleOeil();
946	1499	}
	1500	+ else if(e.getSource() == shadowCB)
	1501	+ {
	1502	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1503	+ }
	1504	+ else if(e.getSource() == freezeCB)
	1505	+ {
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
	1511	+ }
947	1512	else if(e.getSource() == lookAtCB)
948	1513	{
949	1514	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1525,8 @@
960	1525
961	1526	/**/
962	1527	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1528	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1529	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1530	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1531	// We can't move the root node or an empty selection
966	1532	return;
..	..	@@ -1023,8 +1589,6 @@
1023	1589	}
1024	1590	}
1025	1591
1026		- String string = (String) object;
1027		-
1028	1592	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1593	// if( object instanceof java.io.File[])
1030	1594	// {
..	..	@@ -1032,6 +1596,8 @@
1032	1596	// objEditor.DropFile((java.io.File[]) object, true);
1033	1597	// return;
1034	1598	// }
	1599	+
	1600	+ String string = object.toString();
1035	1601
1036	1602	// File path for Mac and Windows
1037	1603	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1643,33 @@
1077	1643
1078	1644	assert target == objEditor.jTree;
1079	1645	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1646	+ Object3D destinationLeaf;
1080	1647	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1648	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1649	} catch (Exception e) {
1083	1650	System.out.println("destinationPath : " + destinationPath);
1084	1651	return;
1085	1652	}
1086	1653
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1654	+ for (int i=group.selection.size(); --i>=0;)
1088	1655	{
	1656	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1657	+
	1658	+ // Cannot move into itself
	1659	+ if (child == destinationLeaf)
	1660	+ return;
	1661	+ }
	1662	+
	1663	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1664	+// {
1089	1665	loadClipboard(true);
1090	1666	objEditor.jTree.setSelectionPath(destinationPath);
1091	1667	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1668	+// } else {
	1669	+// loadClipboard(false);
	1670	+// objEditor.jTree.setSelectionPath(destinationPath);
	1671	+// pasteInto(false, false); // true); // ???
	1672	+// }
1097	1673	}
1098	1674	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1675	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1774,30 @@
1198	1774	{
1199	1775	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1776	//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);
	1777	+// gridItem = menu.add(new MenuItem("Grid"));
	1778	+// gridItem.addActionListener(this);
	1779	+// rectoidItem = menu.add(new MenuItem("Box"));
	1780	+// rectoidItem.addActionListener(this);
	1781	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1782	+// ellipsoidItem.addActionListener(this);
	1783	+// coneItem = menu.add(new MenuItem("Cone"));
	1784	+// coneItem.addActionListener(this);
	1785	+// torusItem = menu.add(new MenuItem("Torus"));
	1786	+// torusItem.addActionListener(this);
	1787	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1788	+// superItem.addActionListener(this);
	1789	+
	1790	+ cameraItem = menu.add(new MenuItem("Camera"));
	1791	+ cameraItem.addActionListener(this);
	1792	+
	1793	+ if (!Globals.ADVANCED)
	1794	+ {
1213	1795	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1796	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1797	+ }
	1798	+
	1799	+// particleItem = menu.add(new MenuItem("Particle system"));
	1800	+// particleItem.addActionListener(this);
1217	1801	if (Globals.ADVANCED)
1218	1802	{
1219	1803	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1823,15 @@
1239	1823	}
1240	1824	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1825	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);
	1826	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1827	+// overlayItem.addActionListener(this);
	1828	+// lightItem = menu.add(new MenuItem("Light"));
	1829	+// lightItem.addActionListener(this);
1246	1830	menu.add("-");
1247	1831	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1832	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1833	+// loopItem = menu.add(new MenuItem("Loop"));
	1834	+// loopItem.addActionListener(this);
1251	1835	doubleItem = menu.add(new MenuItem("Fork"));
1252	1836	doubleItem.addActionListener(this);
1253	1837	if (Globals.ADVANCED)
..	..	@@ -1263,6 +1847,9 @@
1263	1847	animationItem.addItemListener(this);
1264	1848	animationItem.setState(Globals.ANIMATION);
1265	1849
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
	1852	+
1266	1853	menu.add("-");
1267	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	1855	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +1862,8 @@
1275	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	1863	reduce34MorphItem.addActionListener(this);
1277	1864	menu.add("-");
	1865	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1866	+ memoryItem.addActionListener(this);
1278	1867	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	1868	computeAOItem.addActionListener(this);
1280	1869
..	..	@@ -1283,8 +1872,6 @@
1283	1872	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	1873	mirrorItem.addActionListener(this);
1285	1874	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	1876	analyzeItem.addActionListener(this);
1290	1877	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +2015,34 @@
1428	2015	shadow.material = new cMaterial(obj.material);
1429	2016	shadow.material.diffuse = 0.0001f;
1430	2017	shadow.material.specular = 0.0001f;
	2018	+ //shadow.projectedVertices[1].x = 300;
1431	2019
1432	2020	makeSomething(shadow);
1433	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1434	2046
1435	2047	/**
1436	2048	* applyExample
..	..	@@ -1675,7 +2287,7 @@
1675	2287	{
1676	2288	ScreenFit();
1677	2289	} else
1678		- if (source == switchItem)
	2290	+ if (source == switchViewItem)
1679	2291	{
1680	2292	cVector v1 = new cVector();
1681	2293	cVector v2 = new cVector();
..	..	@@ -1684,11 +2296,11 @@
1684	2296	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	2297	objEditor.cameraView.repaint();
1686	2298	} else
1687		- if (source == rectoidItem)
	2299	+ if (source == rectoidItem \|\| source == boxButton)
1688	2300	{
1689	2301	makeSomething(new Box());
1690	2302	} else
1691		- if (source == particleItem)
	2303	+ if (source == particleItem \|\| source == particlesButton)
1692	2304	{
1693	2305	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	2306	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2379,27 @@
1767	2379
1768	2380	makeSomething(obj);
1769	2381	} else
1770		- if (source == gridItem)
	2382	+ if (source == gridItem \|\| source == gridButton)
1771	2383	{
1772	2384	makeSomething(new Grid());
1773	2385	} else
1774		- if (source == ellipsoidItem)
	2386	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2387	{
1776	2388	makeSomething(new Sphere());
1777	2389	} else
1778		- if (source == coneItem)
	2390	+ if (source == coneItem \|\| source == coneButton)
1779	2391	{
1780	2392	makeSomething(new Cone());
1781	2393	} else
1782		- if (source == torusItem)
	2394	+ if (source == torusItem \|\| source == torusButton)
1783	2395	{
1784	2396	makeSomething(new Torus());
1785	2397	} else
1786		- if (source == superItem)
	2398	+ if (source == superItem \|\| source == superButton)
1787	2399	{
1788	2400	makeSomething(new Superellipsoid());
1789	2401	} else
1790		- if (source == kleinItem)
	2402	+ if (source == kleinItem \|\| source == kleinButton)
1791	2403	{
1792	2404	makeSomething(new Klein());
1793	2405	} else
..	..	@@ -1807,7 +2419,7 @@
1807	2419	{
1808	2420	makeSomething(new BezierSurface());
1809	2421	} else
1810		- if (source == overlayItem)
	2422	+ if (source == overlayItem \|\| source == overlayButton)
1811	2423	{
1812	2424	/*
1813	2425	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,10 +2467,27 @@
1855	2467	s.setup();
1856	2468	makeSomething(s);
1857	2469	} else
1858		- if (source == lightItem)
	2470	+ if (source == lightItem \|\| source == lightButton)
1859	2471	{
1860	2472	makeSomething(new Light());
1861	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
1862	2491	if (source == csgItem)
1863	2492	{
1864	2493	group(new CSG());
..	..	@@ -1905,30 +2534,30 @@
1905	2534
1906	2535	group(g);
1907	2536	} else
1908		- if (source == loopItem)
	2537	+ if (source == loopItem \|\| source == loopButton)
1909	2538	{
1910	2539	Composite csg = new GroupLeaf();
1911	2540	csg.count = 5;
1912	2541	group(csg);
1913		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
1914	2543	csg.addChild(child);
1915	2544	child.addChild(csg);
1916	2545	} else
1917	2546	if (source == doubleItem)
1918	2547	{
1919		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
1920	2549	csg.count = 5;
1921	2550	group(csg);
1922		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
1923	2552	csg.addChild(child);
1924	2553	child.addChild(csg);
1925		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
1926	2555	csg.addChild(child);
1927	2556	child.addChild(csg);
1928	2557	} else
1929	2558	if (source == tripleItem)
1930	2559	{
1931		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
1932	2561	csg.count = 4;
1933	2562	group(csg);
1934	2563	Composite child = new cGroup();
..	..	@@ -1944,7 +2573,7 @@
1944	2573	if (source == computeAOItem)
1945	2574	{
1946	2575	Globals.drawMode = CameraPane.OCCLUSION;
1947		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
1948	2577	} else
1949	2578	if (source == recompileItem)
1950	2579	{
..	..	@@ -1959,7 +2588,7 @@
1959	2588	if (source == invariantsItem)
1960	2589	{
1961	2590	System.out.println("Invariants:");
1962		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
1963	2592	} else
1964	2593	if (source == memoryItem)
1965	2594	{
..	..	@@ -1978,17 +2607,52 @@
1978	2607	{
1979	2608	DumpObject();
1980	2609	} else
1981		- if (source == undoButton)
	2610	+ if (source == minButton)
1982	2611	{
1983		- Undo();
	2612	+ Minimize();
1984	2613	} else
1985		- if (source == redoButton)
	2614	+ if (source == maxButton)
1986	2615	{
1987		- Redo();
	2616	+ Maximize();
1988	2617	} else
1989		- if (source == saveButton)
	2618	+ if (source == fullButton)
1990	2619	{
1991		- Save();
	2620	+ ToggleFullScreen();
	2621	+ } else
	2622	+ if (source == previousVersionButton)
	2623	+ {
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
	2628	+ } else
	2629	+ if (source == restoreButton)
	2630	+ {
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
	2634	+ } else
	2635	+ if (source == replaceButton)
	2636	+ {
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
1992	2656	} else
1993	2657	if (source == oneStepButton)
1994	2658	{
..	..	@@ -1997,17 +2661,14 @@
1997	2661	} else
1998	2662	if (source == screenfitButton)
1999	2663	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2664	ScreenFit();
2002	2665	} else
2003	2666	if (source == screenfitpointButton)
2004	2667	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2668	ScreenFitPoint();
2007	2669	} else
2008	2670	if (source == snapobjectButton)
2009	2671	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2672	SnapObject();
2012	2673	} else
2013	2674	// if (event.getSource() == recompileButton)
..	..	@@ -2046,11 +2707,11 @@
2046	2707	} else
2047	2708	if (source == undoItem)
2048	2709	{
2049		- Undo();
	2710	+ PreviousVersion();
2050	2711	} else
2051	2712	if (source == redoItem)
2052	2713	{
2053		- Redo();
	2714	+ NextVersion();
2054	2715	} else
2055	2716	if (source == duplicateItem)
2056	2717	{
..	..	@@ -2371,7 +3032,7 @@
2371	3032	{
2372	3033	StepAll();
2373	3034	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	3036	{
2376	3037	//int indices[] = jList.getSelectedIndices();
2377	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +3044,9 @@
2383	3044	{
2384	3045	ClearSelection(true);
2385	3046	} else
2386		- if (source == grabItem)
	3047	+ if (source == grabItem \|\| source == groupButton)
2387	3048	{
2388		- group(new cGroup(), true);
	3049	+ group(new cGroup(), false); // true);
2389	3050	} else
2390	3051	if (source == hideItem)
2391	3052	{
..	..	@@ -2403,11 +3064,11 @@
2403	3064	{
2404	3065	makeSomething(new Camera());
2405	3066	} else
2406		- if (source == compositeItem)
	3067	+ if (source == compositeItem \|\| source == compositeButton)
2407	3068	{
2408	3069	group(new Composite());
2409	3070	} else
2410		- if (source == randomItem)
	3071	+ if (source == switchItem \|\| source == switchButton)
2411	3072	{
2412	3073	RandomNode random = new RandomNode();
2413	3074	group(random);
..	..	@@ -2509,7 +3170,7 @@
2509	3170	{
2510	3171	group(new cLinker());
2511	3172	} else
2512		- if (source == textureItem)
	3173	+ if (source == textureItem \|\| source == textureButton)
2513	3174	{
2514	3175	group(new TextureNode());
2515	3176	} else
..	..	@@ -2529,17 +3190,30 @@
2529	3190	{
2530	3191	CastShadow(2);
2531	3192	} else
2532		- if (source == ungroupItem)
	3193	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	3194	{
2534		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2535	3197	for (int i=0; i<group.selection.size(); i++)
2536	3198	{
2537		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2538	3204	}
2539	3205
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2543	3217	} else
2544	3218	if (source == genUVItem)
2545	3219	{
..	..	@@ -2840,7 +3514,7 @@
2840	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2841	3515	{
2842	3516	obj = (Object3D)e.nextElement();
2843		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
2844	3518	}
2845	3519
2846	3520	refreshContents();
..	..	@@ -2856,6 +3530,31 @@
2856	3530
2857	3531	refreshContents();
2858	3532	} else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
	3556	+ refreshContents();
	3557	+ } else
2859	3558	if (source == flashSelectionButton)
2860	3559	{
2861	3560	CameraPane.flash = true;
..	..	@@ -2867,6 +3566,10 @@
2867	3566	if (source == twoButton)
2868	3567	{
2869	3568	radio.layout = twoButton;
	3569	+
	3570	+ if (CameraPane.FULLSCREEN)
	3571	+ fullscreenLayout = radio.layout;
	3572	+
2870	3573	// bug
2871	3574	//gridPanel.setDividerLocation(1.0);
2872	3575	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3602,31 @@
2899	3602	bigThree.ClearUI();
2900	3603	bigThree.add(centralPanel);
2901	3604	bigThree.FlushUI();
	3605	+
	3606	+ cameraView.requestFocusInWindow();
	3607	+
	3608	+// refreshContents(true);
	3609	+//
	3610	+// try
	3611	+// {
	3612	+// java.awt.Robot bot = new java.awt.Robot();
	3613	+// int mask = InputEvent.BUTTON1_MASK;
	3614	+// bot.mouseMove(100, 100);
	3615	+// bot.mousePress(mask);
	3616	+// bot.mouseRelease(mask);
	3617	+// }
	3618	+// catch (Exception e)
	3619	+// {
	3620	+//
	3621	+// }
	3622	+
2902	3623	} else
2903	3624	if (source == threeButton)
2904	3625	{
2905	3626	radio.layout = threeButton;
	3627	+
	3628	+ if (CameraPane.FULLSCREEN)
	3629	+ fullscreenLayout = radio.layout;
2906	3630
2907	3631	// bigThree.remove(scenePanel);
2908	3632	// bigThree.remove(centralPanel);
..	..	@@ -2932,13 +3656,18 @@
2932	3656	// centralPanel.setVisible(true);
2933	3657	// XYZPanel.setVisible(true);
2934	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
2935	3660	bigThree.add(centralPanel);
2936		- bigThree.add(XYZPanel);
2937	3661	bigThree.FlushUI();
	3662	+
	3663	+ cameraView.requestFocusInWindow();
2938	3664	} else
2939	3665	if (source == fourButton)
2940	3666	{
2941	3667	radio.layout = fourButton;
	3668	+
	3669	+ if (CameraPane.FULLSCREEN)
	3670	+ fullscreenLayout = radio.layout;
2942	3671
2943	3672	// bigThree.remove(scenePanel);
2944	3673	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3699,15 @@
2970	3699	bigThree.ClearUI();
2971	3700	bigThree.add(scenePanel);
2972	3701	bigThree.FlushUI();
	3702	+
	3703	+ cameraView.requestFocusInWindow();
2973	3704	} else
2974	3705	if (source == sixButton)
2975	3706	{
2976	3707	radio.layout = sixButton;
	3708	+
	3709	+ if (CameraPane.FULLSCREEN)
	3710	+ fullscreenLayout = radio.layout;
2977	3711
2978	3712	// bigThree.remove(scenePanel);
2979	3713	// bigThree.remove(centralPanel);
..	..	@@ -3003,13 +3737,18 @@
3003	3737	// centralPanel.setVisible(true);
3004	3738	// XYZPanel.setVisible(false);
3005	3739	bigThree.ClearUI();
3006		- bigThree.add(scenePanel);
3007	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
3008	3742	bigThree.FlushUI();
	3743	+
	3744	+ cameraView.requestFocusInWindow();
3009	3745	} else
3010	3746	if (source == sevenButton)
3011	3747	{
3012	3748	radio.layout = sevenButton;
	3749	+
	3750	+ if (CameraPane.FULLSCREEN)
	3751	+ fullscreenLayout = radio.layout;
3013	3752
3014	3753	// bigThree.remove(scenePanel);
3015	3754	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3782,8 @@
3043	3782	bigThree.add(centralPanel);
3044	3783	bigThree.add(XYZPanel);
3045	3784	bigThree.FlushUI();
	3785	+
	3786	+ cameraView.requestFocusInWindow();
3046	3787	} else
3047	3788	if (source == rootButton)
3048	3789	{
..	..	@@ -3054,6 +3795,7 @@
3054	3795	EditObject(obj);
3055	3796	}
3056	3797
	3798	+ cameraView.requestFocusInWindow();
3057	3799	refreshContents(true);
3058	3800	} else
3059	3801	if (source == closeButton)
..	..	@@ -3063,22 +3805,37 @@
3063	3805	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3806	{
3065	3807	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3808	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3809	{
	3810	+ // Patch to avoid bug with transparency.
	3811	+ if (!ab.hadMaterial)
	3812	+ {
	3813	+ ab.object.material = null;
	3814	+ }
	3815	+
3068	3816	buttonGroup.remove(ab);
3069	3817	radioPanel.remove(ab);
3070	3818
3071		- ab.GetObject().editWindow = null;
	3819	+ //ab.GetObject().editWindow = null;
	3820	+ ab.GetObject().manipWindow = null;
3072	3821	// ab.GetObject().objectUI = null; // ?????????
3073	3822
3074	3823	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3824	break;
3076	3825	}
3077	3826	}
	3827	+
	3828	+ cameraView.requestFocusInWindow();
3078	3829	refreshContents(true);
3079	3830	} else
3080	3831	if (source == editItem \|\| source == editButton)
3081	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
3082	3839	EditSelection(false);
3083	3840	} else
3084	3841	if (source == uneditButton)
..	..	@@ -3087,9 +3844,10 @@
3087	3844	{
3088	3845	Object3D child = (Object3D)e.nextElement();
3089	3846	if(child.editWindow != null)
3090		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
3091	3848	child.CloseUI();
3092	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	3851
3094	3852	//child.editWindow = null; // ???????????
3095	3853	}
..	..	@@ -3104,16 +3862,18 @@
3104	3862	//copy.ClearUI();
3105	3863	for (Object3D obj : listUI)
3106	3864	{
	3865	+ obj.pinned = false;
3107	3866	obj.CloseUI();
3108	3867	}
3109	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3110	3870	refreshContents(true);
3111	3871	} else
3112	3872	if (source == allParamsButton)
3113	3873	{
3114	3874	assert(copy == group);
3115	3875
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3877
3118	3878	for (Object3D obj : listUI)
3119	3879	{
..	..	@@ -3162,6 +3922,9 @@
3162	3922	}
3163	3923
3164	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3165	3928	//Globals.theRenderer.object = group;
3166	3929	if(!useclient)
3167	3930	{
..	..	@@ -3179,7 +3942,8 @@
3179	3942	}
3180	3943
3181	3944	// fix "+" issue
3182		- group.editWindow = this;
	3945	+ //group.editWindow = this;
	3946	+ group.manipWindow = this;
3183	3947
3184	3948	/*
3185	3949	currentLayout = radio.layout;
..	..	@@ -3187,20 +3951,32 @@
3187	3951	currentLayout = sevenButton;
3188	3952	*/
3189	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
3190	3962	keepparent = group.parent;
3191	3963	// PARENT = NULL or not???
3192	3964	//group.parent = null; // ROOT
3193	3965	//group.attributes = -1;
3194	3966	ResetModel();
	3967	+
	3968	+ cameraView.requestFocusInWindow();
3195	3969	refreshContents(true);
3196	3970	} else if (event.getSource() == editCameraItem)
3197	3971	{
3198	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3199	3974	cameraView.repaint();
3200	3975	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3976	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3977	{
3203	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3204	3980	cameraView.repaint();
3205	3981	return;
3206	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -3215,7 +3991,6 @@
3215	3991	}
3216	3992
3217	3993	boolean useclient = false;
3218		- cRadio radio;
3219	3994
3220	3995	void ToggleRoot()
3221	3996	{
..	..	@@ -3778,7 +4553,7 @@
3778	4553
3779	4554	try
3780	4555	{
3781		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3782	4557	}
3783	4558	catch (Exception e)
3784	4559	{
..	..	@@ -4253,28 +5028,25 @@
4253	5028	// }
4254	5029	// }
4255	5030
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	5031	void EditSelection(boolean newWindow)
4261	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4262	5039	// aConstraints.gridy = 0;
4263	5040	for (int i=0; i<group.selection.size(); i++)
4264	5041	{
4265	5042	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	5043	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5044	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	5045
4269	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	5047	if(elem != group \|\| !newWindow)
4271	5048	{
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
	5049	+ EditElement(elem, newWindow); // ? new
4278	5050	}
4279	5051	}
4280	5052	}
..	..	@@ -4337,9 +5109,7 @@
4337	5109
4338	5110	freezemodel = false;
4339	5111	}
4340		-
4341		- boolean flashIt = true;
4342		-
	5112	+
4343	5113	public void valueChanged(TreeSelectionEvent e)
4344	5114	//public boolean handleEvent(Event event)
4345	5115	{
..	..	@@ -4349,7 +5119,8 @@
4349	5119	//new Exception().printStackTrace();
4350	5120
4351	5121	freezemodel = true;
4352		-
	5122	+ ClearUnpinned();
	5123	+
4353	5124	/**/
4354	5125	//switch (event.id)
4355	5126	{
..	..	@@ -4382,7 +5153,7 @@
4382	5153	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	5154	// a camera
4384	5155	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	5157	{
4387	5158	CameraPane.camerachangeframe = 0; // don't refuse it
4388	5159	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +5162,13 @@
4391	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	5163	}
4393	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4394	5172	refreshContents();
4395	5173	//return true;
4396	5174	}
..	..	@@ -4400,9 +5178,20 @@
4400	5178	freezemodel = false;
4401	5179	}
4402	5180
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ //unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
4403	5191	void refreshContents(boolean cp)
4404	5192	{
4405		- if (!Globals.MOUSEDRAGGED)
	5193	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	5195	{
4407	5196	objEditor.ClearInfo(); // .GetMaterial());
4408	5197
..	..	@@ -4501,7 +5290,8 @@
4501	5290
4502	5291	if (cut)
4503	5292	{
4504		- Save();
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4505	5295	//int indices[] = jList.getSelectedIndices();
4506	5296	//for (int i = indices.length - 1; i >= 0; i--)
4507	5297	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5394,10 @@
4604	5394
4605	5395	void paste(boolean expand)
4606	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4607	5401	// if (GrafreeD.clipboard == null)
4608	5402	// return;
4609	5403	boolean first = true;
..	..	@@ -4663,6 +5457,7 @@
4663	5457	Grafreed.clipboard.get(0).parent = keepparent;
4664	5458	}
4665	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4666	5461	ResetModel();
4667	5462	refreshContents();
4668	5463	}
..	..	@@ -4798,6 +5593,10 @@
4798	5593
4799	5594	void group(Object3D csg, boolean grab)
4800	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
4801	5600	if (//false) // why??
4802	5601	!group.selection.isEmpty())
4803	5602	{
..	..	@@ -4911,10 +5710,15 @@
4911	5710	//node.add(csg);
4912	5711	//makeSomething(node);
4913	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
4914	5714	}
4915	5715
4916	5716	void Ungroup(Object3D g)
4917	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
4918	5722	if (g instanceof HiddenObject)
4919	5723	{
4920	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5735,7 @@
4931	5735	objEditor.makeSomething(g.get(i), false);
4932	5736	}
4933	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
4934	5739	}
4935	5740
4936	5741	void ungroup()
..	..	@@ -5219,10 +6024,43 @@
5219	6024	cButton clearpanelButton;
5220	6025	cButton unselectButton;
5221	6026
5222		- cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
	6027	+ cButton restoreCameraButton;
	6028	+
5225	6029	cButton oneStepButton;
	6030	+
	6031	+ cButton groupButton;
	6032	+ cButton ungroupButton;
	6033	+ cButton compositeButton;
	6034	+ cButton switchButton;
	6035	+ cButton loopButton;
	6036	+ cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
	6053	+
	6054	+ cButton gridButton;
	6055	+ cButton boxButton;
	6056	+ cButton sphereButton;
	6057	+ cButton coneButton;
	6058	+ cButton torusButton;
	6059	+ cButton superButton;
	6060	+ cButton kleinButton;
	6061	+ cButton particlesButton;
	6062	+ cButton overlayButton;
	6063	+ cButton lightButton;
5226	6064
5227	6065	cButton screenfitButton;
5228	6066	cButton screenfitpointButton;
..	..	@@ -5235,14 +6073,6 @@
5235	6073
5236	6074	cButton setsupportButton;
5237	6075
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	6076	//
5247	6077	//Composite
5248	6078	Object3D // to do !!
..	..	@@ -5252,11 +6082,11 @@
5252	6082	//JTree jTree;
5253	6083	private MenuItem lookAtItem;
5254	6084	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	6085	+ private MenuItem switchViewItem;
5256	6086	private MenuItem cutItem;
5257	6087	private MenuItem undoItem;
5258	6088	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	6089	+ private JMenuItem duplicateItem;
5260	6090	private MenuItem cloneItem;
5261	6091	private MenuItem cloneSupportItem;
5262	6092	private MenuItem overwriteGeoItem;
..	..	@@ -5284,7 +6114,7 @@
5284	6114	private MenuItem pasteLinkItem;
5285	6115	private MenuItem pasteCloneItem;
5286	6116	private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5288	6118	private MenuItem clearAllItem;
5289	6119	private MenuItem genUVItem;
5290	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5344,7 +6174,7 @@
5344	6174	private MenuItem frontItem;
5345	6175	private MenuItem cameraItem;
5346	6176	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	6177	+ private MenuItem switchItem;
5348	6178	private MenuItem physicsItem;
5349	6179	private MenuItem frameselectorItem;
5350	6180	private MenuItem scriptNodeItem;
..	..	@@ -5368,6 +6198,8 @@
5368	6198	private MenuItem attachBumpItem;
5369	6199	private MenuItem detachBumpItem;
5370	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5371	6203
5372	6204	private MenuItem particleItem;
5373	6205	private MenuItem ragdollItem;
..	..	@@ -5418,5 +6250,5 @@
5418	6250
5419	6251	Menu cameraMenu;
5420	6252	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	6253	+ MenuItem restoreCameraItem;
5422	6254	}