~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,351 @@
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	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,12 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+ }
	414	+
63	415	if(ui)
64	416	SetupUI(objEditor);
65	417	}
..	..	@@ -80,10 +432,22 @@
80	432	SetupViews(objEditor);
81	433
82	434	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	435	+
	436	+ if (copy.versionlist == null)
	437	+ {
	438	+ copy.versionlist = new Object3D[100];
	439	+ copy.versionindex = -1;
	440	+
	441	+ Save(true);
	442	+ }
83	443	}
84	444
85	445	void CloneSelection(boolean supports)
86	446	{
	447	+ if (Globals.REPLACEONMAKE)
	448	+ Save();
	449	+ boolean keep = Globals.REPLACEONMAKE;
	450	+ Globals.REPLACEONMAKE = false;
87	451	// Object3D keep = GrafreeD.clipboard;
88	452	//Object3D obj;
89	453	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +458,7 @@
94	458
95	459	makeSomething(clone, i==group.selection.size()-1);
96	460	}
	461	+ Globals.REPLACEONMAKE = keep;
97	462	}
98	463
99	464	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +515,8 @@
150	515
151	516	void SetupMenu2(GroupEditor oe)
152	517	{
	518	+ oe.jTree = new cTree();
	519	+
153	520	Menu menu;
154	521	oe.menuBar.add(menu = new Menu("Edit"));
155	522	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +527,7 @@
160	527	// redoItem = menu.add(new MenuItem("Redo"));
161	528	// redoItem.addActionListener(this);
162	529	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	530	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	531	duplicateItem.addActionListener(this);
165	532	cloneItem = menu.add(new MenuItem("Clone"));
166	533	cloneItem.addActionListener(this);
..	..	@@ -176,7 +543,6 @@
176	543	copyItem.addActionListener(this);
177	544	pasteItem = menu.add(new MenuItem("Paste"));
178	545	pasteItem.addActionListener(this);
179		- menu.add("-");
180	546
181	547	menu.add("-");
182	548	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +554,8 @@
188	554	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	555	// pasteExpandItem.addActionListener(this);
190	556	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	557	+ deleteItem = menu.add(new MenuItem("Delete"));
	558	+ deleteItem.addActionListener(this);
193	559
194	560	if (Globals.ADVANCED)
195	561	{
..	..	@@ -203,23 +569,23 @@
203	569	//zBufferItem.addActionListener(this);
204	570	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	571	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	572	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	573	+ restoreCameraItem.addActionListener(this);
208	574
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	575	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	576	+// toggleFullScreenItem.addItemListener(this);
	577	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	578	+// cameraMenu.add("-");
	579	+//
	580	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	581	+// toggleTextureItem.addItemListener(this);
	582	+// toggleTextureItem.setState(CameraPane.textureon);
	583	+//
	584	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	585	+// toggleSwitchItem.addItemListener(this);
	586	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	587
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"));
	588	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	589	toggleHandleItem.addItemListener(this);
224	590	toggleHandleItem.setState(CameraPane.HANDLES);
225	591
..	..	@@ -246,7 +612,7 @@
246	612
247	613	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	614	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	615	+ toggleDebugItem.setState(Globals.DEBUG);
250	616
251	617	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	618	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +640,7 @@
274	640	{
275	641	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	642	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	643	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	644	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	645	oe.cameraMenu.add("-");
280	646	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +648,7 @@
282	648	editLeafItem.addActionListener(this);
283	649	lookAtItem.addActionListener(this);
284	650	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	651	+ //switchViewItem.addActionListener(this);
286	652	}
287	653
288	654	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +693,29 @@
327	693	}
328	694
329	695	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
332	698	backItem = menu.add(new MenuItem("Back"));
333	699	backItem.addActionListener(this);
334	700	frontItem = menu.add(new MenuItem("Front"));
335	701	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
338	707	hideItem = menu.add(new MenuItem("Hidden Group"));
339	708	hideItem.addActionListener(this);
	709	+ }
340	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	711	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
345	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	720	switchGeoItem.addActionListener(this);
347	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +723,6 @@
349	723	morphItem = menu.add(new MenuItem("Morph Group"));
350	724	morphItem.addActionListener(this);
351	725
352		- if (Globals.ADVANCED)
353		- {
354	726	menu.add("-");
355	727	physicsItem = menu.add(new MenuItem("Physics"));
356	728	physicsItem.addActionListener(this);
..	..	@@ -358,30 +730,29 @@
358	730	frameselectorItem.addActionListener(this);
359	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	732	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	733	}
364	734
365	735	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
368	738	billboardItem = menu.add(new MenuItem("Billboard"));
369	739	billboardItem.addActionListener(this);
370	740	csgItem = menu.add(new MenuItem("CSG"));
371	741	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	743	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	745	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
378	751	if (Globals.ADVANCED)
379	752	{
380	753	menu.add("-");
381	754	linkerItem = menu.add(new MenuItem("Linker"));
382	755	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	756	templateItem = menu.add(new MenuItem("Template"));
386	757	templateItem.addActionListener(this);
387	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +781,7 @@
410	781	genNormalsMESHItem.addActionListener(this);
411	782	if (Globals.ADVANCED)
412	783	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	785	genNormalsMINEItem.addActionListener(this);
415	786	}
416	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -470,6 +841,14 @@
470	841	markleavesItem.addActionListener(this);
471	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
473	852	menu.add("-");
474	853	flipVItem = menu.add(new MenuItem("Flip V"));
475	854	flipVItem.addActionListener(this);
..	..	@@ -495,10 +874,15 @@
495	874	attachBumpItem.addActionListener(this);
496	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
498	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	879	detachPigmentItem.addActionListener(this);
500	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
502	886	menu.add("-");
503	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	888	sortbysizeItem.addActionListener(this);
..	..	@@ -525,16 +909,91 @@
525	909	buildToolsMenu(menu);
526	910	}
527	911
	912	+ JTabbedPane resourcecontainer;
	913	+ cGridBag currenttab;
	914	+ boolean added; // patch for jar
	915	+
	916	+ int tabcount = 0;
	917	+ int colcount = 0;
	918	+ int rowcount = 0;
	919	+ int texturecount = 0;
	920	+
	921	+ int columns = 5;
	922	+ int rows = 7;
	923	+
	924	+ public void ResourceCallBack(String[] path)
	925	+ {
	926	+// for (int i = 0; i < path.length; i++)
	927	+// System.out.print(path[i] + "/");
	928	+// System.out.println();
	929	+
	930	+ if (//rowcount == 0 \|\|
	931	+ path.length == 1)
	932	+ {
	933	+ currenttab = new cGridBag();
	934	+ added = false;
	935	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	936	+ currenttab.setName(tabname);
	937	+ rowcount = 1;
	938	+ colcount = 0;
	939	+ texturecount = 0;
	940	+ }
	941	+
	942	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	943	+ {
	944	+ if (!added)
	945	+ {
	946	+ added = true;
	947	+ resourcecontainer.add(currenttab);
	948	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	949	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	950	+ }
	951	+
	952	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	953	+
	954	+ if (++colcount >= columns)
	955	+ {
	956	+ colcount = 0;
	957	+ currenttab.Return();
	958	+
	959	+ if (rowcount++ >= rows)
	960	+ {
	961	+ rowcount = 0;
	962	+ }
	963	+ }
	964	+ }
	965	+ else
	966	+ {
	967	+// if (!path[path.length-1].equals("icons"))
	968	+// resourcecontainer.Return();
	969	+ }
	970	+ }
	971	+
	972	+ void CreateTexturePanel(cGridBag container)
	973	+ {
	974	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	975	+ container.add(resourcecontainer);
	976	+
	977	+ Grafreed.ParseResources("textures", this);
	978	+ }
	979	+
528	980	void SetupUI2(ObjEditor oe)
529	981	{
	982	+ // June 2019
	983	+ if (oe == null)
	984	+ {
	985	+ //super.SetupUI2(this);
	986	+ //return;
	987	+ }
	988	+
	989	+ if (copy != group)
	990	+ {
	991	+ //super.SetupUI2(this);
	992	+ }
	993	+
530	994	//new Exception().printStackTrace();
531	995
532	996	oe.radioPanel = new JPanel(new GridBagLayout());
533		- oe.aConstraints.weightx = 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
536		- oe.aConstraints.gridwidth = 100;
537		- oe.aConstraints.gridheight = 1;
538	997	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
539	998
540	999	oe.buttonGroup = new ButtonGroup();
..	..	@@ -555,39 +1014,122 @@
555	1014	oe.radioPanel.add(dummyButton);
556	1015	oe.buttonGroup.add(dummyButton);
557	1016	*/
	1017	+ cGridBag copyOptionsPanel = new cGridBag();
	1018	+
	1019	+ copyOptionsPanel.preferredHeight = 2;
	1020	+
558	1021	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	1022
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	1023	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+ //minButton.setToolTipText("Minimize window");
	1025	+ //minButton.addActionListener(this);
563	1026
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	1027	+ if (Globals.ADVANCED)
	1028	+ {
	1029	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ maxButton.setToolTipText("Maximize window");
	1031	+ maxButton.addActionListener(this);
	1032	+ }
567	1033
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
570		- saveButton.addActionListener(this);
	1034	+ cButton gcButton;
571	1035
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573		- liveCB.setToolTipText("Enable animation");
574		- liveCB.addItemListener(this);
	1036	+ oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ gcButton.setToolTipText("Garbage collect");
	1038	+ gcButton.addActionListener(new ActionListener()
	1039	+ {
	1040	+ public void actionPerformed(ActionEvent e)
	1041	+ {
	1042	+ System.gc();
	1043	+ }
	1044	+ });
	1045	+
	1046	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ collapseButton.setToolTipText("Collapse toolbar");
	1048	+ collapseButton.addActionListener(this);
	1049	+
	1050	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1052	+ maximize3DButton.addActionListener(this);
	1053	+
	1054	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ twoButton.setToolTipText("Show 3D view only");
	1056	+ twoButton.addActionListener(this);
	1057	+ this.fullscreenLayout = twoButton;
	1058	+
	1059	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1060	+ threeButton.setToolTipText("Show controls and 3D view");
	1061	+ threeButton.addActionListener(this);
	1062	+ if (Globals.ADVANCED)
	1063	+ {
	1064	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ sixButton.setToolTipText("Show 3D view and controls");
	1066	+ sixButton.addActionListener(this);
	1067	+ }
	1068	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+// sevenButton.setToolTipText("3-column layout");
	1070	+// sevenButton.addActionListener(this);
	1071	+ //
	1072	+
	1073	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1074	+ fullButton.setToolTipText("Full-screen window");
	1075	+ fullButton.addActionListener(this);
	1076	+
	1077	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ screenfitButton.setToolTipText("Screen fit");
	1079	+ screenfitButton.addActionListener(this);
575	1080
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1083	+ restoreCameraButton.addActionListener(this);
	1084	+
	1085	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ saveVersionButton.setToolTipText("Duplicate current version");
	1087	+ saveVersionButton.addActionListener(this);
	1088	+
	1089	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ deleteVersionButton.setToolTipText("Delete current version");
	1091	+ deleteVersionButton.addActionListener(this);
	1092	+
	1093	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ previousVersionButton.setToolTipText("Previous version");
	1095	+ previousVersionButton.addActionListener(this);
	1096	+ previousVersionButton.setEnabled(false);
	1097	+
	1098	+ cGridBag updown = new cGridBag().setVertical(true);
	1099	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreButton.setToolTipText("Undo (restore current version)");
	1101	+ restoreButton.addActionListener(this);
	1102	+ //restoreButton.setEnabled(false);
	1103	+
	1104	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ replaceButton.setToolTipText("Save (replace current version)");
	1106	+ replaceButton.addActionListener(this);
	1107	+ //replaceButton.setEnabled(false);
	1108	+
	1109	+ copyOptionsPanel.add(updown);
	1110	+
	1111	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ nextVersionButton.setToolTipText("Next version");
	1113	+ nextVersionButton.addActionListener(this);
	1114	+ nextVersionButton.setEnabled(false);
	1115	+
	1116	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	1117	oneStepButton.setToolTipText("Animate one step forward");
578	1118	oneStepButton.addActionListener(this);
579	1119
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1120	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1121	+ liveCB.setToolTipText("Enable animation");
	1122	+ liveCB.addItemListener(this);
	1123	+
	1124	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	1125	fastCB.setToolTipText("Fast mode");
582	1126	fastCB.addItemListener(this);
583	1127
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	1128	+ //oe.toolboxPanel.Return();
	1129	+
	1130	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1131	+// trackCB.setToolTipText("Enable tracking");
	1132	+// trackCB.addItemListener(this);
591	1133
592	1134	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	1135	// screenfitpointButton.addActionListener(this);
..	..	@@ -597,67 +1139,137 @@
597	1139	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1140	snapobjectButton.addActionListener(this);
599	1141	snapobjectButton.setToolTipText("Snap Object");
	1142	+
	1143	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ fourButton.addActionListener(this);
	1145	+ fourButton.setToolTipText("Show control panel only");
600	1146	}
601	1147
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	1148	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	1149
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
610		- twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
619		- threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
623		- //
624	1150
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1151	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ rootButton.setToolTipText("Open selection in new tab");
627	1153	rootButton.addActionListener(this);
628	1154
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1156	closeButton.setToolTipText("Close tab");
631	1157	closeButton.addActionListener(this);
632	1158	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1159	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1160	+
	1161	+ cGridBag row1 = new cGridBag();
636	1162
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1163	+ // INSERT
	1164	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ gridButton.setToolTipText("Create grid");
	1166	+ gridButton.addActionListener(this);
	1167	+
	1168	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ boxButton.setToolTipText("Create box");
	1170	+ boxButton.addActionListener(this);
	1171	+
	1172	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ sphereButton.setToolTipText("Create sphere");
	1174	+ sphereButton.addActionListener(this);
	1175	+
	1176	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ coneButton.setToolTipText("Create cone");
	1178	+ coneButton.addActionListener(this);
	1179	+
	1180	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ torusButton.setToolTipText("Create torus");
	1182	+ torusButton.addActionListener(this);
	1183	+
	1184	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ superButton.setToolTipText("Create superellipsoid");
	1186	+ superButton.addActionListener(this);
	1187	+
	1188	+ if (Globals.ADVANCED)
	1189	+ {
	1190	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ kleinButton.setToolTipText("Create Klein bottle");
	1192	+ kleinButton.addActionListener(this);
	1193	+ }
	1194	+
	1195	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ particlesButton.setToolTipText("Create particle system");
	1197	+ particlesButton.addActionListener(this);
	1198	+
	1199	+ oe.toolboxPanel.add(row1);
	1200	+
	1201	+ cGridBag row2 = new cGridBag();
	1202	+
	1203	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ groupButton.setToolTipText("Create group");
	1205	+ groupButton.addActionListener(this);
	1206	+
	1207	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ compositeButton.setToolTipText("Create composite");
	1209	+ compositeButton.addActionListener(this);
	1210	+
	1211	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ switchButton.setToolTipText("Create item switcher");
	1213	+ switchButton.addActionListener(this);
	1214	+
	1215	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ loopButton.setToolTipText("Create loop");
	1217	+ loopButton.addActionListener(this);
	1218	+
	1219	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ textureButton.setToolTipText("Create texture");
	1221	+ textureButton.addActionListener(this);
	1222	+
	1223	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ overlayButton.setToolTipText("Create overlay");
	1225	+ overlayButton.addActionListener(this);
	1226	+
	1227	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ lightButton.setToolTipText("Create light");
	1229	+ lightButton.addActionListener(this);
	1230	+
	1231	+ oe.toolboxPanel.add(row2);
	1232	+
	1233	+ cGridBag textures = new cGridBag();
	1234	+
	1235	+ CreateTexturePanel(textures);
	1236	+
	1237	+ oe.toolboxPanel.add(textures);
	1238	+
	1239	+ textures.preferredHeight = 100;
	1240	+
	1241	+ CreateSkyboxPanel(oe.skyboxPanel);
	1242	+
	1243	+ // EDIT panel
	1244	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ editButton.setToolTipText("Pin selection controls");
639	1246	editButton.addActionListener(this);
640	1247
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1248	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ uneditButton.setToolTipText("Unpin and remove selection controls");
643	1250	uneditButton.addActionListener(this);
644	1251
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1252	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1253	+ allParamsButton.setToolTipText("Show all controls");
647	1254	allParamsButton.addActionListener(this);
648	1255
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- clearPanelButton.setToolTipText("Clear edit panel");
	1256	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ clearPanelButton.setToolTipText("Clear all controls");
651	1258	clearPanelButton.addActionListener(this);
652	1259
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- unselectButton.setToolTipText("Unselect");
655		- unselectButton.addActionListener(this);
	1260	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ //unselectButton.setToolTipText("Unselect");
	1262	+ //unselectButton.addActionListener(this);
656	1263
657		- commandsPanel.preferredHeight = 1;
	1264	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1265	+ flashSelectionButton.setToolTipText("Highlight selection");
	1266	+ flashSelectionButton.addActionListener(this);
658	1267
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1268	+ editCommandsPanel.preferredHeight = 1;
	1269	+
	1270	+ SetPinStates(false);
	1271	+// oe.treePanel.add(commandsPanel);
	1272	+// oe.treePanel.Return();
661	1273
662	1274	// oe.aConstraints.gridx += 1;
663	1275	// oe.aConstraints.weighty = 0;
..	..	@@ -674,32 +1286,20 @@
674	1286
675	1287	JScrollPane jSP;
676	1288	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1289	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1290	ResetModel();
679	1291
680	1292	oe.treePanel.add(jSPPanel);
681	1293	oe.treePanel.Return();
682	1294
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	1295	oe.treePanel.add(copyOptionsPanel);
699	1296	oe.treePanel.Return();
	1297	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1298	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1299	+ sliderPane.preferredHeight = 1;
700	1300
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1301	+// mainPanel.setDividerLocation(0.1); //1.0);
	1302	+ mainPanel.setResizeWeight(0.4);
703	1303
704	1304	//jList.addListSelectionListener(this);
705	1305	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1307,7 @@
707	1307	//jTree.setEditable(true);
708	1308	oe.jTree.setDragEnabled(true);
709	1309	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1310	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1311
712	1312	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1313
..	..	@@ -719,29 +1319,49 @@
719	1319	dgr.addDragGestureListener(this);
720	1320	}catch(Exception e) {}
721	1321	*/
722		- radio.layout = sevenButton;
	1322	+ radio.layout = threeButton; // sixButton;
723	1323	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1324	}
725	1325
726	1326	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1327	{
	1328	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1329	+ colorCB.setToolTipText("Copy color when dropped");
	1330	+ colorCB.addItemListener(this);
	1331	+
	1332	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1333	+ materialCB.setToolTipText("Copy material when dropped");
	1334	+ materialCB.addItemListener(this);
	1335	+
	1336	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1337	+ textureCB.setToolTipText("Copy texture when dropped");
	1338	+ textureCB.addItemListener(this);
	1339	+
	1340	+ panel.Return();
	1341	+
728	1342	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1343	boxCB.setToolTipText("Display bounding boxes");
730	1344	boxCB.addItemListener(this);
731	1345
732	1346	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1347	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1348	zoomBoxCB.addItemListener(this);
735	1349
736	1350	if (true) // Globals.ADVANCED)
737	1351	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1352	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1353	+// supportCB.setToolTipText("Enable rigging");
	1354	+// supportCB.addItemListener(this);
	1355	+
	1356	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1357	+ freezeCB.setToolTipText("Fast moving camera");
	1358	+ freezeCB.addItemListener(this);
741	1359
742	1360	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1361	// localCB.addItemListener(this);
744	1362
	1363	+ panel.Return();
	1364	+
745	1365	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1366	crowdCB.setToolTipText("Used for crowds");
747	1367	crowdCB.addItemListener(this);
..	..	@@ -750,14 +1370,19 @@
750	1370	smoothCB.setToolTipText("Snapping delay");
751	1371	smoothCB.addItemListener(this);
752	1372
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1373	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1374	+// slowCB.setToolTipText("Smooth interpolation");
	1375	+// slowCB.addItemListener(this);
	1376	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1377	+ minshaderCB.setToolTipText("Minimal fast shader");
	1378	+ minshaderCB.addItemListener(this);
756	1379
757	1380	// constraints.gridy += 1;
758	1381	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1382	// speakerMocapCB.addItemListener(this);
760	1383
	1384	+ panel.Return();
	1385	+
761	1386	if (false)
762	1387	{
763	1388	// handled in scripts
..	..	@@ -772,34 +1397,74 @@
772	1397	//constraints.gridy += 1;
773	1398	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1399	smoothfocusCB.addItemListener(this);
	1400	+ panel.Return();
775	1401	}
776	1402
777	1403	//constraints.gridx += 1;
778	1404	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1405	// debugCB.addItemListener(this);
780	1406
	1407	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1408	+ trackCB.setToolTipText("Enable tracking target");
	1409	+ trackCB.addItemListener(this);
	1410	+
781	1411	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1412	+ oeilCB.setToolTipText("Move camera when tracking");
782	1413	oeilCB.addItemListener(this);
783	1414
	1415	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1416	+ shadowCB.setToolTipText("When live compute shadows");
	1417	+ shadowCB.addItemListener(this);
	1418	+
	1419	+ panel.Return();
	1420	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1421	+ toggleTextureCB.setToolTipText("Load textures");
	1422	+ toggleTextureCB.addItemListener(this);
	1423	+
	1424	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1425	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1426	+ toggleSwitchCB.addItemListener(this);
	1427	+
	1428	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1429	+ autokeepCB.setToolTipText("On structure change");
	1430	+ autokeepCB.addItemListener(this);
	1431	+
	1432	+ panel.Return();
	1433	+ if (Globals.ADVANCED)
	1434	+ {
784	1435	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1436	lookAtCB.setToolTipText("Look-at target");
786	1437	lookAtCB.addItemListener(this);
	1438	+ }
787	1439
788	1440	}
789	1441
790	1442	cGridBag fill = new cGridBag();
791		-
792	1443	fill.preferredHeight = 200;
	1444	+ cGridBag fill2 = new cGridBag();
	1445	+ fill2.preferredHeight = 200;
	1446	+ cGridBag fill3 = new cGridBag();
	1447	+ fill3.preferredHeight = 200;
793	1448
794	1449	panel.add(fill);
	1450	+ panel.add(fill2);
	1451	+ panel.add(fill3);
795	1452
796	1453	}
797	1454
798	1455	void EditObject(Object3D obj)
799	1456	{
800	1457	cRadio radioButton = new cRadio(obj.name);
	1458	+
	1459	+ // June 2019. Patch to avoid bug with transparency.
	1460	+ radioButton.hadMaterial = obj.material != null;
	1461	+ if (!radioButton.hadMaterial)
	1462	+ {
	1463	+ obj.material = new cMaterial();
	1464	+ }
	1465	+
801	1466	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1467	+ radioButton.layout = threeButton; // sixButton;
803	1468	radioButton.SetCamera(cameraView.renderCamera, false);
804	1469	radioButton.addActionListener(this);
805	1470	radioPanel.add(radioButton);
..	..	@@ -809,6 +1474,8 @@
809	1474
810	1475	void SetupViews(ObjEditor oe)
811	1476	{
	1477	+ theFrame = this;
	1478	+
812	1479	oe.SetupViews();
813	1480
814	1481	System.out.println("SetupViews");
..	..	@@ -817,23 +1484,30 @@
817	1484	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1485	}
819	1486
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1487	+ cToggleButton liveCB;
	1488	+ cCheckBox supportCB;
	1489	+ cCheckBox localCB;
	1490	+ cCheckBox crowdCB;
	1491	+ cCheckBox smoothCB;
	1492	+ cCheckBox minshaderCB;
	1493	+
	1494	+ cToggleButton fastCB;
	1495	+ cCheckBox slowCB;
	1496	+ cCheckBox boxCB;
	1497	+ cCheckBox zoomBoxCB;
	1498	+ cCheckBox freezeCB;
	1499	+ //cToggleButton trackCB;
	1500	+ cCheckBox trackCB;
	1501	+ cCheckBox smoothfocusCB;
831	1502	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1503	+ cCheckBox speakerCameraCB;
	1504	+ cCheckBox speakerFocusCB;
	1505	+ cCheckBox debugCB;
	1506	+
	1507	+ cCheckBox oeilCB;
	1508	+ cCheckBox shadowCB;
	1509	+ cCheckBox autokeepCB;
	1510	+ cCheckBox lookAtCB;
837	1511
838	1512	// static int COLOR = 1;
839	1513	// static int MATERIAL = 2;
..	..	@@ -841,9 +1515,9 @@
841	1515
842	1516	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1517
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1518	+ cCheckBox colorCB;
	1519	+ cCheckBox materialCB;
	1520	+ cCheckBox textureCB;
847	1521
848	1522	public void itemStateChanged(ItemEvent e)
849	1523	{
..	..	@@ -887,6 +1561,12 @@
887	1561	{
888	1562	cameraView.ToggleInertia();
889	1563	cameraView.repaint();
	1564	+ }
	1565	+ else if(e.getSource() == minshaderCB)
	1566	+ {
	1567	+ Globals.MINSHADER ^= true;
	1568	+ cameraView.programInitialized = false;
	1569	+ cameraView.repaint();
890	1570	}
891	1571	else if(e.getSource() == localCB)
892	1572	{
..	..	@@ -936,6 +1616,18 @@
936	1616	{
937	1617	cameraView.ToggleOeil();
938	1618	}
	1619	+ else if(e.getSource() == shadowCB)
	1620	+ {
	1621	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1622	+ }
	1623	+ else if(e.getSource() == freezeCB)
	1624	+ {
	1625	+ Globals.FREEZEONMOVE ^= true;
	1626	+ }
	1627	+ else if(e.getSource() == autokeepCB)
	1628	+ {
	1629	+ Globals.REPLACEONMAKE ^= true;
	1630	+ }
939	1631	else if(e.getSource() == lookAtCB)
940	1632	{
941	1633	cameraView.ToggleLookAt();
..	..	@@ -952,7 +1644,8 @@
952	1644
953	1645	/**/
954	1646	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
955		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1647	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1648	+ TreePath path = objEditor.jTree.getSelectionPath();
956	1649	if ((path == null) \|\| (path.getPathCount() <= 1)) {
957	1650	// We can't move the root node or an empty selection
958	1651	return;
..	..	@@ -1015,8 +1708,6 @@
1015	1708	}
1016	1709	}
1017	1710
1018		- String string = (String) object;
1019		-
1020	1711	System.out.println("Transfer = " + object + "; drop : " + target);
1021	1712	// if( object instanceof java.io.File[])
1022	1713	// {
..	..	@@ -1024,6 +1715,8 @@
1024	1715	// objEditor.DropFile((java.io.File[]) object, true);
1025	1716	// return;
1026	1717	// }
	1718	+
	1719	+ String string = object.toString();
1027	1720
1028	1721	// File path for Mac and Windows
1029	1722	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1069,23 +1762,33 @@
1069	1762
1070	1763	assert target == objEditor.jTree;
1071	1764	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1765	+ Object3D destinationLeaf;
1072	1766	try {
1073		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1767	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1074	1768	} catch (Exception e) {
1075	1769	System.out.println("destinationPath : " + destinationPath);
1076	1770	return;
1077	1771	}
1078	1772
1079		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1773	+ for (int i=group.selection.size(); --i>=0;)
1080	1774	{
	1775	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1776	+
	1777	+ // Cannot move into itself
	1778	+ if (child == destinationLeaf)
	1779	+ return;
	1780	+ }
	1781	+
	1782	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1783	+// {
1081	1784	loadClipboard(true);
1082	1785	objEditor.jTree.setSelectionPath(destinationPath);
1083	1786	pasteInto(false, false);
1084		- } else {
1085		- loadClipboard(false);
1086		- objEditor.jTree.setSelectionPath(destinationPath);
1087		- pasteInto(false, false); // true); // ???
1088		- }
	1787	+// } else {
	1788	+// loadClipboard(false);
	1789	+// objEditor.jTree.setSelectionPath(destinationPath);
	1790	+// pasteInto(false, false); // true); // ???
	1791	+// }
1089	1792	}
1090	1793	public void dropActionChanged(DropTargetDragEvent dtde)
1091	1794	// Called if the user has modified the current drop gesture
..	..	@@ -1141,7 +1844,12 @@
1141	1844	TreePath path;
1142	1845
1143	1846	public TransferableTreePath(TreePath tp) {
1144		- path = tp;
	1847	+ Object[] objs = new Object[tp.getPathCount()];
	1848	+ for (int i=0; i<objs.length; i++)
	1849	+ {
	1850	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1851	+ }
	1852	+ path = new TreePath(objs);
1145	1853	}
1146	1854
1147	1855	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1190,22 +1898,30 @@
1190	1898	{
1191	1899	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1192	1900	//heightFieldItem.addActionListener(this);
1193		- gridItem = menu.add(new MenuItem("Grid"));
1194		- gridItem.addActionListener(this);
1195		- rectoidItem = menu.add(new MenuItem("Box"));
1196		- rectoidItem.addActionListener(this);
1197		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1198		- ellipsoidItem.addActionListener(this);
1199		- coneItem = menu.add(new MenuItem("Cone"));
1200		- coneItem.addActionListener(this);
1201		- torusItem = menu.add(new MenuItem("Torus"));
1202		- torusItem.addActionListener(this);
1203		- superItem = menu.add(new MenuItem("Superellipsoid"));
1204		- superItem.addActionListener(this);
	1901	+// gridItem = menu.add(new MenuItem("Grid"));
	1902	+// gridItem.addActionListener(this);
	1903	+// rectoidItem = menu.add(new MenuItem("Box"));
	1904	+// rectoidItem.addActionListener(this);
	1905	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1906	+// ellipsoidItem.addActionListener(this);
	1907	+// coneItem = menu.add(new MenuItem("Cone"));
	1908	+// coneItem.addActionListener(this);
	1909	+// torusItem = menu.add(new MenuItem("Torus"));
	1910	+// torusItem.addActionListener(this);
	1911	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1912	+// superItem.addActionListener(this);
	1913	+
	1914	+ cameraItem = menu.add(new MenuItem("Camera"));
	1915	+ cameraItem.addActionListener(this);
	1916	+
	1917	+ if (!Globals.ADVANCED)
	1918	+ {
1205	1919	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1206	1920	kleinItem.addActionListener(this);
1207		- particleItem = menu.add(new MenuItem("Particle system"));
1208		- particleItem.addActionListener(this);
	1921	+ }
	1922	+
	1923	+// particleItem = menu.add(new MenuItem("Particle system"));
	1924	+// particleItem.addActionListener(this);
1209	1925	if (Globals.ADVANCED)
1210	1926	{
1211	1927	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1231,15 +1947,15 @@
1231	1947	}
1232	1948	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1233	1949	bezierItem.addActionListener(this);
1234		- overlayItem = menu.add(new MenuItem("Overlay"));
1235		- overlayItem.addActionListener(this);
1236		- lightItem = menu.add(new MenuItem("Light"));
1237		- lightItem.addActionListener(this);
	1950	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1951	+// overlayItem.addActionListener(this);
	1952	+// lightItem = menu.add(new MenuItem("Light"));
	1953	+// lightItem.addActionListener(this);
1238	1954	menu.add("-");
1239	1955	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1240	1956	//superLoopItem.addActionListener(this);
1241		- loopItem = menu.add(new MenuItem("Loop"));
1242		- loopItem.addActionListener(this);
	1957	+// loopItem = menu.add(new MenuItem("Loop"));
	1958	+// loopItem.addActionListener(this);
1243	1959	doubleItem = menu.add(new MenuItem("Fork"));
1244	1960	doubleItem.addActionListener(this);
1245	1961	if (Globals.ADVANCED)
..	..	@@ -1255,6 +1971,9 @@
1255	1971	animationItem.addItemListener(this);
1256	1972	animationItem.setState(Globals.ANIMATION);
1257	1973
	1974	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1975	+ archiveItem.addActionListener(this);
	1976	+
1258	1977	menu.add("-");
1259	1978	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1260	1979	parseverticesItem.addActionListener(this);
..	..	@@ -1267,6 +1986,8 @@
1267	1986	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1268	1987	reduce34MorphItem.addActionListener(this);
1269	1988	menu.add("-");
	1989	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1990	+ memoryItem.addActionListener(this);
1270	1991	menu.add(computeAOItem = new MenuItem("Compute AO"));
1271	1992	computeAOItem.addActionListener(this);
1272	1993
..	..	@@ -1275,8 +1996,6 @@
1275	1996	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1276	1997	mirrorItem.addActionListener(this);
1277	1998	menu.add("-");
1278		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1279		- memoryItem.addActionListener(this);
1280	1999	menu.add(analyzeItem = new MenuItem("Analyze"));
1281	2000	analyzeItem.addActionListener(this);
1282	2001	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1420,9 +2139,34 @@
1420	2139	shadow.material = new cMaterial(obj.material);
1421	2140	shadow.material.diffuse = 0.0001f;
1422	2141	shadow.material.specular = 0.0001f;
	2142	+ //shadow.projectedVertices[1].x = 300;
1423	2143
1424	2144	makeSomething(shadow);
1425	2145	}
	2146	+
	2147	+ private void ClearUnpinned()
	2148	+ {
	2149	+ //for (Object3D obj : listUI)
	2150	+ for (int i=listUI.size(); --i>=0;)
	2151	+ {
	2152	+ Object3D obj = listUI.elementAt(i);
	2153	+ if (!obj.pinned)
	2154	+ {
	2155	+ obj.CloseUI();
	2156	+ listUI.remove(i);
	2157	+ }
	2158	+ }
	2159	+ }
	2160	+
	2161	+ private void EditElement(Object3D elem, boolean newWindow)
	2162	+ {
	2163	+ // if (!(elem instanceof Composite))
	2164	+ // newWindow = false;
	2165	+ listUI.add(elem);
	2166	+ elem.openEditWindow(this, newWindow); //, false);
	2167	+ System.out.println("edit : " + elem);
	2168	+ elem.editWindow.refreshContents(true); // ? new
	2169	+ }
1426	2170
1427	2171	/**
1428	2172	* applyExample
..	..	@@ -1667,7 +2411,7 @@
1667	2411	{
1668	2412	ScreenFit();
1669	2413	} else
1670		- if (source == switchItem)
	2414	+ if (source == switchViewItem)
1671	2415	{
1672	2416	cVector v1 = new cVector();
1673	2417	cVector v2 = new cVector();
..	..	@@ -1676,11 +2420,11 @@
1676	2420	objEditor.cameraView.renderCamera.setAim(v2, v1);
1677	2421	objEditor.cameraView.repaint();
1678	2422	} else
1679		- if (source == rectoidItem)
	2423	+ if (source == rectoidItem \|\| source == boxButton)
1680	2424	{
1681	2425	makeSomething(new Box());
1682	2426	} else
1683		- if (source == particleItem)
	2427	+ if (source == particleItem \|\| source == particlesButton)
1684	2428	{
1685	2429	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1686	2430	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1759,27 +2503,27 @@
1759	2503
1760	2504	makeSomething(obj);
1761	2505	} else
1762		- if (source == gridItem)
	2506	+ if (source == gridItem \|\| source == gridButton)
1763	2507	{
1764	2508	makeSomething(new Grid());
1765	2509	} else
1766		- if (source == ellipsoidItem)
	2510	+ if (source == ellipsoidItem \|\| source == sphereButton)
1767	2511	{
1768	2512	makeSomething(new Sphere());
1769	2513	} else
1770		- if (source == coneItem)
	2514	+ if (source == coneItem \|\| source == coneButton)
1771	2515	{
1772	2516	makeSomething(new Cone());
1773	2517	} else
1774		- if (source == torusItem)
	2518	+ if (source == torusItem \|\| source == torusButton)
1775	2519	{
1776	2520	makeSomething(new Torus());
1777	2521	} else
1778		- if (source == superItem)
	2522	+ if (source == superItem \|\| source == superButton)
1779	2523	{
1780	2524	makeSomething(new Superellipsoid());
1781	2525	} else
1782		- if (source == kleinItem)
	2526	+ if (source == kleinItem \|\| source == kleinButton)
1783	2527	{
1784	2528	makeSomething(new Klein());
1785	2529	} else
..	..	@@ -1799,7 +2543,7 @@
1799	2543	{
1800	2544	makeSomething(new BezierSurface());
1801	2545	} else
1802		- if (source == overlayItem)
	2546	+ if (source == overlayItem \|\| source == overlayButton)
1803	2547	{
1804	2548	/*
1805	2549	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1847,10 +2591,27 @@
1847	2591	s.setup();
1848	2592	makeSomething(s);
1849	2593	} else
1850		- if (source == lightItem)
	2594	+ if (source == lightItem \|\| source == lightButton)
1851	2595	{
1852	2596	makeSomething(new Light());
1853	2597	} else
	2598	+// if (source == skybox1Button \|\|
	2599	+// source == skybox2Button \|\|
	2600	+// source == skybox3Button \|\|
	2601	+// source == skybox4Button \|\|
	2602	+// source == skybox5Button \|\|
	2603	+// source == skybox6Button \|\|
	2604	+// source == skybox7Button \|\|
	2605	+// source == skybox11Button \|\|
	2606	+// source == skybox12Button \|\|
	2607	+// source == skybox13Button \|\|
	2608	+// source == skybox14Button \|\|
	2609	+// source == skybox15Button \|\|
	2610	+// source == skybox16Button \|\|
	2611	+// source == skybox17Button)
	2612	+// {
	2613	+// ChangeSkybox(source);
	2614	+// } else
1854	2615	if (source == csgItem)
1855	2616	{
1856	2617	group(new CSG());
..	..	@@ -1897,30 +2658,30 @@
1897	2658
1898	2659	group(g);
1899	2660	} else
1900		- if (source == loopItem)
	2661	+ if (source == loopItem \|\| source == loopButton)
1901	2662	{
1902	2663	Composite csg = new GroupLeaf();
1903	2664	csg.count = 5;
1904	2665	group(csg);
1905		- Composite child = new cGroup();
	2666	+ Composite child = new cGroup("Branch");
1906	2667	csg.addChild(child);
1907	2668	child.addChild(csg);
1908	2669	} else
1909	2670	if (source == doubleItem)
1910	2671	{
1911		- Composite csg = new GroupLeaf();
	2672	+ Composite csg = new GroupLeaf("Fork");
1912	2673	csg.count = 5;
1913	2674	group(csg);
1914		- Composite child = new cGroup();
	2675	+ Composite child = new cGroup("Branch A");
1915	2676	csg.addChild(child);
1916	2677	child.addChild(csg);
1917		- child = new cGroup();
	2678	+ child = new cGroup("Branch B");
1918	2679	csg.addChild(child);
1919	2680	child.addChild(csg);
1920	2681	} else
1921	2682	if (source == tripleItem)
1922	2683	{
1923		- Composite csg = new GroupLeaf();
	2684	+ Composite csg = new GroupLeaf("Trident");
1924	2685	csg.count = 4;
1925	2686	group(csg);
1926	2687	Composite child = new cGroup();
..	..	@@ -1936,7 +2697,7 @@
1936	2697	if (source == computeAOItem)
1937	2698	{
1938	2699	Globals.drawMode = CameraPane.OCCLUSION;
1939		- Globals.theRenderer.repaint();
	2700	+ cameraView.repaint();
1940	2701	} else
1941	2702	if (source == recompileItem)
1942	2703	{
..	..	@@ -1951,7 +2712,7 @@
1951	2712	if (source == invariantsItem)
1952	2713	{
1953	2714	System.out.println("Invariants:");
1954		- Grafreed.grafreeD.universe.invariants();
	2715	+ Grafreed.grafreed.universe.invariants();
1955	2716	} else
1956	2717	if (source == memoryItem)
1957	2718	{
..	..	@@ -1970,17 +2731,64 @@
1970	2731	{
1971	2732	DumpObject();
1972	2733	} else
1973		- if (source == undoButton)
	2734	+ if (source == minButton)
1974	2735	{
1975		- Undo();
	2736	+ Minimize();
1976	2737	} else
1977		- if (source == redoButton)
	2738	+ if (source == maxButton)
1978	2739	{
1979		- Redo();
	2740	+ Maximize();
1980	2741	} else
1981		- if (source == saveButton)
	2742	+ if (source == fullButton)
1982	2743	{
1983		- Save();
	2744	+ ToggleFullScreen();
	2745	+ } else
	2746	+ if (source == collapseButton)
	2747	+ {
	2748	+ this.expandedLayout = radio.layout;
	2749	+ CollapseToolbar();
	2750	+ } else
	2751	+ if (source == maximize3DButton)
	2752	+ {
	2753	+ this.expandedLayout = radio.layout;
	2754	+ radio.layout = twoButton;
	2755	+ Show3DView();
	2756	+ CollapseToolbar();
	2757	+ } else
	2758	+ if (source == previousVersionButton)
	2759	+ {
	2760	+ // Go to previous version
	2761	+ //if (!Undo())
	2762	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2763	+ PreviousVersion();
	2764	+ } else
	2765	+ if (source == restoreButton)
	2766	+ {
	2767	+ // Restore current version
	2768	+ Restore();
	2769	+ //restoreButton.setEnabled(false);
	2770	+ } else
	2771	+ if (source == replaceButton)
	2772	+ {
	2773	+ // Overwrite current version
	2774	+ Replace();
	2775	+ //replaceButton.setEnabled(false);
	2776	+ } else
	2777	+ if (source == nextVersionButton)
	2778	+ {
	2779	+ // Go to next version
	2780	+ NextVersion();
	2781	+ } else
	2782	+ if (source == saveVersionButton)
	2783	+ {
	2784	+ // Save a new version
	2785	+ if (!Save(true))
	2786	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2787	+ } else
	2788	+ if (source == deleteVersionButton)
	2789	+ {
	2790	+ // Delete a new version
	2791	+ DeleteVersion();
1984	2792	} else
1985	2793	if (source == oneStepButton)
1986	2794	{
..	..	@@ -1989,17 +2797,14 @@
1989	2797	} else
1990	2798	if (source == screenfitButton)
1991	2799	{
1992		- //Reload(lastConverter, lastFilename, true);
1993	2800	ScreenFit();
1994	2801	} else
1995	2802	if (source == screenfitpointButton)
1996	2803	{
1997		- //Reload(lastConverter, lastFilename, true);
1998	2804	ScreenFitPoint();
1999	2805	} else
2000	2806	if (source == snapobjectButton)
2001	2807	{
2002		- //Reload(lastConverter, lastFilename, true);
2003	2808	SnapObject();
2004	2809	} else
2005	2810	// if (event.getSource() == recompileButton)
..	..	@@ -2038,11 +2843,11 @@
2038	2843	} else
2039	2844	if (source == undoItem)
2040	2845	{
2041		- Undo();
	2846	+ PreviousVersion();
2042	2847	} else
2043	2848	if (source == redoItem)
2044	2849	{
2045		- Redo();
	2850	+ NextVersion();
2046	2851	} else
2047	2852	if (source == duplicateItem)
2048	2853	{
..	..	@@ -2363,7 +3168,7 @@
2363	3168	{
2364	3169	StepAll();
2365	3170	} else
2366		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3171	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2367	3172	{
2368	3173	//int indices[] = jList.getSelectedIndices();
2369	3174	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2375,9 +3180,9 @@
2375	3180	{
2376	3181	ClearSelection(true);
2377	3182	} else
2378		- if (source == grabItem)
	3183	+ if (source == grabItem \|\| source == groupButton)
2379	3184	{
2380		- group(new cGroup(), true);
	3185	+ group(new cGroup(), false); // true);
2381	3186	} else
2382	3187	if (source == hideItem)
2383	3188	{
..	..	@@ -2395,11 +3200,11 @@
2395	3200	{
2396	3201	makeSomething(new Camera());
2397	3202	} else
2398		- if (source == compositeItem)
	3203	+ if (source == compositeItem \|\| source == compositeButton)
2399	3204	{
2400	3205	group(new Composite());
2401	3206	} else
2402		- if (source == randomItem)
	3207	+ if (source == switchItem \|\| source == switchButton)
2403	3208	{
2404	3209	RandomNode random = new RandomNode();
2405	3210	group(random);
..	..	@@ -2501,7 +3306,7 @@
2501	3306	{
2502	3307	group(new cLinker());
2503	3308	} else
2504		- if (source == textureItem)
	3309	+ if (source == textureItem \|\| source == textureButton)
2505	3310	{
2506	3311	group(new TextureNode());
2507	3312	} else
..	..	@@ -2521,17 +3326,30 @@
2521	3326	{
2522	3327	CastShadow(2);
2523	3328	} else
2524		- if (source == ungroupItem)
	3329	+ if (source == ungroupItem \|\| source == ungroupButton)
2525	3330	{
2526		- //ungroup();
	3331	+ boolean hasRoot = false;
	3332	+
2527	3333	for (int i=0; i<group.selection.size(); i++)
2528	3334	{
2529		- Ungroup(group.selection.get(i));
	3335	+ if (group.selection.get(i) == group)
	3336	+ {
	3337	+ hasRoot = true;
	3338	+ break;
	3339	+ }
2530	3340	}
2531	3341
2532		- ClearSelection(false);
2533		-
2534		- refreshContents();
	3342	+ if (!hasRoot)
	3343	+ {
	3344	+ for (int i=0; i<group.selection.size(); i++)
	3345	+ {
	3346	+ Ungroup(group.selection.get(i));
	3347	+ }
	3348	+
	3349	+ ClearSelection(false);
	3350	+
	3351	+ refreshContents();
	3352	+ }
2535	3353	} else
2536	3354	if (source == genUVItem)
2537	3355	{
..	..	@@ -2608,6 +3426,22 @@
2608	3426	if (source == unmarkleavesItem)
2609	3427	{
2610	3428	MarkLeaves(false);
	3429	+ } else
	3430	+ if (source == rewindleavesItem)
	3431	+ {
	3432	+ RewindLeaves(true);
	3433	+ } else
	3434	+ if (source == unrewindleavesItem)
	3435	+ {
	3436	+ RewindLeaves(false);
	3437	+ } else
	3438	+ if (source == randomleavesItem)
	3439	+ {
	3440	+ RandomLeaves(true);
	3441	+ } else
	3442	+ if (source == unrandomleavesItem)
	3443	+ {
	3444	+ RandomLeaves(false);
2611	3445	} else
2612	3446	if (source == flipVItem)
2613	3447	{
..	..	@@ -2816,7 +3650,7 @@
2816	3650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2817	3651	{
2818	3652	obj = (Object3D)e.nextElement();
2819		- obj.SetBumpTexture(null);
	3653	+ obj.ResetBumpTexture();
2820	3654	}
2821	3655
2822	3656	refreshContents();
..	..	@@ -2832,6 +3666,31 @@
2832	3666
2833	3667	refreshContents();
2834	3668	} else
	3669	+ if (source == embedTexturesItem)
	3670	+ {
	3671	+ Object3D obj;
	3672	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3673	+ {
	3674	+ obj = (Object3D)e.nextElement();
	3675	+ obj.EmbedTextures(true);
	3676	+ }
	3677	+
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == deEmbedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(false);
	3687	+ }
	3688	+
	3689	+ CameraPane.texturepigment.clear();
	3690	+ CameraPane.texturebump.clear();
	3691	+
	3692	+ refreshContents();
	3693	+ } else
2835	3694	if (source == flashSelectionButton)
2836	3695	{
2837	3696	CameraPane.flash = true;
..	..	@@ -2843,42 +3702,36 @@
2843	3702	if (source == twoButton)
2844	3703	{
2845	3704	radio.layout = twoButton;
2846		- // bug
2847		- //gridPanel.setDividerLocation(1.0);
2848		- //bigPanel.setDividerLocation(0.0);
2849		-// bigThree.remove(scenePanel);
2850		-// bigThree.remove(centralPanel);
2851		-// bigThree.remove(XYZPanel);
2852		-// aWindowConstraints.gridx = 0;
2853		-// aWindowConstraints.gridy = 0;
2854		-// aWindowConstraints.gridwidth = 1;
2855		-// // aConstraints.gridheight = 3;
2856		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2857		-// aWindowConstraints.weightx = 0;
2858		-// aWindowConstraints.weighty = 1;
2859		-// //bigThree.add(jtp, aWindowConstraints);
2860		-// aWindowConstraints.weightx = 1;
2861		-// aWindowConstraints.gridwidth = 3;
2862		-// // aConstraints.gridheight = 3;
2863		-// aWindowConstraints.gridx = 1;
2864		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2865		-// bigThree.add(centralPanel, aWindowConstraints);
2866		-// aWindowConstraints.weightx = 0;
2867		-// aWindowConstraints.gridx = 4;
2868		-// aWindowConstraints.gridwidth = 1;
2869		-// // aConstraints.gridheight = 3;
2870		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2871		-// //bigThree.add(XYZPanel, aWindowConstraints);
2872		-// scenePanel.setVisible(false);
2873		-// centralPanel.setVisible(true);
2874		-// XYZPanel.setVisible(false);
2875		- bigThree.ClearUI();
2876		- bigThree.add(centralPanel);
2877		- bigThree.FlushUI();
	3705	+
	3706	+ if (CameraPane.FULLSCREEN)
	3707	+ fullscreenLayout = radio.layout;
	3708	+
	3709	+ Show3DView();
	3710	+
	3711	+ cameraView.requestFocusInWindow();
	3712	+
	3713	+// refreshContents(true);
	3714	+//
	3715	+// try
	3716	+// {
	3717	+// java.awt.Robot bot = new java.awt.Robot();
	3718	+// int mask = InputEvent.BUTTON1_MASK;
	3719	+// bot.mouseMove(100, 100);
	3720	+// bot.mousePress(mask);
	3721	+// bot.mouseRelease(mask);
	3722	+// }
	3723	+// catch (Exception e)
	3724	+// {
	3725	+//
	3726	+// }
	3727	+
2878	3728	} else
2879	3729	if (source == threeButton)
2880	3730	{
2881	3731	radio.layout = threeButton;
	3732	+
	3733	+ if (CameraPane.FULLSCREEN)
	3734	+ fullscreenLayout = radio.layout;
2882	3735
2883	3736	// bigThree.remove(scenePanel);
2884	3737	// bigThree.remove(centralPanel);
..	..	@@ -2908,13 +3761,18 @@
2908	3761	// centralPanel.setVisible(true);
2909	3762	// XYZPanel.setVisible(true);
2910	3763	bigThree.ClearUI();
	3764	+ bigThree.add(scenePanel);
2911	3765	bigThree.add(centralPanel);
2912		- bigThree.add(XYZPanel);
2913	3766	bigThree.FlushUI();
	3767	+
	3768	+ cameraView.requestFocusInWindow();
2914	3769	} else
2915	3770	if (source == fourButton)
2916	3771	{
2917	3772	radio.layout = fourButton;
	3773	+
	3774	+ if (CameraPane.FULLSCREEN)
	3775	+ fullscreenLayout = radio.layout;
2918	3776
2919	3777	// bigThree.remove(scenePanel);
2920	3778	// bigThree.remove(centralPanel);
..	..	@@ -2946,10 +3804,15 @@
2946	3804	bigThree.ClearUI();
2947	3805	bigThree.add(scenePanel);
2948	3806	bigThree.FlushUI();
	3807	+
	3808	+ cameraView.requestFocusInWindow();
2949	3809	} else
2950	3810	if (source == sixButton)
2951	3811	{
2952	3812	radio.layout = sixButton;
	3813	+
	3814	+ if (CameraPane.FULLSCREEN)
	3815	+ fullscreenLayout = radio.layout;
2953	3816
2954	3817	// bigThree.remove(scenePanel);
2955	3818	// bigThree.remove(centralPanel);
..	..	@@ -2979,13 +3842,18 @@
2979	3842	// centralPanel.setVisible(true);
2980	3843	// XYZPanel.setVisible(false);
2981	3844	bigThree.ClearUI();
2982		- bigThree.add(scenePanel);
2983	3845	bigThree.add(centralPanel);
	3846	+ bigThree.add(scenePanel);
2984	3847	bigThree.FlushUI();
	3848	+
	3849	+ cameraView.requestFocusInWindow();
2985	3850	} else
2986	3851	if (source == sevenButton)
2987	3852	{
2988	3853	radio.layout = sevenButton;
	3854	+
	3855	+ if (CameraPane.FULLSCREEN)
	3856	+ fullscreenLayout = radio.layout;
2989	3857
2990	3858	// bigThree.remove(scenePanel);
2991	3859	// bigThree.remove(centralPanel);
..	..	@@ -3019,6 +3887,8 @@
3019	3887	bigThree.add(centralPanel);
3020	3888	bigThree.add(XYZPanel);
3021	3889	bigThree.FlushUI();
	3890	+
	3891	+ cameraView.requestFocusInWindow();
3022	3892	} else
3023	3893	if (source == rootButton)
3024	3894	{
..	..	@@ -3030,6 +3900,7 @@
3030	3900	EditObject(obj);
3031	3901	}
3032	3902
	3903	+ cameraView.requestFocusInWindow();
3033	3904	refreshContents(true);
3034	3905	} else
3035	3906	if (source == closeButton)
..	..	@@ -3039,22 +3910,37 @@
3039	3910	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3040	3911	{
3041	3912	ab = (cRadio)e.nextElement();
3042		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3913	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3043	3914	{
	3915	+ // Patch to avoid bug with transparency.
	3916	+ if (!ab.hadMaterial)
	3917	+ {
	3918	+ ab.object.material = null;
	3919	+ }
	3920	+
3044	3921	buttonGroup.remove(ab);
3045	3922	radioPanel.remove(ab);
3046	3923
3047		- ab.GetObject().editWindow = null;
	3924	+ //ab.GetObject().editWindow = null;
	3925	+ ab.GetObject().manipWindow = null;
3048	3926	// ab.GetObject().objectUI = null; // ?????????
3049	3927
3050	3928	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3051	3929	break;
3052	3930	}
3053	3931	}
	3932	+
	3933	+ cameraView.requestFocusInWindow();
3054	3934	refreshContents(true);
3055	3935	} else
3056	3936	if (source == editItem \|\| source == editButton)
3057	3937	{
	3938	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3939	+ {
	3940	+ Object3D child = (Object3D)e.nextElement();
	3941	+ child.pinned = true;
	3942	+ }
	3943	+
3058	3944	EditSelection(false);
3059	3945	} else
3060	3946	if (source == uneditButton)
..	..	@@ -3063,9 +3949,10 @@
3063	3949	{
3064	3950	Object3D child = (Object3D)e.nextElement();
3065	3951	if(child.editWindow != null)
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3952	+ child.pinned = false;
3067	3953	child.CloseUI();
3068	3954	listUI.remove(child);
	3955	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3069	3956
3070	3957	//child.editWindow = null; // ???????????
3071	3958	}
..	..	@@ -3080,16 +3967,18 @@
3080	3967	//copy.ClearUI();
3081	3968	for (Object3D obj : listUI)
3082	3969	{
	3970	+ obj.pinned = false;
3083	3971	obj.CloseUI();
3084	3972	}
3085	3973	listUI.clear();
	3974	+ SetPinStates(group.selection.size() > 0);
3086	3975	refreshContents(true);
3087	3976	} else
3088	3977	if (source == allParamsButton)
3089	3978	{
3090	3979	assert(copy == group);
3091	3980
3092		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3981	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	3982
3094	3983	for (Object3D obj : listUI)
3095	3984	{
..	..	@@ -3138,6 +4027,9 @@
3138	4027	}
3139	4028
3140	4029	copy = group;
	4030	+
	4031	+ SetUndoStates();
	4032	+
3141	4033	//Globals.theRenderer.object = group;
3142	4034	if(!useclient)
3143	4035	{
..	..	@@ -3155,7 +4047,8 @@
3155	4047	}
3156	4048
3157	4049	// fix "+" issue
3158		- group.editWindow = this;
	4050	+ //group.editWindow = this;
	4051	+ group.manipWindow = this;
3159	4052
3160	4053	/*
3161	4054	currentLayout = radio.layout;
..	..	@@ -3163,20 +4056,32 @@
3163	4056	currentLayout = sevenButton;
3164	4057	*/
3165	4058	radio.layout.doClick();
	4059	+
	4060	+ ClearUnpinned();
	4061	+
	4062	+ //Grafreed.Assert(group != null);
	4063	+ //Grafreed.Assert(group.selection != null);
	4064	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4065	+ if (group.selection == null \|\| group.selection.size() == 1)
	4066	+ EditSelection(false);
3166	4067	keepparent = group.parent;
3167	4068	// PARENT = NULL or not???
3168	4069	//group.parent = null; // ROOT
3169	4070	//group.attributes = -1;
3170	4071	ResetModel();
	4072	+
	4073	+ cameraView.requestFocusInWindow();
3171	4074	refreshContents(true);
3172	4075	} else if (event.getSource() == editCameraItem)
3173	4076	{
3174	4077	cameraView.ProtectCamera();
	4078	+ cameraView.requestFocusInWindow();
3175	4079	cameraView.repaint();
3176	4080	return;
3177		- } else if (event.getSource() == revertCameraItem)
	4081	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3178	4082	{
3179	4083	cameraView.RevertCamera();
	4084	+ cameraView.requestFocusInWindow();
3180	4085	cameraView.repaint();
3181	4086	return;
3182	4087	// } else if (event.getSource() == textureButton)
..	..	@@ -3191,7 +4096,6 @@
3191	4096	}
3192	4097
3193	4098	boolean useclient = false;
3194		- cRadio radio;
3195	4099
3196	4100	void ToggleRoot()
3197	4101	{
..	..	@@ -3754,7 +4658,7 @@
3754	4658
3755	4659	try
3756	4660	{
3757		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4661	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3758	4662	}
3759	4663	catch (Exception e)
3760	4664	{
..	..	@@ -4146,6 +5050,18 @@
4146	5050	refreshContents();
4147	5051	}
4148	5052
	5053	+ void RewindLeaves(boolean hide)
	5054	+ {
	5055	+ group.selection.RewindLeaves(hide);
	5056	+ refreshContents();
	5057	+ }
	5058	+
	5059	+ void RandomLeaves(boolean hide)
	5060	+ {
	5061	+ group.selection.RandomLeaves(hide);
	5062	+ refreshContents();
	5063	+ }
	5064	+
4149	5065	void SetTexRes(int tr)
4150	5066	{
4151	5067	group.selection.SetTexRes(tr);
..	..	@@ -4217,28 +5133,25 @@
4217	5133	// }
4218	5134	// }
4219	5135
4220		- static boolean allparams = true;
4221		-
4222		- static Vector<Object3D> listUI = new Vector<Object3D>();
4223		-
4224	5136	void EditSelection(boolean newWindow)
4225	5137	{
	5138	+ if (group.selection == null)
	5139	+ {
	5140	+ EditElement(group, newWindow); // ? new
	5141	+ return;
	5142	+ }
	5143	+
4226	5144	// aConstraints.gridy = 0;
4227	5145	for (int i=0; i<group.selection.size(); i++)
4228	5146	{
4229	5147	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4230	5148	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4231		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5149	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4232	5150
4233	5151	Object3D elem = (Object3D)group.selection.elementAt(i);
4234	5152	if(elem != group \|\| !newWindow)
4235	5153	{
4236		- // if (!(elem instanceof Composite))
4237		- // newWindow = false;
4238		- listUI.add(elem);
4239		- elem.openEditWindow(this, newWindow); //, false);
4240		- System.out.println("edit : " + elem);
4241		- elem.editWindow.refreshContents(true); // ? new
	5154	+ EditElement(elem, newWindow); // ? new
4242	5155	}
4243	5156	}
4244	5157	}
..	..	@@ -4301,9 +5214,7 @@
4301	5214
4302	5215	freezemodel = false;
4303	5216	}
4304		-
4305		- boolean flashIt = true;
4306		-
	5217	+
4307	5218	public void valueChanged(TreeSelectionEvent e)
4308	5219	//public boolean handleEvent(Event event)
4309	5220	{
..	..	@@ -4313,7 +5224,8 @@
4313	5224	//new Exception().printStackTrace();
4314	5225
4315	5226	freezemodel = true;
4316		-
	5227	+ ClearUnpinned();
	5228	+
4317	5229	/**/
4318	5230	//switch (event.id)
4319	5231	{
..	..	@@ -4346,7 +5258,7 @@
4346	5258	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4347	5259	// a camera
4348	5260	{
4349		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5261	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4350	5262	{
4351	5263	CameraPane.camerachangeframe = 0; // don't refuse it
4352	5264	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4355,6 +5267,13 @@
4355	5267	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4356	5268	}
4357	5269
	5270	+ if (tps != null && tps.length == 1)
	5271	+ {
	5272	+ EditSelection(false);
	5273	+ }
	5274	+
	5275	+ SetPinStates(tps != null && tps.length > 0);
	5276	+
4358	5277	refreshContents();
4359	5278	//return true;
4360	5279	}
..	..	@@ -4364,9 +5283,20 @@
4364	5283	freezemodel = false;
4365	5284	}
4366	5285
	5286	+ void SetPinStates(boolean enabled)
	5287	+ {
	5288	+ editButton.setEnabled(enabled);
	5289	+ uneditButton.setEnabled(enabled);
	5290	+ //unselectButton.setEnabled(enabled);
	5291	+ flashSelectionButton.setEnabled(enabled);
	5292	+
	5293	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5294	+ }
	5295	+
4367	5296	void refreshContents(boolean cp)
4368	5297	{
4369		- if (!Globals.MOUSEDRAGGED)
	5298	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5299	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4370	5300	{
4371	5301	objEditor.ClearInfo(); // .GetMaterial());
4372	5302
..	..	@@ -4375,7 +5305,7 @@
4375	5305	Object3D child = (Object3D) group.selection.get(i);
4376	5306
4377	5307	objEditor.AddInfo(child, this, true);
4378		- System.err.println("info : " + child.GetPath());
	5308	+// System.err.println("info : " + child.GetPath());
4379	5309	}
4380	5310
4381	5311	objEditor.SetText(); // jan 2014
..	..	@@ -4465,7 +5395,8 @@
4465	5395
4466	5396	if (cut)
4467	5397	{
4468		- Save();
	5398	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5399	+// Save();
4469	5400	//int indices[] = jList.getSelectedIndices();
4470	5401	//for (int i = indices.length - 1; i >= 0; i--)
4471	5402	//jList.remove(indices[i]);
..	..	@@ -4568,6 +5499,10 @@
4568	5499
4569	5500	void paste(boolean expand)
4570	5501	{
	5502	+ if (Globals.REPLACEONMAKE)
	5503	+ Save();
	5504	+ boolean keep = Globals.REPLACEONMAKE;
	5505	+ Globals.REPLACEONMAKE = false;
4571	5506	// if (GrafreeD.clipboard == null)
4572	5507	// return;
4573	5508	boolean first = true;
..	..	@@ -4627,6 +5562,7 @@
4627	5562	Grafreed.clipboard.get(0).parent = keepparent;
4628	5563	}
4629	5564
	5565	+ Globals.REPLACEONMAKE = keep;
4630	5566	ResetModel();
4631	5567	refreshContents();
4632	5568	}
..	..	@@ -4762,6 +5698,10 @@
4762	5698
4763	5699	void group(Object3D csg, boolean grab)
4764	5700	{
	5701	+ if (Globals.REPLACEONMAKE)
	5702	+ Save();
	5703	+ boolean keep = Globals.REPLACEONMAKE;
	5704	+ Globals.REPLACEONMAKE = false;
4765	5705	if (//false) // why??
4766	5706	!group.selection.isEmpty())
4767	5707	{
..	..	@@ -4875,10 +5815,15 @@
4875	5815	//node.add(csg);
4876	5816	//makeSomething(node);
4877	5817	makeSomething(csg);
	5818	+ Globals.REPLACEONMAKE = keep;
4878	5819	}
4879	5820
4880	5821	void Ungroup(Object3D g)
4881	5822	{
	5823	+ if (Globals.REPLACEONMAKE)
	5824	+ Save();
	5825	+ boolean keep = Globals.REPLACEONMAKE;
	5826	+ Globals.REPLACEONMAKE = false;
4882	5827	if (g instanceof HiddenObject)
4883	5828	{
4884	5829	HiddenObject h = (HiddenObject) g;
..	..	@@ -4895,6 +5840,7 @@
4895	5840	objEditor.makeSomething(g.get(i), false);
4896	5841	}
4897	5842	}
	5843	+ Globals.REPLACEONMAKE = keep;
4898	5844	}
4899	5845
4900	5846	void ungroup()
..	..	@@ -5183,10 +6129,43 @@
5183	6129	cButton clearpanelButton;
5184	6130	cButton unselectButton;
5185	6131
5186		- cButton saveButton;
5187		- cButton undoButton;
5188		- cButton redoButton;
	6132	+ cButton restoreCameraButton;
	6133	+
5189	6134	cButton oneStepButton;
	6135	+
	6136	+ cButton groupButton;
	6137	+ cButton ungroupButton;
	6138	+ cButton compositeButton;
	6139	+ cButton switchButton;
	6140	+ cButton loopButton;
	6141	+ cButton textureButton;
	6142	+
	6143	+ cButton skybox1Button;
	6144	+ cButton skybox2Button;
	6145	+ cButton skybox3Button;
	6146	+ cButton skybox4Button;
	6147	+ cButton skybox5Button;
	6148	+ cButton skybox6Button;
	6149	+ cButton skybox7Button;
	6150	+
	6151	+ cButton skybox11Button;
	6152	+ cButton skybox12Button;
	6153	+ cButton skybox13Button;
	6154	+ cButton skybox14Button;
	6155	+ cButton skybox15Button;
	6156	+ cButton skybox16Button;
	6157	+ cButton skybox17Button;
	6158	+
	6159	+ cButton gridButton;
	6160	+ cButton boxButton;
	6161	+ cButton sphereButton;
	6162	+ cButton coneButton;
	6163	+ cButton torusButton;
	6164	+ cButton superButton;
	6165	+ cButton kleinButton;
	6166	+ cButton particlesButton;
	6167	+ cButton overlayButton;
	6168	+ cButton lightButton;
5190	6169
5191	6170	cButton screenfitButton;
5192	6171	cButton screenfitpointButton;
..	..	@@ -5199,14 +6178,6 @@
5199	6178
5200	6179	cButton setsupportButton;
5201	6180
5202		- cButton twoButton;
5203		- cButton sixButton;
5204		- cButton threeButton;
5205		- cButton sevenButton;
5206		- cButton fourButton; // full panel
5207		- cButton oneButton; // full XYZ
5208		- //cButton currentLayout;
5209		-
5210	6181	//
5211	6182	//Composite
5212	6183	Object3D // to do !!
..	..	@@ -5216,11 +6187,11 @@
5216	6187	//JTree jTree;
5217	6188	private MenuItem lookAtItem;
5218	6189	private MenuItem lookFromItem;
5219		- private MenuItem switchItem;
	6190	+ private MenuItem switchViewItem;
5220	6191	private MenuItem cutItem;
5221	6192	private MenuItem undoItem;
5222	6193	private MenuItem redoItem;
5223		- private MenuItem duplicateItem;
	6194	+ private JMenuItem duplicateItem;
5224	6195	private MenuItem cloneItem;
5225	6196	private MenuItem cloneSupportItem;
5226	6197	private MenuItem overwriteGeoItem;
..	..	@@ -5248,7 +6219,7 @@
5248	6219	private MenuItem pasteLinkItem;
5249	6220	private MenuItem pasteCloneItem;
5250	6221	private MenuItem pasteExpandItem;
5251		- private MenuItem clearItem;
	6222	+ private MenuItem deleteItem;
5252	6223	private MenuItem clearAllItem;
5253	6224	private MenuItem genUVItem;
5254	6225	private MenuItem genNormalsMESHItem;
..	..	@@ -5283,6 +6254,10 @@
5283	6254	private MenuItem showleavesItem;
5284	6255	private MenuItem markleavesItem;
5285	6256	private MenuItem unmarkleavesItem;
	6257	+ private MenuItem rewindleavesItem;
	6258	+ private MenuItem unrewindleavesItem;
	6259	+ private MenuItem randomleavesItem;
	6260	+ private MenuItem unrandomleavesItem;
5286	6261
5287	6262	private MenuItem flipVItem;
5288	6263	private MenuItem unflipVItem;
..	..	@@ -5304,7 +6279,7 @@
5304	6279	private MenuItem frontItem;
5305	6280	private MenuItem cameraItem;
5306	6281	private MenuItem compositeItem;
5307		- private MenuItem randomItem;
	6282	+ private MenuItem switchItem;
5308	6283	private MenuItem physicsItem;
5309	6284	private MenuItem frameselectorItem;
5310	6285	private MenuItem scriptNodeItem;
..	..	@@ -5328,6 +6303,8 @@
5328	6303	private MenuItem attachBumpItem;
5329	6304	private MenuItem detachBumpItem;
5330	6305	private MenuItem pigmentBumpItem;
	6306	+ private MenuItem embedTexturesItem;
	6307	+ private MenuItem deEmbedTexturesItem;
5331	6308
5332	6309	private MenuItem particleItem;
5333	6310	private MenuItem ragdollItem;
..	..	@@ -5378,5 +6355,5 @@
5378	6355
5379	6356	Menu cameraMenu;
5380	6357	MenuItem editCameraItem;
5381		- MenuItem revertCameraItem;
	6358	+ MenuItem restoreCameraItem;
5382	6359	}