~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
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 + "/" + s + ".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("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	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 ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -80,10 +317,22 @@
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
86	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
87	336	// Object3D keep = GrafreeD.clipboard;
88	337	//Object3D obj;
89	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +343,7 @@
94	343
95	344	makeSomething(clone, i==group.selection.size()-1);
96	345	}
	346	+ Globals.REPLACEONMAKE = keep;
97	347	}
98	348
99	349	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +400,8 @@
150	400
151	401	void SetupMenu2(GroupEditor oe)
152	402	{
	403	+ oe.jTree = new cTree();
	404	+
153	405	Menu menu;
154	406	oe.menuBar.add(menu = new Menu("Edit"));
155	407	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +412,7 @@
160	412	// redoItem = menu.add(new MenuItem("Redo"));
161	413	// redoItem.addActionListener(this);
162	414	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	415	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	416	duplicateItem.addActionListener(this);
165	417	cloneItem = menu.add(new MenuItem("Clone"));
166	418	cloneItem.addActionListener(this);
..	..	@@ -187,8 +439,8 @@
187	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	440	// pasteExpandItem.addActionListener(this);
189	441	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
192	444
193	445	if (Globals.ADVANCED)
194	446	{
..	..	@@ -202,23 +454,23 @@
202	454	//zBufferItem.addActionListener(this);
203	455	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	456	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
207	459
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	472
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	474	toggleHandleItem.addItemListener(this);
223	475	toggleHandleItem.setState(CameraPane.HANDLES);
224	476
..	..	@@ -273,7 +525,7 @@
273	525	{
274	526	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	527	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	529	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	530	oe.cameraMenu.add("-");
279	531	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +533,7 @@
281	533	editLeafItem.addActionListener(this);
282	534	lookAtItem.addActionListener(this);
283	535	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	536	+ //switchViewItem.addActionListener(this);
285	537	}
286	538
287	539	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +578,29 @@
326	578	}
327	579
328	580	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
331	583	backItem = menu.add(new MenuItem("Back"));
332	584	backItem.addActionListener(this);
333	585	frontItem = menu.add(new MenuItem("Front"));
334	586	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
	589	+
	590	+ if (Globals.ADVANCED)
	591	+ {
337	592	hideItem = menu.add(new MenuItem("Hidden Group"));
338	593	hideItem.addActionListener(this);
	594	+ }
339	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	596	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	597	+
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
	602	+ if (Globals.ADVANCED)
	603	+ {
344	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	605	switchGeoItem.addActionListener(this);
346	606	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +608,6 @@
348	608	morphItem = menu.add(new MenuItem("Morph Group"));
349	609	morphItem.addActionListener(this);
350	610
351		- if (Globals.ADVANCED)
352		- {
353	611	menu.add("-");
354	612	physicsItem = menu.add(new MenuItem("Physics"));
355	613	physicsItem.addActionListener(this);
..	..	@@ -357,13 +615,11 @@
357	615	frameselectorItem.addActionListener(this);
358	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	617	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	618	}
363	619
364	620	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
367	623	billboardItem = menu.add(new MenuItem("Billboard"));
368	624	billboardItem.addActionListener(this);
369	625	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +630,14 @@
374	630	shadowYItem.addActionListener(this);
375	631	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
377	636	if (Globals.ADVANCED)
378	637	{
379	638	menu.add("-");
380	639	linkerItem = menu.add(new MenuItem("Linker"));
381	640	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	641	templateItem = menu.add(new MenuItem("Template"));
385	642	templateItem.addActionListener(this);
386	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +666,7 @@
409	666	genNormalsMESHItem.addActionListener(this);
410	667	if (Globals.ADVANCED)
411	668	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	670	genNormalsMINEItem.addActionListener(this);
414	671	}
415	672	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -502,10 +759,15 @@
502	759	attachBumpItem.addActionListener(this);
503	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
505	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	764	detachPigmentItem.addActionListener(this);
507	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
509	771	menu.add("-");
510	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	773	sortbysizeItem.addActionListener(this);
..	..	@@ -532,6 +794,7 @@
532	794	buildToolsMenu(menu);
533	795	}
534	796
	797	+
535	798	void SetupUI2(ObjEditor oe)
536	799	{
537	800	// June 2019
..	..	@@ -574,51 +837,79 @@
574	837	oe.radioPanel.add(dummyButton);
575	838	oe.buttonGroup.add(dummyButton);
576	839	*/
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
	843	+
577	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	845
579	846	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	847	//minButton.setToolTipText("Minimize window");
581	848	//minButton.addActionListener(this);
582	849
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
586	856
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	857	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	858	fullButton.setToolTipText("Full-screen window");
589	859	fullButton.addActionListener(this);
590	860
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	862	+ screenfitButton.setToolTipText("Screen fit");
	863	+ screenfitButton.addActionListener(this);
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
594	868
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
601	871	saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
602	877
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	897	liveCB.setToolTipText("Enable animation");
605	898	liveCB.addItemListener(this);
606	899
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	901	oneStepButton.setToolTipText("Animate one step forward");
609	902	oneStepButton.addActionListener(this);
610	903
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	905	fastCB.setToolTipText("Fast mode");
613	906	fastCB.addItemListener(this);
614	907
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	908	+ //oe.toolboxPanel.Return();
	909	+
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
622	913
623	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	915	// screenfitpointButton.addActionListener(this);
..	..	@@ -628,51 +919,136 @@
628	919	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	920	snapobjectButton.addActionListener(this);
630	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
631	926	}
632	927
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	928	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	929
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638		-
639		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640		- twoButton.setToolTipText("Show center view only");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
641	932	twoButton.addActionListener(this);
642		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- fourButton.addActionListener(this);
644		- fourButton.setToolTipText("Show left panel only");
645		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
647		- sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
	933	+ this.fullscreenLayout = twoButton;
	934	+
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
650	937	threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
654	944	//
655	945
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
658	948	rootButton.addActionListener(this);
659	949
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	951	closeButton.setToolTipText("Close tab");
662	952	closeButton.addActionListener(this);
663	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	954	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	955	+
	956	+ cGridBag row1 = new cGridBag();
	957	+
	958	+ // INSERT
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	960	+ gridButton.setToolTipText("Create grid");
	961	+ gridButton.addActionListener(this);
	962	+
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	964	+ boxButton.setToolTipText("Create box");
	965	+ boxButton.addActionListener(this);
	966	+
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	968	+ sphereButton.setToolTipText("Create sphere");
	969	+ sphereButton.addActionListener(this);
	970	+
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	972	+ coneButton.setToolTipText("Create cone");
	973	+ coneButton.addActionListener(this);
	974	+
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	976	+ torusButton.setToolTipText("Create torus");
	977	+ torusButton.addActionListener(this);
	978	+
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	980	+ superButton.setToolTipText("Create superellipsoid");
	981	+ superButton.addActionListener(this);
	982	+
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	986	+ kleinButton.setToolTipText("Create Klein bottle");
	987	+ kleinButton.addActionListener(this);
	988	+ }
	989	+
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	991	+ particlesButton.setToolTipText("Create particle system");
	992	+ particlesButton.addActionListener(this);
	993	+
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ overlayButton.setToolTipText("Create overlay");
	1020	+ overlayButton.addActionListener(this);
	1021	+
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1023	+ lightButton.setToolTipText("Create light");
	1024	+ lightButton.addActionListener(this);
	1025	+
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
	1041	+ // EDIT panel
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
668	1044	editButton.addActionListener(this);
669	1045
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
672	1048	uneditButton.addActionListener(this);
673	1049
674	1050	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1051	+ allParamsButton.setToolTipText("Show all controle");
676	1052	allParamsButton.addActionListener(this);
677	1053
678	1054	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +1059,13 @@
683	1059	unselectButton.setToolTipText("Unselect");
684	1060	unselectButton.addActionListener(this);
685	1061
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
	1065	+
686	1066	editCommandsPanel.preferredHeight = 1;
687	1067
	1068	+ SetPinStates(false);
688	1069	// oe.treePanel.add(commandsPanel);
689	1070	// oe.treePanel.Return();
690	1071
..	..	@@ -703,32 +1084,20 @@
703	1084
704	1085	JScrollPane jSP;
705	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1088	ResetModel();
708	1089
709	1090	oe.treePanel.add(jSPPanel);
710	1091	oe.treePanel.Return();
711	1092
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	1093	oe.treePanel.add(copyOptionsPanel);
728	1094	oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
729	1098
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
732	1101
733	1102	//jList.addListSelectionListener(this);
734	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1105,7 @@
736	1105	//jTree.setEditable(true);
737	1106	oe.jTree.setDragEnabled(true);
738	1107	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1109
741	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1111
..	..	@@ -748,29 +1117,49 @@
748	1117	dgr.addDragGestureListener(this);
749	1118	}catch(Exception e) {}
750	1119	*/
751		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
752	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1122	}
754	1123
755	1124	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1125	{
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
	1129	+
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
757	1140	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1141	boxCB.setToolTipText("Display bounding boxes");
759	1142	boxCB.addItemListener(this);
760	1143
761	1144	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1146	zoomBoxCB.addItemListener(this);
764	1147
765	1148	if (true) // Globals.ADVANCED)
766	1149	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
770	1157
771	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1159	// localCB.addItemListener(this);
773	1160
	1161	+ panel.Return();
	1162	+
774	1163	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1164	crowdCB.setToolTipText("Used for crowds");
776	1165	crowdCB.addItemListener(this);
..	..	@@ -787,6 +1176,8 @@
787	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1177	// speakerMocapCB.addItemListener(this);
789	1178
	1179	+ panel.Return();
	1180	+
790	1181	if (false)
791	1182	{
792	1183	// handled in scripts
..	..	@@ -801,34 +1192,74 @@
801	1192	//constraints.gridy += 1;
802	1193	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
804	1196	}
805	1197
806	1198	//constraints.gridx += 1;
807	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1200	// debugCB.addItemListener(this);
809	1201
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
810	1206	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
811	1208	oeilCB.addItemListener(this);
812	1209
	1210	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1211	+ shadowCB.setToolTipText("When live compute shadows");
	1212	+ shadowCB.addItemListener(this);
	1213	+
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+ if (Globals.ADVANCED)
	1229	+ {
813	1230	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	1231	lookAtCB.setToolTipText("Look-at target");
815	1232	lookAtCB.addItemListener(this);
	1233	+ }
816	1234
817	1235	}
818	1236
819	1237	cGridBag fill = new cGridBag();
820		-
821	1238	fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
822	1243
823	1244	panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
824	1247
825	1248	}
826	1249
827	1250	void EditObject(Object3D obj)
828	1251	{
829	1252	cRadio radioButton = new cRadio(obj.name);
	1253	+
	1254	+ // June 2019. Patch to avoid bug with transparency.
	1255	+ radioButton.hadMaterial = obj.material != null;
	1256	+ if (!radioButton.hadMaterial)
	1257	+ {
	1258	+ obj.material = new cMaterial();
	1259	+ }
	1260	+
830	1261	radioButton.SetObject(obj);
831		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
832	1263	radioButton.SetCamera(cameraView.renderCamera, false);
833	1264	radioButton.addActionListener(this);
834	1265	radioPanel.add(radioButton);
..	..	@@ -848,23 +1279,28 @@
848	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1280	}
850	1281
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	1282	+ cToggleButton liveCB;
	1283	+ cCheckBox supportCB;
	1284	+ cCheckBox localCB;
	1285	+ cCheckBox crowdCB;
	1286	+ cCheckBox smoothCB;
	1287	+ cToggleButton fastCB;
	1288	+ cCheckBox slowCB;
	1289	+ cCheckBox boxCB;
	1290	+ cCheckBox zoomBoxCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
	1294	+ cCheckBox smoothfocusCB;
862	1295	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
868	1304
869	1305	// static int COLOR = 1;
870	1306	// static int MATERIAL = 2;
..	..	@@ -872,9 +1308,9 @@
872	1308
873	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1310
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
878	1314
879	1315	public void itemStateChanged(ItemEvent e)
880	1316	{
..	..	@@ -967,6 +1403,18 @@
967	1403	{
968	1404	cameraView.ToggleOeil();
969	1405	}
	1406	+ else if(e.getSource() == shadowCB)
	1407	+ {
	1408	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1409	+ }
	1410	+ else if(e.getSource() == freezeCB)
	1411	+ {
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
	1417	+ }
970	1418	else if(e.getSource() == lookAtCB)
971	1419	{
972	1420	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1431,8 @@
983	1431
984	1432	/**/
985	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1437	// We can't move the root node or an empty selection
989	1438	return;
..	..	@@ -1046,8 +1495,6 @@
1046	1495	}
1047	1496	}
1048	1497
1049		- String string = (String) object;
1050		-
1051	1498	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1499	// if( object instanceof java.io.File[])
1053	1500	// {
..	..	@@ -1055,6 +1502,8 @@
1055	1502	// objEditor.DropFile((java.io.File[]) object, true);
1056	1503	// return;
1057	1504	// }
	1505	+
	1506	+ String string = object.toString();
1058	1507
1059	1508	// File path for Mac and Windows
1060	1509	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1549,33 @@
1100	1549
1101	1550	assert target == objEditor.jTree;
1102	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
1103	1553	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1555	} catch (Exception e) {
1106	1556	System.out.println("destinationPath : " + destinationPath);
1107	1557	return;
1108	1558	}
1109	1559
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
1111	1561	{
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
	1569	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1570	+// {
1112	1571	loadClipboard(true);
1113	1572	objEditor.jTree.setSelectionPath(destinationPath);
1114	1573	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
1120	1579	}
1121	1580	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1680,30 @@
1221	1680	{
1222	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1682	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1236	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1702	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
1240	1707	if (Globals.ADVANCED)
1241	1708	{
1242	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1729,15 @@
1262	1729	}
1263	1730	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1731	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1269	1736	menu.add("-");
1270	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1738	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1274	1741	doubleItem = menu.add(new MenuItem("Fork"));
1275	1742	doubleItem.addActionListener(this);
1276	1743	if (Globals.ADVANCED)
..	..	@@ -1286,6 +1753,9 @@
1286	1753	animationItem.addItemListener(this);
1287	1754	animationItem.setState(Globals.ANIMATION);
1288	1755
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
	1758	+
1289	1759	menu.add("-");
1290	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	1761	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +1768,8 @@
1298	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	1769	reduce34MorphItem.addActionListener(this);
1300	1770	menu.add("-");
	1771	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1772	+ memoryItem.addActionListener(this);
1301	1773	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	1774	computeAOItem.addActionListener(this);
1303	1775
..	..	@@ -1306,8 +1778,6 @@
1306	1778	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	1779	mirrorItem.addActionListener(this);
1308	1780	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	1782	analyzeItem.addActionListener(this);
1313	1783	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1455,6 +1925,30 @@
1455	1925
1456	1926	makeSomething(shadow);
1457	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1458	1952
1459	1953	/**
1460	1954	* applyExample
..	..	@@ -1699,7 +2193,7 @@
1699	2193	{
1700	2194	ScreenFit();
1701	2195	} else
1702		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1703	2197	{
1704	2198	cVector v1 = new cVector();
1705	2199	cVector v2 = new cVector();
..	..	@@ -1708,11 +2202,11 @@
1708	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	2203	objEditor.cameraView.repaint();
1710	2204	} else
1711		- if (source == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1712	2206	{
1713	2207	makeSomething(new Box());
1714	2208	} else
1715		- if (source == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1716	2210	{
1717	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2285,27 @@
1791	2285
1792	2286	makeSomething(obj);
1793	2287	} else
1794		- if (source == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1795	2289	{
1796	2290	makeSomething(new Grid());
1797	2291	} else
1798		- if (source == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2293	{
1800	2294	makeSomething(new Sphere());
1801	2295	} else
1802		- if (source == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1803	2297	{
1804	2298	makeSomething(new Cone());
1805	2299	} else
1806		- if (source == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1807	2301	{
1808	2302	makeSomething(new Torus());
1809	2303	} else
1810		- if (source == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1811	2305	{
1812	2306	makeSomething(new Superellipsoid());
1813	2307	} else
1814		- if (source == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1815	2309	{
1816	2310	makeSomething(new Klein());
1817	2311	} else
..	..	@@ -1831,7 +2325,7 @@
1831	2325	{
1832	2326	makeSomething(new BezierSurface());
1833	2327	} else
1834		- if (source == overlayItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1835	2329	{
1836	2330	/*
1837	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,10 +2373,27 @@
1879	2373	s.setup();
1880	2374	makeSomething(s);
1881	2375	} else
1882		- if (source == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1883	2377	{
1884	2378	makeSomething(new Light());
1885	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1886	2397	if (source == csgItem)
1887	2398	{
1888	2399	group(new CSG());
..	..	@@ -1929,30 +2440,30 @@
1929	2440
1930	2441	group(g);
1931	2442	} else
1932		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1933	2444	{
1934	2445	Composite csg = new GroupLeaf();
1935	2446	csg.count = 5;
1936	2447	group(csg);
1937		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1938	2449	csg.addChild(child);
1939	2450	child.addChild(csg);
1940	2451	} else
1941	2452	if (source == doubleItem)
1942	2453	{
1943		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1944	2455	csg.count = 5;
1945	2456	group(csg);
1946		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1947	2458	csg.addChild(child);
1948	2459	child.addChild(csg);
1949		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1950	2461	csg.addChild(child);
1951	2462	child.addChild(csg);
1952	2463	} else
1953	2464	if (source == tripleItem)
1954	2465	{
1955		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1956	2467	csg.count = 4;
1957	2468	group(csg);
1958	2469	Composite child = new cGroup();
..	..	@@ -1968,7 +2479,7 @@
1968	2479	if (source == computeAOItem)
1969	2480	{
1970	2481	Globals.drawMode = CameraPane.OCCLUSION;
1971		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
1972	2483	} else
1973	2484	if (source == recompileItem)
1974	2485	{
..	..	@@ -2016,15 +2527,31 @@
2016	2527	} else
2017	2528	if (source == undoButton)
2018	2529	{
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2019	2533	Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
2020	2544	} else
2021	2545	if (source == redoButton)
2022	2546	{
	2547	+ // Go to next version
2023	2548	Redo();
2024	2549	} else
2025	2550	if (source == saveButton)
2026	2551	{
2027		- Save();
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
2028	2555	} else
2029	2556	if (source == oneStepButton)
2030	2557	{
..	..	@@ -2033,17 +2560,14 @@
2033	2560	} else
2034	2561	if (source == screenfitButton)
2035	2562	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2563	ScreenFit();
2038	2564	} else
2039	2565	if (source == screenfitpointButton)
2040	2566	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2567	ScreenFitPoint();
2043	2568	} else
2044	2569	if (source == snapobjectButton)
2045	2570	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2571	SnapObject();
2048	2572	} else
2049	2573	// if (event.getSource() == recompileButton)
..	..	@@ -2407,7 +2931,7 @@
2407	2931	{
2408	2932	StepAll();
2409	2933	} else
2410		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2411	2935	{
2412	2936	//int indices[] = jList.getSelectedIndices();
2413	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2419,9 +2943,9 @@
2419	2943	{
2420	2944	ClearSelection(true);
2421	2945	} else
2422		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2423	2947	{
2424		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2425	2949	} else
2426	2950	if (source == hideItem)
2427	2951	{
..	..	@@ -2439,11 +2963,11 @@
2439	2963	{
2440	2964	makeSomething(new Camera());
2441	2965	} else
2442		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2443	2967	{
2444	2968	group(new Composite());
2445	2969	} else
2446		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2447	2971	{
2448	2972	RandomNode random = new RandomNode();
2449	2973	group(random);
..	..	@@ -2545,7 +3069,7 @@
2545	3069	{
2546	3070	group(new cLinker());
2547	3071	} else
2548		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2549	3073	{
2550	3074	group(new TextureNode());
2551	3075	} else
..	..	@@ -2565,17 +3089,30 @@
2565	3089	{
2566	3090	CastShadow(2);
2567	3091	} else
2568		- if (source == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	3093	{
2570		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2571	3096	for (int i=0; i<group.selection.size(); i++)
2572	3097	{
2573		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2574	3103	}
2575	3104
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2579	3116	} else
2580	3117	if (source == genUVItem)
2581	3118	{
..	..	@@ -2876,7 +3413,7 @@
2876	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2877	3414	{
2878	3415	obj = (Object3D)e.nextElement();
2879		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2880	3417	}
2881	3418
2882	3419	refreshContents();
..	..	@@ -2892,6 +3429,31 @@
2892	3429
2893	3430	refreshContents();
2894	3431	} else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
	3455	+ refreshContents();
	3456	+ } else
2895	3457	if (source == flashSelectionButton)
2896	3458	{
2897	3459	CameraPane.flash = true;
..	..	@@ -2903,6 +3465,10 @@
2903	3465	if (source == twoButton)
2904	3466	{
2905	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2906	3472	// bug
2907	3473	//gridPanel.setDividerLocation(1.0);
2908	3474	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3524,9 @@
2958	3524	{
2959	3525	radio.layout = threeButton;
2960	3526
	3527	+ if (CameraPane.FULLSCREEN)
	3528	+ fullscreenLayout = radio.layout;
	3529	+
2961	3530	// bigThree.remove(scenePanel);
2962	3531	// bigThree.remove(centralPanel);
2963	3532	// bigThree.remove(XYZPanel);
..	..	@@ -2986,8 +3555,8 @@
2986	3555	// centralPanel.setVisible(true);
2987	3556	// XYZPanel.setVisible(true);
2988	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
2989	3559	bigThree.add(centralPanel);
2990		- bigThree.add(XYZPanel);
2991	3560	bigThree.FlushUI();
2992	3561
2993	3562	cameraView.requestFocusInWindow();
..	..	@@ -2995,6 +3564,9 @@
2995	3564	if (source == fourButton)
2996	3565	{
2997	3566	radio.layout = fourButton;
	3567	+
	3568	+ if (CameraPane.FULLSCREEN)
	3569	+ fullscreenLayout = radio.layout;
2998	3570
2999	3571	// bigThree.remove(scenePanel);
3000	3572	// bigThree.remove(centralPanel);
..	..	@@ -3033,6 +3605,9 @@
3033	3605	{
3034	3606	radio.layout = sixButton;
3035	3607
	3608	+ if (CameraPane.FULLSCREEN)
	3609	+ fullscreenLayout = radio.layout;
	3610	+
3036	3611	// bigThree.remove(scenePanel);
3037	3612	// bigThree.remove(centralPanel);
3038	3613	// bigThree.remove(XYZPanel);
..	..	@@ -3061,8 +3636,8 @@
3061	3636	// centralPanel.setVisible(true);
3062	3637	// XYZPanel.setVisible(false);
3063	3638	bigThree.ClearUI();
3064		- bigThree.add(scenePanel);
3065	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
3066	3641	bigThree.FlushUI();
3067	3642
3068	3643	cameraView.requestFocusInWindow();
..	..	@@ -3070,6 +3645,9 @@
3070	3645	if (source == sevenButton)
3071	3646	{
3072	3647	radio.layout = sevenButton;
	3648	+
	3649	+ if (CameraPane.FULLSCREEN)
	3650	+ fullscreenLayout = radio.layout;
3073	3651
3074	3652	// bigThree.remove(scenePanel);
3075	3653	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3704,19 @@
3126	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3705	{
3128	3706	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
3131	3715	buttonGroup.remove(ab);
3132	3716	radioPanel.remove(ab);
3133	3717
3134		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
3135	3720	// ab.GetObject().objectUI = null; // ?????????
3136	3721
3137	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3729,12 @@
3144	3729	} else
3145	3730	if (source == editItem \|\| source == editButton)
3146	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
3147	3738	EditSelection(false);
3148	3739	} else
3149	3740	if (source == uneditButton)
..	..	@@ -3153,6 +3744,7 @@
3153	3744	Object3D child = (Object3D)e.nextElement();
3154	3745	if(child.editWindow != null)
3155	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
3156	3748	child.CloseUI();
3157	3749	listUI.remove(child);
3158	3750
..	..	@@ -3169,6 +3761,7 @@
3169	3761	//copy.ClearUI();
3170	3762	for (Object3D obj : listUI)
3171	3763	{
	3764	+ obj.pinned = false;
3172	3765	obj.CloseUI();
3173	3766	}
3174	3767	listUI.clear();
..	..	@@ -3178,7 +3771,7 @@
3178	3771	{
3179	3772	assert(copy == group);
3180	3773
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3775
3183	3776	for (Object3D obj : listUI)
3184	3777	{
..	..	@@ -3227,6 +3820,9 @@
3227	3820	}
3228	3821
3229	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
3230	3826	//Globals.theRenderer.object = group;
3231	3827	if(!useclient)
3232	3828	{
..	..	@@ -3245,6 +3841,7 @@
3245	3841
3246	3842	// fix "+" issue
3247	3843	//group.editWindow = this;
	3844	+ group.manipWindow = this;
3248	3845
3249	3846	/*
3250	3847	currentLayout = radio.layout;
..	..	@@ -3252,6 +3849,13 @@
3252	3849	currentLayout = sevenButton;
3253	3850	*/
3254	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
3255	3859	keepparent = group.parent;
3256	3860	// PARENT = NULL or not???
3257	3861	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3869,7 @@
3265	3869	cameraView.ProtectCamera();
3266	3870	cameraView.repaint();
3267	3871	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3873	{
3270	3874	cameraView.RevertCamera();
3271	3875	cameraView.repaint();
..	..	@@ -3844,7 +4448,7 @@
3844	4448
3845	4449	try
3846	4450	{
3847		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3848	4452	}
3849	4453	catch (Exception e)
3850	4454	{
..	..	@@ -4319,28 +4923,25 @@
4319	4923	// }
4320	4924	// }
4321	4925
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4926	void EditSelection(boolean newWindow)
4327	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4328	4934	// aConstraints.gridy = 0;
4329	4935	for (int i=0; i<group.selection.size(); i++)
4330	4936	{
4331	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4940
4335	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4942	if(elem != group \|\| !newWindow)
4337	4943	{
4338		- // if (!(elem instanceof Composite))
4339		- // newWindow = false;
4340		- listUI.add(elem);
4341		- elem.openEditWindow(this, newWindow); //, false);
4342		- System.out.println("edit : " + elem);
4343		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
4344	4945	}
4345	4946	}
4346	4947	}
..	..	@@ -4415,7 +5016,8 @@
4415	5016	//new Exception().printStackTrace();
4416	5017
4417	5018	freezemodel = true;
4418		-
	5019	+ ClearUnpinned();
	5020	+
4419	5021	/**/
4420	5022	//switch (event.id)
4421	5023	{
..	..	@@ -4448,7 +5050,7 @@
4448	5050	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	5051	// a camera
4450	5052	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	5054	{
4453	5055	CameraPane.camerachangeframe = 0; // don't refuse it
4454	5056	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +5059,13 @@
4457	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	5060	}
4459	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4460	5069	refreshContents();
4461	5070	//return true;
4462	5071	}
..	..	@@ -4466,9 +5075,18 @@
4466	5075	freezemodel = false;
4467	5076	}
4468	5077
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
4469	5086	void refreshContents(boolean cp)
4470	5087	{
4471		- if (!Globals.MOUSEDRAGGED)
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	5090	{
4473	5091	objEditor.ClearInfo(); // .GetMaterial());
4474	5092
..	..	@@ -4567,7 +5185,8 @@
4567	5185
4568	5186	if (cut)
4569	5187	{
4570		- Save();
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4571	5190	//int indices[] = jList.getSelectedIndices();
4572	5191	//for (int i = indices.length - 1; i >= 0; i--)
4573	5192	//jList.remove(indices[i]);
..	..	@@ -4670,6 +5289,10 @@
4670	5289
4671	5290	void paste(boolean expand)
4672	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4673	5296	// if (GrafreeD.clipboard == null)
4674	5297	// return;
4675	5298	boolean first = true;
..	..	@@ -4729,6 +5352,7 @@
4729	5352	Grafreed.clipboard.get(0).parent = keepparent;
4730	5353	}
4731	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4732	5356	ResetModel();
4733	5357	refreshContents();
4734	5358	}
..	..	@@ -4864,6 +5488,10 @@
4864	5488
4865	5489	void group(Object3D csg, boolean grab)
4866	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4867	5495	if (//false) // why??
4868	5496	!group.selection.isEmpty())
4869	5497	{
..	..	@@ -4977,10 +5605,15 @@
4977	5605	//node.add(csg);
4978	5606	//makeSomething(node);
4979	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4980	5609	}
4981	5610
4982	5611	void Ungroup(Object3D g)
4983	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4984	5617	if (g instanceof HiddenObject)
4985	5618	{
4986	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5630,7 @@
4997	5630	objEditor.makeSomething(g.get(i), false);
4998	5631	}
4999	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
5000	5634	}
5001	5635
5002	5636	void ungroup()
..	..	@@ -5285,13 +5919,44 @@
5285	5919	cButton clearpanelButton;
5286	5920	cButton unselectButton;
5287	5921
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
	5922	+ cButton restoreCameraButton;
	5923	+
5293	5924	cButton saveButton;
5294	5925	cButton oneStepButton;
	5926	+
	5927	+ cButton groupButton;
	5928	+ cButton ungroupButton;
	5929	+ cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
	5950	+ cButton gridButton;
	5951	+ cButton boxButton;
	5952	+ cButton sphereButton;
	5953	+ cButton coneButton;
	5954	+ cButton torusButton;
	5955	+ cButton superButton;
	5956	+ cButton kleinButton;
	5957	+ cButton particlesButton;
	5958	+ cButton overlayButton;
	5959	+ cButton lightButton;
5295	5960
5296	5961	cButton screenfitButton;
5297	5962	cButton screenfitpointButton;
..	..	@@ -5313,11 +5978,11 @@
5313	5978	//JTree jTree;
5314	5979	private MenuItem lookAtItem;
5315	5980	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
5317	5982	private MenuItem cutItem;
5318	5983	private MenuItem undoItem;
5319	5984	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5985	+ private JMenuItem duplicateItem;
5321	5986	private MenuItem cloneItem;
5322	5987	private MenuItem cloneSupportItem;
5323	5988	private MenuItem overwriteGeoItem;
..	..	@@ -5345,7 +6010,7 @@
5345	6010	private MenuItem pasteLinkItem;
5346	6011	private MenuItem pasteCloneItem;
5347	6012	private MenuItem pasteExpandItem;
5348		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5349	6014	private MenuItem clearAllItem;
5350	6015	private MenuItem genUVItem;
5351	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5405,7 +6070,7 @@
5405	6070	private MenuItem frontItem;
5406	6071	private MenuItem cameraItem;
5407	6072	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5409	6074	private MenuItem physicsItem;
5410	6075	private MenuItem frameselectorItem;
5411	6076	private MenuItem scriptNodeItem;
..	..	@@ -5429,6 +6094,8 @@
5429	6094	private MenuItem attachBumpItem;
5430	6095	private MenuItem detachBumpItem;
5431	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5432	6099
5433	6100	private MenuItem particleItem;
5434	6101	private MenuItem ragdollItem;
..	..	@@ -5479,5 +6146,5 @@
5479	6146
5480	6147	Menu cameraMenu;
5481	6148	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	6149	+ MenuItem restoreCameraItem;
5483	6150	}