~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,360 @@
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.equals("") ? "No background" : 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", "", 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	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +526,8 @@
150	526
151	527	void SetupMenu2(GroupEditor oe)
152	528	{
	529	+ oe.jTree = new cTree();
	530	+
153	531	Menu menu;
154	532	oe.menuBar.add(menu = new Menu("Edit"));
155	533	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +538,7 @@
160	538	// redoItem = menu.add(new MenuItem("Redo"));
161	539	// redoItem.addActionListener(this);
162	540	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	542	duplicateItem.addActionListener(this);
165	543	cloneItem = menu.add(new MenuItem("Clone"));
166	544	cloneItem.addActionListener(this);
..	..	@@ -176,7 +554,6 @@
176	554	copyItem.addActionListener(this);
177	555	pasteItem = menu.add(new MenuItem("Paste"));
178	556	pasteItem.addActionListener(this);
179		- menu.add("-");
180	557
181	558	menu.add("-");
182	559	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +565,8 @@
188	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	566	// pasteExpandItem.addActionListener(this);
190	567	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
193	570
194	571	if (Globals.ADVANCED)
195	572	{
..	..	@@ -203,23 +580,23 @@
203	580	//zBufferItem.addActionListener(this);
204	581	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	582	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	583	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	584	+ restoreCameraItem.addActionListener(this);
208	585
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	586	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	587	+// toggleFullScreenItem.addItemListener(this);
	588	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	589	+// cameraMenu.add("-");
	590	+//
	591	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	592	+// toggleTextureItem.addItemListener(this);
	593	+// toggleTextureItem.setState(CameraPane.textureon);
	594	+//
	595	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	596	+// toggleSwitchItem.addItemListener(this);
	597	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	598
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"));
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	600	toggleHandleItem.addItemListener(this);
224	601	toggleHandleItem.setState(CameraPane.HANDLES);
225	602
..	..	@@ -274,15 +651,13 @@
274	651	{
275	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	654	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	655	oe.cameraMenu.add("-");
280	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	657	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	658	lookAtItem.addActionListener(this);
284	659	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	660	+ //switchViewItem.addActionListener(this);
286	661	}
287	662
288	663	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +702,29 @@
327	702	}
328	703
329	704	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	705	+// grabItem = menu.add(new MenuItem("Grab"));
	706	+// grabItem.addActionListener(this);
332	707	backItem = menu.add(new MenuItem("Back"));
333	708	backItem.addActionListener(this);
334	709	frontItem = menu.add(new MenuItem("Front"));
335	710	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ if (Globals.ADVANCED)
	715	+ {
338	716	hideItem = menu.add(new MenuItem("Hidden Group"));
339	717	hideItem.addActionListener(this);
	718	+ }
340	719	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	720	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	721	+
	722	+// menu.add("-");
	723	+//
	724	+// switchItem = menu.add(new MenuItem("Switch node"));
	725	+// switchItem.addActionListener(this);
	726	+ if (Globals.ADVANCED)
	727	+ {
345	728	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	729	switchGeoItem.addActionListener(this);
347	730	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +732,6 @@
349	732	morphItem = menu.add(new MenuItem("Morph Group"));
350	733	morphItem.addActionListener(this);
351	734
352		- if (Globals.ADVANCED)
353		- {
354	735	menu.add("-");
355	736	physicsItem = menu.add(new MenuItem("Physics"));
356	737	physicsItem.addActionListener(this);
..	..	@@ -358,30 +739,29 @@
358	739	frameselectorItem.addActionListener(this);
359	740	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	741	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	742	}
364	743
365	744	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	745	+// textureItem = menu.add(new MenuItem("Texture"));
	746	+// textureItem.addActionListener(this);
368	747	billboardItem = menu.add(new MenuItem("Billboard"));
369	748	billboardItem.addActionListener(this);
370	749	csgItem = menu.add(new MenuItem("CSG"));
371	750	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	751	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	752	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	753	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	754	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	755	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	756	shadowZItem.addActionListener(this);
	757	+ attributeItem = menu.add(new MenuItem("Attribute"));
	758	+ attributeItem.addActionListener(this);
	759	+
378	760	if (Globals.ADVANCED)
379	761	{
380	762	menu.add("-");
381	763	linkerItem = menu.add(new MenuItem("Linker"));
382	764	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	765	templateItem = menu.add(new MenuItem("Template"));
386	766	templateItem.addActionListener(this);
387	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +790,7 @@
410	790	genNormalsMESHItem.addActionListener(this);
411	791	if (Globals.ADVANCED)
412	792	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	794	genNormalsMINEItem.addActionListener(this);
415	795	}
416	796	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +883,15 @@
503	883	attachBumpItem.addActionListener(this);
504	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
506	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	888	detachPigmentItem.addActionListener(this);
508	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
510	895	menu.add("-");
511	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	897	sortbysizeItem.addActionListener(this);
..	..	@@ -517,6 +902,9 @@
517	902	shareGeometriesItem.addActionListener(this);
518	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
520	908	if (Globals.ADVANCED)
521	909	{
522	910	// Pretty much the same as duplicate and clone.
..	..	@@ -533,6 +921,74 @@
533	921	buildToolsMenu(menu);
534	922	}
535	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
536	992	void SetupUI2(ObjEditor oe)
537	993	{
538	994	// June 2019
..	..	@@ -550,11 +1006,6 @@
550	1006	//new Exception().printStackTrace();
551	1007
552	1008	oe.radioPanel = new JPanel(new GridBagLayout());
553		- oe.aConstraints.weightx = 1;
554		- oe.aConstraints.weighty = 0;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridwidth = 100;
557		- oe.aConstraints.gridheight = 1;
558	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
559	1010
560	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -575,51 +1026,122 @@
575	1026	oe.radioPanel.add(dummyButton);
576	1027	oe.buttonGroup.add(dummyButton);
577	1028	*/
	1029	+ cGridBag copyOptionsPanel = new cGridBag();
	1030	+
	1031	+ copyOptionsPanel.preferredHeight = 2;
	1032	+
578	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	1034
580	1035	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	1036	//minButton.setToolTipText("Minimize window");
582	1037	//minButton.addActionListener(this);
583	1038
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
587	1045
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
	1084	+
	1085	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	1086	fullButton.setToolTipText("Full-screen window");
590	1087	fullButton.addActionListener(this);
591	1088
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
595		-
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
602		- saveButton.addActionListener(this);
603		-
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
605		- liveCB.setToolTipText("Enable animation");
606		- liveCB.addItemListener(this);
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ screenfitButton.setToolTipText("Screen fit");
	1091	+ screenfitButton.addActionListener(this);
607	1092
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1095	+ restoreCameraButton.addActionListener(this);
	1096	+
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
	1109	+
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
	1115	+
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
	1120	+
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	1129	oneStepButton.setToolTipText("Animate one step forward");
610	1130	oneStepButton.addActionListener(this);
611	1131
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	1137	fastCB.setToolTipText("Fast mode");
614	1138	fastCB.addItemListener(this);
615	1139
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- screenfitButton.addActionListener(this);
	1140	+ //oe.toolboxPanel.Return();
	1141	+
	1142	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1143	+// trackCB.setToolTipText("Enable tracking");
	1144	+// trackCB.addItemListener(this);
623	1145
624	1146	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	1147	// screenfitpointButton.addActionListener(this);
..	..	@@ -629,67 +1151,137 @@
629	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1152	snapobjectButton.addActionListener(this);
631	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
632	1158	}
633	1159
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	1160	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	1161
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
642		- twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- fourButton.addActionListener(this);
645		- fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- sixButton.setToolTipText("2-column layout left");
648		- sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
651		- threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
655		- //
656	1162
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
659	1165	rootButton.addActionListener(this);
660	1166
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	1168	closeButton.setToolTipText("Close tab");
663	1169	closeButton.addActionListener(this);
664	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	1171	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	1172	+
	1173	+ cGridBag row1 = new cGridBag();
668	1174
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	1175	+ // INSERT
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
	1178	+ gridButton.addActionListener(this);
	1179	+
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ boxButton.setToolTipText("Create box");
	1182	+ boxButton.addActionListener(this);
	1183	+
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ sphereButton.setToolTipText("Create sphere");
	1186	+ sphereButton.addActionListener(this);
	1187	+
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ coneButton.setToolTipText("Create cone");
	1190	+ coneButton.addActionListener(this);
	1191	+
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ torusButton.setToolTipText("Create torus");
	1194	+ torusButton.addActionListener(this);
	1195	+
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ superButton.setToolTipText("Create superellipsoid");
	1198	+ superButton.addActionListener(this);
	1199	+
	1200	+ if (Globals.ADVANCED)
	1201	+ {
	1202	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ kleinButton.setToolTipText("Create Klein bottle");
	1204	+ kleinButton.addActionListener(this);
	1205	+ }
	1206	+
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ particlesButton.setToolTipText("Create particle system");
	1209	+ particlesButton.addActionListener(this);
	1210	+
	1211	+ oe.toolboxPanel.add(row1);
	1212	+
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ groupButton.setToolTipText("Create group");
	1217	+ groupButton.addActionListener(this);
	1218	+
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ compositeButton.setToolTipText("Create composite");
	1221	+ compositeButton.addActionListener(this);
	1222	+
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
	1225	+ switchButton.addActionListener(this);
	1226	+
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ loopButton.setToolTipText("Create loop");
	1229	+ loopButton.addActionListener(this);
	1230	+
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ textureButton.setToolTipText("Create texture");
	1233	+ textureButton.addActionListener(this);
	1234	+
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ overlayButton.setToolTipText("Create overlay");
	1237	+ overlayButton.addActionListener(this);
	1238	+
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ lightButton.setToolTipText("Create light");
	1241	+ lightButton.addActionListener(this);
	1242	+
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
	1255	+ // EDIT panel
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
671	1258	editButton.addActionListener(this);
672	1259
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
675	1262	uneditButton.addActionListener(this);
676	1263
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1264	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1265	+ allParamsButton.setToolTipText("Show all controls");
679	1266	allParamsButton.addActionListener(this);
680	1267
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
683	1270	clearPanelButton.addActionListener(this);
684	1271
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- unselectButton.setToolTipText("Unselect");
687		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
688	1275
689		- commandsPanel.preferredHeight = 1;
	1276	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1277	+ flashSelectionButton.setToolTipText("Highlight selection");
	1278	+ flashSelectionButton.addActionListener(this);
690	1279
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1280	+ editCommandsPanel.preferredHeight = 1;
	1281	+
	1282	+ SetPinStates(false);
	1283	+// oe.treePanel.add(commandsPanel);
	1284	+// oe.treePanel.Return();
693	1285
694	1286	// oe.aConstraints.gridx += 1;
695	1287	// oe.aConstraints.weighty = 0;
..	..	@@ -706,32 +1298,20 @@
706	1298
707	1299	JScrollPane jSP;
708	1300	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1301	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1302	ResetModel();
711	1303
712	1304	oe.treePanel.add(jSPPanel);
713	1305	oe.treePanel.Return();
714	1306
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	1307	oe.treePanel.add(copyOptionsPanel);
731	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
732	1312
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
735	1315
736	1316	//jList.addListSelectionListener(this);
737	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1319,7 @@
739	1319	//jTree.setEditable(true);
740	1320	oe.jTree.setDragEnabled(true);
741	1321	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1323
744	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1325
..	..	@@ -751,29 +1331,49 @@
751	1331	dgr.addDragGestureListener(this);
752	1332	}catch(Exception e) {}
753	1333	*/
754		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
755	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1336	}
757	1337
758	1338	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1339	{
	1340	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1341	+ colorCB.setToolTipText("Copy color when dropped");
	1342	+ colorCB.addItemListener(this);
	1343	+
	1344	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1345	+ materialCB.setToolTipText("Copy material when dropped");
	1346	+ materialCB.addItemListener(this);
	1347	+
	1348	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1349	+ textureCB.setToolTipText("Copy texture when dropped");
	1350	+ textureCB.addItemListener(this);
	1351	+
	1352	+ panel.Return();
	1353	+
760	1354	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1355	boxCB.setToolTipText("Display bounding boxes");
762	1356	boxCB.addItemListener(this);
763	1357
764	1358	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1360	zoomBoxCB.addItemListener(this);
767	1361
768	1362	if (true) // Globals.ADVANCED)
769	1363	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
773	1371
774	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1373	// localCB.addItemListener(this);
776	1374
	1375	+ panel.Return();
	1376	+
777	1377	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1378	crowdCB.setToolTipText("Used for crowds");
779	1379	crowdCB.addItemListener(this);
..	..	@@ -782,14 +1382,19 @@
782	1382	smoothCB.setToolTipText("Snapping delay");
783	1383	smoothCB.addItemListener(this);
784	1384
785		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786		- slowCB.setToolTipText("Smooth interpolation");
787		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
788	1391
789	1392	// constraints.gridy += 1;
790	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1394	// speakerMocapCB.addItemListener(this);
792	1395
	1396	+ panel.Return();
	1397	+
793	1398	if (false)
794	1399	{
795	1400	// handled in scripts
..	..	@@ -804,34 +1409,82 @@
804	1409	//constraints.gridy += 1;
805	1410	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1411	smoothfocusCB.addItemListener(this);
	1412	+ panel.Return();
807	1413	}
808	1414
809	1415	//constraints.gridx += 1;
810	1416	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1417	// debugCB.addItemListener(this);
812	1418
	1419	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1420	+ trackCB.setToolTipText("Enable tracking target");
	1421	+ trackCB.addItemListener(this);
	1422	+
813	1423	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1424	+ oeilCB.setToolTipText("Move camera when tracking");
814	1425	oeilCB.addItemListener(this);
815	1426
	1427	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1428	+ shadowCB.setToolTipText("When live compute shadows");
	1429	+ shadowCB.addItemListener(this);
	1430	+
	1431	+ panel.Return();
	1432	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1433	+ toggleTextureCB.setToolTipText("Load textures");
	1434	+ toggleTextureCB.addItemListener(this);
	1435	+
	1436	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1438	+ toggleSwitchCB.addItemListener(this);
	1439	+
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ if (Globals.ADVANCED)
	1446	+ {
816	1447	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1448	lookAtCB.setToolTipText("Look-at target");
818	1449	lookAtCB.addItemListener(this);
	1450	+ }
819	1451
820	1452	}
821	1453
822	1454	cGridBag fill = new cGridBag();
823		-
824	1455	fill.preferredHeight = 200;
	1456	+ cGridBag fill2 = new cGridBag();
	1457	+ fill2.preferredHeight = 200;
	1458	+ cGridBag fill3 = new cGridBag();
	1459	+ fill3.preferredHeight = 200;
825	1460
826	1461	panel.add(fill);
	1462	+ panel.add(fill2);
	1463	+ panel.add(fill3);
827	1464
828	1465	}
829	1466
830	1467	void EditObject(Object3D obj)
831	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
832	1477	cRadio radioButton = new cRadio(obj.name);
	1478	+
	1479	+ // June 2019. Patch to avoid bug with transparency.
	1480	+ radioButton.hadMaterial = obj.material != null;
	1481	+ if (!radioButton.hadMaterial)
	1482	+ {
	1483	+ obj.material = new cMaterial();
	1484	+ }
	1485	+
833	1486	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
835	1488	radioButton.SetCamera(cameraView.renderCamera, false);
836	1489	radioButton.addActionListener(this);
837	1490	radioPanel.add(radioButton);
..	..	@@ -851,23 +1504,30 @@
851	1504	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1505	}
853	1506
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	1507	+ cToggleButton liveCB;
	1508	+ cCheckBox supportCB;
	1509	+ cCheckBox localCB;
	1510	+ cCheckBox crowdCB;
	1511	+ cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
	1514	+ cToggleButton fastCB;
	1515	+ cCheckBox slowCB;
	1516	+ cCheckBox boxCB;
	1517	+ cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
	1519	+ //cToggleButton trackCB;
	1520	+ cCheckBox trackCB;
	1521	+ cCheckBox smoothfocusCB;
865	1522	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1523	+ cCheckBox speakerCameraCB;
	1524	+ cCheckBox speakerFocusCB;
	1525	+ cCheckBox debugCB;
	1526	+
	1527	+ cCheckBox oeilCB;
	1528	+ cCheckBox shadowCB;
	1529	+ cCheckBox autokeepCB;
	1530	+ cCheckBox lookAtCB;
871	1531
872	1532	// static int COLOR = 1;
873	1533	// static int MATERIAL = 2;
..	..	@@ -875,9 +1535,9 @@
875	1535
876	1536	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1537
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1538	+ cCheckBox colorCB;
	1539	+ cCheckBox materialCB;
	1540	+ cCheckBox textureCB;
881	1541
882	1542	public void itemStateChanged(ItemEvent e)
883	1543	{
..	..	@@ -921,6 +1581,12 @@
921	1581	{
922	1582	cameraView.ToggleInertia();
923	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
924	1590	}
925	1591	else if(e.getSource() == localCB)
926	1592	{
..	..	@@ -970,6 +1636,18 @@
970	1636	{
971	1637	cameraView.ToggleOeil();
972	1638	}
	1639	+ else if(e.getSource() == shadowCB)
	1640	+ {
	1641	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1642	+ }
	1643	+ else if(e.getSource() == freezeCB)
	1644	+ {
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
	1650	+ }
973	1651	else if(e.getSource() == lookAtCB)
974	1652	{
975	1653	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1664,8 @@
986	1664
987	1665	/**/
988	1666	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1667	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1668	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1669	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1670	// We can't move the root node or an empty selection
992	1671	return;
..	..	@@ -1049,8 +1728,6 @@
1049	1728	}
1050	1729	}
1051	1730
1052		- String string = (String) object;
1053		-
1054	1731	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1732	// if( object instanceof java.io.File[])
1056	1733	// {
..	..	@@ -1058,6 +1735,8 @@
1058	1735	// objEditor.DropFile((java.io.File[]) object, true);
1059	1736	// return;
1060	1737	// }
	1738	+
	1739	+ String string = object.toString();
1061	1740
1062	1741	// File path for Mac and Windows
1063	1742	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1782,33 @@
1103	1782
1104	1783	assert target == objEditor.jTree;
1105	1784	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1785	+ Object3D destinationLeaf;
1106	1786	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1787	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1788	} catch (Exception e) {
1109	1789	System.out.println("destinationPath : " + destinationPath);
1110	1790	return;
1111	1791	}
1112	1792
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1793	+ for (int i=group.selection.size(); --i>=0;)
1114	1794	{
	1795	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1796	+
	1797	+ // Cannot move into itself
	1798	+ if (child == destinationLeaf)
	1799	+ return;
	1800	+ }
	1801	+
	1802	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1803	+// {
1115	1804	loadClipboard(true);
1116	1805	objEditor.jTree.setSelectionPath(destinationPath);
1117	1806	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1807	+// } else {
	1808	+// loadClipboard(false);
	1809	+// objEditor.jTree.setSelectionPath(destinationPath);
	1810	+// pasteInto(false, false); // true); // ???
	1811	+// }
1123	1812	}
1124	1813	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1814	// Called if the user has modified the current drop gesture
..	..	@@ -1175,7 +1864,12 @@
1175	1864	TreePath path;
1176	1865
1177	1866	public TransferableTreePath(TreePath tp) {
1178		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1179	1873	}
1180	1874
1181	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1224,22 +1918,30 @@
1224	1918	{
1225	1919	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1920	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1921	+// gridItem = menu.add(new MenuItem("Grid"));
	1922	+// gridItem.addActionListener(this);
	1923	+// rectoidItem = menu.add(new MenuItem("Box"));
	1924	+// rectoidItem.addActionListener(this);
	1925	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1926	+// ellipsoidItem.addActionListener(this);
	1927	+// coneItem = menu.add(new MenuItem("Cone"));
	1928	+// coneItem.addActionListener(this);
	1929	+// torusItem = menu.add(new MenuItem("Torus"));
	1930	+// torusItem.addActionListener(this);
	1931	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1932	+// superItem.addActionListener(this);
	1933	+
	1934	+ cameraItem = menu.add(new MenuItem("Camera"));
	1935	+ cameraItem.addActionListener(this);
	1936	+
	1937	+ if (!Globals.ADVANCED)
	1938	+ {
1239	1939	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1940	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1941	+ }
	1942	+
	1943	+// particleItem = menu.add(new MenuItem("Particle system"));
	1944	+// particleItem.addActionListener(this);
1243	1945	if (Globals.ADVANCED)
1244	1946	{
1245	1947	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1967,15 @@
1265	1967	}
1266	1968	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1969	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1970	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1971	+// overlayItem.addActionListener(this);
	1972	+// lightItem = menu.add(new MenuItem("Light"));
	1973	+// lightItem.addActionListener(this);
1272	1974	menu.add("-");
1273	1975	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1976	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1977	+// loopItem = menu.add(new MenuItem("Loop"));
	1978	+// loopItem.addActionListener(this);
1277	1979	doubleItem = menu.add(new MenuItem("Fork"));
1278	1980	doubleItem.addActionListener(this);
1279	1981	if (Globals.ADVANCED)
..	..	@@ -1289,6 +1991,9 @@
1289	1991	animationItem.addItemListener(this);
1290	1992	animationItem.setState(Globals.ANIMATION);
1291	1993
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
	1996	+
1292	1997	menu.add("-");
1293	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	1999	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +2006,8 @@
1301	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	2007	reduce34MorphItem.addActionListener(this);
1303	2008	menu.add("-");
	2009	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2010	+ memoryItem.addActionListener(this);
1304	2011	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	2012	computeAOItem.addActionListener(this);
1306	2013
..	..	@@ -1309,8 +2016,6 @@
1309	2016	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	2017	mirrorItem.addActionListener(this);
1311	2018	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	2020	analyzeItem.addActionListener(this);
1316	2021	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +2159,34 @@
1454	2159	shadow.material = new cMaterial(obj.material);
1455	2160	shadow.material.diffuse = 0.0001f;
1456	2161	shadow.material.specular = 0.0001f;
	2162	+ //shadow.projectedVertices[1].x = 300;
1457	2163
1458	2164	makeSomething(shadow);
1459	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1460	2190
1461	2191	/**
1462	2192	* applyExample
..	..	@@ -1701,7 +2431,7 @@
1701	2431	{
1702	2432	ScreenFit();
1703	2433	} else
1704		- if (source == switchItem)
	2434	+ if (source == switchViewItem)
1705	2435	{
1706	2436	cVector v1 = new cVector();
1707	2437	cVector v2 = new cVector();
..	..	@@ -1710,11 +2440,11 @@
1710	2440	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2441	objEditor.cameraView.repaint();
1712	2442	} else
1713		- if (source == rectoidItem)
	2443	+ if (source == rectoidItem \|\| source == boxButton)
1714	2444	{
1715	2445	makeSomething(new Box());
1716	2446	} else
1717		- if (source == particleItem)
	2447	+ if (source == particleItem \|\| source == particlesButton)
1718	2448	{
1719	2449	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2450	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2523,27 @@
1793	2523
1794	2524	makeSomething(obj);
1795	2525	} else
1796		- if (source == gridItem)
	2526	+ if (source == gridItem \|\| source == gridButton)
1797	2527	{
1798	2528	makeSomething(new Grid());
1799	2529	} else
1800		- if (source == ellipsoidItem)
	2530	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2531	{
1802	2532	makeSomething(new Sphere());
1803	2533	} else
1804		- if (source == coneItem)
	2534	+ if (source == coneItem \|\| source == coneButton)
1805	2535	{
1806	2536	makeSomething(new Cone());
1807	2537	} else
1808		- if (source == torusItem)
	2538	+ if (source == torusItem \|\| source == torusButton)
1809	2539	{
1810	2540	makeSomething(new Torus());
1811	2541	} else
1812		- if (source == superItem)
	2542	+ if (source == superItem \|\| source == superButton)
1813	2543	{
1814	2544	makeSomething(new Superellipsoid());
1815	2545	} else
1816		- if (source == kleinItem)
	2546	+ if (source == kleinItem \|\| source == kleinButton)
1817	2547	{
1818	2548	makeSomething(new Klein());
1819	2549	} else
..	..	@@ -1833,7 +2563,7 @@
1833	2563	{
1834	2564	makeSomething(new BezierSurface());
1835	2565	} else
1836		- if (source == overlayItem)
	2566	+ if (source == overlayItem \|\| source == overlayButton)
1837	2567	{
1838	2568	/*
1839	2569	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2611,27 @@
1881	2611	s.setup();
1882	2612	makeSomething(s);
1883	2613	} else
1884		- if (source == lightItem)
	2614	+ if (source == lightItem \|\| source == lightButton)
1885	2615	{
1886	2616	makeSomething(new Light());
1887	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
1888	2635	if (source == csgItem)
1889	2636	{
1890	2637	group(new CSG());
..	..	@@ -1931,30 +2678,30 @@
1931	2678
1932	2679	group(g);
1933	2680	} else
1934		- if (source == loopItem)
	2681	+ if (source == loopItem \|\| source == loopButton)
1935	2682	{
1936	2683	Composite csg = new GroupLeaf();
1937	2684	csg.count = 5;
1938	2685	group(csg);
1939		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
1940	2687	csg.addChild(child);
1941	2688	child.addChild(csg);
1942	2689	} else
1943	2690	if (source == doubleItem)
1944	2691	{
1945		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
1946	2693	csg.count = 5;
1947	2694	group(csg);
1948		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
1949	2696	csg.addChild(child);
1950	2697	child.addChild(csg);
1951		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
1952	2699	csg.addChild(child);
1953	2700	child.addChild(csg);
1954	2701	} else
1955	2702	if (source == tripleItem)
1956	2703	{
1957		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
1958	2705	csg.count = 4;
1959	2706	group(csg);
1960	2707	Composite child = new cGroup();
..	..	@@ -1970,7 +2717,7 @@
1970	2717	if (source == computeAOItem)
1971	2718	{
1972	2719	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
1974	2721	} else
1975	2722	if (source == recompileItem)
1976	2723	{
..	..	@@ -1985,7 +2732,7 @@
1985	2732	if (source == invariantsItem)
1986	2733	{
1987	2734	System.out.println("Invariants:");
1988		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
1989	2736	} else
1990	2737	if (source == memoryItem)
1991	2738	{
..	..	@@ -2016,17 +2763,52 @@
2016	2763	{
2017	2764	ToggleFullScreen();
2018	2765	} else
2019		- if (source == undoButton)
	2766	+ if (source == collapseButton)
2020	2767	{
2021		- Undo();
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
2022	2770	} else
2023		- if (source == redoButton)
	2771	+ if (source == maximize3DButton)
2024	2772	{
2025		- Redo();
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
2026	2777	} else
2027		- if (source == saveButton)
	2778	+ if (source == previousVersionButton)
2028	2779	{
2029		- Save();
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
2030	2812	} else
2031	2813	if (source == oneStepButton)
2032	2814	{
..	..	@@ -2035,17 +2817,14 @@
2035	2817	} else
2036	2818	if (source == screenfitButton)
2037	2819	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2820	ScreenFit();
2040	2821	} else
2041	2822	if (source == screenfitpointButton)
2042	2823	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2824	ScreenFitPoint();
2045	2825	} else
2046	2826	if (source == snapobjectButton)
2047	2827	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2828	SnapObject();
2050	2829	} else
2051	2830	// if (event.getSource() == recompileButton)
..	..	@@ -2084,11 +2863,11 @@
2084	2863	} else
2085	2864	if (source == undoItem)
2086	2865	{
2087		- Undo();
	2866	+ PreviousVersion();
2088	2867	} else
2089	2868	if (source == redoItem)
2090	2869	{
2091		- Redo();
	2870	+ NextVersion();
2092	2871	} else
2093	2872	if (source == duplicateItem)
2094	2873	{
..	..	@@ -2409,7 +3188,7 @@
2409	3188	{
2410	3189	StepAll();
2411	3190	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	3192	{
2414	3193	//int indices[] = jList.getSelectedIndices();
2415	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +3200,9 @@
2421	3200	{
2422	3201	ClearSelection(true);
2423	3202	} else
2424		- if (source == grabItem)
	3203	+ if (source == grabItem \|\| source == groupButton)
2425	3204	{
2426		- group(new cGroup(), true);
	3205	+ group(new cGroup(), false); // true);
2427	3206	} else
2428	3207	if (source == hideItem)
2429	3208	{
..	..	@@ -2441,11 +3220,11 @@
2441	3220	{
2442	3221	makeSomething(new Camera());
2443	3222	} else
2444		- if (source == compositeItem)
	3223	+ if (source == compositeItem \|\| source == compositeButton)
2445	3224	{
2446	3225	group(new Composite());
2447	3226	} else
2448		- if (source == randomItem)
	3227	+ if (source == switchItem \|\| source == switchButton)
2449	3228	{
2450	3229	RandomNode random = new RandomNode();
2451	3230	group(random);
..	..	@@ -2547,7 +3326,7 @@
2547	3326	{
2548	3327	group(new cLinker());
2549	3328	} else
2550		- if (source == textureItem)
	3329	+ if (source == textureItem \|\| source == textureButton)
2551	3330	{
2552	3331	group(new TextureNode());
2553	3332	} else
..	..	@@ -2567,17 +3346,30 @@
2567	3346	{
2568	3347	CastShadow(2);
2569	3348	} else
2570		- if (source == ungroupItem)
	3349	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3350	{
2572		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2573	3353	for (int i=0; i<group.selection.size(); i++)
2574	3354	{
2575		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2576	3360	}
2577	3361
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2581	3373	} else
2582	3374	if (source == genUVItem)
2583	3375	{
..	..	@@ -2878,7 +3670,7 @@
2878	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3671	{
2880	3672	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
2882	3674	}
2883	3675
2884	3676	refreshContents();
..	..	@@ -2894,6 +3686,31 @@
2894	3686
2895	3687	refreshContents();
2896	3688	} else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
	3712	+ refreshContents();
	3713	+ } else
2897	3714	if (source == flashSelectionButton)
2898	3715	{
2899	3716	CameraPane.flash = true;
..	..	@@ -2905,38 +3722,11 @@
2905	3722	if (source == twoButton)
2906	3723	{
2907	3724	radio.layout = twoButton;
2908		- // bug
2909		- //gridPanel.setDividerLocation(1.0);
2910		- //bigPanel.setDividerLocation(0.0);
2911		-// bigThree.remove(scenePanel);
2912		-// bigThree.remove(centralPanel);
2913		-// bigThree.remove(XYZPanel);
2914		-// aWindowConstraints.gridx = 0;
2915		-// aWindowConstraints.gridy = 0;
2916		-// aWindowConstraints.gridwidth = 1;
2917		-// // aConstraints.gridheight = 3;
2918		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2919		-// aWindowConstraints.weightx = 0;
2920		-// aWindowConstraints.weighty = 1;
2921		-// //bigThree.add(jtp, aWindowConstraints);
2922		-// aWindowConstraints.weightx = 1;
2923		-// aWindowConstraints.gridwidth = 3;
2924		-// // aConstraints.gridheight = 3;
2925		-// aWindowConstraints.gridx = 1;
2926		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2927		-// bigThree.add(centralPanel, aWindowConstraints);
2928		-// aWindowConstraints.weightx = 0;
2929		-// aWindowConstraints.gridx = 4;
2930		-// aWindowConstraints.gridwidth = 1;
2931		-// // aConstraints.gridheight = 3;
2932		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2933		-// //bigThree.add(XYZPanel, aWindowConstraints);
2934		-// scenePanel.setVisible(false);
2935		-// centralPanel.setVisible(true);
2936		-// XYZPanel.setVisible(false);
2937		- bigThree.ClearUI();
2938		- bigThree.add(centralPanel);
2939		- bigThree.FlushUI();
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
	3728	+
	3729	+ Show3DView();
2940	3730
2941	3731	cameraView.requestFocusInWindow();
2942	3732
..	..	@@ -2959,6 +3749,9 @@
2959	3749	if (source == threeButton)
2960	3750	{
2961	3751	radio.layout = threeButton;
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
2962	3755
2963	3756	// bigThree.remove(scenePanel);
2964	3757	// bigThree.remove(centralPanel);
..	..	@@ -2988,8 +3781,8 @@
2988	3781	// centralPanel.setVisible(true);
2989	3782	// XYZPanel.setVisible(true);
2990	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
2991	3785	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3786	bigThree.FlushUI();
2994	3787
2995	3788	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3790,9 @@
2997	3790	if (source == fourButton)
2998	3791	{
2999	3792	radio.layout = fourButton;
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
3000	3796
3001	3797	// bigThree.remove(scenePanel);
3002	3798	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3831,9 @@
3035	3831	{
3036	3832	radio.layout = sixButton;
3037	3833
	3834	+ if (CameraPane.FULLSCREEN)
	3835	+ fullscreenLayout = radio.layout;
	3836	+
3038	3837	// bigThree.remove(scenePanel);
3039	3838	// bigThree.remove(centralPanel);
3040	3839	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3862,8 @@
3063	3862	// centralPanel.setVisible(true);
3064	3863	// XYZPanel.setVisible(false);
3065	3864	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
3068	3867	bigThree.FlushUI();
3069	3868
3070	3869	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3871,9 @@
3072	3871	if (source == sevenButton)
3073	3872	{
3074	3873	radio.layout = sevenButton;
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
3075	3877
3076	3878	// bigThree.remove(scenePanel);
3077	3879	// bigThree.remove(centralPanel);
..	..	@@ -3110,6 +3912,7 @@
3110	3912	} else
3111	3913	if (source == rootButton)
3112	3914	{
	3915	+ Replace();
3113	3916	Object3D obj;
3114	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3115	3918	{
..	..	@@ -3128,12 +3931,19 @@
3128	3931	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3932	{
3130	3933	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3934	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3935	{
	3936	+ // Patch to avoid bug with transparency.
	3937	+ if (!ab.hadMaterial)
	3938	+ {
	3939	+ ab.object.material = null;
	3940	+ }
	3941	+
3133	3942	buttonGroup.remove(ab);
3134	3943	radioPanel.remove(ab);
3135	3944
3136		- ab.GetObject().editWindow = null;
	3945	+ //ab.GetObject().editWindow = null;
	3946	+ ab.GetObject().manipWindow = null;
3137	3947	// ab.GetObject().objectUI = null; // ?????????
3138	3948
3139	3949	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3956,12 @@
3146	3956	} else
3147	3957	if (source == editItem \|\| source == editButton)
3148	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
3149	3965	EditSelection(false);
3150	3966	} else
3151	3967	if (source == uneditButton)
..	..	@@ -3154,9 +3970,10 @@
3154	3970	{
3155	3971	Object3D child = (Object3D)e.nextElement();
3156	3972	if(child.editWindow != null)
3157		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
3158	3974	child.CloseUI();
3159	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3160	3977
3161	3978	//child.editWindow = null; // ???????????
3162	3979	}
..	..	@@ -3171,16 +3988,18 @@
3171	3988	//copy.ClearUI();
3172	3989	for (Object3D obj : listUI)
3173	3990	{
	3991	+ obj.pinned = false;
3174	3992	obj.CloseUI();
3175	3993	}
3176	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3177	3996	refreshContents(true);
3178	3997	} else
3179	3998	if (source == allParamsButton)
3180	3999	{
3181	4000	assert(copy == group);
3182	4001
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	4003
3185	4004	for (Object3D obj : listUI)
3186	4005	{
..	..	@@ -3229,6 +4048,7 @@
3229	4048	}
3230	4049
3231	4050	copy = group;
	4051	+
3232	4052	//Globals.theRenderer.object = group;
3233	4053	if(!useclient)
3234	4054	{
..	..	@@ -3247,6 +4067,7 @@
3247	4067
3248	4068	// fix "+" issue
3249	4069	//group.editWindow = this;
	4070	+ group.manipWindow = this;
3250	4071
3251	4072	/*
3252	4073	currentLayout = radio.layout;
..	..	@@ -3254,6 +4075,26 @@
3254	4075	currentLayout = sevenButton;
3255	4076	*/
3256	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
3257	4098	keepparent = group.parent;
3258	4099	// PARENT = NULL or not???
3259	4100	//group.parent = null; // ROOT
..	..	@@ -3265,11 +4106,13 @@
3265	4106	} else if (event.getSource() == editCameraItem)
3266	4107	{
3267	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3268	4110	cameraView.repaint();
3269	4111	return;
3270		- } else if (event.getSource() == revertCameraItem)
	4112	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	4113	{
3272	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3273	4116	cameraView.repaint();
3274	4117	return;
3275	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -3846,7 +4689,7 @@
3846	4689
3847	4690	try
3848	4691	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4693	}
3851	4694	catch (Exception e)
3852	4695	{
..	..	@@ -4321,28 +5164,25 @@
4321	5164	// }
4322	5165	// }
4323	5166
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	5167	void EditSelection(boolean newWindow)
4329	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4330	5175	// aConstraints.gridy = 0;
4331	5176	for (int i=0; i<group.selection.size(); i++)
4332	5177	{
4333	5178	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	5179	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5180	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	5181
4337	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	5183	if(elem != group \|\| !newWindow)
4339	5184	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
4346	5186	}
4347	5187	}
4348	5188	}
..	..	@@ -4405,9 +5245,7 @@
4405	5245
4406	5246	freezemodel = false;
4407	5247	}
4408		-
4409		- boolean flashIt = true;
4410		-
	5248	+
4411	5249	public void valueChanged(TreeSelectionEvent e)
4412	5250	//public boolean handleEvent(Event event)
4413	5251	{
..	..	@@ -4417,7 +5255,8 @@
4417	5255	//new Exception().printStackTrace();
4418	5256
4419	5257	freezemodel = true;
4420		-
	5258	+ ClearUnpinned();
	5259	+
4421	5260	/**/
4422	5261	//switch (event.id)
4423	5262	{
..	..	@@ -4450,7 +5289,7 @@
4450	5289	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5290	// a camera
4452	5291	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5293	{
4455	5294	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5295	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5298,13 @@
4459	5298	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5299	}
4461	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
4462	5308	refreshContents();
4463	5309	//return true;
4464	5310	}
..	..	@@ -4468,9 +5314,33 @@
4468	5314	freezemodel = false;
4469	5315	}
4470	5316
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
	5338	+ }
	5339	+
4471	5340	void refreshContents(boolean cp)
4472	5341	{
4473		- if (!Globals.MOUSEDRAGGED)
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5343	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5344	{
4475	5345	objEditor.ClearInfo(); // .GetMaterial());
4476	5346
..	..	@@ -4479,7 +5349,7 @@
4479	5349	Object3D child = (Object3D) group.selection.get(i);
4480	5350
4481	5351	objEditor.AddInfo(child, this, true);
4482		- System.err.println("info : " + child.GetPath());
	5352	+// System.err.println("info : " + child.GetPath());
4483	5353	}
4484	5354
4485	5355	objEditor.SetText(); // jan 2014
..	..	@@ -4569,7 +5439,8 @@
4569	5439
4570	5440	if (cut)
4571	5441	{
4572		- Save();
	5442	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5443	+// Save();
4573	5444	//int indices[] = jList.getSelectedIndices();
4574	5445	//for (int i = indices.length - 1; i >= 0; i--)
4575	5446	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5543,10 @@
4672	5543
4673	5544	void paste(boolean expand)
4674	5545	{
	5546	+ if (Globals.REPLACEONMAKE)
	5547	+ Save();
	5548	+ boolean keep = Globals.REPLACEONMAKE;
	5549	+ Globals.REPLACEONMAKE = false;
4675	5550	// if (GrafreeD.clipboard == null)
4676	5551	// return;
4677	5552	boolean first = true;
..	..	@@ -4731,6 +5606,7 @@
4731	5606	Grafreed.clipboard.get(0).parent = keepparent;
4732	5607	}
4733	5608
	5609	+ Globals.REPLACEONMAKE = keep;
4734	5610	ResetModel();
4735	5611	refreshContents();
4736	5612	}
..	..	@@ -4866,6 +5742,10 @@
4866	5742
4867	5743	void group(Object3D csg, boolean grab)
4868	5744	{
	5745	+ if (Globals.REPLACEONMAKE)
	5746	+ Save();
	5747	+ boolean keep = Globals.REPLACEONMAKE;
	5748	+ Globals.REPLACEONMAKE = false;
4869	5749	if (//false) // why??
4870	5750	!group.selection.isEmpty())
4871	5751	{
..	..	@@ -4979,10 +5859,15 @@
4979	5859	//node.add(csg);
4980	5860	//makeSomething(node);
4981	5861	makeSomething(csg);
	5862	+ Globals.REPLACEONMAKE = keep;
4982	5863	}
4983	5864
4984	5865	void Ungroup(Object3D g)
4985	5866	{
	5867	+ if (Globals.REPLACEONMAKE)
	5868	+ Save();
	5869	+ boolean keep = Globals.REPLACEONMAKE;
	5870	+ Globals.REPLACEONMAKE = false;
4986	5871	if (g instanceof HiddenObject)
4987	5872	{
4988	5873	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5884,7 @@
4999	5884	objEditor.makeSomething(g.get(i), false);
5000	5885	}
5001	5886	}
	5887	+ Globals.REPLACEONMAKE = keep;
5002	5888	}
5003	5889
5004	5890	void ungroup()
..	..	@@ -5287,13 +6173,43 @@
5287	6173	cButton clearpanelButton;
5288	6174	cButton unselectButton;
5289	6175
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
5295		- cButton saveButton;
	6176	+ cButton restoreCameraButton;
	6177	+
5296	6178	cButton oneStepButton;
	6179	+
	6180	+ cButton groupButton;
	6181	+ cButton ungroupButton;
	6182	+ cButton compositeButton;
	6183	+ cButton switchButton;
	6184	+ cButton loopButton;
	6185	+ cButton textureButton;
	6186	+
	6187	+ cButton skybox1Button;
	6188	+ cButton skybox2Button;
	6189	+ cButton skybox3Button;
	6190	+ cButton skybox4Button;
	6191	+ cButton skybox5Button;
	6192	+ cButton skybox6Button;
	6193	+ cButton skybox7Button;
	6194	+
	6195	+ cButton skybox11Button;
	6196	+ cButton skybox12Button;
	6197	+ cButton skybox13Button;
	6198	+ cButton skybox14Button;
	6199	+ cButton skybox15Button;
	6200	+ cButton skybox16Button;
	6201	+ cButton skybox17Button;
	6202	+
	6203	+ cButton gridButton;
	6204	+ cButton boxButton;
	6205	+ cButton sphereButton;
	6206	+ cButton coneButton;
	6207	+ cButton torusButton;
	6208	+ cButton superButton;
	6209	+ cButton kleinButton;
	6210	+ cButton particlesButton;
	6211	+ cButton overlayButton;
	6212	+ cButton lightButton;
5297	6213
5298	6214	cButton screenfitButton;
5299	6215	cButton screenfitpointButton;
..	..	@@ -5315,11 +6231,11 @@
5315	6231	//JTree jTree;
5316	6232	private MenuItem lookAtItem;
5317	6233	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	6234	+ private MenuItem switchViewItem;
5319	6235	private MenuItem cutItem;
5320	6236	private MenuItem undoItem;
5321	6237	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	6238	+ private JMenuItem duplicateItem;
5323	6239	private MenuItem cloneItem;
5324	6240	private MenuItem cloneSupportItem;
5325	6241	private MenuItem overwriteGeoItem;
..	..	@@ -5347,7 +6263,7 @@
5347	6263	private MenuItem pasteLinkItem;
5348	6264	private MenuItem pasteCloneItem;
5349	6265	private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6266	+ private MenuItem deleteItem;
5351	6267	private MenuItem clearAllItem;
5352	6268	private MenuItem genUVItem;
5353	6269	private MenuItem genNormalsMESHItem;
..	..	@@ -5407,7 +6323,7 @@
5407	6323	private MenuItem frontItem;
5408	6324	private MenuItem cameraItem;
5409	6325	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6326	+ private MenuItem switchItem;
5411	6327	private MenuItem physicsItem;
5412	6328	private MenuItem frameselectorItem;
5413	6329	private MenuItem scriptNodeItem;
..	..	@@ -5431,6 +6347,8 @@
5431	6347	private MenuItem attachBumpItem;
5432	6348	private MenuItem detachBumpItem;
5433	6349	private MenuItem pigmentBumpItem;
	6350	+ private MenuItem embedTexturesItem;
	6351	+ private MenuItem deEmbedTexturesItem;
5434	6352
5435	6353	private MenuItem particleItem;
5436	6354	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6399,5 @@
5481	6399
5482	6400	Menu cameraMenu;
5483	6401	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6402	+ MenuItem restoreCameraItem;
5485	6403	}