~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,11 +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		- 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"));
158	481	duplicateItem.addActionListener(this);
159	482	cloneItem = menu.add(new MenuItem("Clone"));
160	483	cloneItem.addActionListener(this);
..	..	@@ -170,7 +493,6 @@
170	493	copyItem.addActionListener(this);
171	494	pasteItem = menu.add(new MenuItem("Paste"));
172	495	pasteItem.addActionListener(this);
173		- menu.add("-");
174	496
175	497	menu.add("-");
176	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -182,8 +504,8 @@
182	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183	505	// pasteExpandItem.addActionListener(this);
184	506	menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
187	509
188	510	if (Globals.ADVANCED)
189	511	{
..	..	@@ -197,23 +519,23 @@
197	519	//zBufferItem.addActionListener(this);
198	520	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	521	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
202	524
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- 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);
207	537
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	539	toggleHandleItem.addItemListener(this);
218	540	toggleHandleItem.setState(CameraPane.HANDLES);
219	541
..	..	@@ -240,7 +562,7 @@
240	562
241	563	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	564	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
244	566
245	567	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	568	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +583,14 @@
261	583	// animationItem.addItemListener(this);
262	584	// animationItem.setState(CameraPane.ANIMATION);
263	585	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	587	editCameraItem.addActionListener(this);
266	588
267	589	if (Globals.ADVANCED)
268	590	{
269	591	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	592	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	594	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	595	oe.cameraMenu.add("-");
274	596	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +598,7 @@
276	598	editLeafItem.addActionListener(this);
277	599	lookAtItem.addActionListener(this);
278	600	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	601	+ //switchViewItem.addActionListener(this);
280	602	}
281	603
282	604	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +643,29 @@
321	643	}
322	644
323	645	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
326	648	backItem = menu.add(new MenuItem("Back"));
327	649	backItem.addActionListener(this);
328	650	frontItem = menu.add(new MenuItem("Front"));
329	651	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
332	657	hideItem = menu.add(new MenuItem("Hidden Group"));
333	658	hideItem.addActionListener(this);
	659	+ }
334	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	661	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	670	switchGeoItem.addActionListener(this);
341	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +673,6 @@
343	673	morphItem = menu.add(new MenuItem("Morph Group"));
344	674	morphItem.addActionListener(this);
345	675
346		- if (Globals.ADVANCED)
347		- {
348	676	menu.add("-");
349	677	physicsItem = menu.add(new MenuItem("Physics"));
350	678	physicsItem.addActionListener(this);
..	..	@@ -352,30 +680,29 @@
352	680	frameselectorItem.addActionListener(this);
353	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	682	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	683	}
358	684
359	685	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
362	688	billboardItem = menu.add(new MenuItem("Billboard"));
363	689	billboardItem.addActionListener(this);
364	690	csgItem = menu.add(new MenuItem("CSG"));
365	691	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	693	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	695	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
372	701	if (Globals.ADVANCED)
373	702	{
374	703	menu.add("-");
375	704	linkerItem = menu.add(new MenuItem("Linker"));
376	705	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	706	templateItem = menu.add(new MenuItem("Template"));
380	707	templateItem.addActionListener(this);
381	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -404,7 +731,7 @@
404	731	genNormalsMESHItem.addActionListener(this);
405	732	if (Globals.ADVANCED)
406	733	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	735	genNormalsMINEItem.addActionListener(this);
409	736	}
410	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -464,6 +791,14 @@
464	791	markleavesItem.addActionListener(this);
465	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	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);
467	802	menu.add("-");
468	803	flipVItem = menu.add(new MenuItem("Flip V"));
469	804	flipVItem.addActionListener(this);
..	..	@@ -489,10 +824,15 @@
489	824	attachBumpItem.addActionListener(this);
490	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
492	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	829	detachPigmentItem.addActionListener(this);
494	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	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);
496	836	menu.add("-");
497	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	838	sortbysizeItem.addActionListener(this);
..	..	@@ -519,8 +859,21 @@
519	859	buildToolsMenu(menu);
520	860	}
521	861
	862	+
522	863	void SetupUI2(ObjEditor oe)
523	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	+
524	877	//new Exception().printStackTrace();
525	878
526	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +902,79 @@
549	902	oe.radioPanel.add(dummyButton);
550	903	oe.buttonGroup.add(dummyButton);
551	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
552	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	910
554		- 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(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("New version");
	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);
	942	+
	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);
555	962	liveCB.setToolTipText("Enable animation");
556	963	liveCB.addItemListener(this);
557	964
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	966	oneStepButton.setToolTipText("Animate one step forward");
560	967	oneStepButton.addActionListener(this);
561	968
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	970	fastCB.setToolTipText("Fast mode");
564	971	fastCB.addItemListener(this);
565	972
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- 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);
573	978
574	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	980	// screenfitpointButton.addActionListener(this);
..	..	@@ -579,67 +984,156 @@
579	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	985	snapobjectButton.addActionListener(this);
581	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");
582	991	}
583	992
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	994
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- 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");
592	997	twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- fourButton.addActionListener(this);
595		- fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
598		- sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- 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");
601	1002	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- 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);
605	1009	//
606	1010
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- 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");
609	1013	rootButton.addActionListener(this);
610	1014
611		- 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);
612	1016	closeButton.setToolTipText("Close tab");
613	1017	closeButton.addActionListener(this);
614	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	1019	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
618	1022
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- 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");
621	1110	editButton.addActionListener(this);
622	1111
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
625	1114	uneditButton.addActionListener(this);
626	1115
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
629	1118	allParamsButton.addActionListener(this);
630	1119
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	1121	clearPanelButton.setToolTipText("Clear edit panel");
633	1122	clearPanelButton.addActionListener(this);
634	1123
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	1125	unselectButton.setToolTipText("Unselect");
637	1126	unselectButton.addActionListener(this);
638	1127
639		- 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);
640	1131
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
643	1137
644	1138	// oe.aConstraints.gridx += 1;
645	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -656,32 +1150,20 @@
656	1150
657	1151	JScrollPane jSP;
658	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	1154	ResetModel();
661	1155
662	1156	oe.treePanel.add(jSPPanel);
663	1157	oe.treePanel.Return();
664	1158
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	1159	oe.treePanel.add(copyOptionsPanel);
681	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
682	1164
683		-// mainPanel.setDividerLocation(0.5); //1.0);
684		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
685	1167
686	1168	//jList.addListSelectionListener(this);
687	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -689,7 +1171,7 @@
689	1171	//jTree.setEditable(true);
690	1172	oe.jTree.setDragEnabled(true);
691	1173	//jTree.setPreferredSize(new Dimension(10,10));
692		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
693	1175
694	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
695	1177
..	..	@@ -701,29 +1183,49 @@
701	1183	dgr.addDragGestureListener(this);
702	1184	}catch(Exception e) {}
703	1185	*/
704		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
705	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	1188	}
707	1189
708	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	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	+
710	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	1207	boxCB.setToolTipText("Display bounding boxes");
712	1208	boxCB.addItemListener(this);
713	1209
714	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	1212	zoomBoxCB.addItemListener(this);
717	1213
718	1214	if (true) // Globals.ADVANCED)
719	1215	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- 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);
723	1223
724	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	1225	// localCB.addItemListener(this);
726	1226
	1227	+ panel.Return();
	1228	+
727	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	1230	crowdCB.setToolTipText("Used for crowds");
729	1231	crowdCB.addItemListener(this);
..	..	@@ -732,14 +1234,19 @@
732	1234	smoothCB.setToolTipText("Snapping delay");
733	1235	smoothCB.addItemListener(this);
734	1236
735		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736		- slowCB.setToolTipText("Smooth interpolation");
737		- 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);
738	1243
739	1244	// constraints.gridy += 1;
740	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	1246	// speakerMocapCB.addItemListener(this);
742	1247
	1248	+ panel.Return();
	1249	+
743	1250	if (false)
744	1251	{
745	1252	// handled in scripts
..	..	@@ -754,34 +1261,74 @@
754	1261	//constraints.gridy += 1;
755	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
757	1265	}
758	1266
759	1267	//constraints.gridx += 1;
760	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	1269	// debugCB.addItemListener(this);
762	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
763	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
764	1277	oeilCB.addItemListener(this);
765	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	+ {
766	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	1300	lookAtCB.setToolTipText("Look-at target");
768	1301	lookAtCB.addItemListener(this);
	1302	+ }
769	1303
770	1304	}
771	1305
772	1306	cGridBag fill = new cGridBag();
773		-
774	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
775	1312
776	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
777	1316
778	1317	}
779	1318
780	1319	void EditObject(Object3D obj)
781	1320	{
782	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	+
783	1330	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = sixButton; // sevenButton;
785	1332	radioButton.SetCamera(cameraView.renderCamera, false);
786	1333	radioButton.addActionListener(this);
787	1334	radioPanel.add(radioButton);
..	..	@@ -791,6 +1338,8 @@
791	1338
792	1339	void SetupViews(ObjEditor oe)
793	1340	{
	1341	+ theFrame = this;
	1342	+
794	1343	oe.SetupViews();
795	1344
796	1345	System.out.println("SetupViews");
..	..	@@ -799,23 +1348,30 @@
799	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1349	}
801	1350
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- 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;
813	1366	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
819	1375
820	1376	// static int COLOR = 1;
821	1377	// static int MATERIAL = 2;
..	..	@@ -823,9 +1379,9 @@
823	1379
824	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1381
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
829	1385
830	1386	public void itemStateChanged(ItemEvent e)
831	1387	{
..	..	@@ -853,6 +1409,7 @@
853	1409	} else if(e.getSource() == liveCB)
854	1410	{
855	1411	cameraView.ToggleLive();
	1412	+ refreshContents(false);
856	1413	}
857	1414	else if(e.getSource() == supportCB)
858	1415	{
..	..	@@ -868,6 +1425,12 @@
868	1425	{
869	1426	cameraView.ToggleInertia();
870	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
871	1434	}
872	1435	else if(e.getSource() == localCB)
873	1436	{
..	..	@@ -917,6 +1480,18 @@
917	1480	{
918	1481	cameraView.ToggleOeil();
919	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	+ }
920	1495	else if(e.getSource() == lookAtCB)
921	1496	{
922	1497	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1508,8 @@
933	1508
934	1509	/**/
935	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1514	// We can't move the root node or an empty selection
939	1515	return;
..	..	@@ -996,8 +1572,6 @@
996	1572	}
997	1573	}
998	1574
999		- String string = (String) object;
1000		-
1001	1575	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1576	// if( object instanceof java.io.File[])
1003	1577	// {
..	..	@@ -1005,6 +1579,8 @@
1005	1579	// objEditor.DropFile((java.io.File[]) object, true);
1006	1580	// return;
1007	1581	// }
	1582	+
	1583	+ String string = object.toString();
1008	1584
1009	1585	// File path for Mac and Windows
1010	1586	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1626,33 @@
1050	1626
1051	1627	assert target == objEditor.jTree;
1052	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
1053	1630	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1632	} catch (Exception e) {
1056	1633	System.out.println("destinationPath : " + destinationPath);
1057	1634	return;
1058	1635	}
1059	1636
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
1061	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	+// {
1062	1648	loadClipboard(true);
1063	1649	objEditor.jTree.setSelectionPath(destinationPath);
1064	1650	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
1070	1656	}
1071	1657	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1757,30 @@
1171	1757	{
1172	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1759	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- 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	+ {
1186	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1779	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
1190	1784	if (Globals.ADVANCED)
1191	1785	{
1192	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1806,15 @@
1212	1806	}
1213	1807	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1808	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- 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);
1219	1813	menu.add("-");
1220	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1815	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1224	1818	doubleItem = menu.add(new MenuItem("Fork"));
1225	1819	doubleItem.addActionListener(this);
1226	1820	if (Globals.ADVANCED)
..	..	@@ -1236,6 +1830,9 @@
1236	1830	animationItem.addItemListener(this);
1237	1831	animationItem.setState(Globals.ANIMATION);
1238	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1239	1836	menu.add("-");
1240	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	1838	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +1845,8 @@
1248	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	1846	reduce34MorphItem.addActionListener(this);
1250	1847	menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1251	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	1851	computeAOItem.addActionListener(this);
1253	1852
..	..	@@ -1256,11 +1855,9 @@
1256	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	1856	mirrorItem.addActionListener(this);
1258	1857	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1859	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1860	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1861	dumpItem.addActionListener(this);
1265	1862	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1863	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1998,34 @@
1401	1998	shadow.material = new cMaterial(obj.material);
1402	1999	shadow.material.diffuse = 0.0001f;
1403	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1404	2002
1405	2003	makeSomething(shadow);
1406	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	+ }
1407	2029
1408	2030	/**
1409	2031	* applyExample
..	..	@@ -1648,7 +2270,7 @@
1648	2270	{
1649	2271	ScreenFit();
1650	2272	} else
1651		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1652	2274	{
1653	2275	cVector v1 = new cVector();
1654	2276	cVector v2 = new cVector();
..	..	@@ -1657,11 +2279,11 @@
1657	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	2280	objEditor.cameraView.repaint();
1659	2281	} else
1660		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1661	2283	{
1662	2284	makeSomething(new Box());
1663	2285	} else
1664		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1665	2287	{
1666	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2362,27 @@
1740	2362
1741	2363	makeSomething(obj);
1742	2364	} else
1743		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1744	2366	{
1745	2367	makeSomething(new Grid());
1746	2368	} else
1747		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2370	{
1749	2371	makeSomething(new Sphere());
1750	2372	} else
1751		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1752	2374	{
1753	2375	makeSomething(new Cone());
1754	2376	} else
1755		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1756	2378	{
1757	2379	makeSomething(new Torus());
1758	2380	} else
1759		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1760	2382	{
1761	2383	makeSomething(new Superellipsoid());
1762	2384	} else
1763		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1764	2386	{
1765	2387	makeSomething(new Klein());
1766	2388	} else
..	..	@@ -1780,7 +2402,7 @@
1780	2402	{
1781	2403	makeSomething(new BezierSurface());
1782	2404	} else
1783		- if (source == overlayItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1784	2406	{
1785	2407	/*
1786	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,10 +2450,27 @@
1828	2450	s.setup();
1829	2451	makeSomething(s);
1830	2452	} else
1831		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1832	2454	{
1833	2455	makeSomething(new Light());
1834	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
1835	2474	if (source == csgItem)
1836	2475	{
1837	2476	group(new CSG());
..	..	@@ -1878,30 +2517,30 @@
1878	2517
1879	2518	group(g);
1880	2519	} else
1881		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1882	2521	{
1883	2522	Composite csg = new GroupLeaf();
1884	2523	csg.count = 5;
1885	2524	group(csg);
1886		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1887	2526	csg.addChild(child);
1888	2527	child.addChild(csg);
1889	2528	} else
1890	2529	if (source == doubleItem)
1891	2530	{
1892		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1893	2532	csg.count = 5;
1894	2533	group(csg);
1895		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1896	2535	csg.addChild(child);
1897	2536	child.addChild(csg);
1898		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1899	2538	csg.addChild(child);
1900	2539	child.addChild(csg);
1901	2540	} else
1902	2541	if (source == tripleItem)
1903	2542	{
1904		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1905	2544	csg.count = 4;
1906	2545	group(csg);
1907	2546	Composite child = new cGroup();
..	..	@@ -1917,7 +2556,7 @@
1917	2556	if (source == computeAOItem)
1918	2557	{
1919	2558	Globals.drawMode = CameraPane.OCCLUSION;
1920		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1921	2560	} else
1922	2561	if (source == recompileItem)
1923	2562	{
..	..	@@ -1951,6 +2590,46 @@
1951	2590	{
1952	2591	DumpObject();
1953	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
	2605	+ if (source == undoButton)
	2606	+ {
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	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();
	2621	+ } else
	2622	+ if (source == redoButton)
	2623	+ {
	2624	+ // Go to next version
	2625	+ Redo();
	2626	+ } else
	2627	+ if (source == saveButton)
	2628	+ {
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2632	+ } else
1954	2633	if (source == oneStepButton)
1955	2634	{
1956	2635	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2637,14 @@
1958	2637	} else
1959	2638	if (source == screenfitButton)
1960	2639	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2640	ScreenFit();
1963	2641	} else
1964	2642	if (source == screenfitpointButton)
1965	2643	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2644	ScreenFitPoint();
1968	2645	} else
1969	2646	if (source == snapobjectButton)
1970	2647	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2648	SnapObject();
1973	2649	} else
1974	2650	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2680,14 @@
2004	2680	if (source == cutItem \|\| source == clearButton)
2005	2681	{
2006	2682	loadClipboard(true);
	2683	+ } else
	2684	+ if (source == undoItem)
	2685	+ {
	2686	+ Undo();
	2687	+ } else
	2688	+ if (source == redoItem)
	2689	+ {
	2690	+ Redo();
2007	2691	} else
2008	2692	if (source == duplicateItem)
2009	2693	{
..	..	@@ -2324,7 +3008,7 @@
2324	3008	{
2325	3009	StepAll();
2326	3010	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	3012	{
2329	3013	//int indices[] = jList.getSelectedIndices();
2330	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +3020,9 @@
2336	3020	{
2337	3021	ClearSelection(true);
2338	3022	} else
2339		- if (source == grabItem)
	3023	+ if (source == grabItem \|\| source == groupButton)
2340	3024	{
2341		- group(new cGroup(), true);
	3025	+ group(new cGroup(), false); // true);
2342	3026	} else
2343	3027	if (source == hideItem)
2344	3028	{
..	..	@@ -2356,11 +3040,11 @@
2356	3040	{
2357	3041	makeSomething(new Camera());
2358	3042	} else
2359		- if (source == compositeItem)
	3043	+ if (source == compositeItem \|\| source == compositeButton)
2360	3044	{
2361	3045	group(new Composite());
2362	3046	} else
2363		- if (source == randomItem)
	3047	+ if (source == switchItem \|\| source == switchButton)
2364	3048	{
2365	3049	RandomNode random = new RandomNode();
2366	3050	group(random);
..	..	@@ -2462,7 +3146,7 @@
2462	3146	{
2463	3147	group(new cLinker());
2464	3148	} else
2465		- if (source == textureItem)
	3149	+ if (source == textureItem \|\| source == textureButton)
2466	3150	{
2467	3151	group(new TextureNode());
2468	3152	} else
..	..	@@ -2482,17 +3166,30 @@
2482	3166	{
2483	3167	CastShadow(2);
2484	3168	} else
2485		- if (source == ungroupItem)
	3169	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	3170	{
2487		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2488	3173	for (int i=0; i<group.selection.size(); i++)
2489	3174	{
2490		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2491	3180	}
2492	3181
2493		- ClearSelection(false);
2494		-
2495		- 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	+ }
2496	3193	} else
2497	3194	if (source == genUVItem)
2498	3195	{
..	..	@@ -2504,7 +3201,7 @@
2504	3201	} else
2505	3202	if (source == genNormalsMESHItem)
2506	3203	{
2507		- GenNormals(true); // TODO
	3204	+ GenNormalsMESH();
2508	3205	} else
2509	3206	if (source == genNormalsORGANItem)
2510	3207	{
..	..	@@ -2569,6 +3266,22 @@
2569	3266	if (source == unmarkleavesItem)
2570	3267	{
2571	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);
2572	3285	} else
2573	3286	if (source == flipVItem)
2574	3287	{
..	..	@@ -2777,7 +3490,7 @@
2777	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3491	{
2779	3492	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
2781	3494	}
2782	3495
2783	3496	refreshContents();
..	..	@@ -2793,6 +3506,31 @@
2793	3506
2794	3507	refreshContents();
2795	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
2796	3534	if (source == flashSelectionButton)
2797	3535	{
2798	3536	CameraPane.flash = true;
..	..	@@ -2804,6 +3542,10 @@
2804	3542	if (source == twoButton)
2805	3543	{
2806	3544	radio.layout = twoButton;
	3545	+
	3546	+ if (CameraPane.FULLSCREEN)
	3547	+ fullscreenLayout = radio.layout;
	3548	+
2807	3549	// bug
2808	3550	//gridPanel.setDividerLocation(1.0);
2809	3551	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3578,31 @@
2836	3578	bigThree.ClearUI();
2837	3579	bigThree.add(centralPanel);
2838	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	+
2839	3599	} else
2840	3600	if (source == threeButton)
2841	3601	{
2842	3602	radio.layout = threeButton;
	3603	+
	3604	+ if (CameraPane.FULLSCREEN)
	3605	+ fullscreenLayout = radio.layout;
2843	3606
2844	3607	// bigThree.remove(scenePanel);
2845	3608	// bigThree.remove(centralPanel);
..	..	@@ -2869,13 +3632,18 @@
2869	3632	// centralPanel.setVisible(true);
2870	3633	// XYZPanel.setVisible(true);
2871	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
2872	3636	bigThree.add(centralPanel);
2873		- bigThree.add(XYZPanel);
2874	3637	bigThree.FlushUI();
	3638	+
	3639	+ cameraView.requestFocusInWindow();
2875	3640	} else
2876	3641	if (source == fourButton)
2877	3642	{
2878	3643	radio.layout = fourButton;
	3644	+
	3645	+ if (CameraPane.FULLSCREEN)
	3646	+ fullscreenLayout = radio.layout;
2879	3647
2880	3648	// bigThree.remove(scenePanel);
2881	3649	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3675,15 @@
2907	3675	bigThree.ClearUI();
2908	3676	bigThree.add(scenePanel);
2909	3677	bigThree.FlushUI();
	3678	+
	3679	+ cameraView.requestFocusInWindow();
2910	3680	} else
2911	3681	if (source == sixButton)
2912	3682	{
2913	3683	radio.layout = sixButton;
	3684	+
	3685	+ if (CameraPane.FULLSCREEN)
	3686	+ fullscreenLayout = radio.layout;
2914	3687
2915	3688	// bigThree.remove(scenePanel);
2916	3689	// bigThree.remove(centralPanel);
..	..	@@ -2940,13 +3713,18 @@
2940	3713	// centralPanel.setVisible(true);
2941	3714	// XYZPanel.setVisible(false);
2942	3715	bigThree.ClearUI();
2943		- bigThree.add(scenePanel);
2944	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
2945	3718	bigThree.FlushUI();
	3719	+
	3720	+ cameraView.requestFocusInWindow();
2946	3721	} else
2947	3722	if (source == sevenButton)
2948	3723	{
2949	3724	radio.layout = sevenButton;
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
2950	3728
2951	3729	// bigThree.remove(scenePanel);
2952	3730	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3758,8 @@
2980	3758	bigThree.add(centralPanel);
2981	3759	bigThree.add(XYZPanel);
2982	3760	bigThree.FlushUI();
	3761	+
	3762	+ cameraView.requestFocusInWindow();
2983	3763	} else
2984	3764	if (source == rootButton)
2985	3765	{
..	..	@@ -2991,6 +3771,7 @@
2991	3771	EditObject(obj);
2992	3772	}
2993	3773
	3774	+ cameraView.requestFocusInWindow();
2994	3775	refreshContents(true);
2995	3776	} else
2996	3777	if (source == closeButton)
..	..	@@ -3000,22 +3781,37 @@
3000	3781	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3782	{
3002	3783	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3784	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3785	{
	3786	+ // Patch to avoid bug with transparency.
	3787	+ if (!ab.hadMaterial)
	3788	+ {
	3789	+ ab.object.material = null;
	3790	+ }
	3791	+
3005	3792	buttonGroup.remove(ab);
3006	3793	radioPanel.remove(ab);
3007	3794
3008		- ab.GetObject().editWindow = null;
	3795	+ //ab.GetObject().editWindow = null;
	3796	+ ab.GetObject().manipWindow = null;
3009	3797	// ab.GetObject().objectUI = null; // ?????????
3010	3798
3011	3799	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3800	break;
3013	3801	}
3014	3802	}
	3803	+
	3804	+ cameraView.requestFocusInWindow();
3015	3805	refreshContents(true);
3016	3806	} else
3017	3807	if (source == editItem \|\| source == editButton)
3018	3808	{
	3809	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3810	+ {
	3811	+ Object3D child = (Object3D)e.nextElement();
	3812	+ child.pinned = true;
	3813	+ }
	3814	+
3019	3815	EditSelection(false);
3020	3816	} else
3021	3817	if (source == uneditButton)
..	..	@@ -3025,10 +3821,11 @@
3025	3821	Object3D child = (Object3D)e.nextElement();
3026	3822	if(child.editWindow != null)
3027	3823	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3824	+ child.pinned = false;
3028	3825	child.CloseUI();
3029	3826	listUI.remove(child);
3030	3827
3031		- child.editWindow = null; // ???????????
	3828	+ //child.editWindow = null; // ???????????
3032	3829	}
3033	3830	objEditor.ctrlPanel.FlushUI();
3034	3831	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3838,7 @@
3041	3838	//copy.ClearUI();
3042	3839	for (Object3D obj : listUI)
3043	3840	{
	3841	+ obj.pinned = false;
3044	3842	obj.CloseUI();
3045	3843	}
3046	3844	listUI.clear();
..	..	@@ -3050,7 +3848,7 @@
3050	3848	{
3051	3849	assert(copy == group);
3052	3850
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3851	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3852
3055	3853	for (Object3D obj : listUI)
3056	3854	{
..	..	@@ -3099,6 +3897,9 @@
3099	3897	}
3100	3898
3101	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
3102	3903	//Globals.theRenderer.object = group;
3103	3904	if(!useclient)
3104	3905	{
..	..	@@ -3115,7 +3916,9 @@
3115	3916	sideView.object = group;
3116	3917	}
3117	3918
3118		-// fix "+" issue group.editWindow = this;
	3919	+// fix "+" issue
	3920	+ //group.editWindow = this;
	3921	+ group.manipWindow = this;
3119	3922
3120	3923	/*
3121	3924	currentLayout = radio.layout;
..	..	@@ -3123,18 +3926,27 @@
3123	3926	currentLayout = sevenButton;
3124	3927	*/
3125	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);
3126	3936	keepparent = group.parent;
3127	3937	// PARENT = NULL or not???
3128	3938	//group.parent = null; // ROOT
3129	3939	//group.attributes = -1;
3130	3940	ResetModel();
	3941	+
	3942	+ cameraView.requestFocusInWindow();
3131	3943	refreshContents(true);
3132	3944	} else if (event.getSource() == editCameraItem)
3133	3945	{
3134	3946	cameraView.ProtectCamera();
3135	3947	cameraView.repaint();
3136	3948	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3949	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3950	{
3139	3951	cameraView.RevertCamera();
3140	3952	cameraView.repaint();
..	..	@@ -3151,7 +3963,6 @@
3151	3963	}
3152	3964
3153	3965	boolean useclient = false;
3154		- cRadio radio;
3155	3966
3156	3967	void ToggleRoot()
3157	3968	{
..	..	@@ -3390,7 +4201,8 @@
3390	4201
3391	4202	int size = obj.MemorySize();
3392	4203
3393		- 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)");
3394	4206	}
3395	4207	}
3396	4208	catch (Exception e)
..	..	@@ -3471,6 +4283,13 @@
3471	4283	void GenNormals(boolean crease)
3472	4284	{
3473	4285	group.GenNormalsS(crease);
	4286	+
	4287	+ refreshContents();
	4288	+ }
	4289	+
	4290	+ void GenNormalsMESH()
	4291	+ {
	4292	+ group.GenNormalsMeshS();
3474	4293
3475	4294	refreshContents();
3476	4295	}
..	..	@@ -3706,7 +4525,7 @@
3706	4525
3707	4526	try
3708	4527	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4528	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4529	}
3711	4530	catch (Exception e)
3712	4531	{
..	..	@@ -4098,6 +4917,18 @@
4098	4917	refreshContents();
4099	4918	}
4100	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	+
4101	4932	void SetTexRes(int tr)
4102	4933	{
4103	4934	group.selection.SetTexRes(tr);
..	..	@@ -4169,28 +5000,25 @@
4169	5000	// }
4170	5001	// }
4171	5002
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	5003	void EditSelection(boolean newWindow)
4177	5004	{
	5005	+ if (group.selection == null)
	5006	+ {
	5007	+ EditElement(group, newWindow); // ? new
	5008	+ return;
	5009	+ }
	5010	+
4178	5011	// aConstraints.gridy = 0;
4179	5012	for (int i=0; i<group.selection.size(); i++)
4180	5013	{
4181	5014	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	5015	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5016	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	5017
4185	5018	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	5019	if(elem != group \|\| !newWindow)
4187	5020	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	5021	+ EditElement(elem, newWindow); // ? new
4194	5022	}
4195	5023	}
4196	5024	}
..	..	@@ -4265,7 +5093,8 @@
4265	5093	//new Exception().printStackTrace();
4266	5094
4267	5095	freezemodel = true;
4268		-
	5096	+ ClearUnpinned();
	5097	+
4269	5098	/**/
4270	5099	//switch (event.id)
4271	5100	{
..	..	@@ -4273,7 +5102,6 @@
4273	5102	//case 702: // Event.LIST_DESELECT
4274	5103	group.deselectAll();
4275	5104	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	5105	if (tps != null)
4278	5106	{
4279	5107	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +5110,8 @@
4282	5110
4283	5111	//if (child.parent != null)
4284	5112	//child.parent.addSelectee(child);
	5113	+ objEditor.SetMaterial(child);
4285	5114	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	5115	}
4290	5116	}
4291	5117	// else
..	..	@@ -4295,20 +5121,28 @@
4295	5121	// System.err.println("info : " + group.GetPath());
4296	5122	// }
4297	5123
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5124	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	5125	CameraPane.flash = true;
4302	5126
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5127	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	5128	// a camera
4305	5129	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5130	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5131	+ {
	5132	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5133	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5134	+ }
4308	5135	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	5136	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	5137	}
4311	5138
	5139	+ if (tps != null && tps.length == 1)
	5140	+ {
	5141	+ EditSelection(false);
	5142	+ }
	5143	+
	5144	+ SetPinStates(tps != null && tps.length > 0);
	5145	+
4312	5146	refreshContents();
4313	5147	//return true;
4314	5148	}
..	..	@@ -4317,6 +5151,35 @@
4317	5151
4318	5152	freezemodel = false;
4319	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	+ }
4320	5183
4321	5184	void linkSomething(Object3D thing)
4322	5185	{
..	..	@@ -4388,6 +5251,7 @@
4388	5251	{
4389	5252	if (group.selection.isEmpty())
4390	5253	return;
	5254	+
4391	5255	Grafreed.clipboardIsTempGroup = false;
4392	5256	Composite tGroup = null;
4393	5257	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +5262,8 @@
4398	5262
4399	5263	if (cut)
4400	5264	{
	5265	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5266	+// Save();
4401	5267	//int indices[] = jList.getSelectedIndices();
4402	5268	//for (int i = indices.length - 1; i >= 0; i--)
4403	5269	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5353,10 @@
4487	5353	}
4488	5354
4489	5355	}
	5356	+
4490	5357	if (Grafreed.clipboardIsTempGroup)
4491	5358	Grafreed.clipboard = tGroup;
	5359	+
4492	5360	if (cut)
4493	5361	{
4494	5362	ResetModel();
..	..	@@ -4498,6 +5366,10 @@
4498	5366
4499	5367	void paste(boolean expand)
4500	5368	{
	5369	+ if (Globals.REPLACEONMAKE)
	5370	+ Save();
	5371	+ boolean keep = Globals.REPLACEONMAKE;
	5372	+ Globals.REPLACEONMAKE = false;
4501	5373	// if (GrafreeD.clipboard == null)
4502	5374	// return;
4503	5375	boolean first = true;
..	..	@@ -4557,6 +5429,7 @@
4557	5429	Grafreed.clipboard.get(0).parent = keepparent;
4558	5430	}
4559	5431
	5432	+ Globals.REPLACEONMAKE = keep;
4560	5433	ResetModel();
4561	5434	refreshContents();
4562	5435	}
..	..	@@ -4692,6 +5565,10 @@
4692	5565
4693	5566	void group(Object3D csg, boolean grab)
4694	5567	{
	5568	+ if (Globals.REPLACEONMAKE)
	5569	+ Save();
	5570	+ boolean keep = Globals.REPLACEONMAKE;
	5571	+ Globals.REPLACEONMAKE = false;
4695	5572	if (//false) // why??
4696	5573	!group.selection.isEmpty())
4697	5574	{
..	..	@@ -4805,10 +5682,15 @@
4805	5682	//node.add(csg);
4806	5683	//makeSomething(node);
4807	5684	makeSomething(csg);
	5685	+ Globals.REPLACEONMAKE = keep;
4808	5686	}
4809	5687
4810	5688	void Ungroup(Object3D g)
4811	5689	{
	5690	+ if (Globals.REPLACEONMAKE)
	5691	+ Save();
	5692	+ boolean keep = Globals.REPLACEONMAKE;
	5693	+ Globals.REPLACEONMAKE = false;
4812	5694	if (g instanceof HiddenObject)
4813	5695	{
4814	5696	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5707,7 @@
4825	5707	objEditor.makeSomething(g.get(i), false);
4826	5708	}
4827	5709	}
	5710	+ Globals.REPLACEONMAKE = keep;
4828	5711	}
4829	5712
4830	5713	void ungroup()
..	..	@@ -5113,7 +5996,44 @@
5113	5996	cButton clearpanelButton;
5114	5997	cButton unselectButton;
5115	5998
	5999	+ cButton restoreCameraButton;
	6000	+
	6001	+ cButton saveButton;
5116	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;
5117	6037
5118	6038	cButton screenfitButton;
5119	6039	cButton screenfitpointButton;
..	..	@@ -5126,14 +6046,6 @@
5126	6046
5127	6047	cButton setsupportButton;
5128	6048
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	6049	//
5138	6050	//Composite
5139	6051	Object3D // to do !!
..	..	@@ -5143,9 +6055,11 @@
5143	6055	//JTree jTree;
5144	6056	private MenuItem lookAtItem;
5145	6057	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	6058	+ private MenuItem switchViewItem;
5147	6059	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	6060	+ private MenuItem undoItem;
	6061	+ private MenuItem redoItem;
	6062	+ private JMenuItem duplicateItem;
5149	6063	private MenuItem cloneItem;
5150	6064	private MenuItem cloneSupportItem;
5151	6065	private MenuItem overwriteGeoItem;
..	..	@@ -5173,7 +6087,7 @@
5173	6087	private MenuItem pasteLinkItem;
5174	6088	private MenuItem pasteCloneItem;
5175	6089	private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	6090	+ private MenuItem deleteItem;
5177	6091	private MenuItem clearAllItem;
5178	6092	private MenuItem genUVItem;
5179	6093	private MenuItem genNormalsMESHItem;
..	..	@@ -5208,6 +6122,10 @@
5208	6122	private MenuItem showleavesItem;
5209	6123	private MenuItem markleavesItem;
5210	6124	private MenuItem unmarkleavesItem;
	6125	+ private MenuItem rewindleavesItem;
	6126	+ private MenuItem unrewindleavesItem;
	6127	+ private MenuItem randomleavesItem;
	6128	+ private MenuItem unrandomleavesItem;
5211	6129
5212	6130	private MenuItem flipVItem;
5213	6131	private MenuItem unflipVItem;
..	..	@@ -5229,7 +6147,7 @@
5229	6147	private MenuItem frontItem;
5230	6148	private MenuItem cameraItem;
5231	6149	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	6150	+ private MenuItem switchItem;
5233	6151	private MenuItem physicsItem;
5234	6152	private MenuItem frameselectorItem;
5235	6153	private MenuItem scriptNodeItem;
..	..	@@ -5253,6 +6171,8 @@
5253	6171	private MenuItem attachBumpItem;
5254	6172	private MenuItem detachBumpItem;
5255	6173	private MenuItem pigmentBumpItem;
	6174	+ private MenuItem embedTexturesItem;
	6175	+ private MenuItem deEmbedTexturesItem;
5256	6176
5257	6177	private MenuItem particleItem;
5258	6178	private MenuItem ragdollItem;
..	..	@@ -5303,5 +6223,5 @@
5303	6223
5304	6224	Menu cameraMenu;
5305	6225	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	6226	+ MenuItem restoreCameraItem;
5307	6227	}