~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.versions == null)
	360	+ {
	361	+ copy.versions = new byte[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.versions == null)
	387	+ {
	388	+ copy.versions = new byte[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,6 +465,8 @@
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"));
..	..	@@ -160,7 +477,7 @@
160	477	// redoItem = menu.add(new MenuItem("Redo"));
161	478	// redoItem.addActionListener(this);
162	479	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	481	duplicateItem.addActionListener(this);
165	482	cloneItem = menu.add(new MenuItem("Clone"));
166	483	cloneItem.addActionListener(this);
..	..	@@ -176,7 +493,6 @@
176	493	copyItem.addActionListener(this);
177	494	pasteItem = menu.add(new MenuItem("Paste"));
178	495	pasteItem.addActionListener(this);
179		- menu.add("-");
180	496
181	497	menu.add("-");
182	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +504,8 @@
188	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	505	// pasteExpandItem.addActionListener(this);
190	506	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
193	509
194	510	if (Globals.ADVANCED)
195	511	{
..	..	@@ -203,23 +519,23 @@
203	519	//zBufferItem.addActionListener(this);
204	520	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	521	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
208	524
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- 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);
213	537
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"));
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	539	toggleHandleItem.addItemListener(this);
224	540	toggleHandleItem.setState(CameraPane.HANDLES);
225	541
..	..	@@ -246,7 +562,7 @@
246	562
247	563	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	564	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
250	566
251	567	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	568	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +590,7 @@
274	590	{
275	591	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	592	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	594	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	595	oe.cameraMenu.add("-");
280	596	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +598,7 @@
282	598	editLeafItem.addActionListener(this);
283	599	lookAtItem.addActionListener(this);
284	600	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	601	+ //switchViewItem.addActionListener(this);
286	602	}
287	603
288	604	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +643,29 @@
327	643	}
328	644
329	645	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
332	648	backItem = menu.add(new MenuItem("Back"));
333	649	backItem.addActionListener(this);
334	650	frontItem = menu.add(new MenuItem("Front"));
335	651	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
338	657	hideItem = menu.add(new MenuItem("Hidden Group"));
339	658	hideItem.addActionListener(this);
	659	+ }
340	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	661	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- 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	+ {
345	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	670	switchGeoItem.addActionListener(this);
347	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +673,6 @@
349	673	morphItem = menu.add(new MenuItem("Morph Group"));
350	674	morphItem.addActionListener(this);
351	675
352		- if (Globals.ADVANCED)
353		- {
354	676	menu.add("-");
355	677	physicsItem = menu.add(new MenuItem("Physics"));
356	678	physicsItem.addActionListener(this);
..	..	@@ -358,30 +680,29 @@
358	680	frameselectorItem.addActionListener(this);
359	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	682	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	683	}
364	684
365	685	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
368	688	billboardItem = menu.add(new MenuItem("Billboard"));
369	689	billboardItem.addActionListener(this);
370	690	csgItem = menu.add(new MenuItem("CSG"));
371	691	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	693	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	695	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
378	701	if (Globals.ADVANCED)
379	702	{
380	703	menu.add("-");
381	704	linkerItem = menu.add(new MenuItem("Linker"));
382	705	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	706	templateItem = menu.add(new MenuItem("Template"));
386	707	templateItem.addActionListener(this);
387	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +731,7 @@
410	731	genNormalsMESHItem.addActionListener(this);
411	732	if (Globals.ADVANCED)
412	733	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	735	genNormalsMINEItem.addActionListener(this);
415	736	}
416	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -470,6 +791,14 @@
470	791	markleavesItem.addActionListener(this);
471	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	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);
473	802	menu.add("-");
474	803	flipVItem = menu.add(new MenuItem("Flip V"));
475	804	flipVItem.addActionListener(this);
..	..	@@ -495,10 +824,15 @@
495	824	attachBumpItem.addActionListener(this);
496	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
498	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	829	detachPigmentItem.addActionListener(this);
500	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	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);
502	836	menu.add("-");
503	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	838	sortbysizeItem.addActionListener(this);
..	..	@@ -525,8 +859,21 @@
525	859	buildToolsMenu(menu);
526	860	}
527	861
	862	+
528	863	void SetupUI2(ObjEditor oe)
529	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	+
530	877	//new Exception().printStackTrace();
531	878
532	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +902,79 @@
555	902	oe.radioPanel.add(dummyButton);
556	903	oe.buttonGroup.add(dummyButton);
557	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
558	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	910
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
563	914
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	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	+ }
567	921
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
	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(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("New version");
570	936	saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
571	942
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	962	liveCB.setToolTipText("Enable animation");
574	963	liveCB.addItemListener(this);
575	964
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	966	oneStepButton.setToolTipText("Animate one step forward");
578	967	oneStepButton.addActionListener(this);
579	968
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	970	fastCB.setToolTipText("Fast mode");
582	971	fastCB.addItemListener(this);
583	972
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	973	+ //oe.toolboxPanel.Return();
	974	+
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
591	978
592	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	980	// screenfitpointButton.addActionListener(this);
..	..	@@ -597,67 +984,156 @@
597	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	985	snapobjectButton.addActionListener(this);
599	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
600	991	}
601	992
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	994
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
610	997	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
	998	+ this.fullscreenLayout = twoButton;
	999	+
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
619	1002	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
623	1009	//
624	1010
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
627	1013	rootButton.addActionListener(this);
628	1014
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1016	closeButton.setToolTipText("Close tab");
631	1017	closeButton.addActionListener(this);
632	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1019	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
636	1022
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1023	+ // INSERT
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ gridButton.setToolTipText("Create grid");
	1026	+ gridButton.addActionListener(this);
	1027	+
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ boxButton.setToolTipText("Create box");
	1030	+ boxButton.addActionListener(this);
	1031	+
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ sphereButton.setToolTipText("Create sphere");
	1034	+ sphereButton.addActionListener(this);
	1035	+
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ coneButton.setToolTipText("Create cone");
	1038	+ coneButton.addActionListener(this);
	1039	+
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ torusButton.setToolTipText("Create torus");
	1042	+ torusButton.addActionListener(this);
	1043	+
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ superButton.setToolTipText("Create superellipsoid");
	1046	+ superButton.addActionListener(this);
	1047	+
	1048	+ if (Globals.ADVANCED)
	1049	+ {
	1050	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ kleinButton.setToolTipText("Create Klein bottle");
	1052	+ kleinButton.addActionListener(this);
	1053	+ }
	1054	+
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ particlesButton.setToolTipText("Create particle system");
	1057	+ particlesButton.addActionListener(this);
	1058	+
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ overlayButton.setToolTipText("Create overlay");
	1085	+ overlayButton.addActionListener(this);
	1086	+
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ lightButton.setToolTipText("Create light");
	1089	+ lightButton.addActionListener(this);
	1090	+
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
	1107	+ // EDIT panel
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
639	1110	editButton.addActionListener(this);
640	1111
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
643	1114	uneditButton.addActionListener(this);
644	1115
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
647	1118	allParamsButton.addActionListener(this);
648	1119
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	1121	clearPanelButton.setToolTipText("Clear edit panel");
651	1122	clearPanelButton.addActionListener(this);
652	1123
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	1125	unselectButton.setToolTipText("Unselect");
655	1126	unselectButton.addActionListener(this);
656	1127
657		- commandsPanel.preferredHeight = 1;
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
658	1131
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
661	1137
662	1138	// oe.aConstraints.gridx += 1;
663	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -674,32 +1150,20 @@
674	1150
675	1151	JScrollPane jSP;
676	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1154	ResetModel();
679	1155
680	1156	oe.treePanel.add(jSPPanel);
681	1157	oe.treePanel.Return();
682	1158
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	1159	oe.treePanel.add(copyOptionsPanel);
699	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
700	1164
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
703	1167
704	1168	//jList.addListSelectionListener(this);
705	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1171,7 @@
707	1171	//jTree.setEditable(true);
708	1172	oe.jTree.setDragEnabled(true);
709	1173	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1175
712	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1177
..	..	@@ -719,29 +1183,49 @@
719	1183	dgr.addDragGestureListener(this);
720	1184	}catch(Exception e) {}
721	1185	*/
722		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
723	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1188	}
725	1189
726	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1191	{
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
	1195	+
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
728	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1207	boxCB.setToolTipText("Display bounding boxes");
730	1208	boxCB.addItemListener(this);
731	1209
732	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1212	zoomBoxCB.addItemListener(this);
735	1213
736	1214	if (true) // Globals.ADVANCED)
737	1215	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
741	1223
742	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1225	// localCB.addItemListener(this);
744	1226
	1227	+ panel.Return();
	1228	+
745	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1230	crowdCB.setToolTipText("Used for crowds");
747	1231	crowdCB.addItemListener(this);
..	..	@@ -750,14 +1234,19 @@
750	1234	smoothCB.setToolTipText("Snapping delay");
751	1235	smoothCB.addItemListener(this);
752	1236
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
756	1243
757	1244	// constraints.gridy += 1;
758	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1246	// speakerMocapCB.addItemListener(this);
760	1247
	1248	+ panel.Return();
	1249	+
761	1250	if (false)
762	1251	{
763	1252	// handled in scripts
..	..	@@ -772,34 +1261,74 @@
772	1261	//constraints.gridy += 1;
773	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
775	1265	}
776	1266
777	1267	//constraints.gridx += 1;
778	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1269	// debugCB.addItemListener(this);
780	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
781	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
782	1277	oeilCB.addItemListener(this);
783	1278
	1279	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1280	+ shadowCB.setToolTipText("When live compute shadows");
	1281	+ shadowCB.addItemListener(this);
	1282	+
	1283	+ panel.Return();
	1284	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1285	+ toggleTextureCB.setToolTipText("Load textures");
	1286	+ toggleTextureCB.addItemListener(this);
	1287	+
	1288	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1290	+ toggleSwitchCB.addItemListener(this);
	1291	+
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
	1295	+
	1296	+ panel.Return();
	1297	+ if (Globals.ADVANCED)
	1298	+ {
784	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1300	lookAtCB.setToolTipText("Look-at target");
786	1301	lookAtCB.addItemListener(this);
	1302	+ }
787	1303
788	1304	}
789	1305
790	1306	cGridBag fill = new cGridBag();
791		-
792	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
793	1312
794	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
795	1316
796	1317	}
797	1318
798	1319	void EditObject(Object3D obj)
799	1320	{
800	1321	cRadio radioButton = new cRadio(obj.name);
	1322	+
	1323	+ // June 2019. Patch to avoid bug with transparency.
	1324	+ radioButton.hadMaterial = obj.material != null;
	1325	+ if (!radioButton.hadMaterial)
	1326	+ {
	1327	+ obj.material = new cMaterial();
	1328	+ }
	1329	+
801	1330	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = sixButton; // sevenButton;
803	1332	radioButton.SetCamera(cameraView.renderCamera, false);
804	1333	radioButton.addActionListener(this);
805	1334	radioPanel.add(radioButton);
..	..	@@ -809,6 +1338,8 @@
809	1338
810	1339	void SetupViews(ObjEditor oe)
811	1340	{
	1341	+ theFrame = this;
	1342	+
812	1343	oe.SetupViews();
813	1344
814	1345	System.out.println("SetupViews");
..	..	@@ -817,23 +1348,30 @@
817	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1349	}
819	1350
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1351	+ cToggleButton liveCB;
	1352	+ cCheckBox supportCB;
	1353	+ cCheckBox localCB;
	1354	+ cCheckBox crowdCB;
	1355	+ cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
	1358	+ cToggleButton fastCB;
	1359	+ cCheckBox slowCB;
	1360	+ cCheckBox boxCB;
	1361	+ cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
	1363	+ //cToggleButton trackCB;
	1364	+ cCheckBox trackCB;
	1365	+ cCheckBox smoothfocusCB;
831	1366	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
837	1375
838	1376	// static int COLOR = 1;
839	1377	// static int MATERIAL = 2;
..	..	@@ -841,9 +1379,9 @@
841	1379
842	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1381
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
847	1385
848	1386	public void itemStateChanged(ItemEvent e)
849	1387	{
..	..	@@ -871,6 +1409,7 @@
871	1409	} else if(e.getSource() == liveCB)
872	1410	{
873	1411	cameraView.ToggleLive();
	1412	+ refreshContents(false);
874	1413	}
875	1414	else if(e.getSource() == supportCB)
876	1415	{
..	..	@@ -886,6 +1425,12 @@
886	1425	{
887	1426	cameraView.ToggleInertia();
888	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
889	1434	}
890	1435	else if(e.getSource() == localCB)
891	1436	{
..	..	@@ -935,6 +1480,18 @@
935	1480	{
936	1481	cameraView.ToggleOeil();
937	1482	}
	1483	+ else if(e.getSource() == shadowCB)
	1484	+ {
	1485	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1486	+ }
	1487	+ else if(e.getSource() == freezeCB)
	1488	+ {
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
	1494	+ }
938	1495	else if(e.getSource() == lookAtCB)
939	1496	{
940	1497	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1508,8 @@
951	1508
952	1509	/**/
953	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1514	// We can't move the root node or an empty selection
957	1515	return;
..	..	@@ -1014,8 +1572,6 @@
1014	1572	}
1015	1573	}
1016	1574
1017		- String string = (String) object;
1018		-
1019	1575	System.out.println("Transfer = " + object + "; drop : " + target);
1020	1576	// if( object instanceof java.io.File[])
1021	1577	// {
..	..	@@ -1023,6 +1579,8 @@
1023	1579	// objEditor.DropFile((java.io.File[]) object, true);
1024	1580	// return;
1025	1581	// }
	1582	+
	1583	+ String string = object.toString();
1026	1584
1027	1585	// File path for Mac and Windows
1028	1586	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1068,23 +1626,33 @@
1068	1626
1069	1627	assert target == objEditor.jTree;
1070	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
1071	1630	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1632	} catch (Exception e) {
1074	1633	System.out.println("destinationPath : " + destinationPath);
1075	1634	return;
1076	1635	}
1077	1636
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
1079	1638	{
	1639	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1640	+
	1641	+ // Cannot move into itself
	1642	+ if (child == destinationLeaf)
	1643	+ return;
	1644	+ }
	1645	+
	1646	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1647	+// {
1080	1648	loadClipboard(true);
1081	1649	objEditor.jTree.setSelectionPath(destinationPath);
1082	1650	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
1088	1656	}
1089	1657	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1189,22 +1757,30 @@
1189	1757	{
1190	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1759	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1760	+// gridItem = menu.add(new MenuItem("Grid"));
	1761	+// gridItem.addActionListener(this);
	1762	+// rectoidItem = menu.add(new MenuItem("Box"));
	1763	+// rectoidItem.addActionListener(this);
	1764	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1765	+// ellipsoidItem.addActionListener(this);
	1766	+// coneItem = menu.add(new MenuItem("Cone"));
	1767	+// coneItem.addActionListener(this);
	1768	+// torusItem = menu.add(new MenuItem("Torus"));
	1769	+// torusItem.addActionListener(this);
	1770	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1771	+// superItem.addActionListener(this);
	1772	+
	1773	+ cameraItem = menu.add(new MenuItem("Camera"));
	1774	+ cameraItem.addActionListener(this);
	1775	+
	1776	+ if (!Globals.ADVANCED)
	1777	+ {
1204	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1779	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
1208	1784	if (Globals.ADVANCED)
1209	1785	{
1210	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1806,15 @@
1230	1806	}
1231	1807	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1808	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1237	1813	menu.add("-");
1238	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1815	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1242	1818	doubleItem = menu.add(new MenuItem("Fork"));
1243	1819	doubleItem.addActionListener(this);
1244	1820	if (Globals.ADVANCED)
..	..	@@ -1254,6 +1830,9 @@
1254	1830	animationItem.addItemListener(this);
1255	1831	animationItem.setState(Globals.ANIMATION);
1256	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1257	1836	menu.add("-");
1258	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1259	1838	parseverticesItem.addActionListener(this);
..	..	@@ -1266,6 +1845,8 @@
1266	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1267	1846	reduce34MorphItem.addActionListener(this);
1268	1847	menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1269	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1270	1851	computeAOItem.addActionListener(this);
1271	1852
..	..	@@ -1274,11 +1855,9 @@
1274	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1275	1856	mirrorItem.addActionListener(this);
1276	1857	menu.add("-");
1277		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1278		- memoryItem.addActionListener(this);
1279	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	1859	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	1860	+ menu.add(dumpItem = new MenuItem("Print"));
1282	1861	dumpItem.addActionListener(this);
1283	1862	// menu.add(pathItem = new MenuItem("From-to path"));
1284	1863	// pathItem.addActionListener(this);
..	..	@@ -1419,9 +1998,34 @@
1419	1998	shadow.material = new cMaterial(obj.material);
1420	1999	shadow.material.diffuse = 0.0001f;
1421	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1422	2002
1423	2003	makeSomething(shadow);
1424	2004	}
	2005	+
	2006	+ private void ClearUnpinned()
	2007	+ {
	2008	+ //for (Object3D obj : listUI)
	2009	+ for (int i=listUI.size(); --i>=0;)
	2010	+ {
	2011	+ Object3D obj = listUI.elementAt(i);
	2012	+ if (!obj.pinned)
	2013	+ {
	2014	+ obj.CloseUI();
	2015	+ listUI.remove(i);
	2016	+ }
	2017	+ }
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1425	2029
1426	2030	/**
1427	2031	* applyExample
..	..	@@ -1666,7 +2270,7 @@
1666	2270	{
1667	2271	ScreenFit();
1668	2272	} else
1669		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1670	2274	{
1671	2275	cVector v1 = new cVector();
1672	2276	cVector v2 = new cVector();
..	..	@@ -1675,11 +2279,11 @@
1675	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	2280	objEditor.cameraView.repaint();
1677	2281	} else
1678		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1679	2283	{
1680	2284	makeSomething(new Box());
1681	2285	} else
1682		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1683	2287	{
1684	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +2362,27 @@
1758	2362
1759	2363	makeSomething(obj);
1760	2364	} else
1761		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1762	2366	{
1763	2367	makeSomething(new Grid());
1764	2368	} else
1765		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	2370	{
1767	2371	makeSomething(new Sphere());
1768	2372	} else
1769		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1770	2374	{
1771	2375	makeSomething(new Cone());
1772	2376	} else
1773		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1774	2378	{
1775	2379	makeSomething(new Torus());
1776	2380	} else
1777		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1778	2382	{
1779	2383	makeSomething(new Superellipsoid());
1780	2384	} else
1781		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1782	2386	{
1783	2387	makeSomething(new Klein());
1784	2388	} else
..	..	@@ -1798,7 +2402,7 @@
1798	2402	{
1799	2403	makeSomething(new BezierSurface());
1800	2404	} else
1801		- if (source == overlayItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1802	2406	{
1803	2407	/*
1804	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,10 +2450,27 @@
1846	2450	s.setup();
1847	2451	makeSomething(s);
1848	2452	} else
1849		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1850	2454	{
1851	2455	makeSomething(new Light());
1852	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
1853	2474	if (source == csgItem)
1854	2475	{
1855	2476	group(new CSG());
..	..	@@ -1896,30 +2517,30 @@
1896	2517
1897	2518	group(g);
1898	2519	} else
1899		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1900	2521	{
1901	2522	Composite csg = new GroupLeaf();
1902	2523	csg.count = 5;
1903	2524	group(csg);
1904		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1905	2526	csg.addChild(child);
1906	2527	child.addChild(csg);
1907	2528	} else
1908	2529	if (source == doubleItem)
1909	2530	{
1910		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1911	2532	csg.count = 5;
1912	2533	group(csg);
1913		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1914	2535	csg.addChild(child);
1915	2536	child.addChild(csg);
1916		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1917	2538	csg.addChild(child);
1918	2539	child.addChild(csg);
1919	2540	} else
1920	2541	if (source == tripleItem)
1921	2542	{
1922		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1923	2544	csg.count = 4;
1924	2545	group(csg);
1925	2546	Composite child = new cGroup();
..	..	@@ -1935,7 +2556,7 @@
1935	2556	if (source == computeAOItem)
1936	2557	{
1937	2558	Globals.drawMode = CameraPane.OCCLUSION;
1938		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1939	2560	} else
1940	2561	if (source == recompileItem)
1941	2562	{
..	..	@@ -1969,17 +2590,45 @@
1969	2590	{
1970	2591	DumpObject();
1971	2592	} else
	2593	+ if (source == minButton)
	2594	+ {
	2595	+ Minimize();
	2596	+ } else
	2597	+ if (source == maxButton)
	2598	+ {
	2599	+ Maximize();
	2600	+ } else
	2601	+ if (source == fullButton)
	2602	+ {
	2603	+ ToggleFullScreen();
	2604	+ } else
1972	2605	if (source == undoButton)
1973	2606	{
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
1974	2610	Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ } else
	2617	+ if (source == replaceButton)
	2618	+ {
	2619	+ // Overwrite current version
	2620	+ Replace();
1975	2621	} else
1976	2622	if (source == redoButton)
1977	2623	{
	2624	+ // Go to next version
1978	2625	Redo();
1979	2626	} else
1980	2627	if (source == saveButton)
1981	2628	{
1982		- Save();
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
1983	2632	} else
1984	2633	if (source == oneStepButton)
1985	2634	{
..	..	@@ -1988,17 +2637,14 @@
1988	2637	} else
1989	2638	if (source == screenfitButton)
1990	2639	{
1991		- //Reload(lastConverter, lastFilename, true);
1992	2640	ScreenFit();
1993	2641	} else
1994	2642	if (source == screenfitpointButton)
1995	2643	{
1996		- //Reload(lastConverter, lastFilename, true);
1997	2644	ScreenFitPoint();
1998	2645	} else
1999	2646	if (source == snapobjectButton)
2000	2647	{
2001		- //Reload(lastConverter, lastFilename, true);
2002	2648	SnapObject();
2003	2649	} else
2004	2650	// if (event.getSource() == recompileButton)
..	..	@@ -2362,7 +3008,7 @@
2362	3008	{
2363	3009	StepAll();
2364	3010	} else
2365		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2366	3012	{
2367	3013	//int indices[] = jList.getSelectedIndices();
2368	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2374,9 +3020,9 @@
2374	3020	{
2375	3021	ClearSelection(true);
2376	3022	} else
2377		- if (source == grabItem)
	3023	+ if (source == grabItem \|\| source == groupButton)
2378	3024	{
2379		- group(new cGroup(), true);
	3025	+ group(new cGroup(), false); // true);
2380	3026	} else
2381	3027	if (source == hideItem)
2382	3028	{
..	..	@@ -2394,11 +3040,11 @@
2394	3040	{
2395	3041	makeSomething(new Camera());
2396	3042	} else
2397		- if (source == compositeItem)
	3043	+ if (source == compositeItem \|\| source == compositeButton)
2398	3044	{
2399	3045	group(new Composite());
2400	3046	} else
2401		- if (source == randomItem)
	3047	+ if (source == switchItem \|\| source == switchButton)
2402	3048	{
2403	3049	RandomNode random = new RandomNode();
2404	3050	group(random);
..	..	@@ -2500,7 +3146,7 @@
2500	3146	{
2501	3147	group(new cLinker());
2502	3148	} else
2503		- if (source == textureItem)
	3149	+ if (source == textureItem \|\| source == textureButton)
2504	3150	{
2505	3151	group(new TextureNode());
2506	3152	} else
..	..	@@ -2520,17 +3166,30 @@
2520	3166	{
2521	3167	CastShadow(2);
2522	3168	} else
2523		- if (source == ungroupItem)
	3169	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	3170	{
2525		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2526	3173	for (int i=0; i<group.selection.size(); i++)
2527	3174	{
2528		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2529	3180	}
2530	3181
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	3182	+ if (!hasRoot)
	3183	+ {
	3184	+ for (int i=0; i<group.selection.size(); i++)
	3185	+ {
	3186	+ Ungroup(group.selection.get(i));
	3187	+ }
	3188	+
	3189	+ ClearSelection(false);
	3190	+
	3191	+ refreshContents();
	3192	+ }
2534	3193	} else
2535	3194	if (source == genUVItem)
2536	3195	{
..	..	@@ -2542,7 +3201,7 @@
2542	3201	} else
2543	3202	if (source == genNormalsMESHItem)
2544	3203	{
2545		- GenNormals(true); // TODO
	3204	+ GenNormalsMESH();
2546	3205	} else
2547	3206	if (source == genNormalsORGANItem)
2548	3207	{
..	..	@@ -2607,6 +3266,22 @@
2607	3266	if (source == unmarkleavesItem)
2608	3267	{
2609	3268	MarkLeaves(false);
	3269	+ } else
	3270	+ if (source == rewindleavesItem)
	3271	+ {
	3272	+ RewindLeaves(true);
	3273	+ } else
	3274	+ if (source == unrewindleavesItem)
	3275	+ {
	3276	+ RewindLeaves(false);
	3277	+ } else
	3278	+ if (source == randomleavesItem)
	3279	+ {
	3280	+ RandomLeaves(true);
	3281	+ } else
	3282	+ if (source == unrandomleavesItem)
	3283	+ {
	3284	+ RandomLeaves(false);
2610	3285	} else
2611	3286	if (source == flipVItem)
2612	3287	{
..	..	@@ -2815,7 +3490,7 @@
2815	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2816	3491	{
2817	3492	obj = (Object3D)e.nextElement();
2818		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
2819	3494	}
2820	3495
2821	3496	refreshContents();
..	..	@@ -2831,6 +3506,31 @@
2831	3506
2832	3507	refreshContents();
2833	3508	} else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
	3532	+ refreshContents();
	3533	+ } else
2834	3534	if (source == flashSelectionButton)
2835	3535	{
2836	3536	CameraPane.flash = true;
..	..	@@ -2842,6 +3542,10 @@
2842	3542	if (source == twoButton)
2843	3543	{
2844	3544	radio.layout = twoButton;
	3545	+
	3546	+ if (CameraPane.FULLSCREEN)
	3547	+ fullscreenLayout = radio.layout;
	3548	+
2845	3549	// bug
2846	3550	//gridPanel.setDividerLocation(1.0);
2847	3551	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2874,10 +3578,31 @@
2874	3578	bigThree.ClearUI();
2875	3579	bigThree.add(centralPanel);
2876	3580	bigThree.FlushUI();
	3581	+
	3582	+ cameraView.requestFocusInWindow();
	3583	+
	3584	+// refreshContents(true);
	3585	+//
	3586	+// try
	3587	+// {
	3588	+// java.awt.Robot bot = new java.awt.Robot();
	3589	+// int mask = InputEvent.BUTTON1_MASK;
	3590	+// bot.mouseMove(100, 100);
	3591	+// bot.mousePress(mask);
	3592	+// bot.mouseRelease(mask);
	3593	+// }
	3594	+// catch (Exception e)
	3595	+// {
	3596	+//
	3597	+// }
	3598	+
2877	3599	} else
2878	3600	if (source == threeButton)
2879	3601	{
2880	3602	radio.layout = threeButton;
	3603	+
	3604	+ if (CameraPane.FULLSCREEN)
	3605	+ fullscreenLayout = radio.layout;
2881	3606
2882	3607	// bigThree.remove(scenePanel);
2883	3608	// bigThree.remove(centralPanel);
..	..	@@ -2907,13 +3632,18 @@
2907	3632	// centralPanel.setVisible(true);
2908	3633	// XYZPanel.setVisible(true);
2909	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
2910	3636	bigThree.add(centralPanel);
2911		- bigThree.add(XYZPanel);
2912	3637	bigThree.FlushUI();
	3638	+
	3639	+ cameraView.requestFocusInWindow();
2913	3640	} else
2914	3641	if (source == fourButton)
2915	3642	{
2916	3643	radio.layout = fourButton;
	3644	+
	3645	+ if (CameraPane.FULLSCREEN)
	3646	+ fullscreenLayout = radio.layout;
2917	3647
2918	3648	// bigThree.remove(scenePanel);
2919	3649	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3675,15 @@
2945	3675	bigThree.ClearUI();
2946	3676	bigThree.add(scenePanel);
2947	3677	bigThree.FlushUI();
	3678	+
	3679	+ cameraView.requestFocusInWindow();
2948	3680	} else
2949	3681	if (source == sixButton)
2950	3682	{
2951	3683	radio.layout = sixButton;
	3684	+
	3685	+ if (CameraPane.FULLSCREEN)
	3686	+ fullscreenLayout = radio.layout;
2952	3687
2953	3688	// bigThree.remove(scenePanel);
2954	3689	// bigThree.remove(centralPanel);
..	..	@@ -2978,13 +3713,18 @@
2978	3713	// centralPanel.setVisible(true);
2979	3714	// XYZPanel.setVisible(false);
2980	3715	bigThree.ClearUI();
2981		- bigThree.add(scenePanel);
2982	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
2983	3718	bigThree.FlushUI();
	3719	+
	3720	+ cameraView.requestFocusInWindow();
2984	3721	} else
2985	3722	if (source == sevenButton)
2986	3723	{
2987	3724	radio.layout = sevenButton;
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
2988	3728
2989	3729	// bigThree.remove(scenePanel);
2990	3730	// bigThree.remove(centralPanel);
..	..	@@ -3018,6 +3758,8 @@
3018	3758	bigThree.add(centralPanel);
3019	3759	bigThree.add(XYZPanel);
3020	3760	bigThree.FlushUI();
	3761	+
	3762	+ cameraView.requestFocusInWindow();
3021	3763	} else
3022	3764	if (source == rootButton)
3023	3765	{
..	..	@@ -3029,6 +3771,7 @@
3029	3771	EditObject(obj);
3030	3772	}
3031	3773
	3774	+ cameraView.requestFocusInWindow();
3032	3775	refreshContents(true);
3033	3776	} else
3034	3777	if (source == closeButton)
..	..	@@ -3038,22 +3781,37 @@
3038	3781	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3782	{
3040	3783	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3784	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3785	{
	3786	+ // Patch to avoid bug with transparency.
	3787	+ if (!ab.hadMaterial)
	3788	+ {
	3789	+ ab.object.material = null;
	3790	+ }
	3791	+
3043	3792	buttonGroup.remove(ab);
3044	3793	radioPanel.remove(ab);
3045	3794
3046		- ab.GetObject().editWindow = null;
	3795	+ //ab.GetObject().editWindow = null;
	3796	+ ab.GetObject().manipWindow = null;
3047	3797	// ab.GetObject().objectUI = null; // ?????????
3048	3798
3049	3799	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3800	break;
3051	3801	}
3052	3802	}
	3803	+
	3804	+ cameraView.requestFocusInWindow();
3053	3805	refreshContents(true);
3054	3806	} else
3055	3807	if (source == editItem \|\| source == editButton)
3056	3808	{
	3809	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3810	+ {
	3811	+ Object3D child = (Object3D)e.nextElement();
	3812	+ child.pinned = true;
	3813	+ }
	3814	+
3057	3815	EditSelection(false);
3058	3816	} else
3059	3817	if (source == uneditButton)
..	..	@@ -3063,6 +3821,7 @@
3063	3821	Object3D child = (Object3D)e.nextElement();
3064	3822	if(child.editWindow != null)
3065	3823	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3824	+ child.pinned = false;
3066	3825	child.CloseUI();
3067	3826	listUI.remove(child);
3068	3827
..	..	@@ -3079,6 +3838,7 @@
3079	3838	//copy.ClearUI();
3080	3839	for (Object3D obj : listUI)
3081	3840	{
	3841	+ obj.pinned = false;
3082	3842	obj.CloseUI();
3083	3843	}
3084	3844	listUI.clear();
..	..	@@ -3088,7 +3848,7 @@
3088	3848	{
3089	3849	assert(copy == group);
3090	3850
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3851	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	3852
3093	3853	for (Object3D obj : listUI)
3094	3854	{
..	..	@@ -3137,6 +3897,9 @@
3137	3897	}
3138	3898
3139	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
3140	3903	//Globals.theRenderer.object = group;
3141	3904	if(!useclient)
3142	3905	{
..	..	@@ -3154,7 +3917,8 @@
3154	3917	}
3155	3918
3156	3919	// fix "+" issue
3157		- group.editWindow = this;
	3920	+ //group.editWindow = this;
	3921	+ group.manipWindow = this;
3158	3922
3159	3923	/*
3160	3924	currentLayout = radio.layout;
..	..	@@ -3162,18 +3926,27 @@
3162	3926	currentLayout = sevenButton;
3163	3927	*/
3164	3928	radio.layout.doClick();
	3929	+
	3930	+ ClearUnpinned();
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
	3935	+ EditSelection(false);
3165	3936	keepparent = group.parent;
3166	3937	// PARENT = NULL or not???
3167	3938	//group.parent = null; // ROOT
3168	3939	//group.attributes = -1;
3169	3940	ResetModel();
	3941	+
	3942	+ cameraView.requestFocusInWindow();
3170	3943	refreshContents(true);
3171	3944	} else if (event.getSource() == editCameraItem)
3172	3945	{
3173	3946	cameraView.ProtectCamera();
3174	3947	cameraView.repaint();
3175	3948	return;
3176		- } else if (event.getSource() == revertCameraItem)
	3949	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	3950	{
3178	3951	cameraView.RevertCamera();
3179	3952	cameraView.repaint();
..	..	@@ -3190,7 +3963,6 @@
3190	3963	}
3191	3964
3192	3965	boolean useclient = false;
3193		- cRadio radio;
3194	3966
3195	3967	void ToggleRoot()
3196	3968	{
..	..	@@ -3429,7 +4201,8 @@
3429	4201
3430	4202	int size = obj.MemorySize();
3431	4203
3432		- System.err.println((size/1024) + " KB is the size of " + obj);
	4204	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4205	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3433	4206	}
3434	4207	}
3435	4208	catch (Exception e)
..	..	@@ -3510,6 +4283,13 @@
3510	4283	void GenNormals(boolean crease)
3511	4284	{
3512	4285	group.GenNormalsS(crease);
	4286	+
	4287	+ refreshContents();
	4288	+ }
	4289	+
	4290	+ void GenNormalsMESH()
	4291	+ {
	4292	+ group.GenNormalsMeshS();
3513	4293
3514	4294	refreshContents();
3515	4295	}
..	..	@@ -3745,7 +4525,7 @@
3745	4525
3746	4526	try
3747	4527	{
3748		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4528	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3749	4529	}
3750	4530	catch (Exception e)
3751	4531	{
..	..	@@ -4137,6 +4917,18 @@
4137	4917	refreshContents();
4138	4918	}
4139	4919
	4920	+ void RewindLeaves(boolean hide)
	4921	+ {
	4922	+ group.selection.RewindLeaves(hide);
	4923	+ refreshContents();
	4924	+ }
	4925	+
	4926	+ void RandomLeaves(boolean hide)
	4927	+ {
	4928	+ group.selection.RandomLeaves(hide);
	4929	+ refreshContents();
	4930	+ }
	4931	+
4140	4932	void SetTexRes(int tr)
4141	4933	{
4142	4934	group.selection.SetTexRes(tr);
..	..	@@ -4208,28 +5000,25 @@
4208	5000	// }
4209	5001	// }
4210	5002
4211		- static boolean allparams = true;
4212		-
4213		- static Vector<Object3D> listUI = new Vector<Object3D>();
4214		-
4215	5003	void EditSelection(boolean newWindow)
4216	5004	{
	5005	+ if (group.selection == null)
	5006	+ {
	5007	+ EditElement(group, newWindow); // ? new
	5008	+ return;
	5009	+ }
	5010	+
4217	5011	// aConstraints.gridy = 0;
4218	5012	for (int i=0; i<group.selection.size(); i++)
4219	5013	{
4220	5014	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4221	5015	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4222		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5016	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4223	5017
4224	5018	Object3D elem = (Object3D)group.selection.elementAt(i);
4225	5019	if(elem != group \|\| !newWindow)
4226	5020	{
4227		- // if (!(elem instanceof Composite))
4228		- // newWindow = false;
4229		- listUI.add(elem);
4230		- elem.openEditWindow(this, newWindow); //, false);
4231		- System.out.println("edit : " + elem);
4232		- elem.editWindow.refreshContents(true); // ? new
	5021	+ EditElement(elem, newWindow); // ? new
4233	5022	}
4234	5023	}
4235	5024	}
..	..	@@ -4304,7 +5093,8 @@
4304	5093	//new Exception().printStackTrace();
4305	5094
4306	5095	freezemodel = true;
4307		-
	5096	+ ClearUnpinned();
	5097	+
4308	5098	/**/
4309	5099	//switch (event.id)
4310	5100	{
..	..	@@ -4312,7 +5102,6 @@
4312	5102	//case 702: // Event.LIST_DESELECT
4313	5103	group.deselectAll();
4314	5104	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4315		- objEditor.ClearInfo(); // .GetMaterial());
4316	5105	if (tps != null)
4317	5106	{
4318	5107	for (int i=0; i < tps.length; i++)
..	..	@@ -4321,10 +5110,8 @@
4321	5110
4322	5111	//if (child.parent != null)
4323	5112	//child.parent.addSelectee(child);
	5113	+ objEditor.SetMaterial(child);
4324	5114	group.addSelectee(child);
4325		- objEditor.SetMaterial(child); // .GetMaterial());
4326		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4327		- System.err.println("info : " + child.GetPath());
4328	5115	}
4329	5116	}
4330	5117	// else
..	..	@@ -4334,15 +5121,13 @@
4334	5121	// System.err.println("info : " + group.GetPath());
4335	5122	// }
4336	5123
4337		- objEditor.SetText(); // jan 2014
4338		-
4339	5124	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4340	5125	CameraPane.flash = true;
4341	5126
4342	5127	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4343	5128	// a camera
4344	5129	{
4345		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5130	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4346	5131	{
4347	5132	CameraPane.camerachangeframe = 0; // don't refuse it
4348	5133	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4351,6 +5136,13 @@
4351	5136	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4352	5137	}
4353	5138
	5139	+ if (tps != null && tps.length == 1)
	5140	+ {
	5141	+ EditSelection(false);
	5142	+ }
	5143	+
	5144	+ SetPinStates(tps != null && tps.length > 0);
	5145	+
4354	5146	refreshContents();
4355	5147	//return true;
4356	5148	}
..	..	@@ -4359,6 +5151,35 @@
4359	5151
4360	5152	freezemodel = false;
4361	5153	}
	5154	+
	5155	+ void SetPinStates(boolean enabled)
	5156	+ {
	5157	+ editButton.setEnabled(enabled);
	5158	+ uneditButton.setEnabled(enabled);
	5159	+ unselectButton.setEnabled(enabled);
	5160	+ flashSelectionButton.setEnabled(enabled);
	5161	+ }
	5162	+
	5163	+ void refreshContents(boolean cp)
	5164	+ {
	5165	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5166	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5167	+ {
	5168	+ objEditor.ClearInfo(); // .GetMaterial());
	5169	+
	5170	+ for (int i=0; i < group.selection.Size(); i++)
	5171	+ {
	5172	+ Object3D child = (Object3D) group.selection.get(i);
	5173	+
	5174	+ objEditor.AddInfo(child, this, true);
	5175	+ System.err.println("info : " + child.GetPath());
	5176	+ }
	5177	+
	5178	+ objEditor.SetText(); // jan 2014
	5179	+ }
	5180	+
	5181	+ super.refreshContents(cp);
	5182	+ }
4362	5183
4363	5184	void linkSomething(Object3D thing)
4364	5185	{
..	..	@@ -4441,7 +5262,8 @@
4441	5262
4442	5263	if (cut)
4443	5264	{
4444		- Save();
	5265	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5266	+// Save();
4445	5267	//int indices[] = jList.getSelectedIndices();
4446	5268	//for (int i = indices.length - 1; i >= 0; i--)
4447	5269	//jList.remove(indices[i]);
..	..	@@ -4544,6 +5366,10 @@
4544	5366
4545	5367	void paste(boolean expand)
4546	5368	{
	5369	+ if (Globals.REPLACEONMAKE)
	5370	+ Save();
	5371	+ boolean keep = Globals.REPLACEONMAKE;
	5372	+ Globals.REPLACEONMAKE = false;
4547	5373	// if (GrafreeD.clipboard == null)
4548	5374	// return;
4549	5375	boolean first = true;
..	..	@@ -4603,6 +5429,7 @@
4603	5429	Grafreed.clipboard.get(0).parent = keepparent;
4604	5430	}
4605	5431
	5432	+ Globals.REPLACEONMAKE = keep;
4606	5433	ResetModel();
4607	5434	refreshContents();
4608	5435	}
..	..	@@ -4738,6 +5565,10 @@
4738	5565
4739	5566	void group(Object3D csg, boolean grab)
4740	5567	{
	5568	+ if (Globals.REPLACEONMAKE)
	5569	+ Save();
	5570	+ boolean keep = Globals.REPLACEONMAKE;
	5571	+ Globals.REPLACEONMAKE = false;
4741	5572	if (//false) // why??
4742	5573	!group.selection.isEmpty())
4743	5574	{
..	..	@@ -4851,10 +5682,15 @@
4851	5682	//node.add(csg);
4852	5683	//makeSomething(node);
4853	5684	makeSomething(csg);
	5685	+ Globals.REPLACEONMAKE = keep;
4854	5686	}
4855	5687
4856	5688	void Ungroup(Object3D g)
4857	5689	{
	5690	+ if (Globals.REPLACEONMAKE)
	5691	+ Save();
	5692	+ boolean keep = Globals.REPLACEONMAKE;
	5693	+ Globals.REPLACEONMAKE = false;
4858	5694	if (g instanceof HiddenObject)
4859	5695	{
4860	5696	HiddenObject h = (HiddenObject) g;
..	..	@@ -4871,6 +5707,7 @@
4871	5707	objEditor.makeSomething(g.get(i), false);
4872	5708	}
4873	5709	}
	5710	+ Globals.REPLACEONMAKE = keep;
4874	5711	}
4875	5712
4876	5713	void ungroup()
..	..	@@ -5159,10 +5996,44 @@
5159	5996	cButton clearpanelButton;
5160	5997	cButton unselectButton;
5161	5998
	5999	+ cButton restoreCameraButton;
	6000	+
5162	6001	cButton saveButton;
5163		- cButton undoButton;
5164		- cButton redoButton;
5165	6002	cButton oneStepButton;
	6003	+
	6004	+ cButton groupButton;
	6005	+ cButton ungroupButton;
	6006	+ cButton compositeButton;
	6007	+ cButton switchButton;
	6008	+ cButton loopButton;
	6009	+ cButton textureButton;
	6010	+
	6011	+ cButton skybox1Button;
	6012	+ cButton skybox2Button;
	6013	+ cButton skybox3Button;
	6014	+ cButton skybox4Button;
	6015	+ cButton skybox5Button;
	6016	+ cButton skybox6Button;
	6017	+ cButton skybox7Button;
	6018	+
	6019	+ cButton skybox11Button;
	6020	+ cButton skybox12Button;
	6021	+ cButton skybox13Button;
	6022	+ cButton skybox14Button;
	6023	+ cButton skybox15Button;
	6024	+ cButton skybox16Button;
	6025	+ cButton skybox17Button;
	6026	+
	6027	+ cButton gridButton;
	6028	+ cButton boxButton;
	6029	+ cButton sphereButton;
	6030	+ cButton coneButton;
	6031	+ cButton torusButton;
	6032	+ cButton superButton;
	6033	+ cButton kleinButton;
	6034	+ cButton particlesButton;
	6035	+ cButton overlayButton;
	6036	+ cButton lightButton;
5166	6037
5167	6038	cButton screenfitButton;
5168	6039	cButton screenfitpointButton;
..	..	@@ -5175,14 +6046,6 @@
5175	6046
5176	6047	cButton setsupportButton;
5177	6048
5178		- cButton twoButton;
5179		- cButton sixButton;
5180		- cButton threeButton;
5181		- cButton sevenButton;
5182		- cButton fourButton; // full panel
5183		- cButton oneButton; // full XYZ
5184		- //cButton currentLayout;
5185		-
5186	6049	//
5187	6050	//Composite
5188	6051	Object3D // to do !!
..	..	@@ -5192,11 +6055,11 @@
5192	6055	//JTree jTree;
5193	6056	private MenuItem lookAtItem;
5194	6057	private MenuItem lookFromItem;
5195		- private MenuItem switchItem;
	6058	+ private MenuItem switchViewItem;
5196	6059	private MenuItem cutItem;
5197	6060	private MenuItem undoItem;
5198	6061	private MenuItem redoItem;
5199		- private MenuItem duplicateItem;
	6062	+ private JMenuItem duplicateItem;
5200	6063	private MenuItem cloneItem;
5201	6064	private MenuItem cloneSupportItem;
5202	6065	private MenuItem overwriteGeoItem;
..	..	@@ -5224,7 +6087,7 @@
5224	6087	private MenuItem pasteLinkItem;
5225	6088	private MenuItem pasteCloneItem;
5226	6089	private MenuItem pasteExpandItem;
5227		- private MenuItem clearItem;
	6090	+ private MenuItem deleteItem;
5228	6091	private MenuItem clearAllItem;
5229	6092	private MenuItem genUVItem;
5230	6093	private MenuItem genNormalsMESHItem;
..	..	@@ -5259,6 +6122,10 @@
5259	6122	private MenuItem showleavesItem;
5260	6123	private MenuItem markleavesItem;
5261	6124	private MenuItem unmarkleavesItem;
	6125	+ private MenuItem rewindleavesItem;
	6126	+ private MenuItem unrewindleavesItem;
	6127	+ private MenuItem randomleavesItem;
	6128	+ private MenuItem unrandomleavesItem;
5262	6129
5263	6130	private MenuItem flipVItem;
5264	6131	private MenuItem unflipVItem;
..	..	@@ -5280,7 +6147,7 @@
5280	6147	private MenuItem frontItem;
5281	6148	private MenuItem cameraItem;
5282	6149	private MenuItem compositeItem;
5283		- private MenuItem randomItem;
	6150	+ private MenuItem switchItem;
5284	6151	private MenuItem physicsItem;
5285	6152	private MenuItem frameselectorItem;
5286	6153	private MenuItem scriptNodeItem;
..	..	@@ -5304,6 +6171,8 @@
5304	6171	private MenuItem attachBumpItem;
5305	6172	private MenuItem detachBumpItem;
5306	6173	private MenuItem pigmentBumpItem;
	6174	+ private MenuItem embedTexturesItem;
	6175	+ private MenuItem deEmbedTexturesItem;
5307	6176
5308	6177	private MenuItem particleItem;
5309	6178	private MenuItem ragdollItem;
..	..	@@ -5354,5 +6223,5 @@
5354	6223
5355	6224	Menu cameraMenu;
5356	6225	MenuItem editCameraItem;
5357		- MenuItem revertCameraItem;
	6226	+ MenuItem restoreCameraItem;
5358	6227	}