~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,240 @@
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("default", "skycube", 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("park", "Stairs", 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", "Ryfjallet", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("penguins", "wrath", row5);
	152	+ AddSkyboxButton("penguins", "yonder", row5);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "Greenlands", row6);
	160	+ AddSkyboxButton("daz", "MountainTrail", row6);
	161	+ AddSkyboxButton("daz", "Oasis", row6);
	162	+ /*
	163	+Autumn
	164	+Greenlands
	165	+MountainTrail
	166	+Oasis
	167	+TheRock
	168	+TopOfTheWorld
	169	+Winter
	170	+ */
	171	+
	172	+ tab0.add(row0);
	173	+ tab0.add(row1);
	174	+ tab0.add(row2);
	175	+ tab0.add(row3);
	176	+ tab0.add(row4);
	177	+ tab0.add(row5);
	178	+ tab0.add(row6);
	179	+
	180	+ for (int i=5; --i>=0;)
	181	+ {
	182	+ //oe.toolboxPanel.Return();
	183	+ //tab0.add(new cGridBag());
	184	+ }
	185	+ }
	186	+
	187	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	188	+ {
	189	+ cGridBag tab0 = new cGridBag().setVertical(true);
	190	+
	191	+ tab0.setName("Night");
	192	+ skyboxpanel.add(tab0);
	193	+
	194	+ cGridBag row0 = new cGridBag();
	195	+ cGridBag row1 = new cGridBag();
	196	+ cGridBag row2 = new cGridBag();
	197	+ cGridBag row3 = new cGridBag();
	198	+ cGridBag row4 = new cGridBag();
	199	+ cGridBag row5 = new cGridBag();
	200	+ cGridBag row6 = new cGridBag();
	201	+
	202	+ AddSkyboxButton("night", "NightPath", row0);
	203	+ AddSkyboxButton("night", "PondNight", row0);
	204	+ AddSkyboxButton("night", "Powerlines", row0);
	205	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	206	+
	207	+ AddSkyboxButton("urban", "CNTower", row1);
	208	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	209	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	210	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	211	+
	212	+ AddSkyboxButton("penguins", "kenon_star", row2);
	213	+ AddSkyboxButton("indoors", "DallasW", row2);
	214	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	215	+ AddSkyboxButton("indoors", "Vasa", row2);
	216	+
	217	+ AddSkyboxButton("winter", "Backyard", row3);
	218	+ AddSkyboxButton("winter", "Creek", row3);
	219	+ AddSkyboxButton("winter", "FootballField3", row3);
	220	+ AddSkyboxButton("winter", "Forest", row3);
	221	+
	222	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	223	+ AddSkyboxButton("winter", "House", row4);
	224	+ AddSkyboxButton("winter", "IceLake", row4);
	225	+ AddSkyboxButton("winter", "IceRiver", row4);
	226	+
	227	+ AddSkyboxButton("winter", "Park3", row5);
	228	+ AddSkyboxButton("winter", "PondWinter", row5);
	229	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	230	+ AddSkyboxButton("winter", "Vindelalven", row5);
	231	+
	232	+ AddSkyboxButton("daz", "TheRock", row6);
	233	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	234	+ AddSkyboxButton("daz", "Winter", row6);
	235	+ AddSkyboxButton("penguins", "desertdawn", row6);
	236	+
	237	+ tab0.add(row0);
	238	+ tab0.add(row1);
	239	+ tab0.add(row2);
	240	+ tab0.add(row3);
	241	+ tab0.add(row4);
	242	+ tab0.add(row5);
	243	+ tab0.add(row6);
	244	+
	245	+ for (int i=5; --i>=0;)
	246	+ {
	247	+ //oe.toolboxPanel.Return();
	248	+ //tab0.add(new cGridBag());
	249	+ }
	250	+ }
	251	+
	252	+ public void ChangeSkybox(String name)
	253	+ {
	254	+ //cameraView.envyoff = false;
	255	+ group.skyboxname = name;
	256	+ group.skyboxext = "jpg";
	257	+ cameraView.repaint();
	258	+ }
	259	+
26	260	//ObjEditor objEditor;
27	261	public void closeUI2()
28	262	{
..	..	@@ -60,6 +294,12 @@
60	294	this.copy = this.group = group;
61	295	//selectees = this.group.selectees;
62	296
	297	+ if (copy.versions == null)
	298	+ {
	299	+ copy.versions = new byte[100][];
	300	+ copy.versionindex = -1;
	301	+ }
	302	+
63	303	if(ui)
64	304	SetupUI(objEditor);
65	305	}
..	..	@@ -80,10 +320,22 @@
80	320	SetupViews(objEditor);
81	321
82	322	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	323	+
	324	+ if (copy.versions == null)
	325	+ {
	326	+ copy.versions = new byte[100][];
	327	+ copy.versionindex = -1;
	328	+
	329	+ Save(true);
	330	+ }
83	331	}
84	332
85	333	void CloneSelection(boolean supports)
86	334	{
	335	+ if (Globals.REPLACEONMAKE)
	336	+ Save();
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
87	339	// Object3D keep = GrafreeD.clipboard;
88	340	//Object3D obj;
89	341	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +346,7 @@
94	346
95	347	makeSomething(clone, i==group.selection.size()-1);
96	348	}
	349	+ Globals.REPLACEONMAKE = keep;
97	350	}
98	351
99	352	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +403,8 @@
150	403
151	404	void SetupMenu2(GroupEditor oe)
152	405	{
	406	+ oe.jTree = new cTree();
	407	+
153	408	Menu menu;
154	409	oe.menuBar.add(menu = new Menu("Edit"));
155	410	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +415,7 @@
160	415	// redoItem = menu.add(new MenuItem("Redo"));
161	416	// redoItem.addActionListener(this);
162	417	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	418	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	419	duplicateItem.addActionListener(this);
165	420	cloneItem = menu.add(new MenuItem("Clone"));
166	421	cloneItem.addActionListener(this);
..	..	@@ -176,7 +431,6 @@
176	431	copyItem.addActionListener(this);
177	432	pasteItem = menu.add(new MenuItem("Paste"));
178	433	pasteItem.addActionListener(this);
179		- menu.add("-");
180	434
181	435	menu.add("-");
182	436	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +442,8 @@
188	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	443	// pasteExpandItem.addActionListener(this);
190	444	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
193	447
194	448	if (Globals.ADVANCED)
195	449	{
..	..	@@ -203,23 +457,23 @@
203	457	//zBufferItem.addActionListener(this);
204	458	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	459	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	460	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	461	+ restoreCameraItem.addActionListener(this);
208	462
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	463	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	464	+// toggleFullScreenItem.addItemListener(this);
	465	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	466	+// cameraMenu.add("-");
	467	+//
	468	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	469	+// toggleTextureItem.addItemListener(this);
	470	+// toggleTextureItem.setState(CameraPane.textureon);
	471	+//
	472	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	473	+// toggleSwitchItem.addItemListener(this);
	474	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	475
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"));
	476	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	477	toggleHandleItem.addItemListener(this);
224	478	toggleHandleItem.setState(CameraPane.HANDLES);
225	479
..	..	@@ -274,7 +528,7 @@
274	528	{
275	529	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	530	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	531	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	532	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	533	oe.cameraMenu.add("-");
280	534	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +536,7 @@
282	536	editLeafItem.addActionListener(this);
283	537	lookAtItem.addActionListener(this);
284	538	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	539	+ //switchViewItem.addActionListener(this);
286	540	}
287	541
288	542	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +581,29 @@
327	581	}
328	582
329	583	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	584	+// grabItem = menu.add(new MenuItem("Grab"));
	585	+// grabItem.addActionListener(this);
332	586	backItem = menu.add(new MenuItem("Back"));
333	587	backItem.addActionListener(this);
334	588	frontItem = menu.add(new MenuItem("Front"));
335	589	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	590	+// compositeItem = menu.add(new MenuItem("Composite"));
	591	+// compositeItem.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
338	595	hideItem = menu.add(new MenuItem("Hidden Group"));
339	596	hideItem.addActionListener(this);
	597	+ }
340	598	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	599	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	600	+
	601	+// menu.add("-");
	602	+//
	603	+// switchItem = menu.add(new MenuItem("Switch node"));
	604	+// switchItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
345	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	608	switchGeoItem.addActionListener(this);
347	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +611,6 @@
349	611	morphItem = menu.add(new MenuItem("Morph Group"));
350	612	morphItem.addActionListener(this);
351	613
352		- if (Globals.ADVANCED)
353		- {
354	614	menu.add("-");
355	615	physicsItem = menu.add(new MenuItem("Physics"));
356	616	physicsItem.addActionListener(this);
..	..	@@ -358,30 +618,29 @@
358	618	frameselectorItem.addActionListener(this);
359	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	620	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	621	}
364	622
365	623	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
368	626	billboardItem = menu.add(new MenuItem("Billboard"));
369	627	billboardItem.addActionListener(this);
370	628	csgItem = menu.add(new MenuItem("CSG"));
371	629	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	630	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	631	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	632	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	633	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	634	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
378	639	if (Globals.ADVANCED)
379	640	{
380	641	menu.add("-");
381	642	linkerItem = menu.add(new MenuItem("Linker"));
382	643	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	644	templateItem = menu.add(new MenuItem("Template"));
386	645	templateItem.addActionListener(this);
387	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +669,7 @@
410	669	genNormalsMESHItem.addActionListener(this);
411	670	if (Globals.ADVANCED)
412	671	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	673	genNormalsMINEItem.addActionListener(this);
415	674	}
416	675	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +762,15 @@
503	762	attachBumpItem.addActionListener(this);
504	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
506	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	767	detachPigmentItem.addActionListener(this);
508	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	769	detachBumpItem.addActionListener(this);
	770	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	771	+ embedTexturesItem.addActionListener(this);
	772	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	773	+ deEmbedTexturesItem.addActionListener(this);
510	774	menu.add("-");
511	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	776	sortbysizeItem.addActionListener(this);
..	..	@@ -533,6 +797,7 @@
533	797	buildToolsMenu(menu);
534	798	}
535	799
	800	+
536	801	void SetupUI2(ObjEditor oe)
537	802	{
538	803	// June 2019
..	..	@@ -575,51 +840,79 @@
575	840	oe.radioPanel.add(dummyButton);
576	841	oe.buttonGroup.add(dummyButton);
577	842	*/
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
	846	+
578	847	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	848
580	849	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	850	//minButton.setToolTipText("Minimize window");
582	851	//minButton.addActionListener(this);
583	852
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	853	+ if (Globals.ADVANCED)
	854	+ {
	855	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	856	+ maxButton.setToolTipText("Maximize window");
	857	+ maxButton.addActionListener(this);
	858	+ }
587	859
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	860	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	861	fullButton.setToolTipText("Full-screen window");
590	862	fullButton.addActionListener(this);
591	863
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
	864	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	865	+ screenfitButton.setToolTipText("Screen fit");
	866	+ screenfitButton.addActionListener(this);
	867	+
	868	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	869	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	870	+ restoreCameraButton.addActionListener(this);
595	871
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
	872	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	873	+ saveButton.setToolTipText("New version");
602	874	saveButton.addActionListener(this);
	875	+
	876	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	877	+ undoButton.setToolTipText("Previous version");
	878	+ undoButton.addActionListener(this);
	879	+ undoButton.setEnabled(false);
603	880
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	881	+ cGridBag updown = new cGridBag().setVertical(true);
	882	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	883	+ restoreButton.setToolTipText("Restore current");
	884	+ restoreButton.addActionListener(this);
	885	+ restoreButton.setEnabled(false);
	886	+
	887	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	888	+ replaceButton.setToolTipText("Replace current");
	889	+ replaceButton.addActionListener(this);
	890	+ replaceButton.setEnabled(false);
	891	+
	892	+ copyOptionsPanel.add(updown);
	893	+
	894	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	895	+ redoButton.setToolTipText("Next version");
	896	+ redoButton.addActionListener(this);
	897	+ redoButton.setEnabled(false);
	898	+
	899	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605	900	liveCB.setToolTipText("Enable animation");
606	901	liveCB.addItemListener(this);
607	902
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	904	oneStepButton.setToolTipText("Animate one step forward");
610	905	oneStepButton.addActionListener(this);
611	906
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	908	fastCB.setToolTipText("Fast mode");
614	909	fastCB.addItemListener(this);
615	910
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- screenfitButton.addActionListener(this);
	911	+ //oe.toolboxPanel.Return();
	912	+
	913	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	914	+// trackCB.setToolTipText("Enable tracking");
	915	+// trackCB.addItemListener(this);
623	916
624	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	918	// screenfitpointButton.addActionListener(this);
..	..	@@ -629,67 +922,155 @@
629	922	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	923	snapobjectButton.addActionListener(this);
631	924	snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ fourButton.addActionListener(this);
	928	+ fourButton.setToolTipText("Show control panel only");
632	929	}
633	930
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	931	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	932
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
642	935	twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- fourButton.addActionListener(this);
645		- fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- sixButton.setToolTipText("2-column layout left");
648		- sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
	936	+ this.fullscreenLayout = twoButton;
	937	+
	938	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ threeButton.setToolTipText("Show controls and 3D view");
651	940	threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
	941	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ sixButton.setToolTipText("Show 3D view and controls");
	943	+ sixButton.addActionListener(this);
	944	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+// sevenButton.setToolTipText("3-column layout");
	946	+// sevenButton.addActionListener(this);
655	947	//
656	948
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	949	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ rootButton.setToolTipText("Open selection in new tab");
659	951	rootButton.addActionListener(this);
660	952
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	953	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	954	closeButton.setToolTipText("Close tab");
663	955	closeButton.addActionListener(this);
664	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	957	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	958	+
	959	+ cGridBag row1 = new cGridBag();
668	960
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	961	+ // INSERT
	962	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	963	+ gridButton.setToolTipText("Create grid");
	964	+ gridButton.addActionListener(this);
	965	+
	966	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ boxButton.setToolTipText("Create box");
	968	+ boxButton.addActionListener(this);
	969	+
	970	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	971	+ sphereButton.setToolTipText("Create sphere");
	972	+ sphereButton.addActionListener(this);
	973	+
	974	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	975	+ coneButton.setToolTipText("Create cone");
	976	+ coneButton.addActionListener(this);
	977	+
	978	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	979	+ torusButton.setToolTipText("Create torus");
	980	+ torusButton.addActionListener(this);
	981	+
	982	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	983	+ superButton.setToolTipText("Create superellipsoid");
	984	+ superButton.addActionListener(this);
	985	+
	986	+ if (Globals.ADVANCED)
	987	+ {
	988	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ kleinButton.setToolTipText("Create Klein bottle");
	990	+ kleinButton.addActionListener(this);
	991	+ }
	992	+
	993	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	994	+ particlesButton.setToolTipText("Create particle system");
	995	+ particlesButton.addActionListener(this);
	996	+
	997	+ oe.toolboxPanel.add(row1);
	998	+
	999	+ cGridBag row2 = new cGridBag();
	1000	+
	1001	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1002	+ groupButton.setToolTipText("Create group");
	1003	+ groupButton.addActionListener(this);
	1004	+
	1005	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ compositeButton.setToolTipText("Create composite");
	1007	+ compositeButton.addActionListener(this);
	1008	+
	1009	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1010	+ switchButton.setToolTipText("Create item switcher");
	1011	+ switchButton.addActionListener(this);
	1012	+
	1013	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1014	+ loopButton.setToolTipText("Create loop");
	1015	+ loopButton.addActionListener(this);
	1016	+
	1017	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ textureButton.setToolTipText("Create texture");
	1019	+ textureButton.addActionListener(this);
	1020	+
	1021	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ overlayButton.setToolTipText("Create overlay");
	1023	+ overlayButton.addActionListener(this);
	1024	+
	1025	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ lightButton.setToolTipText("Create light");
	1027	+ lightButton.addActionListener(this);
	1028	+
	1029	+ oe.toolboxPanel.add(row2);
	1030	+
	1031	+ // ENVYMAPS
	1032	+ cGridBag skyboxpane = new cGridBag();
	1033	+ skyboxpane.preferredHeight = 100;
	1034	+
	1035	+ oe.toolboxPanel.add(skyboxpane);
	1036	+
	1037	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1038	+ skyboxpane.add(skyboxpanel);
	1039	+
	1040	+ AddSkyboxTab0(skyboxpanel);
	1041	+ AddSkyboxTab1(skyboxpanel);
	1042	+ AddSkyboxTab2(skyboxpanel);
	1043	+
	1044	+ // EDIT panel
	1045	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ editButton.setToolTipText("Pin selection controls");
671	1047	editButton.addActionListener(this);
672	1048
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
675	1051	uneditButton.addActionListener(this);
676	1052
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1053	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1054	+ allParamsButton.setToolTipText("Show all controle");
679	1055	allParamsButton.addActionListener(this);
680	1056
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1057	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1058	clearPanelButton.setToolTipText("Clear edit panel");
683	1059	clearPanelButton.addActionListener(this);
684	1060
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	1062	unselectButton.setToolTipText("Unselect");
687	1063	unselectButton.addActionListener(this);
688	1064
689		- commandsPanel.preferredHeight = 1;
	1065	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+ flashSelectionButton.setToolTipText("Highlight selection");
	1067	+ flashSelectionButton.addActionListener(this);
690	1068
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1069	+ editCommandsPanel.preferredHeight = 1;
	1070	+
	1071	+ SetPinStates(false);
	1072	+// oe.treePanel.add(commandsPanel);
	1073	+// oe.treePanel.Return();
693	1074
694	1075	// oe.aConstraints.gridx += 1;
695	1076	// oe.aConstraints.weighty = 0;
..	..	@@ -706,32 +1087,20 @@
706	1087
707	1088	JScrollPane jSP;
708	1089	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1091	ResetModel();
711	1092
712	1093	oe.treePanel.add(jSPPanel);
713	1094	oe.treePanel.Return();
714	1095
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	1096	oe.treePanel.add(copyOptionsPanel);
731	1097	oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
732	1101
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
735	1104
736	1105	//jList.addListSelectionListener(this);
737	1106	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1108,7 @@
739	1108	//jTree.setEditable(true);
740	1109	oe.jTree.setDragEnabled(true);
741	1110	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1112
744	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1114
..	..	@@ -751,29 +1120,49 @@
751	1120	dgr.addDragGestureListener(this);
752	1121	}catch(Exception e) {}
753	1122	*/
754		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
755	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1125	}
757	1126
758	1127	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1128	{
	1129	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1130	+ colorCB.setToolTipText("Copy color when dropped");
	1131	+ colorCB.addItemListener(this);
	1132	+
	1133	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1134	+ materialCB.setToolTipText("Copy material when dropped");
	1135	+ materialCB.addItemListener(this);
	1136	+
	1137	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1138	+ textureCB.setToolTipText("Copy texture when dropped");
	1139	+ textureCB.addItemListener(this);
	1140	+
	1141	+ panel.Return();
	1142	+
760	1143	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1144	boxCB.setToolTipText("Display bounding boxes");
762	1145	boxCB.addItemListener(this);
763	1146
764	1147	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1149	zoomBoxCB.addItemListener(this);
767	1150
768	1151	if (true) // Globals.ADVANCED)
769	1152	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1153	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1154	+// supportCB.setToolTipText("Enable rigging");
	1155	+// supportCB.addItemListener(this);
	1156	+
	1157	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1158	+ freezeCB.setToolTipText("Fast moving camera");
	1159	+ freezeCB.addItemListener(this);
773	1160
774	1161	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1162	// localCB.addItemListener(this);
776	1163
	1164	+ panel.Return();
	1165	+
777	1166	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1167	crowdCB.setToolTipText("Used for crowds");
779	1168	crowdCB.addItemListener(this);
..	..	@@ -790,6 +1179,8 @@
790	1179	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1180	// speakerMocapCB.addItemListener(this);
792	1181
	1182	+ panel.Return();
	1183	+
793	1184	if (false)
794	1185	{
795	1186	// handled in scripts
..	..	@@ -804,34 +1195,74 @@
804	1195	//constraints.gridy += 1;
805	1196	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1197	smoothfocusCB.addItemListener(this);
	1198	+ panel.Return();
807	1199	}
808	1200
809	1201	//constraints.gridx += 1;
810	1202	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1203	// debugCB.addItemListener(this);
812	1204
	1205	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1206	+ trackCB.setToolTipText("Enable tracking target");
	1207	+ trackCB.addItemListener(this);
	1208	+
813	1209	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1210	+ oeilCB.setToolTipText("Move camera when tracking");
814	1211	oeilCB.addItemListener(this);
815	1212
	1213	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1214	+ shadowCB.setToolTipText("When live compute shadows");
	1215	+ shadowCB.addItemListener(this);
	1216	+
	1217	+ panel.Return();
	1218	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1219	+ toggleTextureCB.setToolTipText("Load textures");
	1220	+ toggleTextureCB.addItemListener(this);
	1221	+
	1222	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1223	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1224	+ toggleSwitchCB.addItemListener(this);
	1225	+
	1226	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1227	+ autokeepCB.setToolTipText("On structure change");
	1228	+ autokeepCB.addItemListener(this);
	1229	+
	1230	+ panel.Return();
	1231	+ if (Globals.ADVANCED)
	1232	+ {
816	1233	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1234	lookAtCB.setToolTipText("Look-at target");
818	1235	lookAtCB.addItemListener(this);
	1236	+ }
819	1237
820	1238	}
821	1239
822	1240	cGridBag fill = new cGridBag();
823		-
824	1241	fill.preferredHeight = 200;
	1242	+ cGridBag fill2 = new cGridBag();
	1243	+ fill2.preferredHeight = 200;
	1244	+ cGridBag fill3 = new cGridBag();
	1245	+ fill3.preferredHeight = 200;
825	1246
826	1247	panel.add(fill);
	1248	+ panel.add(fill2);
	1249	+ panel.add(fill3);
827	1250
828	1251	}
829	1252
830	1253	void EditObject(Object3D obj)
831	1254	{
832	1255	cRadio radioButton = new cRadio(obj.name);
	1256	+
	1257	+ // June 2019. Patch to avoid bug with transparency.
	1258	+ radioButton.hadMaterial = obj.material != null;
	1259	+ if (!radioButton.hadMaterial)
	1260	+ {
	1261	+ obj.material = new cMaterial();
	1262	+ }
	1263	+
833	1264	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
835	1266	radioButton.SetCamera(cameraView.renderCamera, false);
836	1267	radioButton.addActionListener(this);
837	1268	radioPanel.add(radioButton);
..	..	@@ -851,23 +1282,28 @@
851	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1283	}
853	1284
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	1285	+ cToggleButton liveCB;
	1286	+ cCheckBox supportCB;
	1287	+ cCheckBox localCB;
	1288	+ cCheckBox crowdCB;
	1289	+ cCheckBox smoothCB;
	1290	+ cToggleButton fastCB;
	1291	+ cCheckBox slowCB;
	1292	+ cCheckBox boxCB;
	1293	+ cCheckBox zoomBoxCB;
	1294	+ cCheckBox freezeCB;
	1295	+ //cToggleButton trackCB;
	1296	+ cCheckBox trackCB;
	1297	+ cCheckBox smoothfocusCB;
865	1298	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
871	1307
872	1308	// static int COLOR = 1;
873	1309	// static int MATERIAL = 2;
..	..	@@ -875,9 +1311,9 @@
875	1311
876	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1313
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
881	1317
882	1318	public void itemStateChanged(ItemEvent e)
883	1319	{
..	..	@@ -970,6 +1406,18 @@
970	1406	{
971	1407	cameraView.ToggleOeil();
972	1408	}
	1409	+ else if(e.getSource() == shadowCB)
	1410	+ {
	1411	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1412	+ }
	1413	+ else if(e.getSource() == freezeCB)
	1414	+ {
	1415	+ Globals.FREEZEONMOVE ^= true;
	1416	+ }
	1417	+ else if(e.getSource() == autokeepCB)
	1418	+ {
	1419	+ Globals.REPLACEONMAKE ^= true;
	1420	+ }
973	1421	else if(e.getSource() == lookAtCB)
974	1422	{
975	1423	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1434,8 @@
986	1434
987	1435	/**/
988	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1440	// We can't move the root node or an empty selection
992	1441	return;
..	..	@@ -1049,8 +1498,6 @@
1049	1498	}
1050	1499	}
1051	1500
1052		- String string = (String) object;
1053		-
1054	1501	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1502	// if( object instanceof java.io.File[])
1056	1503	// {
..	..	@@ -1058,6 +1505,8 @@
1058	1505	// objEditor.DropFile((java.io.File[]) object, true);
1059	1506	// return;
1060	1507	// }
	1508	+
	1509	+ String string = object.toString();
1061	1510
1062	1511	// File path for Mac and Windows
1063	1512	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1552,33 @@
1103	1552
1104	1553	assert target == objEditor.jTree;
1105	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
1106	1556	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1558	} catch (Exception e) {
1109	1559	System.out.println("destinationPath : " + destinationPath);
1110	1560	return;
1111	1561	}
1112	1562
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
1114	1564	{
	1565	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1566	+
	1567	+ // Cannot move into itself
	1568	+ if (child == destinationLeaf)
	1569	+ return;
	1570	+ }
	1571	+
	1572	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1573	+// {
1115	1574	loadClipboard(true);
1116	1575	objEditor.jTree.setSelectionPath(destinationPath);
1117	1576	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
1123	1582	}
1124	1583	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1224,22 +1683,30 @@
1224	1683	{
1225	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1685	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1686	+// gridItem = menu.add(new MenuItem("Grid"));
	1687	+// gridItem.addActionListener(this);
	1688	+// rectoidItem = menu.add(new MenuItem("Box"));
	1689	+// rectoidItem.addActionListener(this);
	1690	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1691	+// ellipsoidItem.addActionListener(this);
	1692	+// coneItem = menu.add(new MenuItem("Cone"));
	1693	+// coneItem.addActionListener(this);
	1694	+// torusItem = menu.add(new MenuItem("Torus"));
	1695	+// torusItem.addActionListener(this);
	1696	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1697	+// superItem.addActionListener(this);
	1698	+
	1699	+ cameraItem = menu.add(new MenuItem("Camera"));
	1700	+ cameraItem.addActionListener(this);
	1701	+
	1702	+ if (!Globals.ADVANCED)
	1703	+ {
1239	1704	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1705	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
1243	1710	if (Globals.ADVANCED)
1244	1711	{
1245	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1732,15 @@
1265	1732	}
1266	1733	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1734	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1735	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1736	+// overlayItem.addActionListener(this);
	1737	+// lightItem = menu.add(new MenuItem("Light"));
	1738	+// lightItem.addActionListener(this);
1272	1739	menu.add("-");
1273	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1741	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1277	1744	doubleItem = menu.add(new MenuItem("Fork"));
1278	1745	doubleItem.addActionListener(this);
1279	1746	if (Globals.ADVANCED)
..	..	@@ -1289,6 +1756,9 @@
1289	1756	animationItem.addItemListener(this);
1290	1757	animationItem.setState(Globals.ANIMATION);
1291	1758
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
	1761	+
1292	1762	menu.add("-");
1293	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	1764	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +1771,8 @@
1301	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	1772	reduce34MorphItem.addActionListener(this);
1303	1773	menu.add("-");
	1774	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1775	+ memoryItem.addActionListener(this);
1304	1776	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	1777	computeAOItem.addActionListener(this);
1306	1778
..	..	@@ -1309,8 +1781,6 @@
1309	1781	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	1782	mirrorItem.addActionListener(this);
1311	1783	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	1785	analyzeItem.addActionListener(this);
1316	1786	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +1924,34 @@
1454	1924	shadow.material = new cMaterial(obj.material);
1455	1925	shadow.material.diffuse = 0.0001f;
1456	1926	shadow.material.specular = 0.0001f;
	1927	+ //shadow.projectedVertices[1].x = 300;
1457	1928
1458	1929	makeSomething(shadow);
1459	1930	}
	1931	+
	1932	+ private void ClearUnpinned()
	1933	+ {
	1934	+ //for (Object3D obj : listUI)
	1935	+ for (int i=listUI.size(); --i>=0;)
	1936	+ {
	1937	+ Object3D obj = listUI.elementAt(i);
	1938	+ if (!obj.pinned)
	1939	+ {
	1940	+ obj.CloseUI();
	1941	+ listUI.remove(i);
	1942	+ }
	1943	+ }
	1944	+ }
	1945	+
	1946	+ private void EditElement(Object3D elem, boolean newWindow)
	1947	+ {
	1948	+ // if (!(elem instanceof Composite))
	1949	+ // newWindow = false;
	1950	+ listUI.add(elem);
	1951	+ elem.openEditWindow(this, newWindow); //, false);
	1952	+ System.out.println("edit : " + elem);
	1953	+ elem.editWindow.refreshContents(true); // ? new
	1954	+ }
1460	1955
1461	1956	/**
1462	1957	* applyExample
..	..	@@ -1701,7 +2196,7 @@
1701	2196	{
1702	2197	ScreenFit();
1703	2198	} else
1704		- if (source == switchItem)
	2199	+ if (source == switchViewItem)
1705	2200	{
1706	2201	cVector v1 = new cVector();
1707	2202	cVector v2 = new cVector();
..	..	@@ -1710,11 +2205,11 @@
1710	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2206	objEditor.cameraView.repaint();
1712	2207	} else
1713		- if (source == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1714	2209	{
1715	2210	makeSomething(new Box());
1716	2211	} else
1717		- if (source == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1718	2213	{
1719	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2288,27 @@
1793	2288
1794	2289	makeSomething(obj);
1795	2290	} else
1796		- if (source == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1797	2292	{
1798	2293	makeSomething(new Grid());
1799	2294	} else
1800		- if (source == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2296	{
1802	2297	makeSomething(new Sphere());
1803	2298	} else
1804		- if (source == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1805	2300	{
1806	2301	makeSomething(new Cone());
1807	2302	} else
1808		- if (source == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1809	2304	{
1810	2305	makeSomething(new Torus());
1811	2306	} else
1812		- if (source == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1813	2308	{
1814	2309	makeSomething(new Superellipsoid());
1815	2310	} else
1816		- if (source == kleinItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
1817	2312	{
1818	2313	makeSomething(new Klein());
1819	2314	} else
..	..	@@ -1833,7 +2328,7 @@
1833	2328	{
1834	2329	makeSomething(new BezierSurface());
1835	2330	} else
1836		- if (source == overlayItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1837	2332	{
1838	2333	/*
1839	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2376,27 @@
1881	2376	s.setup();
1882	2377	makeSomething(s);
1883	2378	} else
1884		- if (source == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1885	2380	{
1886	2381	makeSomething(new Light());
1887	2382	} else
	2383	+// if (source == skybox1Button \|\|
	2384	+// source == skybox2Button \|\|
	2385	+// source == skybox3Button \|\|
	2386	+// source == skybox4Button \|\|
	2387	+// source == skybox5Button \|\|
	2388	+// source == skybox6Button \|\|
	2389	+// source == skybox7Button \|\|
	2390	+// source == skybox11Button \|\|
	2391	+// source == skybox12Button \|\|
	2392	+// source == skybox13Button \|\|
	2393	+// source == skybox14Button \|\|
	2394	+// source == skybox15Button \|\|
	2395	+// source == skybox16Button \|\|
	2396	+// source == skybox17Button)
	2397	+// {
	2398	+// ChangeSkybox(source);
	2399	+// } else
1888	2400	if (source == csgItem)
1889	2401	{
1890	2402	group(new CSG());
..	..	@@ -1931,30 +2443,30 @@
1931	2443
1932	2444	group(g);
1933	2445	} else
1934		- if (source == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1935	2447	{
1936	2448	Composite csg = new GroupLeaf();
1937	2449	csg.count = 5;
1938	2450	group(csg);
1939		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1940	2452	csg.addChild(child);
1941	2453	child.addChild(csg);
1942	2454	} else
1943	2455	if (source == doubleItem)
1944	2456	{
1945		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1946	2458	csg.count = 5;
1947	2459	group(csg);
1948		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1949	2461	csg.addChild(child);
1950	2462	child.addChild(csg);
1951		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1952	2464	csg.addChild(child);
1953	2465	child.addChild(csg);
1954	2466	} else
1955	2467	if (source == tripleItem)
1956	2468	{
1957		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1958	2470	csg.count = 4;
1959	2471	group(csg);
1960	2472	Composite child = new cGroup();
..	..	@@ -1970,7 +2482,7 @@
1970	2482	if (source == computeAOItem)
1971	2483	{
1972	2484	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
1974	2486	} else
1975	2487	if (source == recompileItem)
1976	2488	{
..	..	@@ -2018,15 +2530,31 @@
2018	2530	} else
2019	2531	if (source == undoButton)
2020	2532	{
	2533	+ // Go to previous version
	2534	+ //if (!Undo())
	2535	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2021	2536	Undo();
	2537	+ } else
	2538	+ if (source == restoreButton)
	2539	+ {
	2540	+ // Restore current version
	2541	+ Restore();
	2542	+ } else
	2543	+ if (source == replaceButton)
	2544	+ {
	2545	+ // Overwrite current version
	2546	+ Replace();
2022	2547	} else
2023	2548	if (source == redoButton)
2024	2549	{
	2550	+ // Go to next version
2025	2551	Redo();
2026	2552	} else
2027	2553	if (source == saveButton)
2028	2554	{
2029		- Save();
	2555	+ // Save a new version
	2556	+ if (!Save(true))
	2557	+ java.awt.Toolkit.getDefaultToolkit().beep();
2030	2558	} else
2031	2559	if (source == oneStepButton)
2032	2560	{
..	..	@@ -2035,17 +2563,14 @@
2035	2563	} else
2036	2564	if (source == screenfitButton)
2037	2565	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2566	ScreenFit();
2040	2567	} else
2041	2568	if (source == screenfitpointButton)
2042	2569	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2570	ScreenFitPoint();
2045	2571	} else
2046	2572	if (source == snapobjectButton)
2047	2573	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2574	SnapObject();
2050	2575	} else
2051	2576	// if (event.getSource() == recompileButton)
..	..	@@ -2409,7 +2934,7 @@
2409	2934	{
2410	2935	StepAll();
2411	2936	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	2938	{
2414	2939	//int indices[] = jList.getSelectedIndices();
2415	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +2946,9 @@
2421	2946	{
2422	2947	ClearSelection(true);
2423	2948	} else
2424		- if (source == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2425	2950	{
2426		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2427	2952	} else
2428	2953	if (source == hideItem)
2429	2954	{
..	..	@@ -2441,11 +2966,11 @@
2441	2966	{
2442	2967	makeSomething(new Camera());
2443	2968	} else
2444		- if (source == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2445	2970	{
2446	2971	group(new Composite());
2447	2972	} else
2448		- if (source == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2449	2974	{
2450	2975	RandomNode random = new RandomNode();
2451	2976	group(random);
..	..	@@ -2547,7 +3072,7 @@
2547	3072	{
2548	3073	group(new cLinker());
2549	3074	} else
2550		- if (source == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2551	3076	{
2552	3077	group(new TextureNode());
2553	3078	} else
..	..	@@ -2567,17 +3092,30 @@
2567	3092	{
2568	3093	CastShadow(2);
2569	3094	} else
2570		- if (source == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3096	{
2572		- //ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
2573	3099	for (int i=0; i<group.selection.size(); i++)
2574	3100	{
2575		- Ungroup(group.selection.get(i));
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
2576	3106	}
2577	3107
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3108	+ if (!hasRoot)
	3109	+ {
	3110	+ for (int i=0; i<group.selection.size(); i++)
	3111	+ {
	3112	+ Ungroup(group.selection.get(i));
	3113	+ }
	3114	+
	3115	+ ClearSelection(false);
	3116	+
	3117	+ refreshContents();
	3118	+ }
2581	3119	} else
2582	3120	if (source == genUVItem)
2583	3121	{
..	..	@@ -2878,7 +3416,7 @@
2878	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3417	{
2880	3418	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2882	3420	}
2883	3421
2884	3422	refreshContents();
..	..	@@ -2894,6 +3432,31 @@
2894	3432
2895	3433	refreshContents();
2896	3434	} else
	3435	+ if (source == embedTexturesItem)
	3436	+ {
	3437	+ Object3D obj;
	3438	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3439	+ {
	3440	+ obj = (Object3D)e.nextElement();
	3441	+ obj.EmbedTextures(true);
	3442	+ }
	3443	+
	3444	+ refreshContents();
	3445	+ } else
	3446	+ if (source == deEmbedTexturesItem)
	3447	+ {
	3448	+ Object3D obj;
	3449	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3450	+ {
	3451	+ obj = (Object3D)e.nextElement();
	3452	+ obj.EmbedTextures(false);
	3453	+ }
	3454	+
	3455	+ CameraPane.texturepigment.clear();
	3456	+ CameraPane.texturebump.clear();
	3457	+
	3458	+ refreshContents();
	3459	+ } else
2897	3460	if (source == flashSelectionButton)
2898	3461	{
2899	3462	CameraPane.flash = true;
..	..	@@ -2905,6 +3468,10 @@
2905	3468	if (source == twoButton)
2906	3469	{
2907	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2908	3475	// bug
2909	3476	//gridPanel.setDividerLocation(1.0);
2910	3477	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2960,6 +3527,9 @@
2960	3527	{
2961	3528	radio.layout = threeButton;
2962	3529
	3530	+ if (CameraPane.FULLSCREEN)
	3531	+ fullscreenLayout = radio.layout;
	3532	+
2963	3533	// bigThree.remove(scenePanel);
2964	3534	// bigThree.remove(centralPanel);
2965	3535	// bigThree.remove(XYZPanel);
..	..	@@ -2988,8 +3558,8 @@
2988	3558	// centralPanel.setVisible(true);
2989	3559	// XYZPanel.setVisible(true);
2990	3560	bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
2991	3562	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3563	bigThree.FlushUI();
2994	3564
2995	3565	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3567,9 @@
2997	3567	if (source == fourButton)
2998	3568	{
2999	3569	radio.layout = fourButton;
	3570	+
	3571	+ if (CameraPane.FULLSCREEN)
	3572	+ fullscreenLayout = radio.layout;
3000	3573
3001	3574	// bigThree.remove(scenePanel);
3002	3575	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3608,9 @@
3035	3608	{
3036	3609	radio.layout = sixButton;
3037	3610
	3611	+ if (CameraPane.FULLSCREEN)
	3612	+ fullscreenLayout = radio.layout;
	3613	+
3038	3614	// bigThree.remove(scenePanel);
3039	3615	// bigThree.remove(centralPanel);
3040	3616	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3639,8 @@
3063	3639	// centralPanel.setVisible(true);
3064	3640	// XYZPanel.setVisible(false);
3065	3641	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3642	bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
3068	3644	bigThree.FlushUI();
3069	3645
3070	3646	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3648,9 @@
3072	3648	if (source == sevenButton)
3073	3649	{
3074	3650	radio.layout = sevenButton;
	3651	+
	3652	+ if (CameraPane.FULLSCREEN)
	3653	+ fullscreenLayout = radio.layout;
3075	3654
3076	3655	// bigThree.remove(scenePanel);
3077	3656	// bigThree.remove(centralPanel);
..	..	@@ -3128,12 +3707,19 @@
3128	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3708	{
3130	3709	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
3133	3718	buttonGroup.remove(ab);
3134	3719	radioPanel.remove(ab);
3135	3720
3136		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
3137	3723	// ab.GetObject().objectUI = null; // ?????????
3138	3724
3139	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3732,12 @@
3146	3732	} else
3147	3733	if (source == editItem \|\| source == editButton)
3148	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
3149	3741	EditSelection(false);
3150	3742	} else
3151	3743	if (source == uneditButton)
..	..	@@ -3155,6 +3747,7 @@
3155	3747	Object3D child = (Object3D)e.nextElement();
3156	3748	if(child.editWindow != null)
3157	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
3158	3751	child.CloseUI();
3159	3752	listUI.remove(child);
3160	3753
..	..	@@ -3171,6 +3764,7 @@
3171	3764	//copy.ClearUI();
3172	3765	for (Object3D obj : listUI)
3173	3766	{
	3767	+ obj.pinned = false;
3174	3768	obj.CloseUI();
3175	3769	}
3176	3770	listUI.clear();
..	..	@@ -3180,7 +3774,7 @@
3180	3774	{
3181	3775	assert(copy == group);
3182	3776
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	3778
3185	3779	for (Object3D obj : listUI)
3186	3780	{
..	..	@@ -3229,6 +3823,9 @@
3229	3823	}
3230	3824
3231	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
3232	3829	//Globals.theRenderer.object = group;
3233	3830	if(!useclient)
3234	3831	{
..	..	@@ -3247,6 +3844,7 @@
3247	3844
3248	3845	// fix "+" issue
3249	3846	//group.editWindow = this;
	3847	+ group.manipWindow = this;
3250	3848
3251	3849	/*
3252	3850	currentLayout = radio.layout;
..	..	@@ -3254,6 +3852,13 @@
3254	3852	currentLayout = sevenButton;
3255	3853	*/
3256	3854	radio.layout.doClick();
	3855	+
	3856	+ ClearUnpinned();
	3857	+ //Grafreed.Assert(group != null);
	3858	+ //Grafreed.Assert(group.selection != null);
	3859	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3860	+ if (group.selection == null \|\| group.selection.size() == 1)
	3861	+ EditSelection(false);
3257	3862	keepparent = group.parent;
3258	3863	// PARENT = NULL or not???
3259	3864	//group.parent = null; // ROOT
..	..	@@ -3267,7 +3872,7 @@
3267	3872	cameraView.ProtectCamera();
3268	3873	cameraView.repaint();
3269	3874	return;
3270		- } else if (event.getSource() == revertCameraItem)
	3875	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	3876	{
3272	3877	cameraView.RevertCamera();
3273	3878	cameraView.repaint();
..	..	@@ -3846,7 +4451,7 @@
3846	4451
3847	4452	try
3848	4453	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4454	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4455	}
3851	4456	catch (Exception e)
3852	4457	{
..	..	@@ -4321,28 +4926,25 @@
4321	4926	// }
4322	4927	// }
4323	4928
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	4929	void EditSelection(boolean newWindow)
4329	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
4330	4937	// aConstraints.gridy = 0;
4331	4938	for (int i=0; i<group.selection.size(); i++)
4332	4939	{
4333	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	4943
4337	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	4945	if(elem != group \|\| !newWindow)
4339	4946	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
4346	4948	}
4347	4949	}
4348	4950	}
..	..	@@ -4417,7 +5019,8 @@
4417	5019	//new Exception().printStackTrace();
4418	5020
4419	5021	freezemodel = true;
4420		-
	5022	+ ClearUnpinned();
	5023	+
4421	5024	/**/
4422	5025	//switch (event.id)
4423	5026	{
..	..	@@ -4450,7 +5053,7 @@
4450	5053	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5054	// a camera
4452	5055	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5056	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5057	{
4455	5058	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5059	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5062,13 @@
4459	5062	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5063	}
4461	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
4462	5072	refreshContents();
4463	5073	//return true;
4464	5074	}
..	..	@@ -4468,9 +5078,18 @@
4468	5078	freezemodel = false;
4469	5079	}
4470	5080
	5081	+ void SetPinStates(boolean enabled)
	5082	+ {
	5083	+ editButton.setEnabled(enabled);
	5084	+ uneditButton.setEnabled(enabled);
	5085	+ unselectButton.setEnabled(enabled);
	5086	+ flashSelectionButton.setEnabled(enabled);
	5087	+ }
	5088	+
4471	5089	void refreshContents(boolean cp)
4472	5090	{
4473		- if (!Globals.MOUSEDRAGGED)
	5091	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5092	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5093	{
4475	5094	objEditor.ClearInfo(); // .GetMaterial());
4476	5095
..	..	@@ -4569,7 +5188,8 @@
4569	5188
4570	5189	if (cut)
4571	5190	{
4572		- Save();
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4573	5193	//int indices[] = jList.getSelectedIndices();
4574	5194	//for (int i = indices.length - 1; i >= 0; i--)
4575	5195	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5292,10 @@
4672	5292
4673	5293	void paste(boolean expand)
4674	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4675	5299	// if (GrafreeD.clipboard == null)
4676	5300	// return;
4677	5301	boolean first = true;
..	..	@@ -4731,6 +5355,7 @@
4731	5355	Grafreed.clipboard.get(0).parent = keepparent;
4732	5356	}
4733	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4734	5359	ResetModel();
4735	5360	refreshContents();
4736	5361	}
..	..	@@ -4866,6 +5491,10 @@
4866	5491
4867	5492	void group(Object3D csg, boolean grab)
4868	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4869	5498	if (//false) // why??
4870	5499	!group.selection.isEmpty())
4871	5500	{
..	..	@@ -4979,10 +5608,15 @@
4979	5608	//node.add(csg);
4980	5609	//makeSomething(node);
4981	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4982	5612	}
4983	5613
4984	5614	void Ungroup(Object3D g)
4985	5615	{
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
4986	5620	if (g instanceof HiddenObject)
4987	5621	{
4988	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5633,7 @@
4999	5633	objEditor.makeSomething(g.get(i), false);
5000	5634	}
5001	5635	}
	5636	+ Globals.REPLACEONMAKE = keep;
5002	5637	}
5003	5638
5004	5639	void ungroup()
..	..	@@ -5287,13 +5922,44 @@
5287	5922	cButton clearpanelButton;
5288	5923	cButton unselectButton;
5289	5924
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
	5925	+ cButton restoreCameraButton;
	5926	+
5295	5927	cButton saveButton;
5296	5928	cButton oneStepButton;
	5929	+
	5930	+ cButton groupButton;
	5931	+ cButton ungroupButton;
	5932	+ cButton compositeButton;
	5933	+ cButton switchButton;
	5934	+ cButton loopButton;
	5935	+ cButton textureButton;
	5936	+
	5937	+ cButton skybox1Button;
	5938	+ cButton skybox2Button;
	5939	+ cButton skybox3Button;
	5940	+ cButton skybox4Button;
	5941	+ cButton skybox5Button;
	5942	+ cButton skybox6Button;
	5943	+ cButton skybox7Button;
	5944	+
	5945	+ cButton skybox11Button;
	5946	+ cButton skybox12Button;
	5947	+ cButton skybox13Button;
	5948	+ cButton skybox14Button;
	5949	+ cButton skybox15Button;
	5950	+ cButton skybox16Button;
	5951	+ cButton skybox17Button;
	5952	+
	5953	+ cButton gridButton;
	5954	+ cButton boxButton;
	5955	+ cButton sphereButton;
	5956	+ cButton coneButton;
	5957	+ cButton torusButton;
	5958	+ cButton superButton;
	5959	+ cButton kleinButton;
	5960	+ cButton particlesButton;
	5961	+ cButton overlayButton;
	5962	+ cButton lightButton;
5297	5963
5298	5964	cButton screenfitButton;
5299	5965	cButton screenfitpointButton;
..	..	@@ -5315,11 +5981,11 @@
5315	5981	//JTree jTree;
5316	5982	private MenuItem lookAtItem;
5317	5983	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
5319	5985	private MenuItem cutItem;
5320	5986	private MenuItem undoItem;
5321	5987	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	5988	+ private JMenuItem duplicateItem;
5323	5989	private MenuItem cloneItem;
5324	5990	private MenuItem cloneSupportItem;
5325	5991	private MenuItem overwriteGeoItem;
..	..	@@ -5347,7 +6013,7 @@
5347	6013	private MenuItem pasteLinkItem;
5348	6014	private MenuItem pasteCloneItem;
5349	6015	private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
5351	6017	private MenuItem clearAllItem;
5352	6018	private MenuItem genUVItem;
5353	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -5407,7 +6073,7 @@
5407	6073	private MenuItem frontItem;
5408	6074	private MenuItem cameraItem;
5409	6075	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
5411	6077	private MenuItem physicsItem;
5412	6078	private MenuItem frameselectorItem;
5413	6079	private MenuItem scriptNodeItem;
..	..	@@ -5431,6 +6097,8 @@
5431	6097	private MenuItem attachBumpItem;
5432	6098	private MenuItem detachBumpItem;
5433	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5434	6102
5435	6103	private MenuItem particleItem;
5436	6104	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6149,5 @@
5481	6149
5482	6150	Menu cameraMenu;
5483	6151	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6152	+ MenuItem restoreCameraItem;
5485	6153	}