~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versionlist == null)
	360	+ {
	361	+ copy.versionlist = new Object3D[100];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -80,10 +382,22 @@
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +408,7 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
..	..	@@ -150,16 +465,19 @@
150	465
151	466	void SetupMenu2(GroupEditor oe)
152	467	{
	468	+ oe.jTree = new cTree();
	469	+
153	470	Menu menu;
154	471	oe.menuBar.add(menu = new Menu("Edit"));
155	472	//editItem = menu.add(new MenuItem("Edit"));
156	473	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	474	+
	475	+// undoItem = menu.add(new MenuItem("Undo"));
	476	+// undoItem.addActionListener(this);
	477	+// redoItem = menu.add(new MenuItem("Redo"));
	478	+// redoItem.addActionListener(this);
	479	+// menu.add("-");
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	481	duplicateItem.addActionListener(this);
164	482	cloneItem = menu.add(new MenuItem("Clone"));
165	483	cloneItem.addActionListener(this);
..	..	@@ -175,7 +493,6 @@
175	493	copyItem.addActionListener(this);
176	494	pasteItem = menu.add(new MenuItem("Paste"));
177	495	pasteItem.addActionListener(this);
178		- menu.add("-");
179	496
180	497	menu.add("-");
181	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -187,8 +504,8 @@
187	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	505	// pasteExpandItem.addActionListener(this);
189	506	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
192	509
193	510	if (Globals.ADVANCED)
194	511	{
..	..	@@ -202,23 +519,23 @@
202	519	//zBufferItem.addActionListener(this);
203	520	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	521	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
207	524
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	537
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	539	toggleHandleItem.addItemListener(this);
223	540	toggleHandleItem.setState(CameraPane.HANDLES);
224	541
..	..	@@ -245,7 +562,7 @@
245	562
246	563	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	564	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
249	566
250	567	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	568	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +583,14 @@
266	583	// animationItem.addItemListener(this);
267	584	// animationItem.setState(CameraPane.ANIMATION);
268	585	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	587	editCameraItem.addActionListener(this);
271	588
272	589	if (Globals.ADVANCED)
273	590	{
274	591	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	592	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	594	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	595	oe.cameraMenu.add("-");
279	596	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +598,7 @@
281	598	editLeafItem.addActionListener(this);
282	599	lookAtItem.addActionListener(this);
283	600	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	601	+ //switchViewItem.addActionListener(this);
285	602	}
286	603
287	604	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +643,29 @@
326	643	}
327	644
328	645	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
331	648	backItem = menu.add(new MenuItem("Back"));
332	649	backItem.addActionListener(this);
333	650	frontItem = menu.add(new MenuItem("Front"));
334	651	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
337	657	hideItem = menu.add(new MenuItem("Hidden Group"));
338	658	hideItem.addActionListener(this);
	659	+ }
339	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	661	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
344	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	670	switchGeoItem.addActionListener(this);
346	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +673,6 @@
348	673	morphItem = menu.add(new MenuItem("Morph Group"));
349	674	morphItem.addActionListener(this);
350	675
351		- if (Globals.ADVANCED)
352		- {
353	676	menu.add("-");
354	677	physicsItem = menu.add(new MenuItem("Physics"));
355	678	physicsItem.addActionListener(this);
..	..	@@ -357,30 +680,29 @@
357	680	frameselectorItem.addActionListener(this);
358	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	682	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	683	}
363	684
364	685	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
367	688	billboardItem = menu.add(new MenuItem("Billboard"));
368	689	billboardItem.addActionListener(this);
369	690	csgItem = menu.add(new MenuItem("CSG"));
370	691	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	693	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	695	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
377	701	if (Globals.ADVANCED)
378	702	{
379	703	menu.add("-");
380	704	linkerItem = menu.add(new MenuItem("Linker"));
381	705	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	706	templateItem = menu.add(new MenuItem("Template"));
385	707	templateItem.addActionListener(this);
386	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +731,7 @@
409	731	genNormalsMESHItem.addActionListener(this);
410	732	if (Globals.ADVANCED)
411	733	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	735	genNormalsMINEItem.addActionListener(this);
414	736	}
415	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -469,6 +791,14 @@
469	791	markleavesItem.addActionListener(this);
470	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	793	unmarkleavesItem.addActionListener(this);
	794	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	795	+ rewindleavesItem.addActionListener(this);
	796	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	797	+ unrewindleavesItem.addActionListener(this);
	798	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	799	+ randomleavesItem.addActionListener(this);
	800	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	801	+ unrandomleavesItem.addActionListener(this);
472	802	menu.add("-");
473	803	flipVItem = menu.add(new MenuItem("Flip V"));
474	804	flipVItem.addActionListener(this);
..	..	@@ -494,10 +824,15 @@
494	824	attachBumpItem.addActionListener(this);
495	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
496	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
497	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
498	829	detachPigmentItem.addActionListener(this);
499	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
500	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
501	836	menu.add("-");
502	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
503	838	sortbysizeItem.addActionListener(this);
..	..	@@ -524,8 +859,21 @@
524	859	buildToolsMenu(menu);
525	860	}
526	861
	862	+
527	863	void SetupUI2(ObjEditor oe)
528	864	{
	865	+ // June 2019
	866	+ if (oe == null)
	867	+ {
	868	+ //super.SetupUI2(this);
	869	+ //return;
	870	+ }
	871	+
	872	+ if (copy != group)
	873	+ {
	874	+ //super.SetupUI2(this);
	875	+ }
	876	+
529	877	//new Exception().printStackTrace();
530	878
531	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +902,83 @@
554	902	oe.radioPanel.add(dummyButton);
555	903	oe.buttonGroup.add(dummyButton);
556	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
557	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	910
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
	914	+
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
	921	+
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ fullButton.setToolTipText("Full-screen window");
	924	+ fullButton.addActionListener(this);
	925	+
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
	933	+
	934	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveVersionButton.setToolTipText("Duplicate current version");
	936	+ saveVersionButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ deleteVersionButton.setToolTipText("Delete current version");
	940	+ deleteVersionButton.addActionListener(this);
	941	+
	942	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	943	+ previousVersionButton.setToolTipText("Previous version");
	944	+ previousVersionButton.addActionListener(this);
	945	+ previousVersionButton.setEnabled(false);
	946	+
	947	+ cGridBag updown = new cGridBag().setVertical(true);
	948	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	949	+ restoreButton.setToolTipText("Undo (restore current version)");
	950	+ restoreButton.addActionListener(this);
	951	+ //restoreButton.setEnabled(false);
	952	+
	953	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	954	+ replaceButton.setToolTipText("Save (replace current version)");
	955	+ replaceButton.addActionListener(this);
	956	+ //replaceButton.setEnabled(false);
	957	+
	958	+ copyOptionsPanel.add(updown);
	959	+
	960	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	961	+ nextVersionButton.setToolTipText("Next version");
	962	+ nextVersionButton.addActionListener(this);
	963	+ nextVersionButton.setEnabled(false);
	964	+
	965	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	966	liveCB.setToolTipText("Enable animation");
561	967	liveCB.addItemListener(this);
562	968
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	969	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	970	oneStepButton.setToolTipText("Animate one step forward");
565	971	oneStepButton.addActionListener(this);
566	972
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	973	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	974	fastCB.setToolTipText("Fast mode");
569	975	fastCB.addItemListener(this);
570	976
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- screenfitButton.addActionListener(this);
	977	+ //oe.toolboxPanel.Return();
	978	+
	979	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	980	+// trackCB.setToolTipText("Enable tracking");
	981	+// trackCB.addItemListener(this);
578	982
579	983	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	984	// screenfitpointButton.addActionListener(this);
..	..	@@ -584,67 +988,156 @@
584	988	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	989	snapobjectButton.addActionListener(this);
586	990	snapobjectButton.setToolTipText("Snap Object");
	991	+
	992	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	993	+ fourButton.addActionListener(this);
	994	+ fourButton.setToolTipText("Show control panel only");
587	995	}
588	996
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	997	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	998
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- twoButton.setToolTipText("Show center view only");
	999	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1000	+ twoButton.setToolTipText("Show 3D view only");
597	1001	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599		- fourButton.addActionListener(this);
600		- fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- sixButton.setToolTipText("2-column layout left");
603		- sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605		- threeButton.setToolTipText("2-column layout right");
	1002	+ this.fullscreenLayout = twoButton;
	1003	+
	1004	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1005	+ threeButton.setToolTipText("Show controls and 3D view");
606	1006	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- sevenButton.setToolTipText("3-column layout");
609		- sevenButton.addActionListener(this);
	1007	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1008	+ sixButton.setToolTipText("Show 3D view and controls");
	1009	+ sixButton.addActionListener(this);
	1010	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+// sevenButton.setToolTipText("3-column layout");
	1012	+// sevenButton.addActionListener(this);
610	1013	//
611	1014
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613		- rootButton.setToolTipText("Edit selection in new tab");
	1015	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1016	+ rootButton.setToolTipText("Open selection in new tab");
614	1017	rootButton.addActionListener(this);
615	1018
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	1020	closeButton.setToolTipText("Close tab");
618	1021	closeButton.addActionListener(this);
619	1022	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	1023	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	1024	+
	1025	+ cGridBag row1 = new cGridBag();
623	1026
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	1027	+ // INSERT
	1028	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ gridButton.setToolTipText("Create grid");
	1030	+ gridButton.addActionListener(this);
	1031	+
	1032	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ boxButton.setToolTipText("Create box");
	1034	+ boxButton.addActionListener(this);
	1035	+
	1036	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ sphereButton.setToolTipText("Create sphere");
	1038	+ sphereButton.addActionListener(this);
	1039	+
	1040	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ coneButton.setToolTipText("Create cone");
	1042	+ coneButton.addActionListener(this);
	1043	+
	1044	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ torusButton.setToolTipText("Create torus");
	1046	+ torusButton.addActionListener(this);
	1047	+
	1048	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ superButton.setToolTipText("Create superellipsoid");
	1050	+ superButton.addActionListener(this);
	1051	+
	1052	+ if (Globals.ADVANCED)
	1053	+ {
	1054	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ kleinButton.setToolTipText("Create Klein bottle");
	1056	+ kleinButton.addActionListener(this);
	1057	+ }
	1058	+
	1059	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1060	+ particlesButton.setToolTipText("Create particle system");
	1061	+ particlesButton.addActionListener(this);
	1062	+
	1063	+ oe.toolboxPanel.add(row1);
	1064	+
	1065	+ cGridBag row2 = new cGridBag();
	1066	+
	1067	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ groupButton.setToolTipText("Create group");
	1069	+ groupButton.addActionListener(this);
	1070	+
	1071	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ compositeButton.setToolTipText("Create composite");
	1073	+ compositeButton.addActionListener(this);
	1074	+
	1075	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ switchButton.setToolTipText("Create item switcher");
	1077	+ switchButton.addActionListener(this);
	1078	+
	1079	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ loopButton.setToolTipText("Create loop");
	1081	+ loopButton.addActionListener(this);
	1082	+
	1083	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ textureButton.setToolTipText("Create texture");
	1085	+ textureButton.addActionListener(this);
	1086	+
	1087	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ overlayButton.setToolTipText("Create overlay");
	1089	+ overlayButton.addActionListener(this);
	1090	+
	1091	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ lightButton.setToolTipText("Create light");
	1093	+ lightButton.addActionListener(this);
	1094	+
	1095	+ oe.toolboxPanel.add(row2);
	1096	+
	1097	+ // ENVYMAPS
	1098	+ cGridBag skyboxpane = new cGridBag();
	1099	+ skyboxpane.preferredHeight = 100;
	1100	+
	1101	+ oe.toolboxPanel.add(skyboxpane);
	1102	+
	1103	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1104	+ skyboxpane.add(skyboxpanel);
	1105	+
	1106	+ AddSkyboxTab0(skyboxpanel);
	1107	+ AddSkyboxTab1(skyboxpanel);
	1108	+ AddSkyboxTab2(skyboxpanel);
	1109	+ AddSkyboxTab3(skyboxpanel);
	1110	+
	1111	+ // EDIT panel
	1112	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ editButton.setToolTipText("Pin selection controls");
626	1114	editButton.addActionListener(this);
627	1115
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	1116	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ uneditButton.setToolTipText("Unpin and remove selection controls");
630	1118	uneditButton.addActionListener(this);
631	1119
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	1120	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1121	+ allParamsButton.setToolTipText("Show all controle");
634	1122	allParamsButton.addActionListener(this);
635	1123
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	1125	clearPanelButton.setToolTipText("Clear edit panel");
638	1126	clearPanelButton.addActionListener(this);
639	1127
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	1129	unselectButton.setToolTipText("Unselect");
642	1130	unselectButton.addActionListener(this);
643	1131
644		- commandsPanel.preferredHeight = 1;
	1132	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ flashSelectionButton.setToolTipText("Highlight selection");
	1134	+ flashSelectionButton.addActionListener(this);
645	1135
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	1136	+ editCommandsPanel.preferredHeight = 1;
	1137	+
	1138	+ SetPinStates(false);
	1139	+// oe.treePanel.add(commandsPanel);
	1140	+// oe.treePanel.Return();
648	1141
649	1142	// oe.aConstraints.gridx += 1;
650	1143	// oe.aConstraints.weighty = 0;
..	..	@@ -661,32 +1154,20 @@
661	1154
662	1155	JScrollPane jSP;
663	1156	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1157	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	1158	ResetModel();
666	1159
667	1160	oe.treePanel.add(jSPPanel);
668	1161	oe.treePanel.Return();
669	1162
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	1163	oe.treePanel.add(copyOptionsPanel);
686	1164	oe.treePanel.Return();
	1165	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1166	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1167	+ sliderPane.preferredHeight = 1;
687	1168
688		-// mainPanel.setDividerLocation(0.5); //1.0);
689		-// mainPanel.setResizeWeight(0.5);
	1169	+// mainPanel.setDividerLocation(0.1); //1.0);
	1170	+ mainPanel.setResizeWeight(0.4);
690	1171
691	1172	//jList.addListSelectionListener(this);
692	1173	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -694,7 +1175,7 @@
694	1175	//jTree.setEditable(true);
695	1176	oe.jTree.setDragEnabled(true);
696	1177	//jTree.setPreferredSize(new Dimension(10,10));
697		- jSP.setPreferredSize(new Dimension(100,200));
	1178	+ //jSP.setPreferredSize(new Dimension(100,200));
698	1179
699	1180	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
700	1181
..	..	@@ -706,29 +1187,49 @@
706	1187	dgr.addDragGestureListener(this);
707	1188	}catch(Exception e) {}
708	1189	*/
709		- radio.layout = sevenButton;
	1190	+ radio.layout = threeButton; // sixButton;
710	1191	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
711	1192	}
712	1193
713	1194	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	1195	{
	1196	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1197	+ colorCB.setToolTipText("Copy color when dropped");
	1198	+ colorCB.addItemListener(this);
	1199	+
	1200	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1201	+ materialCB.setToolTipText("Copy material when dropped");
	1202	+ materialCB.addItemListener(this);
	1203	+
	1204	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1205	+ textureCB.setToolTipText("Copy texture when dropped");
	1206	+ textureCB.addItemListener(this);
	1207	+
	1208	+ panel.Return();
	1209	+
715	1210	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	1211	boxCB.setToolTipText("Display bounding boxes");
717	1212	boxCB.addItemListener(this);
718	1213
719	1214	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1215	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	1216	zoomBoxCB.addItemListener(this);
722	1217
723	1218	if (true) // Globals.ADVANCED)
724	1219	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	1220	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1221	+// supportCB.setToolTipText("Enable rigging");
	1222	+// supportCB.addItemListener(this);
	1223	+
	1224	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1225	+ freezeCB.setToolTipText("Fast moving camera");
	1226	+ freezeCB.addItemListener(this);
728	1227
729	1228	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	1229	// localCB.addItemListener(this);
731	1230
	1231	+ panel.Return();
	1232	+
732	1233	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	1234	crowdCB.setToolTipText("Used for crowds");
734	1235	crowdCB.addItemListener(this);
..	..	@@ -737,14 +1238,19 @@
737	1238	smoothCB.setToolTipText("Snapping delay");
738	1239	smoothCB.addItemListener(this);
739	1240
740		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
741		- slowCB.setToolTipText("Smooth interpolation");
742		- slowCB.addItemListener(this);
	1241	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1242	+// slowCB.setToolTipText("Smooth interpolation");
	1243	+// slowCB.addItemListener(this);
	1244	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1245	+ minshaderCB.setToolTipText("Minimal fast shader");
	1246	+ minshaderCB.addItemListener(this);
743	1247
744	1248	// constraints.gridy += 1;
745	1249	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	1250	// speakerMocapCB.addItemListener(this);
747	1251
	1252	+ panel.Return();
	1253	+
748	1254	if (false)
749	1255	{
750	1256	// handled in scripts
..	..	@@ -759,34 +1265,74 @@
759	1265	//constraints.gridy += 1;
760	1266	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	1267	smoothfocusCB.addItemListener(this);
	1268	+ panel.Return();
762	1269	}
763	1270
764	1271	//constraints.gridx += 1;
765	1272	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	1273	// debugCB.addItemListener(this);
767	1274
	1275	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1276	+ trackCB.setToolTipText("Enable tracking target");
	1277	+ trackCB.addItemListener(this);
	1278	+
768	1279	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1280	+ oeilCB.setToolTipText("Move camera when tracking");
769	1281	oeilCB.addItemListener(this);
770	1282
	1283	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1284	+ shadowCB.setToolTipText("When live compute shadows");
	1285	+ shadowCB.addItemListener(this);
	1286	+
	1287	+ panel.Return();
	1288	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1289	+ toggleTextureCB.setToolTipText("Load textures");
	1290	+ toggleTextureCB.addItemListener(this);
	1291	+
	1292	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1293	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1294	+ toggleSwitchCB.addItemListener(this);
	1295	+
	1296	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1297	+ autokeepCB.setToolTipText("On structure change");
	1298	+ autokeepCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ if (Globals.ADVANCED)
	1302	+ {
771	1303	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	1304	lookAtCB.setToolTipText("Look-at target");
773	1305	lookAtCB.addItemListener(this);
	1306	+ }
774	1307
775	1308	}
776	1309
777	1310	cGridBag fill = new cGridBag();
778		-
779	1311	fill.preferredHeight = 200;
	1312	+ cGridBag fill2 = new cGridBag();
	1313	+ fill2.preferredHeight = 200;
	1314	+ cGridBag fill3 = new cGridBag();
	1315	+ fill3.preferredHeight = 200;
780	1316
781	1317	panel.add(fill);
	1318	+ panel.add(fill2);
	1319	+ panel.add(fill3);
782	1320
783	1321	}
784	1322
785	1323	void EditObject(Object3D obj)
786	1324	{
787	1325	cRadio radioButton = new cRadio(obj.name);
	1326	+
	1327	+ // June 2019. Patch to avoid bug with transparency.
	1328	+ radioButton.hadMaterial = obj.material != null;
	1329	+ if (!radioButton.hadMaterial)
	1330	+ {
	1331	+ obj.material = new cMaterial();
	1332	+ }
	1333	+
788	1334	radioButton.SetObject(obj);
789		- radioButton.layout = sevenButton;
	1335	+ radioButton.layout = threeButton; // sixButton;
790	1336	radioButton.SetCamera(cameraView.renderCamera, false);
791	1337	radioButton.addActionListener(this);
792	1338	radioPanel.add(radioButton);
..	..	@@ -796,6 +1342,8 @@
796	1342
797	1343	void SetupViews(ObjEditor oe)
798	1344	{
	1345	+ theFrame = this;
	1346	+
799	1347	oe.SetupViews();
800	1348
801	1349	System.out.println("SetupViews");
..	..	@@ -804,23 +1352,30 @@
804	1352	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1353	}
806	1354
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- JCheckBox smoothfocusCB;
	1355	+ cToggleButton liveCB;
	1356	+ cCheckBox supportCB;
	1357	+ cCheckBox localCB;
	1358	+ cCheckBox crowdCB;
	1359	+ cCheckBox smoothCB;
	1360	+ cCheckBox minshaderCB;
	1361	+
	1362	+ cToggleButton fastCB;
	1363	+ cCheckBox slowCB;
	1364	+ cCheckBox boxCB;
	1365	+ cCheckBox zoomBoxCB;
	1366	+ cCheckBox freezeCB;
	1367	+ //cToggleButton trackCB;
	1368	+ cCheckBox trackCB;
	1369	+ cCheckBox smoothfocusCB;
818	1370	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1371	+ cCheckBox speakerCameraCB;
	1372	+ cCheckBox speakerFocusCB;
	1373	+ cCheckBox debugCB;
	1374	+
	1375	+ cCheckBox oeilCB;
	1376	+ cCheckBox shadowCB;
	1377	+ cCheckBox autokeepCB;
	1378	+ cCheckBox lookAtCB;
824	1379
825	1380	// static int COLOR = 1;
826	1381	// static int MATERIAL = 2;
..	..	@@ -828,9 +1383,9 @@
828	1383
829	1384	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1385
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1386	+ cCheckBox colorCB;
	1387	+ cCheckBox materialCB;
	1388	+ cCheckBox textureCB;
834	1389
835	1390	public void itemStateChanged(ItemEvent e)
836	1391	{
..	..	@@ -858,6 +1413,7 @@
858	1413	} else if(e.getSource() == liveCB)
859	1414	{
860	1415	cameraView.ToggleLive();
	1416	+ refreshContents(false);
861	1417	}
862	1418	else if(e.getSource() == supportCB)
863	1419	{
..	..	@@ -873,6 +1429,12 @@
873	1429	{
874	1430	cameraView.ToggleInertia();
875	1431	cameraView.repaint();
	1432	+ }
	1433	+ else if(e.getSource() == minshaderCB)
	1434	+ {
	1435	+ Globals.MINSHADER ^= true;
	1436	+ cameraView.programInitialized = false;
	1437	+ cameraView.repaint();
876	1438	}
877	1439	else if(e.getSource() == localCB)
878	1440	{
..	..	@@ -922,6 +1484,18 @@
922	1484	{
923	1485	cameraView.ToggleOeil();
924	1486	}
	1487	+ else if(e.getSource() == shadowCB)
	1488	+ {
	1489	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == freezeCB)
	1492	+ {
	1493	+ Globals.FREEZEONMOVE ^= true;
	1494	+ }
	1495	+ else if(e.getSource() == autokeepCB)
	1496	+ {
	1497	+ Globals.REPLACEONMAKE ^= true;
	1498	+ }
925	1499	else if(e.getSource() == lookAtCB)
926	1500	{
927	1501	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1512,8 @@
938	1512
939	1513	/**/
940	1514	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1515	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1516	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1517	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1518	// We can't move the root node or an empty selection
944	1519	return;
..	..	@@ -1001,8 +1576,6 @@
1001	1576	}
1002	1577	}
1003	1578
1004		- String string = (String) object;
1005		-
1006	1579	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1580	// if( object instanceof java.io.File[])
1008	1581	// {
..	..	@@ -1010,6 +1583,8 @@
1010	1583	// objEditor.DropFile((java.io.File[]) object, true);
1011	1584	// return;
1012	1585	// }
	1586	+
	1587	+ String string = object.toString();
1013	1588
1014	1589	// File path for Mac and Windows
1015	1590	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1630,33 @@
1055	1630
1056	1631	assert target == objEditor.jTree;
1057	1632	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1633	+ Object3D destinationLeaf;
1058	1634	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1635	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1636	} catch (Exception e) {
1061	1637	System.out.println("destinationPath : " + destinationPath);
1062	1638	return;
1063	1639	}
1064	1640
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1641	+ for (int i=group.selection.size(); --i>=0;)
1066	1642	{
	1643	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1644	+
	1645	+ // Cannot move into itself
	1646	+ if (child == destinationLeaf)
	1647	+ return;
	1648	+ }
	1649	+
	1650	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1651	+// {
1067	1652	loadClipboard(true);
1068	1653	objEditor.jTree.setSelectionPath(destinationPath);
1069	1654	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1655	+// } else {
	1656	+// loadClipboard(false);
	1657	+// objEditor.jTree.setSelectionPath(destinationPath);
	1658	+// pasteInto(false, false); // true); // ???
	1659	+// }
1075	1660	}
1076	1661	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1662	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1761,30 @@
1176	1761	{
1177	1762	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1763	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- superItem.addActionListener(this);
	1764	+// gridItem = menu.add(new MenuItem("Grid"));
	1765	+// gridItem.addActionListener(this);
	1766	+// rectoidItem = menu.add(new MenuItem("Box"));
	1767	+// rectoidItem.addActionListener(this);
	1768	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1769	+// ellipsoidItem.addActionListener(this);
	1770	+// coneItem = menu.add(new MenuItem("Cone"));
	1771	+// coneItem.addActionListener(this);
	1772	+// torusItem = menu.add(new MenuItem("Torus"));
	1773	+// torusItem.addActionListener(this);
	1774	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1775	+// superItem.addActionListener(this);
	1776	+
	1777	+ cameraItem = menu.add(new MenuItem("Camera"));
	1778	+ cameraItem.addActionListener(this);
	1779	+
	1780	+ if (!Globals.ADVANCED)
	1781	+ {
1191	1782	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1783	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1784	+ }
	1785	+
	1786	+// particleItem = menu.add(new MenuItem("Particle system"));
	1787	+// particleItem.addActionListener(this);
1195	1788	if (Globals.ADVANCED)
1196	1789	{
1197	1790	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1810,15 @@
1217	1810	}
1218	1811	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1812	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- lightItem.addActionListener(this);
	1813	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1814	+// overlayItem.addActionListener(this);
	1815	+// lightItem = menu.add(new MenuItem("Light"));
	1816	+// lightItem.addActionListener(this);
1224	1817	menu.add("-");
1225	1818	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1819	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1820	+// loopItem = menu.add(new MenuItem("Loop"));
	1821	+// loopItem.addActionListener(this);
1229	1822	doubleItem = menu.add(new MenuItem("Fork"));
1230	1823	doubleItem.addActionListener(this);
1231	1824	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1834,9 @@
1241	1834	animationItem.addItemListener(this);
1242	1835	animationItem.setState(Globals.ANIMATION);
1243	1836
	1837	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1838	+ archiveItem.addActionListener(this);
	1839	+
1244	1840	menu.add("-");
1245	1841	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	1842	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +1849,8 @@
1253	1849	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	1850	reduce34MorphItem.addActionListener(this);
1255	1851	menu.add("-");
	1852	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1853	+ memoryItem.addActionListener(this);
1256	1854	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	1855	computeAOItem.addActionListener(this);
1258	1856
..	..	@@ -1261,11 +1859,9 @@
1261	1859	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	1860	mirrorItem.addActionListener(this);
1263	1861	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	1862	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1863	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1864	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1865	dumpItem.addActionListener(this);
1270	1866	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1867	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +2002,34 @@
1406	2002	shadow.material = new cMaterial(obj.material);
1407	2003	shadow.material.diffuse = 0.0001f;
1408	2004	shadow.material.specular = 0.0001f;
	2005	+ //shadow.projectedVertices[1].x = 300;
1409	2006
1410	2007	makeSomething(shadow);
1411	2008	}
	2009	+
	2010	+ private void ClearUnpinned()
	2011	+ {
	2012	+ //for (Object3D obj : listUI)
	2013	+ for (int i=listUI.size(); --i>=0;)
	2014	+ {
	2015	+ Object3D obj = listUI.elementAt(i);
	2016	+ if (!obj.pinned)
	2017	+ {
	2018	+ obj.CloseUI();
	2019	+ listUI.remove(i);
	2020	+ }
	2021	+ }
	2022	+ }
	2023	+
	2024	+ private void EditElement(Object3D elem, boolean newWindow)
	2025	+ {
	2026	+ // if (!(elem instanceof Composite))
	2027	+ // newWindow = false;
	2028	+ listUI.add(elem);
	2029	+ elem.openEditWindow(this, newWindow); //, false);
	2030	+ System.out.println("edit : " + elem);
	2031	+ elem.editWindow.refreshContents(true); // ? new
	2032	+ }
1412	2033
1413	2034	/**
1414	2035	* applyExample
..	..	@@ -1653,7 +2274,7 @@
1653	2274	{
1654	2275	ScreenFit();
1655	2276	} else
1656		- if (source == switchItem)
	2277	+ if (source == switchViewItem)
1657	2278	{
1658	2279	cVector v1 = new cVector();
1659	2280	cVector v2 = new cVector();
..	..	@@ -1662,11 +2283,11 @@
1662	2283	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	2284	objEditor.cameraView.repaint();
1664	2285	} else
1665		- if (source == rectoidItem)
	2286	+ if (source == rectoidItem \|\| source == boxButton)
1666	2287	{
1667	2288	makeSomething(new Box());
1668	2289	} else
1669		- if (source == particleItem)
	2290	+ if (source == particleItem \|\| source == particlesButton)
1670	2291	{
1671	2292	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	2293	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2366,27 @@
1745	2366
1746	2367	makeSomething(obj);
1747	2368	} else
1748		- if (source == gridItem)
	2369	+ if (source == gridItem \|\| source == gridButton)
1749	2370	{
1750	2371	makeSomething(new Grid());
1751	2372	} else
1752		- if (source == ellipsoidItem)
	2373	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2374	{
1754	2375	makeSomething(new Sphere());
1755	2376	} else
1756		- if (source == coneItem)
	2377	+ if (source == coneItem \|\| source == coneButton)
1757	2378	{
1758	2379	makeSomething(new Cone());
1759	2380	} else
1760		- if (source == torusItem)
	2381	+ if (source == torusItem \|\| source == torusButton)
1761	2382	{
1762	2383	makeSomething(new Torus());
1763	2384	} else
1764		- if (source == superItem)
	2385	+ if (source == superItem \|\| source == superButton)
1765	2386	{
1766	2387	makeSomething(new Superellipsoid());
1767	2388	} else
1768		- if (source == kleinItem)
	2389	+ if (source == kleinItem \|\| source == kleinButton)
1769	2390	{
1770	2391	makeSomething(new Klein());
1771	2392	} else
..	..	@@ -1785,7 +2406,7 @@
1785	2406	{
1786	2407	makeSomething(new BezierSurface());
1787	2408	} else
1788		- if (source == overlayItem)
	2409	+ if (source == overlayItem \|\| source == overlayButton)
1789	2410	{
1790	2411	/*
1791	2412	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,10 +2454,27 @@
1833	2454	s.setup();
1834	2455	makeSomething(s);
1835	2456	} else
1836		- if (source == lightItem)
	2457	+ if (source == lightItem \|\| source == lightButton)
1837	2458	{
1838	2459	makeSomething(new Light());
1839	2460	} else
	2461	+// if (source == skybox1Button \|\|
	2462	+// source == skybox2Button \|\|
	2463	+// source == skybox3Button \|\|
	2464	+// source == skybox4Button \|\|
	2465	+// source == skybox5Button \|\|
	2466	+// source == skybox6Button \|\|
	2467	+// source == skybox7Button \|\|
	2468	+// source == skybox11Button \|\|
	2469	+// source == skybox12Button \|\|
	2470	+// source == skybox13Button \|\|
	2471	+// source == skybox14Button \|\|
	2472	+// source == skybox15Button \|\|
	2473	+// source == skybox16Button \|\|
	2474	+// source == skybox17Button)
	2475	+// {
	2476	+// ChangeSkybox(source);
	2477	+// } else
1840	2478	if (source == csgItem)
1841	2479	{
1842	2480	group(new CSG());
..	..	@@ -1883,30 +2521,30 @@
1883	2521
1884	2522	group(g);
1885	2523	} else
1886		- if (source == loopItem)
	2524	+ if (source == loopItem \|\| source == loopButton)
1887	2525	{
1888	2526	Composite csg = new GroupLeaf();
1889	2527	csg.count = 5;
1890	2528	group(csg);
1891		- Composite child = new cGroup();
	2529	+ Composite child = new cGroup("Branch");
1892	2530	csg.addChild(child);
1893	2531	child.addChild(csg);
1894	2532	} else
1895	2533	if (source == doubleItem)
1896	2534	{
1897		- Composite csg = new GroupLeaf();
	2535	+ Composite csg = new GroupLeaf("Fork");
1898	2536	csg.count = 5;
1899	2537	group(csg);
1900		- Composite child = new cGroup();
	2538	+ Composite child = new cGroup("Branch A");
1901	2539	csg.addChild(child);
1902	2540	child.addChild(csg);
1903		- child = new cGroup();
	2541	+ child = new cGroup("Branch B");
1904	2542	csg.addChild(child);
1905	2543	child.addChild(csg);
1906	2544	} else
1907	2545	if (source == tripleItem)
1908	2546	{
1909		- Composite csg = new GroupLeaf();
	2547	+ Composite csg = new GroupLeaf("Trident");
1910	2548	csg.count = 4;
1911	2549	group(csg);
1912	2550	Composite child = new cGroup();
..	..	@@ -1922,7 +2560,7 @@
1922	2560	if (source == computeAOItem)
1923	2561	{
1924	2562	Globals.drawMode = CameraPane.OCCLUSION;
1925		- Globals.theRenderer.repaint();
	2563	+ cameraView.repaint();
1926	2564	} else
1927	2565	if (source == recompileItem)
1928	2566	{
..	..	@@ -1937,7 +2575,7 @@
1937	2575	if (source == invariantsItem)
1938	2576	{
1939	2577	System.out.println("Invariants:");
1940		- Grafreed.grafreeD.universe.invariants();
	2578	+ Grafreed.grafreed.universe.invariants();
1941	2579	} else
1942	2580	if (source == memoryItem)
1943	2581	{
..	..	@@ -1956,6 +2594,53 @@
1956	2594	{
1957	2595	DumpObject();
1958	2596	} else
	2597	+ if (source == minButton)
	2598	+ {
	2599	+ Minimize();
	2600	+ } else
	2601	+ if (source == maxButton)
	2602	+ {
	2603	+ Maximize();
	2604	+ } else
	2605	+ if (source == fullButton)
	2606	+ {
	2607	+ ToggleFullScreen();
	2608	+ } else
	2609	+ if (source == previousVersionButton)
	2610	+ {
	2611	+ // Go to previous version
	2612	+ //if (!Undo())
	2613	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2614	+ PreviousVersion();
	2615	+ } else
	2616	+ if (source == restoreButton)
	2617	+ {
	2618	+ // Restore current version
	2619	+ Restore();
	2620	+ //restoreButton.setEnabled(false);
	2621	+ } else
	2622	+ if (source == replaceButton)
	2623	+ {
	2624	+ // Overwrite current version
	2625	+ Replace();
	2626	+ //replaceButton.setEnabled(false);
	2627	+ } else
	2628	+ if (source == nextVersionButton)
	2629	+ {
	2630	+ // Go to next version
	2631	+ NextVersion();
	2632	+ } else
	2633	+ if (source == saveVersionButton)
	2634	+ {
	2635	+ // Save a new version
	2636	+ if (!Save(true))
	2637	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2638	+ } else
	2639	+ if (source == deleteVersionButton)
	2640	+ {
	2641	+ // Delete a new version
	2642	+ DeleteVersion();
	2643	+ } else
1959	2644	if (source == oneStepButton)
1960	2645	{
1961	2646	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2648,14 @@
1963	2648	} else
1964	2649	if (source == screenfitButton)
1965	2650	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2651	ScreenFit();
1968	2652	} else
1969	2653	if (source == screenfitpointButton)
1970	2654	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2655	ScreenFitPoint();
1973	2656	} else
1974	2657	if (source == snapobjectButton)
1975	2658	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2659	SnapObject();
1978	2660	} else
1979	2661	// if (event.getSource() == recompileButton)
..	..	@@ -2012,11 +2694,11 @@
2012	2694	} else
2013	2695	if (source == undoItem)
2014	2696	{
2015		- Undo();
	2697	+ PreviousVersion();
2016	2698	} else
2017	2699	if (source == redoItem)
2018	2700	{
2019		- Redo();
	2701	+ NextVersion();
2020	2702	} else
2021	2703	if (source == duplicateItem)
2022	2704	{
..	..	@@ -2337,7 +3019,7 @@
2337	3019	{
2338	3020	StepAll();
2339	3021	} else
2340		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3022	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2341	3023	{
2342	3024	//int indices[] = jList.getSelectedIndices();
2343	3025	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2349,9 +3031,9 @@
2349	3031	{
2350	3032	ClearSelection(true);
2351	3033	} else
2352		- if (source == grabItem)
	3034	+ if (source == grabItem \|\| source == groupButton)
2353	3035	{
2354		- group(new cGroup(), true);
	3036	+ group(new cGroup(), false); // true);
2355	3037	} else
2356	3038	if (source == hideItem)
2357	3039	{
..	..	@@ -2369,11 +3051,11 @@
2369	3051	{
2370	3052	makeSomething(new Camera());
2371	3053	} else
2372		- if (source == compositeItem)
	3054	+ if (source == compositeItem \|\| source == compositeButton)
2373	3055	{
2374	3056	group(new Composite());
2375	3057	} else
2376		- if (source == randomItem)
	3058	+ if (source == switchItem \|\| source == switchButton)
2377	3059	{
2378	3060	RandomNode random = new RandomNode();
2379	3061	group(random);
..	..	@@ -2475,7 +3157,7 @@
2475	3157	{
2476	3158	group(new cLinker());
2477	3159	} else
2478		- if (source == textureItem)
	3160	+ if (source == textureItem \|\| source == textureButton)
2479	3161	{
2480	3162	group(new TextureNode());
2481	3163	} else
..	..	@@ -2495,17 +3177,30 @@
2495	3177	{
2496	3178	CastShadow(2);
2497	3179	} else
2498		- if (source == ungroupItem)
	3180	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	3181	{
2500		- //ungroup();
	3182	+ boolean hasRoot = false;
	3183	+
2501	3184	for (int i=0; i<group.selection.size(); i++)
2502	3185	{
2503		- Ungroup(group.selection.get(i));
	3186	+ if (group.selection.get(i) == group)
	3187	+ {
	3188	+ hasRoot = true;
	3189	+ break;
	3190	+ }
2504	3191	}
2505	3192
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	3193	+ if (!hasRoot)
	3194	+ {
	3195	+ for (int i=0; i<group.selection.size(); i++)
	3196	+ {
	3197	+ Ungroup(group.selection.get(i));
	3198	+ }
	3199	+
	3200	+ ClearSelection(false);
	3201	+
	3202	+ refreshContents();
	3203	+ }
2509	3204	} else
2510	3205	if (source == genUVItem)
2511	3206	{
..	..	@@ -2517,7 +3212,7 @@
2517	3212	} else
2518	3213	if (source == genNormalsMESHItem)
2519	3214	{
2520		- GenNormals(true); // TODO
	3215	+ GenNormalsMESH();
2521	3216	} else
2522	3217	if (source == genNormalsORGANItem)
2523	3218	{
..	..	@@ -2582,6 +3277,22 @@
2582	3277	if (source == unmarkleavesItem)
2583	3278	{
2584	3279	MarkLeaves(false);
	3280	+ } else
	3281	+ if (source == rewindleavesItem)
	3282	+ {
	3283	+ RewindLeaves(true);
	3284	+ } else
	3285	+ if (source == unrewindleavesItem)
	3286	+ {
	3287	+ RewindLeaves(false);
	3288	+ } else
	3289	+ if (source == randomleavesItem)
	3290	+ {
	3291	+ RandomLeaves(true);
	3292	+ } else
	3293	+ if (source == unrandomleavesItem)
	3294	+ {
	3295	+ RandomLeaves(false);
2585	3296	} else
2586	3297	if (source == flipVItem)
2587	3298	{
..	..	@@ -2790,7 +3501,7 @@
2790	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2791	3502	{
2792	3503	obj = (Object3D)e.nextElement();
2793		- obj.SetBumpTexture(null);
	3504	+ obj.ResetBumpTexture();
2794	3505	}
2795	3506
2796	3507	refreshContents();
..	..	@@ -2806,6 +3517,31 @@
2806	3517
2807	3518	refreshContents();
2808	3519	} else
	3520	+ if (source == embedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(true);
	3527	+ }
	3528	+
	3529	+ refreshContents();
	3530	+ } else
	3531	+ if (source == deEmbedTexturesItem)
	3532	+ {
	3533	+ Object3D obj;
	3534	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3535	+ {
	3536	+ obj = (Object3D)e.nextElement();
	3537	+ obj.EmbedTextures(false);
	3538	+ }
	3539	+
	3540	+ CameraPane.texturepigment.clear();
	3541	+ CameraPane.texturebump.clear();
	3542	+
	3543	+ refreshContents();
	3544	+ } else
2809	3545	if (source == flashSelectionButton)
2810	3546	{
2811	3547	CameraPane.flash = true;
..	..	@@ -2817,6 +3553,10 @@
2817	3553	if (source == twoButton)
2818	3554	{
2819	3555	radio.layout = twoButton;
	3556	+
	3557	+ if (CameraPane.FULLSCREEN)
	3558	+ fullscreenLayout = radio.layout;
	3559	+
2820	3560	// bug
2821	3561	//gridPanel.setDividerLocation(1.0);
2822	3562	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3589,31 @@
2849	3589	bigThree.ClearUI();
2850	3590	bigThree.add(centralPanel);
2851	3591	bigThree.FlushUI();
	3592	+
	3593	+ cameraView.requestFocusInWindow();
	3594	+
	3595	+// refreshContents(true);
	3596	+//
	3597	+// try
	3598	+// {
	3599	+// java.awt.Robot bot = new java.awt.Robot();
	3600	+// int mask = InputEvent.BUTTON1_MASK;
	3601	+// bot.mouseMove(100, 100);
	3602	+// bot.mousePress(mask);
	3603	+// bot.mouseRelease(mask);
	3604	+// }
	3605	+// catch (Exception e)
	3606	+// {
	3607	+//
	3608	+// }
	3609	+
2852	3610	} else
2853	3611	if (source == threeButton)
2854	3612	{
2855	3613	radio.layout = threeButton;
	3614	+
	3615	+ if (CameraPane.FULLSCREEN)
	3616	+ fullscreenLayout = radio.layout;
2856	3617
2857	3618	// bigThree.remove(scenePanel);
2858	3619	// bigThree.remove(centralPanel);
..	..	@@ -2882,13 +3643,18 @@
2882	3643	// centralPanel.setVisible(true);
2883	3644	// XYZPanel.setVisible(true);
2884	3645	bigThree.ClearUI();
	3646	+ bigThree.add(scenePanel);
2885	3647	bigThree.add(centralPanel);
2886		- bigThree.add(XYZPanel);
2887	3648	bigThree.FlushUI();
	3649	+
	3650	+ cameraView.requestFocusInWindow();
2888	3651	} else
2889	3652	if (source == fourButton)
2890	3653	{
2891	3654	radio.layout = fourButton;
	3655	+
	3656	+ if (CameraPane.FULLSCREEN)
	3657	+ fullscreenLayout = radio.layout;
2892	3658
2893	3659	// bigThree.remove(scenePanel);
2894	3660	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3686,15 @@
2920	3686	bigThree.ClearUI();
2921	3687	bigThree.add(scenePanel);
2922	3688	bigThree.FlushUI();
	3689	+
	3690	+ cameraView.requestFocusInWindow();
2923	3691	} else
2924	3692	if (source == sixButton)
2925	3693	{
2926	3694	radio.layout = sixButton;
	3695	+
	3696	+ if (CameraPane.FULLSCREEN)
	3697	+ fullscreenLayout = radio.layout;
2927	3698
2928	3699	// bigThree.remove(scenePanel);
2929	3700	// bigThree.remove(centralPanel);
..	..	@@ -2953,13 +3724,18 @@
2953	3724	// centralPanel.setVisible(true);
2954	3725	// XYZPanel.setVisible(false);
2955	3726	bigThree.ClearUI();
2956		- bigThree.add(scenePanel);
2957	3727	bigThree.add(centralPanel);
	3728	+ bigThree.add(scenePanel);
2958	3729	bigThree.FlushUI();
	3730	+
	3731	+ cameraView.requestFocusInWindow();
2959	3732	} else
2960	3733	if (source == sevenButton)
2961	3734	{
2962	3735	radio.layout = sevenButton;
	3736	+
	3737	+ if (CameraPane.FULLSCREEN)
	3738	+ fullscreenLayout = radio.layout;
2963	3739
2964	3740	// bigThree.remove(scenePanel);
2965	3741	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3769,8 @@
2993	3769	bigThree.add(centralPanel);
2994	3770	bigThree.add(XYZPanel);
2995	3771	bigThree.FlushUI();
	3772	+
	3773	+ cameraView.requestFocusInWindow();
2996	3774	} else
2997	3775	if (source == rootButton)
2998	3776	{
..	..	@@ -3004,6 +3782,7 @@
3004	3782	EditObject(obj);
3005	3783	}
3006	3784
	3785	+ cameraView.requestFocusInWindow();
3007	3786	refreshContents(true);
3008	3787	} else
3009	3788	if (source == closeButton)
..	..	@@ -3013,22 +3792,37 @@
3013	3792	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3793	{
3015	3794	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3795	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3796	{
	3797	+ // Patch to avoid bug with transparency.
	3798	+ if (!ab.hadMaterial)
	3799	+ {
	3800	+ ab.object.material = null;
	3801	+ }
	3802	+
3018	3803	buttonGroup.remove(ab);
3019	3804	radioPanel.remove(ab);
3020	3805
3021		- ab.GetObject().editWindow = null;
	3806	+ //ab.GetObject().editWindow = null;
	3807	+ ab.GetObject().manipWindow = null;
3022	3808	// ab.GetObject().objectUI = null; // ?????????
3023	3809
3024	3810	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3811	break;
3026	3812	}
3027	3813	}
	3814	+
	3815	+ cameraView.requestFocusInWindow();
3028	3816	refreshContents(true);
3029	3817	} else
3030	3818	if (source == editItem \|\| source == editButton)
3031	3819	{
	3820	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3821	+ {
	3822	+ Object3D child = (Object3D)e.nextElement();
	3823	+ child.pinned = true;
	3824	+ }
	3825	+
3032	3826	EditSelection(false);
3033	3827	} else
3034	3828	if (source == uneditButton)
..	..	@@ -3037,9 +3831,10 @@
3037	3831	{
3038	3832	Object3D child = (Object3D)e.nextElement();
3039	3833	if(child.editWindow != null)
3040		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3834	+ child.pinned = false;
3041	3835	child.CloseUI();
3042	3836	listUI.remove(child);
	3837	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3043	3838
3044	3839	//child.editWindow = null; // ???????????
3045	3840	}
..	..	@@ -3054,16 +3849,18 @@
3054	3849	//copy.ClearUI();
3055	3850	for (Object3D obj : listUI)
3056	3851	{
	3852	+ obj.pinned = false;
3057	3853	obj.CloseUI();
3058	3854	}
3059	3855	listUI.clear();
	3856	+ SetPinStates(group.selection.size() > 0);
3060	3857	refreshContents(true);
3061	3858	} else
3062	3859	if (source == allParamsButton)
3063	3860	{
3064	3861	assert(copy == group);
3065	3862
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3863	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3864
3068	3865	for (Object3D obj : listUI)
3069	3866	{
..	..	@@ -3112,6 +3909,9 @@
3112	3909	}
3113	3910
3114	3911	copy = group;
	3912	+
	3913	+ SetUndoStates();
	3914	+
3115	3915	//Globals.theRenderer.object = group;
3116	3916	if(!useclient)
3117	3917	{
..	..	@@ -3128,7 +3928,9 @@
3128	3928	sideView.object = group;
3129	3929	}
3130	3930
3131		-// fix "+" issue group.editWindow = this;
	3931	+// fix "+" issue
	3932	+ //group.editWindow = this;
	3933	+ group.manipWindow = this;
3132	3934
3133	3935	/*
3134	3936	currentLayout = radio.layout;
..	..	@@ -3136,20 +3938,32 @@
3136	3938	currentLayout = sevenButton;
3137	3939	*/
3138	3940	radio.layout.doClick();
	3941	+
	3942	+ ClearUnpinned();
	3943	+
	3944	+ //Grafreed.Assert(group != null);
	3945	+ //Grafreed.Assert(group.selection != null);
	3946	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3947	+ if (group.selection == null \|\| group.selection.size() == 1)
	3948	+ EditSelection(false);
3139	3949	keepparent = group.parent;
3140	3950	// PARENT = NULL or not???
3141	3951	//group.parent = null; // ROOT
3142	3952	//group.attributes = -1;
3143	3953	ResetModel();
	3954	+
	3955	+ cameraView.requestFocusInWindow();
3144	3956	refreshContents(true);
3145	3957	} else if (event.getSource() == editCameraItem)
3146	3958	{
3147	3959	cameraView.ProtectCamera();
	3960	+ cameraView.requestFocusInWindow();
3148	3961	cameraView.repaint();
3149	3962	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3963	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3964	{
3152	3965	cameraView.RevertCamera();
	3966	+ cameraView.requestFocusInWindow();
3153	3967	cameraView.repaint();
3154	3968	return;
3155	3969	// } else if (event.getSource() == textureButton)
..	..	@@ -3164,7 +3978,6 @@
3164	3978	}
3165	3979
3166	3980	boolean useclient = false;
3167		- cRadio radio;
3168	3981
3169	3982	void ToggleRoot()
3170	3983	{
..	..	@@ -3403,7 +4216,8 @@
3403	4216
3404	4217	int size = obj.MemorySize();
3405	4218
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	4219	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4220	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	4221	}
3408	4222	}
3409	4223	catch (Exception e)
..	..	@@ -3484,6 +4298,13 @@
3484	4298	void GenNormals(boolean crease)
3485	4299	{
3486	4300	group.GenNormalsS(crease);
	4301	+
	4302	+ refreshContents();
	4303	+ }
	4304	+
	4305	+ void GenNormalsMESH()
	4306	+ {
	4307	+ group.GenNormalsMeshS();
3487	4308
3488	4309	refreshContents();
3489	4310	}
..	..	@@ -3719,7 +4540,7 @@
3719	4540
3720	4541	try
3721	4542	{
3722		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4543	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3723	4544	}
3724	4545	catch (Exception e)
3725	4546	{
..	..	@@ -4111,6 +4932,18 @@
4111	4932	refreshContents();
4112	4933	}
4113	4934
	4935	+ void RewindLeaves(boolean hide)
	4936	+ {
	4937	+ group.selection.RewindLeaves(hide);
	4938	+ refreshContents();
	4939	+ }
	4940	+
	4941	+ void RandomLeaves(boolean hide)
	4942	+ {
	4943	+ group.selection.RandomLeaves(hide);
	4944	+ refreshContents();
	4945	+ }
	4946	+
4114	4947	void SetTexRes(int tr)
4115	4948	{
4116	4949	group.selection.SetTexRes(tr);
..	..	@@ -4182,28 +5015,25 @@
4182	5015	// }
4183	5016	// }
4184	5017
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	5018	void EditSelection(boolean newWindow)
4190	5019	{
	5020	+ if (group.selection == null)
	5021	+ {
	5022	+ EditElement(group, newWindow); // ? new
	5023	+ return;
	5024	+ }
	5025	+
4191	5026	// aConstraints.gridy = 0;
4192	5027	for (int i=0; i<group.selection.size(); i++)
4193	5028	{
4194	5029	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	5030	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5031	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	5032
4198	5033	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	5034	if(elem != group \|\| !newWindow)
4200	5035	{
4201		- // if (!(elem instanceof Composite))
4202		- // newWindow = false;
4203		- listUI.add(elem);
4204		- elem.openEditWindow(this, newWindow); //, false);
4205		- System.out.println("edit : " + elem);
4206		- elem.editWindow.refreshContents(true); // ? new
	5036	+ EditElement(elem, newWindow); // ? new
4207	5037	}
4208	5038	}
4209	5039	}
..	..	@@ -4266,9 +5096,7 @@
4266	5096
4267	5097	freezemodel = false;
4268	5098	}
4269		-
4270		- boolean flashIt = true;
4271		-
	5099	+
4272	5100	public void valueChanged(TreeSelectionEvent e)
4273	5101	//public boolean handleEvent(Event event)
4274	5102	{
..	..	@@ -4278,7 +5106,8 @@
4278	5106	//new Exception().printStackTrace();
4279	5107
4280	5108	freezemodel = true;
4281		-
	5109	+ ClearUnpinned();
	5110	+
4282	5111	/**/
4283	5112	//switch (event.id)
4284	5113	{
..	..	@@ -4286,7 +5115,6 @@
4286	5115	//case 702: // Event.LIST_DESELECT
4287	5116	group.deselectAll();
4288	5117	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	5118	if (tps != null)
4291	5119	{
4292	5120	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +5123,8 @@
4295	5123
4296	5124	//if (child.parent != null)
4297	5125	//child.parent.addSelectee(child);
	5126	+ objEditor.SetMaterial(child);
4298	5127	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	5128	}
4303	5129	}
4304	5130	// else
..	..	@@ -4308,15 +5134,13 @@
4308	5134	// System.err.println("info : " + group.GetPath());
4309	5135	// }
4310	5136
4311		- objEditor.SetText(); // jan 2014
4312		-
4313	5137	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4314	5138	CameraPane.flash = true;
4315	5139
4316	5140	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4317	5141	// a camera
4318	5142	{
4319		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5143	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4320	5144	{
4321	5145	CameraPane.camerachangeframe = 0; // don't refuse it
4322	5146	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4325,6 +5149,13 @@
4325	5149	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4326	5150	}
4327	5151
	5152	+ if (tps != null && tps.length == 1)
	5153	+ {
	5154	+ EditSelection(false);
	5155	+ }
	5156	+
	5157	+ SetPinStates(tps != null && tps.length > 0);
	5158	+
4328	5159	refreshContents();
4329	5160	//return true;
4330	5161	}
..	..	@@ -4333,6 +5164,37 @@
4333	5164
4334	5165	freezemodel = false;
4335	5166	}
	5167	+
	5168	+ void SetPinStates(boolean enabled)
	5169	+ {
	5170	+ editButton.setEnabled(enabled);
	5171	+ uneditButton.setEnabled(enabled);
	5172	+ unselectButton.setEnabled(enabled);
	5173	+ flashSelectionButton.setEnabled(enabled);
	5174	+
	5175	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5176	+ }
	5177	+
	5178	+ void refreshContents(boolean cp)
	5179	+ {
	5180	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5181	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5182	+ {
	5183	+ objEditor.ClearInfo(); // .GetMaterial());
	5184	+
	5185	+ for (int i=0; i < group.selection.Size(); i++)
	5186	+ {
	5187	+ Object3D child = (Object3D) group.selection.get(i);
	5188	+
	5189	+ objEditor.AddInfo(child, this, true);
	5190	+ System.err.println("info : " + child.GetPath());
	5191	+ }
	5192	+
	5193	+ objEditor.SetText(); // jan 2014
	5194	+ }
	5195	+
	5196	+ super.refreshContents(cp);
	5197	+ }
4336	5198
4337	5199	void linkSomething(Object3D thing)
4338	5200	{
..	..	@@ -4404,6 +5266,7 @@
4404	5266	{
4405	5267	if (group.selection.isEmpty())
4406	5268	return;
	5269	+
4407	5270	Grafreed.clipboardIsTempGroup = false;
4408	5271	Composite tGroup = null;
4409	5272	if (group.selection.size() > 0) // 1)
..	..	@@ -4414,6 +5277,8 @@
4414	5277
4415	5278	if (cut)
4416	5279	{
	5280	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5281	+// Save();
4417	5282	//int indices[] = jList.getSelectedIndices();
4418	5283	//for (int i = indices.length - 1; i >= 0; i--)
4419	5284	//jList.remove(indices[i]);
..	..	@@ -4503,8 +5368,10 @@
4503	5368	}
4504	5369
4505	5370	}
	5371	+
4506	5372	if (Grafreed.clipboardIsTempGroup)
4507	5373	Grafreed.clipboard = tGroup;
	5374	+
4508	5375	if (cut)
4509	5376	{
4510	5377	ResetModel();
..	..	@@ -4514,6 +5381,10 @@
4514	5381
4515	5382	void paste(boolean expand)
4516	5383	{
	5384	+ if (Globals.REPLACEONMAKE)
	5385	+ Save();
	5386	+ boolean keep = Globals.REPLACEONMAKE;
	5387	+ Globals.REPLACEONMAKE = false;
4517	5388	// if (GrafreeD.clipboard == null)
4518	5389	// return;
4519	5390	boolean first = true;
..	..	@@ -4573,6 +5444,7 @@
4573	5444	Grafreed.clipboard.get(0).parent = keepparent;
4574	5445	}
4575	5446
	5447	+ Globals.REPLACEONMAKE = keep;
4576	5448	ResetModel();
4577	5449	refreshContents();
4578	5450	}
..	..	@@ -4708,6 +5580,10 @@
4708	5580
4709	5581	void group(Object3D csg, boolean grab)
4710	5582	{
	5583	+ if (Globals.REPLACEONMAKE)
	5584	+ Save();
	5585	+ boolean keep = Globals.REPLACEONMAKE;
	5586	+ Globals.REPLACEONMAKE = false;
4711	5587	if (//false) // why??
4712	5588	!group.selection.isEmpty())
4713	5589	{
..	..	@@ -4821,10 +5697,15 @@
4821	5697	//node.add(csg);
4822	5698	//makeSomething(node);
4823	5699	makeSomething(csg);
	5700	+ Globals.REPLACEONMAKE = keep;
4824	5701	}
4825	5702
4826	5703	void Ungroup(Object3D g)
4827	5704	{
	5705	+ if (Globals.REPLACEONMAKE)
	5706	+ Save();
	5707	+ boolean keep = Globals.REPLACEONMAKE;
	5708	+ Globals.REPLACEONMAKE = false;
4828	5709	if (g instanceof HiddenObject)
4829	5710	{
4830	5711	HiddenObject h = (HiddenObject) g;
..	..	@@ -4841,6 +5722,7 @@
4841	5722	objEditor.makeSomething(g.get(i), false);
4842	5723	}
4843	5724	}
	5725	+ Globals.REPLACEONMAKE = keep;
4844	5726	}
4845	5727
4846	5728	void ungroup()
..	..	@@ -5129,7 +6011,43 @@
5129	6011	cButton clearpanelButton;
5130	6012	cButton unselectButton;
5131	6013
	6014	+ cButton restoreCameraButton;
	6015	+
5132	6016	cButton oneStepButton;
	6017	+
	6018	+ cButton groupButton;
	6019	+ cButton ungroupButton;
	6020	+ cButton compositeButton;
	6021	+ cButton switchButton;
	6022	+ cButton loopButton;
	6023	+ cButton textureButton;
	6024	+
	6025	+ cButton skybox1Button;
	6026	+ cButton skybox2Button;
	6027	+ cButton skybox3Button;
	6028	+ cButton skybox4Button;
	6029	+ cButton skybox5Button;
	6030	+ cButton skybox6Button;
	6031	+ cButton skybox7Button;
	6032	+
	6033	+ cButton skybox11Button;
	6034	+ cButton skybox12Button;
	6035	+ cButton skybox13Button;
	6036	+ cButton skybox14Button;
	6037	+ cButton skybox15Button;
	6038	+ cButton skybox16Button;
	6039	+ cButton skybox17Button;
	6040	+
	6041	+ cButton gridButton;
	6042	+ cButton boxButton;
	6043	+ cButton sphereButton;
	6044	+ cButton coneButton;
	6045	+ cButton torusButton;
	6046	+ cButton superButton;
	6047	+ cButton kleinButton;
	6048	+ cButton particlesButton;
	6049	+ cButton overlayButton;
	6050	+ cButton lightButton;
5133	6051
5134	6052	cButton screenfitButton;
5135	6053	cButton screenfitpointButton;
..	..	@@ -5142,14 +6060,6 @@
5142	6060
5143	6061	cButton setsupportButton;
5144	6062
5145		- cButton twoButton;
5146		- cButton sixButton;
5147		- cButton threeButton;
5148		- cButton sevenButton;
5149		- cButton fourButton; // full panel
5150		- cButton oneButton; // full XYZ
5151		- //cButton currentLayout;
5152		-
5153	6063	//
5154	6064	//Composite
5155	6065	Object3D // to do !!
..	..	@@ -5159,11 +6069,11 @@
5159	6069	//JTree jTree;
5160	6070	private MenuItem lookAtItem;
5161	6071	private MenuItem lookFromItem;
5162		- private MenuItem switchItem;
	6072	+ private MenuItem switchViewItem;
5163	6073	private MenuItem cutItem;
5164	6074	private MenuItem undoItem;
5165	6075	private MenuItem redoItem;
5166		- private MenuItem duplicateItem;
	6076	+ private JMenuItem duplicateItem;
5167	6077	private MenuItem cloneItem;
5168	6078	private MenuItem cloneSupportItem;
5169	6079	private MenuItem overwriteGeoItem;
..	..	@@ -5191,7 +6101,7 @@
5191	6101	private MenuItem pasteLinkItem;
5192	6102	private MenuItem pasteCloneItem;
5193	6103	private MenuItem pasteExpandItem;
5194		- private MenuItem clearItem;
	6104	+ private MenuItem deleteItem;
5195	6105	private MenuItem clearAllItem;
5196	6106	private MenuItem genUVItem;
5197	6107	private MenuItem genNormalsMESHItem;
..	..	@@ -5226,6 +6136,10 @@
5226	6136	private MenuItem showleavesItem;
5227	6137	private MenuItem markleavesItem;
5228	6138	private MenuItem unmarkleavesItem;
	6139	+ private MenuItem rewindleavesItem;
	6140	+ private MenuItem unrewindleavesItem;
	6141	+ private MenuItem randomleavesItem;
	6142	+ private MenuItem unrandomleavesItem;
5229	6143
5230	6144	private MenuItem flipVItem;
5231	6145	private MenuItem unflipVItem;
..	..	@@ -5247,7 +6161,7 @@
5247	6161	private MenuItem frontItem;
5248	6162	private MenuItem cameraItem;
5249	6163	private MenuItem compositeItem;
5250		- private MenuItem randomItem;
	6164	+ private MenuItem switchItem;
5251	6165	private MenuItem physicsItem;
5252	6166	private MenuItem frameselectorItem;
5253	6167	private MenuItem scriptNodeItem;
..	..	@@ -5271,6 +6185,8 @@
5271	6185	private MenuItem attachBumpItem;
5272	6186	private MenuItem detachBumpItem;
5273	6187	private MenuItem pigmentBumpItem;
	6188	+ private MenuItem embedTexturesItem;
	6189	+ private MenuItem deEmbedTexturesItem;
5274	6190
5275	6191	private MenuItem particleItem;
5276	6192	private MenuItem ragdollItem;
..	..	@@ -5321,5 +6237,5 @@
5321	6237
5322	6238	Menu cameraMenu;
5323	6239	MenuItem editCameraItem;
5324		- MenuItem revertCameraItem;
	6240	+ MenuItem restoreCameraItem;
5325	6241	}