~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,341 @@
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, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	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	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
26	362	//ObjEditor objEditor;
27	363	public void closeUI2()
28	364	{
..	..	@@ -60,6 +396,12 @@
60	396	this.copy = this.group = group;
61	397	//selectees = this.group.selectees;
62	398
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+ }
	404	+
63	405	if(ui)
64	406	SetupUI(objEditor);
65	407	}
..	..	@@ -80,10 +422,22 @@
80	422	SetupViews(objEditor);
81	423
82	424	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	425	+
	426	+ if (copy.versionlist == null)
	427	+ {
	428	+ copy.versionlist = new Object3D[100];
	429	+ copy.versionindex = -1;
	430	+
	431	+ Save(true);
	432	+ }
83	433	}
84	434
85	435	void CloneSelection(boolean supports)
86	436	{
	437	+ if (Globals.REPLACEONMAKE)
	438	+ Save();
	439	+ boolean keep = Globals.REPLACEONMAKE;
	440	+ Globals.REPLACEONMAKE = false;
87	441	// Object3D keep = GrafreeD.clipboard;
88	442	//Object3D obj;
89	443	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +448,7 @@
94	448
95	449	makeSomething(clone, i==group.selection.size()-1);
96	450	}
	451	+ Globals.REPLACEONMAKE = keep;
97	452	}
98	453
99	454	void CloneClipboard(boolean supports)
..	..	@@ -150,16 +505,19 @@
150	505
151	506	void SetupMenu2(GroupEditor oe)
152	507	{
	508	+ oe.jTree = new cTree();
	509	+
153	510	Menu menu;
154	511	oe.menuBar.add(menu = new Menu("Edit"));
155	512	//editItem = menu.add(new MenuItem("Edit"));
156	513	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	514	+
	515	+// undoItem = menu.add(new MenuItem("Undo"));
	516	+// undoItem.addActionListener(this);
	517	+// redoItem = menu.add(new MenuItem("Redo"));
	518	+// redoItem.addActionListener(this);
	519	+// menu.add("-");
	520	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	521	duplicateItem.addActionListener(this);
164	522	cloneItem = menu.add(new MenuItem("Clone"));
165	523	cloneItem.addActionListener(this);
..	..	@@ -175,7 +533,6 @@
175	533	copyItem.addActionListener(this);
176	534	pasteItem = menu.add(new MenuItem("Paste"));
177	535	pasteItem.addActionListener(this);
178		- menu.add("-");
179	536
180	537	menu.add("-");
181	538	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -187,8 +544,8 @@
187	544	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	545	// pasteExpandItem.addActionListener(this);
189	546	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	547	+ deleteItem = menu.add(new MenuItem("Delete"));
	548	+ deleteItem.addActionListener(this);
192	549
193	550	if (Globals.ADVANCED)
194	551	{
..	..	@@ -202,23 +559,23 @@
202	559	//zBufferItem.addActionListener(this);
203	560	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	561	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	562	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	563	+ restoreCameraItem.addActionListener(this);
207	564
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	565	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	566	+// toggleFullScreenItem.addItemListener(this);
	567	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	568	+// cameraMenu.add("-");
	569	+//
	570	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	571	+// toggleTextureItem.addItemListener(this);
	572	+// toggleTextureItem.setState(CameraPane.textureon);
	573	+//
	574	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	575	+// toggleSwitchItem.addItemListener(this);
	576	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	577
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	578	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	579	toggleHandleItem.addItemListener(this);
223	580	toggleHandleItem.setState(CameraPane.HANDLES);
224	581
..	..	@@ -245,7 +602,7 @@
245	602
246	603	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	604	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	605	+ toggleDebugItem.setState(Globals.DEBUG);
249	606
250	607	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	608	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +623,14 @@
266	623	// animationItem.addItemListener(this);
267	624	// animationItem.setState(CameraPane.ANIMATION);
268	625	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	626	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	627	editCameraItem.addActionListener(this);
271	628
272	629	if (Globals.ADVANCED)
273	630	{
274	631	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	632	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	633	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	634	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	635	oe.cameraMenu.add("-");
279	636	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +638,7 @@
281	638	editLeafItem.addActionListener(this);
282	639	lookAtItem.addActionListener(this);
283	640	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	641	+ //switchViewItem.addActionListener(this);
285	642	}
286	643
287	644	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +683,29 @@
326	683	}
327	684
328	685	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	686	+// grabItem = menu.add(new MenuItem("Grab"));
	687	+// grabItem.addActionListener(this);
331	688	backItem = menu.add(new MenuItem("Back"));
332	689	backItem.addActionListener(this);
333	690	frontItem = menu.add(new MenuItem("Front"));
334	691	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	692	+// compositeItem = menu.add(new MenuItem("Composite"));
	693	+// compositeItem.addActionListener(this);
	694	+
	695	+ if (Globals.ADVANCED)
	696	+ {
337	697	hideItem = menu.add(new MenuItem("Hidden Group"));
338	698	hideItem.addActionListener(this);
	699	+ }
339	700	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	701	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	702	+
	703	+// menu.add("-");
	704	+//
	705	+// switchItem = menu.add(new MenuItem("Switch node"));
	706	+// switchItem.addActionListener(this);
	707	+ if (Globals.ADVANCED)
	708	+ {
344	709	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	710	switchGeoItem.addActionListener(this);
346	711	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +713,6 @@
348	713	morphItem = menu.add(new MenuItem("Morph Group"));
349	714	morphItem.addActionListener(this);
350	715
351		- if (Globals.ADVANCED)
352		- {
353	716	menu.add("-");
354	717	physicsItem = menu.add(new MenuItem("Physics"));
355	718	physicsItem.addActionListener(this);
..	..	@@ -357,30 +720,29 @@
357	720	frameselectorItem.addActionListener(this);
358	721	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	722	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	723	}
363	724
364	725	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	726	+// textureItem = menu.add(new MenuItem("Texture"));
	727	+// textureItem.addActionListener(this);
367	728	billboardItem = menu.add(new MenuItem("Billboard"));
368	729	billboardItem.addActionListener(this);
369	730	csgItem = menu.add(new MenuItem("CSG"));
370	731	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	732	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	733	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	734	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	735	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	736	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	737	shadowZItem.addActionListener(this);
	738	+ attributeItem = menu.add(new MenuItem("Attribute"));
	739	+ attributeItem.addActionListener(this);
	740	+
377	741	if (Globals.ADVANCED)
378	742	{
379	743	menu.add("-");
380	744	linkerItem = menu.add(new MenuItem("Linker"));
381	745	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	746	templateItem = menu.add(new MenuItem("Template"));
385	747	templateItem.addActionListener(this);
386	748	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +771,7 @@
409	771	genNormalsMESHItem.addActionListener(this);
410	772	if (Globals.ADVANCED)
411	773	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	774	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	775	genNormalsMINEItem.addActionListener(this);
414	776	}
415	777	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -469,6 +831,14 @@
469	831	markleavesItem.addActionListener(this);
470	832	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	833	unmarkleavesItem.addActionListener(this);
	834	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	835	+ rewindleavesItem.addActionListener(this);
	836	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	837	+ unrewindleavesItem.addActionListener(this);
	838	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	839	+ randomleavesItem.addActionListener(this);
	840	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	841	+ unrandomleavesItem.addActionListener(this);
472	842	menu.add("-");
473	843	flipVItem = menu.add(new MenuItem("Flip V"));
474	844	flipVItem.addActionListener(this);
..	..	@@ -494,10 +864,15 @@
494	864	attachBumpItem.addActionListener(this);
495	865	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
496	866	pigmentBumpItem.addActionListener(this);
	867	+ //embedTexturesItem
497	868	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
498	869	detachPigmentItem.addActionListener(this);
499	870	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
500	871	detachBumpItem.addActionListener(this);
	872	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	873	+ embedTexturesItem.addActionListener(this);
	874	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	875	+ deEmbedTexturesItem.addActionListener(this);
501	876	menu.add("-");
502	877	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
503	878	sortbysizeItem.addActionListener(this);
..	..	@@ -524,8 +899,88 @@
524	899	buildToolsMenu(menu);
525	900	}
526	901
	902	+ JTabbedPane resourcecontainer;
	903	+ cGridBag currenttab;
	904	+ boolean added; // patch for jar
	905	+
	906	+ int tabcount = 0;
	907	+ int colcount = 0;
	908	+ int rowcount = 0;
	909	+ int texturecount = 0;
	910	+
	911	+ int columns = 5;
	912	+ int rows = 7;
	913	+
	914	+ public void ResourceCallBack(String[] path)
	915	+ {
	916	+// for (int i = 0; i < path.length; i++)
	917	+// System.out.print(path[i] + "/");
	918	+// System.out.println();
	919	+
	920	+ if (//rowcount == 0 \|\|
	921	+ path.length == 1)
	922	+ {
	923	+ currenttab = new cGridBag();
	924	+ added = false;
	925	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	926	+ currenttab.setName(tabname);
	927	+ rowcount = 1;
	928	+ colcount = 0;
	929	+ texturecount = 0;
	930	+ }
	931	+
	932	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	933	+ {
	934	+ if (!added)
	935	+ {
	936	+ added = true;
	937	+ resourcecontainer.add(currenttab);
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	940	+ }
	941	+
	942	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	943	+
	944	+ if (++colcount >= columns)
	945	+ {
	946	+ colcount = 0;
	947	+ currenttab.Return();
	948	+
	949	+ if (rowcount++ >= rows)
	950	+ {
	951	+ rowcount = 0;
	952	+ }
	953	+ }
	954	+ }
	955	+ else
	956	+ {
	957	+// if (!path[path.length-1].equals("icons"))
	958	+// resourcecontainer.Return();
	959	+ }
	960	+ }
	961	+
	962	+ void CreateTexturePanel(cGridBag container)
	963	+ {
	964	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	965	+ container.add(resourcecontainer);
	966	+
	967	+ Grafreed.ParseResources("textures", this);
	968	+ }
	969	+
527	970	void SetupUI2(ObjEditor oe)
528	971	{
	972	+ // June 2019
	973	+ if (oe == null)
	974	+ {
	975	+ //super.SetupUI2(this);
	976	+ //return;
	977	+ }
	978	+
	979	+ if (copy != group)
	980	+ {
	981	+ //super.SetupUI2(this);
	982	+ }
	983	+
529	984	//new Exception().printStackTrace();
530	985
531	986	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +1009,83 @@
554	1009	oe.radioPanel.add(dummyButton);
555	1010	oe.buttonGroup.add(dummyButton);
556	1011	*/
	1012	+ cGridBag copyOptionsPanel = new cGridBag();
	1013	+
	1014	+ copyOptionsPanel.preferredHeight = 2;
	1015	+
557	1016	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	1017
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	1018	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ //minButton.setToolTipText("Minimize window");
	1020	+ //minButton.addActionListener(this);
	1021	+
	1022	+ if (Globals.ADVANCED)
	1023	+ {
	1024	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ maxButton.setToolTipText("Maximize window");
	1026	+ maxButton.addActionListener(this);
	1027	+ }
	1028	+
	1029	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ fullButton.setToolTipText("Full-screen window");
	1031	+ fullButton.addActionListener(this);
	1032	+
	1033	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ screenfitButton.setToolTipText("Screen fit");
	1035	+ screenfitButton.addActionListener(this);
	1036	+
	1037	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1039	+ restoreCameraButton.addActionListener(this);
	1040	+
	1041	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ saveVersionButton.setToolTipText("Duplicate current version");
	1043	+ saveVersionButton.addActionListener(this);
	1044	+
	1045	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ deleteVersionButton.setToolTipText("Delete current version");
	1047	+ deleteVersionButton.addActionListener(this);
	1048	+
	1049	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ previousVersionButton.setToolTipText("Previous version");
	1051	+ previousVersionButton.addActionListener(this);
	1052	+ previousVersionButton.setEnabled(false);
	1053	+
	1054	+ cGridBag updown = new cGridBag().setVertical(true);
	1055	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ restoreButton.setToolTipText("Undo (restore current version)");
	1057	+ restoreButton.addActionListener(this);
	1058	+ //restoreButton.setEnabled(false);
	1059	+
	1060	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ replaceButton.setToolTipText("Save (replace current version)");
	1062	+ replaceButton.addActionListener(this);
	1063	+ //replaceButton.setEnabled(false);
	1064	+
	1065	+ copyOptionsPanel.add(updown);
	1066	+
	1067	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ nextVersionButton.setToolTipText("Next version");
	1069	+ nextVersionButton.addActionListener(this);
	1070	+ nextVersionButton.setEnabled(false);
	1071	+
	1072	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	1073	liveCB.setToolTipText("Enable animation");
561	1074	liveCB.addItemListener(this);
562	1075
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	1077	oneStepButton.setToolTipText("Animate one step forward");
565	1078	oneStepButton.addActionListener(this);
566	1079
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1080	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	1081	fastCB.setToolTipText("Fast mode");
569	1082	fastCB.addItemListener(this);
570	1083
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- screenfitButton.addActionListener(this);
	1084	+ //oe.toolboxPanel.Return();
	1085	+
	1086	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1087	+// trackCB.setToolTipText("Enable tracking");
	1088	+// trackCB.addItemListener(this);
578	1089
579	1090	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	1091	// screenfitpointButton.addActionListener(this);
..	..	@@ -584,67 +1095,152 @@
584	1095	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	1096	snapobjectButton.addActionListener(this);
586	1097	snapobjectButton.setToolTipText("Snap Object");
	1098	+
	1099	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ fourButton.addActionListener(this);
	1101	+ fourButton.setToolTipText("Show control panel only");
587	1102	}
588	1103
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	1104	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	1105
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- twoButton.setToolTipText("Show center view only");
	1106	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ twoButton.setToolTipText("Show 3D view only");
597	1108	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599		- fourButton.addActionListener(this);
600		- fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- sixButton.setToolTipText("2-column layout left");
603		- sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605		- threeButton.setToolTipText("2-column layout right");
	1109	+ this.fullscreenLayout = twoButton;
	1110	+
	1111	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ threeButton.setToolTipText("Show controls and 3D view");
606	1113	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- sevenButton.setToolTipText("3-column layout");
609		- sevenButton.addActionListener(this);
	1114	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ sixButton.setToolTipText("Show 3D view and controls");
	1116	+ sixButton.addActionListener(this);
	1117	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+// sevenButton.setToolTipText("3-column layout");
	1119	+// sevenButton.addActionListener(this);
610	1120	//
611	1121
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613		- rootButton.setToolTipText("Edit selection in new tab");
	1122	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ rootButton.setToolTipText("Open selection in new tab");
614	1124	rootButton.addActionListener(this);
615	1125
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	1127	closeButton.setToolTipText("Close tab");
618	1128	closeButton.addActionListener(this);
619	1129	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	1130	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	1131	+
	1132	+ cGridBag row1 = new cGridBag();
623	1133
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	1134	+ // INSERT
	1135	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ gridButton.setToolTipText("Create grid");
	1137	+ gridButton.addActionListener(this);
	1138	+
	1139	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ boxButton.setToolTipText("Create box");
	1141	+ boxButton.addActionListener(this);
	1142	+
	1143	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ sphereButton.setToolTipText("Create sphere");
	1145	+ sphereButton.addActionListener(this);
	1146	+
	1147	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1148	+ coneButton.setToolTipText("Create cone");
	1149	+ coneButton.addActionListener(this);
	1150	+
	1151	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ torusButton.setToolTipText("Create torus");
	1153	+ torusButton.addActionListener(this);
	1154	+
	1155	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ superButton.setToolTipText("Create superellipsoid");
	1157	+ superButton.addActionListener(this);
	1158	+
	1159	+ if (Globals.ADVANCED)
	1160	+ {
	1161	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ kleinButton.setToolTipText("Create Klein bottle");
	1163	+ kleinButton.addActionListener(this);
	1164	+ }
	1165	+
	1166	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ particlesButton.setToolTipText("Create particle system");
	1168	+ particlesButton.addActionListener(this);
	1169	+
	1170	+ oe.toolboxPanel.add(row1);
	1171	+
	1172	+ cGridBag row2 = new cGridBag();
	1173	+
	1174	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ groupButton.setToolTipText("Create group");
	1176	+ groupButton.addActionListener(this);
	1177	+
	1178	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ compositeButton.setToolTipText("Create composite");
	1180	+ compositeButton.addActionListener(this);
	1181	+
	1182	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ switchButton.setToolTipText("Create item switcher");
	1184	+ switchButton.addActionListener(this);
	1185	+
	1186	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ loopButton.setToolTipText("Create loop");
	1188	+ loopButton.addActionListener(this);
	1189	+
	1190	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ textureButton.setToolTipText("Create texture");
	1192	+ textureButton.addActionListener(this);
	1193	+
	1194	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ overlayButton.setToolTipText("Create overlay");
	1196	+ overlayButton.addActionListener(this);
	1197	+
	1198	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ lightButton.setToolTipText("Create light");
	1200	+ lightButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row2);
	1203	+
	1204	+ cGridBag textures = new cGridBag();
	1205	+
	1206	+ CreateTexturePanel(textures);
	1207	+
	1208	+ oe.toolboxPanel.add(textures);
	1209	+
	1210	+ textures.preferredHeight = 100;
	1211	+
	1212	+ CreateSkyboxPanel(oe.skyboxPanel);
	1213	+
	1214	+ // EDIT panel
	1215	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ editButton.setToolTipText("Pin selection controls");
626	1217	editButton.addActionListener(this);
627	1218
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	1219	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
630	1221	uneditButton.addActionListener(this);
631	1222
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	1223	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1224	+ allParamsButton.setToolTipText("Show all controls");
634	1225	allParamsButton.addActionListener(this);
635	1226
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- clearPanelButton.setToolTipText("Clear edit panel");
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
638	1229	clearPanelButton.addActionListener(this);
639	1230
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- unselectButton.setToolTipText("Unselect");
642		- unselectButton.addActionListener(this);
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
643	1234
644		- commandsPanel.preferredHeight = 1;
	1235	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ flashSelectionButton.setToolTipText("Highlight selection");
	1237	+ flashSelectionButton.addActionListener(this);
645	1238
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	1239	+ editCommandsPanel.preferredHeight = 1;
	1240	+
	1241	+ SetPinStates(false);
	1242	+// oe.treePanel.add(commandsPanel);
	1243	+// oe.treePanel.Return();
648	1244
649	1245	// oe.aConstraints.gridx += 1;
650	1246	// oe.aConstraints.weighty = 0;
..	..	@@ -661,32 +1257,20 @@
661	1257
662	1258	JScrollPane jSP;
663	1259	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1260	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	1261	ResetModel();
666	1262
667	1263	oe.treePanel.add(jSPPanel);
668	1264	oe.treePanel.Return();
669	1265
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	1266	oe.treePanel.add(copyOptionsPanel);
686	1267	oe.treePanel.Return();
	1268	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1269	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1270	+ sliderPane.preferredHeight = 1;
687	1271
688		-// mainPanel.setDividerLocation(0.5); //1.0);
689		-// mainPanel.setResizeWeight(0.5);
	1272	+// mainPanel.setDividerLocation(0.1); //1.0);
	1273	+ mainPanel.setResizeWeight(0.4);
690	1274
691	1275	//jList.addListSelectionListener(this);
692	1276	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -694,7 +1278,7 @@
694	1278	//jTree.setEditable(true);
695	1279	oe.jTree.setDragEnabled(true);
696	1280	//jTree.setPreferredSize(new Dimension(10,10));
697		- jSP.setPreferredSize(new Dimension(100,200));
	1281	+ //jSP.setPreferredSize(new Dimension(100,200));
698	1282
699	1283	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
700	1284
..	..	@@ -706,29 +1290,49 @@
706	1290	dgr.addDragGestureListener(this);
707	1291	}catch(Exception e) {}
708	1292	*/
709		- radio.layout = sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
710	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
711	1295	}
712	1296
713	1297	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	1298	{
	1299	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1300	+ colorCB.setToolTipText("Copy color when dropped");
	1301	+ colorCB.addItemListener(this);
	1302	+
	1303	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1304	+ materialCB.setToolTipText("Copy material when dropped");
	1305	+ materialCB.addItemListener(this);
	1306	+
	1307	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1308	+ textureCB.setToolTipText("Copy texture when dropped");
	1309	+ textureCB.addItemListener(this);
	1310	+
	1311	+ panel.Return();
	1312	+
715	1313	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	1314	boxCB.setToolTipText("Display bounding boxes");
717	1315	boxCB.addItemListener(this);
718	1316
719	1317	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1318	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	1319	zoomBoxCB.addItemListener(this);
722	1320
723	1321	if (true) // Globals.ADVANCED)
724	1322	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	1323	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1324	+// supportCB.setToolTipText("Enable rigging");
	1325	+// supportCB.addItemListener(this);
	1326	+
	1327	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1328	+ freezeCB.setToolTipText("Fast moving camera");
	1329	+ freezeCB.addItemListener(this);
728	1330
729	1331	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	1332	// localCB.addItemListener(this);
731	1333
	1334	+ panel.Return();
	1335	+
732	1336	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	1337	crowdCB.setToolTipText("Used for crowds");
734	1338	crowdCB.addItemListener(this);
..	..	@@ -737,14 +1341,19 @@
737	1341	smoothCB.setToolTipText("Snapping delay");
738	1342	smoothCB.addItemListener(this);
739	1343
740		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
741		- slowCB.setToolTipText("Smooth interpolation");
742		- slowCB.addItemListener(this);
	1344	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1345	+// slowCB.setToolTipText("Smooth interpolation");
	1346	+// slowCB.addItemListener(this);
	1347	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1348	+ minshaderCB.setToolTipText("Minimal fast shader");
	1349	+ minshaderCB.addItemListener(this);
743	1350
744	1351	// constraints.gridy += 1;
745	1352	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	1353	// speakerMocapCB.addItemListener(this);
747	1354
	1355	+ panel.Return();
	1356	+
748	1357	if (false)
749	1358	{
750	1359	// handled in scripts
..	..	@@ -759,34 +1368,74 @@
759	1368	//constraints.gridy += 1;
760	1369	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	1370	smoothfocusCB.addItemListener(this);
	1371	+ panel.Return();
762	1372	}
763	1373
764	1374	//constraints.gridx += 1;
765	1375	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	1376	// debugCB.addItemListener(this);
767	1377
	1378	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1379	+ trackCB.setToolTipText("Enable tracking target");
	1380	+ trackCB.addItemListener(this);
	1381	+
768	1382	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1383	+ oeilCB.setToolTipText("Move camera when tracking");
769	1384	oeilCB.addItemListener(this);
770	1385
	1386	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1387	+ shadowCB.setToolTipText("When live compute shadows");
	1388	+ shadowCB.addItemListener(this);
	1389	+
	1390	+ panel.Return();
	1391	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1392	+ toggleTextureCB.setToolTipText("Load textures");
	1393	+ toggleTextureCB.addItemListener(this);
	1394	+
	1395	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1396	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1397	+ toggleSwitchCB.addItemListener(this);
	1398	+
	1399	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1400	+ autokeepCB.setToolTipText("On structure change");
	1401	+ autokeepCB.addItemListener(this);
	1402	+
	1403	+ panel.Return();
	1404	+ if (Globals.ADVANCED)
	1405	+ {
771	1406	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	1407	lookAtCB.setToolTipText("Look-at target");
773	1408	lookAtCB.addItemListener(this);
	1409	+ }
774	1410
775	1411	}
776	1412
777	1413	cGridBag fill = new cGridBag();
778		-
779	1414	fill.preferredHeight = 200;
	1415	+ cGridBag fill2 = new cGridBag();
	1416	+ fill2.preferredHeight = 200;
	1417	+ cGridBag fill3 = new cGridBag();
	1418	+ fill3.preferredHeight = 200;
780	1419
781	1420	panel.add(fill);
	1421	+ panel.add(fill2);
	1422	+ panel.add(fill3);
782	1423
783	1424	}
784	1425
785	1426	void EditObject(Object3D obj)
786	1427	{
787	1428	cRadio radioButton = new cRadio(obj.name);
	1429	+
	1430	+ // June 2019. Patch to avoid bug with transparency.
	1431	+ radioButton.hadMaterial = obj.material != null;
	1432	+ if (!radioButton.hadMaterial)
	1433	+ {
	1434	+ obj.material = new cMaterial();
	1435	+ }
	1436	+
788	1437	radioButton.SetObject(obj);
789		- radioButton.layout = sevenButton;
	1438	+ radioButton.layout = threeButton; // sixButton;
790	1439	radioButton.SetCamera(cameraView.renderCamera, false);
791	1440	radioButton.addActionListener(this);
792	1441	radioPanel.add(radioButton);
..	..	@@ -796,6 +1445,8 @@
796	1445
797	1446	void SetupViews(ObjEditor oe)
798	1447	{
	1448	+ theFrame = this;
	1449	+
799	1450	oe.SetupViews();
800	1451
801	1452	System.out.println("SetupViews");
..	..	@@ -804,23 +1455,30 @@
804	1455	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1456	}
806	1457
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- JCheckBox smoothfocusCB;
	1458	+ cToggleButton liveCB;
	1459	+ cCheckBox supportCB;
	1460	+ cCheckBox localCB;
	1461	+ cCheckBox crowdCB;
	1462	+ cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
	1465	+ cToggleButton fastCB;
	1466	+ cCheckBox slowCB;
	1467	+ cCheckBox boxCB;
	1468	+ cCheckBox zoomBoxCB;
	1469	+ cCheckBox freezeCB;
	1470	+ //cToggleButton trackCB;
	1471	+ cCheckBox trackCB;
	1472	+ cCheckBox smoothfocusCB;
818	1473	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1474	+ cCheckBox speakerCameraCB;
	1475	+ cCheckBox speakerFocusCB;
	1476	+ cCheckBox debugCB;
	1477	+
	1478	+ cCheckBox oeilCB;
	1479	+ cCheckBox shadowCB;
	1480	+ cCheckBox autokeepCB;
	1481	+ cCheckBox lookAtCB;
824	1482
825	1483	// static int COLOR = 1;
826	1484	// static int MATERIAL = 2;
..	..	@@ -828,9 +1486,9 @@
828	1486
829	1487	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1488
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1489	+ cCheckBox colorCB;
	1490	+ cCheckBox materialCB;
	1491	+ cCheckBox textureCB;
834	1492
835	1493	public void itemStateChanged(ItemEvent e)
836	1494	{
..	..	@@ -858,6 +1516,7 @@
858	1516	} else if(e.getSource() == liveCB)
859	1517	{
860	1518	cameraView.ToggleLive();
	1519	+ refreshContents(false);
861	1520	}
862	1521	else if(e.getSource() == supportCB)
863	1522	{
..	..	@@ -873,6 +1532,12 @@
873	1532	{
874	1533	cameraView.ToggleInertia();
875	1534	cameraView.repaint();
	1535	+ }
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
876	1541	}
877	1542	else if(e.getSource() == localCB)
878	1543	{
..	..	@@ -922,6 +1587,18 @@
922	1587	{
923	1588	cameraView.ToggleOeil();
924	1589	}
	1590	+ else if(e.getSource() == shadowCB)
	1591	+ {
	1592	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1593	+ }
	1594	+ else if(e.getSource() == freezeCB)
	1595	+ {
	1596	+ Globals.FREEZEONMOVE ^= true;
	1597	+ }
	1598	+ else if(e.getSource() == autokeepCB)
	1599	+ {
	1600	+ Globals.REPLACEONMAKE ^= true;
	1601	+ }
925	1602	else if(e.getSource() == lookAtCB)
926	1603	{
927	1604	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1615,8 @@
938	1615
939	1616	/**/
940	1617	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1618	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1619	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1620	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1621	// We can't move the root node or an empty selection
944	1622	return;
..	..	@@ -1001,8 +1679,6 @@
1001	1679	}
1002	1680	}
1003	1681
1004		- String string = (String) object;
1005		-
1006	1682	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1683	// if( object instanceof java.io.File[])
1008	1684	// {
..	..	@@ -1010,6 +1686,8 @@
1010	1686	// objEditor.DropFile((java.io.File[]) object, true);
1011	1687	// return;
1012	1688	// }
	1689	+
	1690	+ String string = object.toString();
1013	1691
1014	1692	// File path for Mac and Windows
1015	1693	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1733,33 @@
1055	1733
1056	1734	assert target == objEditor.jTree;
1057	1735	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1736	+ Object3D destinationLeaf;
1058	1737	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1738	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1739	} catch (Exception e) {
1061	1740	System.out.println("destinationPath : " + destinationPath);
1062	1741	return;
1063	1742	}
1064	1743
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1744	+ for (int i=group.selection.size(); --i>=0;)
1066	1745	{
	1746	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1747	+
	1748	+ // Cannot move into itself
	1749	+ if (child == destinationLeaf)
	1750	+ return;
	1751	+ }
	1752	+
	1753	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1754	+// {
1067	1755	loadClipboard(true);
1068	1756	objEditor.jTree.setSelectionPath(destinationPath);
1069	1757	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1758	+// } else {
	1759	+// loadClipboard(false);
	1760	+// objEditor.jTree.setSelectionPath(destinationPath);
	1761	+// pasteInto(false, false); // true); // ???
	1762	+// }
1075	1763	}
1076	1764	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1765	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1864,30 @@
1176	1864	{
1177	1865	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1866	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- superItem.addActionListener(this);
	1867	+// gridItem = menu.add(new MenuItem("Grid"));
	1868	+// gridItem.addActionListener(this);
	1869	+// rectoidItem = menu.add(new MenuItem("Box"));
	1870	+// rectoidItem.addActionListener(this);
	1871	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1872	+// ellipsoidItem.addActionListener(this);
	1873	+// coneItem = menu.add(new MenuItem("Cone"));
	1874	+// coneItem.addActionListener(this);
	1875	+// torusItem = menu.add(new MenuItem("Torus"));
	1876	+// torusItem.addActionListener(this);
	1877	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1878	+// superItem.addActionListener(this);
	1879	+
	1880	+ cameraItem = menu.add(new MenuItem("Camera"));
	1881	+ cameraItem.addActionListener(this);
	1882	+
	1883	+ if (!Globals.ADVANCED)
	1884	+ {
1191	1885	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1886	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1887	+ }
	1888	+
	1889	+// particleItem = menu.add(new MenuItem("Particle system"));
	1890	+// particleItem.addActionListener(this);
1195	1891	if (Globals.ADVANCED)
1196	1892	{
1197	1893	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1913,15 @@
1217	1913	}
1218	1914	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1915	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- lightItem.addActionListener(this);
	1916	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1917	+// overlayItem.addActionListener(this);
	1918	+// lightItem = menu.add(new MenuItem("Light"));
	1919	+// lightItem.addActionListener(this);
1224	1920	menu.add("-");
1225	1921	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1922	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1923	+// loopItem = menu.add(new MenuItem("Loop"));
	1924	+// loopItem.addActionListener(this);
1229	1925	doubleItem = menu.add(new MenuItem("Fork"));
1230	1926	doubleItem.addActionListener(this);
1231	1927	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1937,9 @@
1241	1937	animationItem.addItemListener(this);
1242	1938	animationItem.setState(Globals.ANIMATION);
1243	1939
	1940	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1941	+ archiveItem.addActionListener(this);
	1942	+
1244	1943	menu.add("-");
1245	1944	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	1945	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +1952,8 @@
1253	1952	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	1953	reduce34MorphItem.addActionListener(this);
1255	1954	menu.add("-");
	1955	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1956	+ memoryItem.addActionListener(this);
1256	1957	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	1958	computeAOItem.addActionListener(this);
1258	1959
..	..	@@ -1261,11 +1962,9 @@
1261	1962	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	1963	mirrorItem.addActionListener(this);
1263	1964	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	1965	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1966	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1967	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1968	dumpItem.addActionListener(this);
1270	1969	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1970	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +2105,34 @@
1406	2105	shadow.material = new cMaterial(obj.material);
1407	2106	shadow.material.diffuse = 0.0001f;
1408	2107	shadow.material.specular = 0.0001f;
	2108	+ //shadow.projectedVertices[1].x = 300;
1409	2109
1410	2110	makeSomething(shadow);
1411	2111	}
	2112	+
	2113	+ private void ClearUnpinned()
	2114	+ {
	2115	+ //for (Object3D obj : listUI)
	2116	+ for (int i=listUI.size(); --i>=0;)
	2117	+ {
	2118	+ Object3D obj = listUI.elementAt(i);
	2119	+ if (!obj.pinned)
	2120	+ {
	2121	+ obj.CloseUI();
	2122	+ listUI.remove(i);
	2123	+ }
	2124	+ }
	2125	+ }
	2126	+
	2127	+ private void EditElement(Object3D elem, boolean newWindow)
	2128	+ {
	2129	+ // if (!(elem instanceof Composite))
	2130	+ // newWindow = false;
	2131	+ listUI.add(elem);
	2132	+ elem.openEditWindow(this, newWindow); //, false);
	2133	+ System.out.println("edit : " + elem);
	2134	+ elem.editWindow.refreshContents(true); // ? new
	2135	+ }
1412	2136
1413	2137	/**
1414	2138	* applyExample
..	..	@@ -1653,7 +2377,7 @@
1653	2377	{
1654	2378	ScreenFit();
1655	2379	} else
1656		- if (source == switchItem)
	2380	+ if (source == switchViewItem)
1657	2381	{
1658	2382	cVector v1 = new cVector();
1659	2383	cVector v2 = new cVector();
..	..	@@ -1662,11 +2386,11 @@
1662	2386	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	2387	objEditor.cameraView.repaint();
1664	2388	} else
1665		- if (source == rectoidItem)
	2389	+ if (source == rectoidItem \|\| source == boxButton)
1666	2390	{
1667	2391	makeSomething(new Box());
1668	2392	} else
1669		- if (source == particleItem)
	2393	+ if (source == particleItem \|\| source == particlesButton)
1670	2394	{
1671	2395	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	2396	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2469,27 @@
1745	2469
1746	2470	makeSomething(obj);
1747	2471	} else
1748		- if (source == gridItem)
	2472	+ if (source == gridItem \|\| source == gridButton)
1749	2473	{
1750	2474	makeSomething(new Grid());
1751	2475	} else
1752		- if (source == ellipsoidItem)
	2476	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2477	{
1754	2478	makeSomething(new Sphere());
1755	2479	} else
1756		- if (source == coneItem)
	2480	+ if (source == coneItem \|\| source == coneButton)
1757	2481	{
1758	2482	makeSomething(new Cone());
1759	2483	} else
1760		- if (source == torusItem)
	2484	+ if (source == torusItem \|\| source == torusButton)
1761	2485	{
1762	2486	makeSomething(new Torus());
1763	2487	} else
1764		- if (source == superItem)
	2488	+ if (source == superItem \|\| source == superButton)
1765	2489	{
1766	2490	makeSomething(new Superellipsoid());
1767	2491	} else
1768		- if (source == kleinItem)
	2492	+ if (source == kleinItem \|\| source == kleinButton)
1769	2493	{
1770	2494	makeSomething(new Klein());
1771	2495	} else
..	..	@@ -1785,7 +2509,7 @@
1785	2509	{
1786	2510	makeSomething(new BezierSurface());
1787	2511	} else
1788		- if (source == overlayItem)
	2512	+ if (source == overlayItem \|\| source == overlayButton)
1789	2513	{
1790	2514	/*
1791	2515	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,10 +2557,27 @@
1833	2557	s.setup();
1834	2558	makeSomething(s);
1835	2559	} else
1836		- if (source == lightItem)
	2560	+ if (source == lightItem \|\| source == lightButton)
1837	2561	{
1838	2562	makeSomething(new Light());
1839	2563	} else
	2564	+// if (source == skybox1Button \|\|
	2565	+// source == skybox2Button \|\|
	2566	+// source == skybox3Button \|\|
	2567	+// source == skybox4Button \|\|
	2568	+// source == skybox5Button \|\|
	2569	+// source == skybox6Button \|\|
	2570	+// source == skybox7Button \|\|
	2571	+// source == skybox11Button \|\|
	2572	+// source == skybox12Button \|\|
	2573	+// source == skybox13Button \|\|
	2574	+// source == skybox14Button \|\|
	2575	+// source == skybox15Button \|\|
	2576	+// source == skybox16Button \|\|
	2577	+// source == skybox17Button)
	2578	+// {
	2579	+// ChangeSkybox(source);
	2580	+// } else
1840	2581	if (source == csgItem)
1841	2582	{
1842	2583	group(new CSG());
..	..	@@ -1883,30 +2624,30 @@
1883	2624
1884	2625	group(g);
1885	2626	} else
1886		- if (source == loopItem)
	2627	+ if (source == loopItem \|\| source == loopButton)
1887	2628	{
1888	2629	Composite csg = new GroupLeaf();
1889	2630	csg.count = 5;
1890	2631	group(csg);
1891		- Composite child = new cGroup();
	2632	+ Composite child = new cGroup("Branch");
1892	2633	csg.addChild(child);
1893	2634	child.addChild(csg);
1894	2635	} else
1895	2636	if (source == doubleItem)
1896	2637	{
1897		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Fork");
1898	2639	csg.count = 5;
1899	2640	group(csg);
1900		- Composite child = new cGroup();
	2641	+ Composite child = new cGroup("Branch A");
1901	2642	csg.addChild(child);
1902	2643	child.addChild(csg);
1903		- child = new cGroup();
	2644	+ child = new cGroup("Branch B");
1904	2645	csg.addChild(child);
1905	2646	child.addChild(csg);
1906	2647	} else
1907	2648	if (source == tripleItem)
1908	2649	{
1909		- Composite csg = new GroupLeaf();
	2650	+ Composite csg = new GroupLeaf("Trident");
1910	2651	csg.count = 4;
1911	2652	group(csg);
1912	2653	Composite child = new cGroup();
..	..	@@ -1922,7 +2663,7 @@
1922	2663	if (source == computeAOItem)
1923	2664	{
1924	2665	Globals.drawMode = CameraPane.OCCLUSION;
1925		- Globals.theRenderer.repaint();
	2666	+ cameraView.repaint();
1926	2667	} else
1927	2668	if (source == recompileItem)
1928	2669	{
..	..	@@ -1937,7 +2678,7 @@
1937	2678	if (source == invariantsItem)
1938	2679	{
1939	2680	System.out.println("Invariants:");
1940		- Grafreed.grafreeD.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
1941	2682	} else
1942	2683	if (source == memoryItem)
1943	2684	{
..	..	@@ -1956,6 +2697,53 @@
1956	2697	{
1957	2698	DumpObject();
1958	2699	} else
	2700	+ if (source == minButton)
	2701	+ {
	2702	+ Minimize();
	2703	+ } else
	2704	+ if (source == maxButton)
	2705	+ {
	2706	+ Maximize();
	2707	+ } else
	2708	+ if (source == fullButton)
	2709	+ {
	2710	+ ToggleFullScreen();
	2711	+ } else
	2712	+ if (source == previousVersionButton)
	2713	+ {
	2714	+ // Go to previous version
	2715	+ //if (!Undo())
	2716	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2717	+ PreviousVersion();
	2718	+ } else
	2719	+ if (source == restoreButton)
	2720	+ {
	2721	+ // Restore current version
	2722	+ Restore();
	2723	+ //restoreButton.setEnabled(false);
	2724	+ } else
	2725	+ if (source == replaceButton)
	2726	+ {
	2727	+ // Overwrite current version
	2728	+ Replace();
	2729	+ //replaceButton.setEnabled(false);
	2730	+ } else
	2731	+ if (source == nextVersionButton)
	2732	+ {
	2733	+ // Go to next version
	2734	+ NextVersion();
	2735	+ } else
	2736	+ if (source == saveVersionButton)
	2737	+ {
	2738	+ // Save a new version
	2739	+ if (!Save(true))
	2740	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2741	+ } else
	2742	+ if (source == deleteVersionButton)
	2743	+ {
	2744	+ // Delete a new version
	2745	+ DeleteVersion();
	2746	+ } else
1959	2747	if (source == oneStepButton)
1960	2748	{
1961	2749	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2751,14 @@
1963	2751	} else
1964	2752	if (source == screenfitButton)
1965	2753	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2754	ScreenFit();
1968	2755	} else
1969	2756	if (source == screenfitpointButton)
1970	2757	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2758	ScreenFitPoint();
1973	2759	} else
1974	2760	if (source == snapobjectButton)
1975	2761	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2762	SnapObject();
1978	2763	} else
1979	2764	// if (event.getSource() == recompileButton)
..	..	@@ -2012,11 +2797,11 @@
2012	2797	} else
2013	2798	if (source == undoItem)
2014	2799	{
2015		- Undo();
	2800	+ PreviousVersion();
2016	2801	} else
2017	2802	if (source == redoItem)
2018	2803	{
2019		- Redo();
	2804	+ NextVersion();
2020	2805	} else
2021	2806	if (source == duplicateItem)
2022	2807	{
..	..	@@ -2337,7 +3122,7 @@
2337	3122	{
2338	3123	StepAll();
2339	3124	} else
2340		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3125	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2341	3126	{
2342	3127	//int indices[] = jList.getSelectedIndices();
2343	3128	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2349,9 +3134,9 @@
2349	3134	{
2350	3135	ClearSelection(true);
2351	3136	} else
2352		- if (source == grabItem)
	3137	+ if (source == grabItem \|\| source == groupButton)
2353	3138	{
2354		- group(new cGroup(), true);
	3139	+ group(new cGroup(), false); // true);
2355	3140	} else
2356	3141	if (source == hideItem)
2357	3142	{
..	..	@@ -2369,11 +3154,11 @@
2369	3154	{
2370	3155	makeSomething(new Camera());
2371	3156	} else
2372		- if (source == compositeItem)
	3157	+ if (source == compositeItem \|\| source == compositeButton)
2373	3158	{
2374	3159	group(new Composite());
2375	3160	} else
2376		- if (source == randomItem)
	3161	+ if (source == switchItem \|\| source == switchButton)
2377	3162	{
2378	3163	RandomNode random = new RandomNode();
2379	3164	group(random);
..	..	@@ -2475,7 +3260,7 @@
2475	3260	{
2476	3261	group(new cLinker());
2477	3262	} else
2478		- if (source == textureItem)
	3263	+ if (source == textureItem \|\| source == textureButton)
2479	3264	{
2480	3265	group(new TextureNode());
2481	3266	} else
..	..	@@ -2495,17 +3280,30 @@
2495	3280	{
2496	3281	CastShadow(2);
2497	3282	} else
2498		- if (source == ungroupItem)
	3283	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	3284	{
2500		- //ungroup();
	3285	+ boolean hasRoot = false;
	3286	+
2501	3287	for (int i=0; i<group.selection.size(); i++)
2502	3288	{
2503		- Ungroup(group.selection.get(i));
	3289	+ if (group.selection.get(i) == group)
	3290	+ {
	3291	+ hasRoot = true;
	3292	+ break;
	3293	+ }
2504	3294	}
2505	3295
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	3296	+ if (!hasRoot)
	3297	+ {
	3298	+ for (int i=0; i<group.selection.size(); i++)
	3299	+ {
	3300	+ Ungroup(group.selection.get(i));
	3301	+ }
	3302	+
	3303	+ ClearSelection(false);
	3304	+
	3305	+ refreshContents();
	3306	+ }
2509	3307	} else
2510	3308	if (source == genUVItem)
2511	3309	{
..	..	@@ -2517,7 +3315,7 @@
2517	3315	} else
2518	3316	if (source == genNormalsMESHItem)
2519	3317	{
2520		- GenNormals(true); // TODO
	3318	+ GenNormalsMESH();
2521	3319	} else
2522	3320	if (source == genNormalsORGANItem)
2523	3321	{
..	..	@@ -2582,6 +3380,22 @@
2582	3380	if (source == unmarkleavesItem)
2583	3381	{
2584	3382	MarkLeaves(false);
	3383	+ } else
	3384	+ if (source == rewindleavesItem)
	3385	+ {
	3386	+ RewindLeaves(true);
	3387	+ } else
	3388	+ if (source == unrewindleavesItem)
	3389	+ {
	3390	+ RewindLeaves(false);
	3391	+ } else
	3392	+ if (source == randomleavesItem)
	3393	+ {
	3394	+ RandomLeaves(true);
	3395	+ } else
	3396	+ if (source == unrandomleavesItem)
	3397	+ {
	3398	+ RandomLeaves(false);
2585	3399	} else
2586	3400	if (source == flipVItem)
2587	3401	{
..	..	@@ -2790,7 +3604,7 @@
2790	3604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2791	3605	{
2792	3606	obj = (Object3D)e.nextElement();
2793		- obj.SetBumpTexture(null);
	3607	+ obj.ResetBumpTexture();
2794	3608	}
2795	3609
2796	3610	refreshContents();
..	..	@@ -2806,6 +3620,31 @@
2806	3620
2807	3621	refreshContents();
2808	3622	} else
	3623	+ if (source == embedTexturesItem)
	3624	+ {
	3625	+ Object3D obj;
	3626	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3627	+ {
	3628	+ obj = (Object3D)e.nextElement();
	3629	+ obj.EmbedTextures(true);
	3630	+ }
	3631	+
	3632	+ refreshContents();
	3633	+ } else
	3634	+ if (source == deEmbedTexturesItem)
	3635	+ {
	3636	+ Object3D obj;
	3637	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3638	+ {
	3639	+ obj = (Object3D)e.nextElement();
	3640	+ obj.EmbedTextures(false);
	3641	+ }
	3642	+
	3643	+ CameraPane.texturepigment.clear();
	3644	+ CameraPane.texturebump.clear();
	3645	+
	3646	+ refreshContents();
	3647	+ } else
2809	3648	if (source == flashSelectionButton)
2810	3649	{
2811	3650	CameraPane.flash = true;
..	..	@@ -2817,6 +3656,10 @@
2817	3656	if (source == twoButton)
2818	3657	{
2819	3658	radio.layout = twoButton;
	3659	+
	3660	+ if (CameraPane.FULLSCREEN)
	3661	+ fullscreenLayout = radio.layout;
	3662	+
2820	3663	// bug
2821	3664	//gridPanel.setDividerLocation(1.0);
2822	3665	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3692,31 @@
2849	3692	bigThree.ClearUI();
2850	3693	bigThree.add(centralPanel);
2851	3694	bigThree.FlushUI();
	3695	+
	3696	+ cameraView.requestFocusInWindow();
	3697	+
	3698	+// refreshContents(true);
	3699	+//
	3700	+// try
	3701	+// {
	3702	+// java.awt.Robot bot = new java.awt.Robot();
	3703	+// int mask = InputEvent.BUTTON1_MASK;
	3704	+// bot.mouseMove(100, 100);
	3705	+// bot.mousePress(mask);
	3706	+// bot.mouseRelease(mask);
	3707	+// }
	3708	+// catch (Exception e)
	3709	+// {
	3710	+//
	3711	+// }
	3712	+
2852	3713	} else
2853	3714	if (source == threeButton)
2854	3715	{
2855	3716	radio.layout = threeButton;
	3717	+
	3718	+ if (CameraPane.FULLSCREEN)
	3719	+ fullscreenLayout = radio.layout;
2856	3720
2857	3721	// bigThree.remove(scenePanel);
2858	3722	// bigThree.remove(centralPanel);
..	..	@@ -2882,13 +3746,18 @@
2882	3746	// centralPanel.setVisible(true);
2883	3747	// XYZPanel.setVisible(true);
2884	3748	bigThree.ClearUI();
	3749	+ bigThree.add(scenePanel);
2885	3750	bigThree.add(centralPanel);
2886		- bigThree.add(XYZPanel);
2887	3751	bigThree.FlushUI();
	3752	+
	3753	+ cameraView.requestFocusInWindow();
2888	3754	} else
2889	3755	if (source == fourButton)
2890	3756	{
2891	3757	radio.layout = fourButton;
	3758	+
	3759	+ if (CameraPane.FULLSCREEN)
	3760	+ fullscreenLayout = radio.layout;
2892	3761
2893	3762	// bigThree.remove(scenePanel);
2894	3763	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3789,15 @@
2920	3789	bigThree.ClearUI();
2921	3790	bigThree.add(scenePanel);
2922	3791	bigThree.FlushUI();
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2923	3794	} else
2924	3795	if (source == sixButton)
2925	3796	{
2926	3797	radio.layout = sixButton;
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
2927	3801
2928	3802	// bigThree.remove(scenePanel);
2929	3803	// bigThree.remove(centralPanel);
..	..	@@ -2953,13 +3827,18 @@
2953	3827	// centralPanel.setVisible(true);
2954	3828	// XYZPanel.setVisible(false);
2955	3829	bigThree.ClearUI();
2956		- bigThree.add(scenePanel);
2957	3830	bigThree.add(centralPanel);
	3831	+ bigThree.add(scenePanel);
2958	3832	bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2959	3835	} else
2960	3836	if (source == sevenButton)
2961	3837	{
2962	3838	radio.layout = sevenButton;
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
2963	3842
2964	3843	// bigThree.remove(scenePanel);
2965	3844	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3872,8 @@
2993	3872	bigThree.add(centralPanel);
2994	3873	bigThree.add(XYZPanel);
2995	3874	bigThree.FlushUI();
	3875	+
	3876	+ cameraView.requestFocusInWindow();
2996	3877	} else
2997	3878	if (source == rootButton)
2998	3879	{
..	..	@@ -3004,6 +3885,7 @@
3004	3885	EditObject(obj);
3005	3886	}
3006	3887
	3888	+ cameraView.requestFocusInWindow();
3007	3889	refreshContents(true);
3008	3890	} else
3009	3891	if (source == closeButton)
..	..	@@ -3013,22 +3895,37 @@
3013	3895	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3896	{
3015	3897	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3898	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3899	{
	3900	+ // Patch to avoid bug with transparency.
	3901	+ if (!ab.hadMaterial)
	3902	+ {
	3903	+ ab.object.material = null;
	3904	+ }
	3905	+
3018	3906	buttonGroup.remove(ab);
3019	3907	radioPanel.remove(ab);
3020	3908
3021		- ab.GetObject().editWindow = null;
	3909	+ //ab.GetObject().editWindow = null;
	3910	+ ab.GetObject().manipWindow = null;
3022	3911	// ab.GetObject().objectUI = null; // ?????????
3023	3912
3024	3913	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3914	break;
3026	3915	}
3027	3916	}
	3917	+
	3918	+ cameraView.requestFocusInWindow();
3028	3919	refreshContents(true);
3029	3920	} else
3030	3921	if (source == editItem \|\| source == editButton)
3031	3922	{
	3923	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3924	+ {
	3925	+ Object3D child = (Object3D)e.nextElement();
	3926	+ child.pinned = true;
	3927	+ }
	3928	+
3032	3929	EditSelection(false);
3033	3930	} else
3034	3931	if (source == uneditButton)
..	..	@@ -3037,9 +3934,10 @@
3037	3934	{
3038	3935	Object3D child = (Object3D)e.nextElement();
3039	3936	if(child.editWindow != null)
3040		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3937	+ child.pinned = false;
3041	3938	child.CloseUI();
3042	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3043	3941
3044	3942	//child.editWindow = null; // ???????????
3045	3943	}
..	..	@@ -3054,16 +3952,18 @@
3054	3952	//copy.ClearUI();
3055	3953	for (Object3D obj : listUI)
3056	3954	{
	3955	+ obj.pinned = false;
3057	3956	obj.CloseUI();
3058	3957	}
3059	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
3060	3960	refreshContents(true);
3061	3961	} else
3062	3962	if (source == allParamsButton)
3063	3963	{
3064	3964	assert(copy == group);
3065	3965
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3966	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3967
3068	3968	for (Object3D obj : listUI)
3069	3969	{
..	..	@@ -3112,6 +4012,9 @@
3112	4012	}
3113	4013
3114	4014	copy = group;
	4015	+
	4016	+ SetUndoStates();
	4017	+
3115	4018	//Globals.theRenderer.object = group;
3116	4019	if(!useclient)
3117	4020	{
..	..	@@ -3128,7 +4031,9 @@
3128	4031	sideView.object = group;
3129	4032	}
3130	4033
3131		-// fix "+" issue group.editWindow = this;
	4034	+// fix "+" issue
	4035	+ //group.editWindow = this;
	4036	+ group.manipWindow = this;
3132	4037
3133	4038	/*
3134	4039	currentLayout = radio.layout;
..	..	@@ -3136,20 +4041,32 @@
3136	4041	currentLayout = sevenButton;
3137	4042	*/
3138	4043	radio.layout.doClick();
	4044	+
	4045	+ ClearUnpinned();
	4046	+
	4047	+ //Grafreed.Assert(group != null);
	4048	+ //Grafreed.Assert(group.selection != null);
	4049	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4050	+ if (group.selection == null \|\| group.selection.size() == 1)
	4051	+ EditSelection(false);
3139	4052	keepparent = group.parent;
3140	4053	// PARENT = NULL or not???
3141	4054	//group.parent = null; // ROOT
3142	4055	//group.attributes = -1;
3143	4056	ResetModel();
	4057	+
	4058	+ cameraView.requestFocusInWindow();
3144	4059	refreshContents(true);
3145	4060	} else if (event.getSource() == editCameraItem)
3146	4061	{
3147	4062	cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
3148	4064	cameraView.repaint();
3149	4065	return;
3150		- } else if (event.getSource() == revertCameraItem)
	4066	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	4067	{
3152	4068	cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
3153	4070	cameraView.repaint();
3154	4071	return;
3155	4072	// } else if (event.getSource() == textureButton)
..	..	@@ -3164,7 +4081,6 @@
3164	4081	}
3165	4082
3166	4083	boolean useclient = false;
3167		- cRadio radio;
3168	4084
3169	4085	void ToggleRoot()
3170	4086	{
..	..	@@ -3403,7 +4319,8 @@
3403	4319
3404	4320	int size = obj.MemorySize();
3405	4321
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	4322	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4323	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	4324	}
3408	4325	}
3409	4326	catch (Exception e)
..	..	@@ -3484,6 +4401,13 @@
3484	4401	void GenNormals(boolean crease)
3485	4402	{
3486	4403	group.GenNormalsS(crease);
	4404	+
	4405	+ refreshContents();
	4406	+ }
	4407	+
	4408	+ void GenNormalsMESH()
	4409	+ {
	4410	+ group.GenNormalsMeshS();
3487	4411
3488	4412	refreshContents();
3489	4413	}
..	..	@@ -3719,7 +4643,7 @@
3719	4643
3720	4644	try
3721	4645	{
3722		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4646	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3723	4647	}
3724	4648	catch (Exception e)
3725	4649	{
..	..	@@ -4111,6 +5035,18 @@
4111	5035	refreshContents();
4112	5036	}
4113	5037
	5038	+ void RewindLeaves(boolean hide)
	5039	+ {
	5040	+ group.selection.RewindLeaves(hide);
	5041	+ refreshContents();
	5042	+ }
	5043	+
	5044	+ void RandomLeaves(boolean hide)
	5045	+ {
	5046	+ group.selection.RandomLeaves(hide);
	5047	+ refreshContents();
	5048	+ }
	5049	+
4114	5050	void SetTexRes(int tr)
4115	5051	{
4116	5052	group.selection.SetTexRes(tr);
..	..	@@ -4182,28 +5118,25 @@
4182	5118	// }
4183	5119	// }
4184	5120
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	5121	void EditSelection(boolean newWindow)
4190	5122	{
	5123	+ if (group.selection == null)
	5124	+ {
	5125	+ EditElement(group, newWindow); // ? new
	5126	+ return;
	5127	+ }
	5128	+
4191	5129	// aConstraints.gridy = 0;
4192	5130	for (int i=0; i<group.selection.size(); i++)
4193	5131	{
4194	5132	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	5133	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5134	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	5135
4198	5136	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	5137	if(elem != group \|\| !newWindow)
4200	5138	{
4201		- // if (!(elem instanceof Composite))
4202		- // newWindow = false;
4203		- listUI.add(elem);
4204		- elem.openEditWindow(this, newWindow); //, false);
4205		- System.out.println("edit : " + elem);
4206		- elem.editWindow.refreshContents(true); // ? new
	5139	+ EditElement(elem, newWindow); // ? new
4207	5140	}
4208	5141	}
4209	5142	}
..	..	@@ -4266,9 +5199,7 @@
4266	5199
4267	5200	freezemodel = false;
4268	5201	}
4269		-
4270		- boolean flashIt = true;
4271		-
	5202	+
4272	5203	public void valueChanged(TreeSelectionEvent e)
4273	5204	//public boolean handleEvent(Event event)
4274	5205	{
..	..	@@ -4278,7 +5209,8 @@
4278	5209	//new Exception().printStackTrace();
4279	5210
4280	5211	freezemodel = true;
4281		-
	5212	+ ClearUnpinned();
	5213	+
4282	5214	/**/
4283	5215	//switch (event.id)
4284	5216	{
..	..	@@ -4286,7 +5218,6 @@
4286	5218	//case 702: // Event.LIST_DESELECT
4287	5219	group.deselectAll();
4288	5220	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	5221	if (tps != null)
4291	5222	{
4292	5223	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +5226,8 @@
4295	5226
4296	5227	//if (child.parent != null)
4297	5228	//child.parent.addSelectee(child);
	5229	+ objEditor.SetMaterial(child);
4298	5230	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	5231	}
4303	5232	}
4304	5233	// else
..	..	@@ -4308,15 +5237,13 @@
4308	5237	// System.err.println("info : " + group.GetPath());
4309	5238	// }
4310	5239
4311		- objEditor.SetText(); // jan 2014
4312		-
4313	5240	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4314	5241	CameraPane.flash = true;
4315	5242
4316	5243	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4317	5244	// a camera
4318	5245	{
4319		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5246	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4320	5247	{
4321	5248	CameraPane.camerachangeframe = 0; // don't refuse it
4322	5249	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4325,6 +5252,13 @@
4325	5252	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4326	5253	}
4327	5254
	5255	+ if (tps != null && tps.length == 1)
	5256	+ {
	5257	+ EditSelection(false);
	5258	+ }
	5259	+
	5260	+ SetPinStates(tps != null && tps.length > 0);
	5261	+
4328	5262	refreshContents();
4329	5263	//return true;
4330	5264	}
..	..	@@ -4333,6 +5267,37 @@
4333	5267
4334	5268	freezemodel = false;
4335	5269	}
	5270	+
	5271	+ void SetPinStates(boolean enabled)
	5272	+ {
	5273	+ editButton.setEnabled(enabled);
	5274	+ uneditButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
	5276	+ flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5279	+ }
	5280	+
	5281	+ void refreshContents(boolean cp)
	5282	+ {
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5284	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5285	+ {
	5286	+ objEditor.ClearInfo(); // .GetMaterial());
	5287	+
	5288	+ for (int i=0; i < group.selection.Size(); i++)
	5289	+ {
	5290	+ Object3D child = (Object3D) group.selection.get(i);
	5291	+
	5292	+ objEditor.AddInfo(child, this, true);
	5293	+ System.err.println("info : " + child.GetPath());
	5294	+ }
	5295	+
	5296	+ objEditor.SetText(); // jan 2014
	5297	+ }
	5298	+
	5299	+ super.refreshContents(cp);
	5300	+ }
4336	5301
4337	5302	void linkSomething(Object3D thing)
4338	5303	{
..	..	@@ -4404,6 +5369,7 @@
4404	5369	{
4405	5370	if (group.selection.isEmpty())
4406	5371	return;
	5372	+
4407	5373	Grafreed.clipboardIsTempGroup = false;
4408	5374	Composite tGroup = null;
4409	5375	if (group.selection.size() > 0) // 1)
..	..	@@ -4414,6 +5380,8 @@
4414	5380
4415	5381	if (cut)
4416	5382	{
	5383	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5384	+// Save();
4417	5385	//int indices[] = jList.getSelectedIndices();
4418	5386	//for (int i = indices.length - 1; i >= 0; i--)
4419	5387	//jList.remove(indices[i]);
..	..	@@ -4503,8 +5471,10 @@
4503	5471	}
4504	5472
4505	5473	}
	5474	+
4506	5475	if (Grafreed.clipboardIsTempGroup)
4507	5476	Grafreed.clipboard = tGroup;
	5477	+
4508	5478	if (cut)
4509	5479	{
4510	5480	ResetModel();
..	..	@@ -4514,6 +5484,10 @@
4514	5484
4515	5485	void paste(boolean expand)
4516	5486	{
	5487	+ if (Globals.REPLACEONMAKE)
	5488	+ Save();
	5489	+ boolean keep = Globals.REPLACEONMAKE;
	5490	+ Globals.REPLACEONMAKE = false;
4517	5491	// if (GrafreeD.clipboard == null)
4518	5492	// return;
4519	5493	boolean first = true;
..	..	@@ -4573,6 +5547,7 @@
4573	5547	Grafreed.clipboard.get(0).parent = keepparent;
4574	5548	}
4575	5549
	5550	+ Globals.REPLACEONMAKE = keep;
4576	5551	ResetModel();
4577	5552	refreshContents();
4578	5553	}
..	..	@@ -4708,6 +5683,10 @@
4708	5683
4709	5684	void group(Object3D csg, boolean grab)
4710	5685	{
	5686	+ if (Globals.REPLACEONMAKE)
	5687	+ Save();
	5688	+ boolean keep = Globals.REPLACEONMAKE;
	5689	+ Globals.REPLACEONMAKE = false;
4711	5690	if (//false) // why??
4712	5691	!group.selection.isEmpty())
4713	5692	{
..	..	@@ -4821,10 +5800,15 @@
4821	5800	//node.add(csg);
4822	5801	//makeSomething(node);
4823	5802	makeSomething(csg);
	5803	+ Globals.REPLACEONMAKE = keep;
4824	5804	}
4825	5805
4826	5806	void Ungroup(Object3D g)
4827	5807	{
	5808	+ if (Globals.REPLACEONMAKE)
	5809	+ Save();
	5810	+ boolean keep = Globals.REPLACEONMAKE;
	5811	+ Globals.REPLACEONMAKE = false;
4828	5812	if (g instanceof HiddenObject)
4829	5813	{
4830	5814	HiddenObject h = (HiddenObject) g;
..	..	@@ -4841,6 +5825,7 @@
4841	5825	objEditor.makeSomething(g.get(i), false);
4842	5826	}
4843	5827	}
	5828	+ Globals.REPLACEONMAKE = keep;
4844	5829	}
4845	5830
4846	5831	void ungroup()
..	..	@@ -5129,7 +6114,43 @@
5129	6114	cButton clearpanelButton;
5130	6115	cButton unselectButton;
5131	6116
	6117	+ cButton restoreCameraButton;
	6118	+
5132	6119	cButton oneStepButton;
	6120	+
	6121	+ cButton groupButton;
	6122	+ cButton ungroupButton;
	6123	+ cButton compositeButton;
	6124	+ cButton switchButton;
	6125	+ cButton loopButton;
	6126	+ cButton textureButton;
	6127	+
	6128	+ cButton skybox1Button;
	6129	+ cButton skybox2Button;
	6130	+ cButton skybox3Button;
	6131	+ cButton skybox4Button;
	6132	+ cButton skybox5Button;
	6133	+ cButton skybox6Button;
	6134	+ cButton skybox7Button;
	6135	+
	6136	+ cButton skybox11Button;
	6137	+ cButton skybox12Button;
	6138	+ cButton skybox13Button;
	6139	+ cButton skybox14Button;
	6140	+ cButton skybox15Button;
	6141	+ cButton skybox16Button;
	6142	+ cButton skybox17Button;
	6143	+
	6144	+ cButton gridButton;
	6145	+ cButton boxButton;
	6146	+ cButton sphereButton;
	6147	+ cButton coneButton;
	6148	+ cButton torusButton;
	6149	+ cButton superButton;
	6150	+ cButton kleinButton;
	6151	+ cButton particlesButton;
	6152	+ cButton overlayButton;
	6153	+ cButton lightButton;
5133	6154
5134	6155	cButton screenfitButton;
5135	6156	cButton screenfitpointButton;
..	..	@@ -5142,14 +6163,6 @@
5142	6163
5143	6164	cButton setsupportButton;
5144	6165
5145		- cButton twoButton;
5146		- cButton sixButton;
5147		- cButton threeButton;
5148		- cButton sevenButton;
5149		- cButton fourButton; // full panel
5150		- cButton oneButton; // full XYZ
5151		- //cButton currentLayout;
5152		-
5153	6166	//
5154	6167	//Composite
5155	6168	Object3D // to do !!
..	..	@@ -5159,11 +6172,11 @@
5159	6172	//JTree jTree;
5160	6173	private MenuItem lookAtItem;
5161	6174	private MenuItem lookFromItem;
5162		- private MenuItem switchItem;
	6175	+ private MenuItem switchViewItem;
5163	6176	private MenuItem cutItem;
5164	6177	private MenuItem undoItem;
5165	6178	private MenuItem redoItem;
5166		- private MenuItem duplicateItem;
	6179	+ private JMenuItem duplicateItem;
5167	6180	private MenuItem cloneItem;
5168	6181	private MenuItem cloneSupportItem;
5169	6182	private MenuItem overwriteGeoItem;
..	..	@@ -5191,7 +6204,7 @@
5191	6204	private MenuItem pasteLinkItem;
5192	6205	private MenuItem pasteCloneItem;
5193	6206	private MenuItem pasteExpandItem;
5194		- private MenuItem clearItem;
	6207	+ private MenuItem deleteItem;
5195	6208	private MenuItem clearAllItem;
5196	6209	private MenuItem genUVItem;
5197	6210	private MenuItem genNormalsMESHItem;
..	..	@@ -5226,6 +6239,10 @@
5226	6239	private MenuItem showleavesItem;
5227	6240	private MenuItem markleavesItem;
5228	6241	private MenuItem unmarkleavesItem;
	6242	+ private MenuItem rewindleavesItem;
	6243	+ private MenuItem unrewindleavesItem;
	6244	+ private MenuItem randomleavesItem;
	6245	+ private MenuItem unrandomleavesItem;
5229	6246
5230	6247	private MenuItem flipVItem;
5231	6248	private MenuItem unflipVItem;
..	..	@@ -5247,7 +6264,7 @@
5247	6264	private MenuItem frontItem;
5248	6265	private MenuItem cameraItem;
5249	6266	private MenuItem compositeItem;
5250		- private MenuItem randomItem;
	6267	+ private MenuItem switchItem;
5251	6268	private MenuItem physicsItem;
5252	6269	private MenuItem frameselectorItem;
5253	6270	private MenuItem scriptNodeItem;
..	..	@@ -5271,6 +6288,8 @@
5271	6288	private MenuItem attachBumpItem;
5272	6289	private MenuItem detachBumpItem;
5273	6290	private MenuItem pigmentBumpItem;
	6291	+ private MenuItem embedTexturesItem;
	6292	+ private MenuItem deEmbedTexturesItem;
5274	6293
5275	6294	private MenuItem particleItem;
5276	6295	private MenuItem ragdollItem;
..	..	@@ -5321,5 +6340,5 @@
5321	6340
5322	6341	Menu cameraMenu;
5323	6342	MenuItem editCameraItem;
5324		- MenuItem revertCameraItem;
	6343	+ MenuItem restoreCameraItem;
5325	6344	}