~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,350 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -80,10 +435,22 @@
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +461,7 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +518,8 @@
150	518
151	519	void SetupMenu2(GroupEditor oe)
152	520	{
	521	+ oe.jTree = new cTree();
	522	+
153	523	Menu menu;
154	524	oe.menuBar.add(menu = new Menu("Edit"));
155	525	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,36 +530,37 @@
160	530	// redoItem = menu.add(new MenuItem("Redo"));
161	531	// redoItem.addActionListener(this);
162	532	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	533	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	534	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	537	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
168	539	{
169	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	541	cloneSupportItem.addActionListener(this);
171	542	}
	543	+ oe.jTree.popup.addSeparator();
172	544	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	546	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	548	copyItem.addActionListener(this);
177	549	pasteItem = menu.add(new MenuItem("Paste"));
178	550	pasteItem.addActionListener(this);
179		- menu.add("-");
180	551
181		- menu.add("-");
182		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
183	555	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	557	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	559	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	561	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
193	564
194	565	if (Globals.ADVANCED)
195	566	{
..	..	@@ -203,23 +574,23 @@
203	574	//zBufferItem.addActionListener(this);
204	575	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	576	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
208	579
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	580	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	581	+// toggleFullScreenItem.addItemListener(this);
	582	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	583	+// cameraMenu.add("-");
	584	+//
	585	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	586	+// toggleTextureItem.addItemListener(this);
	587	+// toggleTextureItem.setState(CameraPane.textureon);
	588	+//
	589	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	590	+// toggleSwitchItem.addItemListener(this);
	591	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	592
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"));
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	594	toggleHandleItem.addItemListener(this);
224	595	toggleHandleItem.setState(CameraPane.HANDLES);
225	596
..	..	@@ -274,15 +645,13 @@
274	645	{
275	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	649	oe.cameraMenu.add("-");
280	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	651	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	652	lookAtItem.addActionListener(this);
284	653	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	654	+ //switchViewItem.addActionListener(this);
286	655	}
287	656
288	657	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,22 +695,37 @@
326	695	setMasterItem.addActionListener(this);
327	696	}
328	697
329		- oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
332	700	backItem = menu.add(new MenuItem("Back"));
333	701	backItem.addActionListener(this);
334	702	frontItem = menu.add(new MenuItem("Front"));
335	703	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	704	+// compositeItem = menu.add(new MenuItem("Composite"));
	705	+// compositeItem.addActionListener(this);
	706	+
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
338	712	hideItem = menu.add(new MenuItem("Hidden Group"));
339	713	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	716	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
	722	+
	723	+// menu.add("-");
	724	+//
	725	+// switchItem = menu.add(new MenuItem("Switch node"));
	726	+// switchItem.addActionListener(this);
	727	+ if (Globals.ADVANCED)
	728	+ {
345	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	730	switchGeoItem.addActionListener(this);
347	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +733,6 @@
349	733	morphItem = menu.add(new MenuItem("Morph Group"));
350	734	morphItem.addActionListener(this);
351	735
352		- if (Globals.ADVANCED)
353		- {
354	736	menu.add("-");
355	737	physicsItem = menu.add(new MenuItem("Physics"));
356	738	physicsItem.addActionListener(this);
..	..	@@ -358,41 +740,47 @@
358	740	frameselectorItem.addActionListener(this);
359	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	742	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	743	}
364	744
365	745	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
368	748	billboardItem = menu.add(new MenuItem("Billboard"));
369	749	billboardItem.addActionListener(this);
370	750	csgItem = menu.add(new MenuItem("CSG"));
371	751	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	753	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	755	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
378	761	if (Globals.ADVANCED)
379	762	{
380	763	menu.add("-");
381	764	linkerItem = menu.add(new MenuItem("Linker"));
382	765	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	766	templateItem = menu.add(new MenuItem("Template"));
386	767	templateItem.addActionListener(this);
387	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
388	769	pointflowItem.addActionListener(this);
389	770	}
390	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
391	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
392	780	resetTransformItem.addActionListener(this);
393	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
394	782	resetCentroidItem.addActionListener(this);
395		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
396	784	resetCentroidXZItem.addActionListener(this);
397	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
398	786	transformGeometryItem.addActionListener(this);
..	..	@@ -410,7 +798,7 @@
410	798	genNormalsMESHItem.addActionListener(this);
411	799	if (Globals.ADVANCED)
412	800	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	802	genNormalsMINEItem.addActionListener(this);
415	803	}
416	804	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -444,6 +832,8 @@
444	832	}
445	833
446	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
447	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
448	838	clearMaterialsItem.addActionListener(this);
449	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -466,9 +856,9 @@
466	856	hideleavesItem.addActionListener(this);
467	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
468	858	showleavesItem.addActionListener(this);
469		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470	860	markleavesItem.addActionListener(this);
471		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472	862	unmarkleavesItem.addActionListener(this);
473	863	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474	864	rewindleavesItem.addActionListener(this);
..	..	@@ -503,10 +893,15 @@
503	893	attachBumpItem.addActionListener(this);
504	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
506	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	898	detachPigmentItem.addActionListener(this);
508	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	900	detachBumpItem.addActionListener(this);
	901	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	902	+ embedTexturesItem.addActionListener(this);
	903	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	904	+ deEmbedTexturesItem.addActionListener(this);
510	905	menu.add("-");
511	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	907	sortbysizeItem.addActionListener(this);
..	..	@@ -517,6 +912,9 @@
517	912	shareGeometriesItem.addActionListener(this);
518	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
520	918	if (Globals.ADVANCED)
521	919	{
522	920	// Pretty much the same as duplicate and clone.
..	..	@@ -533,6 +931,80 @@
533	931	buildToolsMenu(menu);
534	932	}
535	933
	934	+ JTabbedPane resourcecontainer;
	935	+ cGridBag currenttab;
	936	+ //boolean added; // patch for jar
	937	+
	938	+ int totalcount = 0;
	939	+
	940	+ int tabcount = 0;
	941	+ int colcount = 0;
	942	+ int rowcount = 0;
	943	+ int texturecount = 0;
	944	+
	945	+ int columns = 5;
	946	+ int rows = 7;
	947	+
	948	+ public void ResourceCallBack(String[] path)
	949	+ {
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	956	+ {
	957	+ currenttab = new cGridBag();
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	959	+ currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	963	+ rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
	966	+ }
	967	+
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	969	+ {
	970	+ //if (!added)
	971	+ {
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	975	+ }
	976	+
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
	980	+ if (++colcount >= columns)
	981	+ {
	982	+ colcount = 0;
	983	+ currenttab.Return();
	984	+
	985	+ if (rowcount++ >= rows)
	986	+ {
	987	+ rowcount = 0;
	988	+ }
	989	+ }
	990	+ }
	991	+ else
	992	+ {
	993	+// if (!path[path.length-1].equals("icons"))
	994	+// resourcecontainer.Return();
	995	+ }
	996	+ }
	997	+
	998	+ void CreateTexturePanel(cGridBag container)
	999	+ {
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1001	+ container.add(resourcecontainer);
	1002	+
	1003	+ Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
	1006	+ }
	1007	+
536	1008	void SetupUI2(ObjEditor oe)
537	1009	{
538	1010	// June 2019
..	..	@@ -550,11 +1022,6 @@
550	1022	//new Exception().printStackTrace();
551	1023
552	1024	oe.radioPanel = new JPanel(new GridBagLayout());
553		- oe.aConstraints.weightx = 1;
554		- oe.aConstraints.weighty = 0;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridwidth = 100;
557		- oe.aConstraints.gridheight = 1;
558	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
559	1026
560	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -575,121 +1042,268 @@
575	1042	oe.radioPanel.add(dummyButton);
576	1043	oe.buttonGroup.add(dummyButton);
577	1044	*/
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
	1048	+
578	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	1050
580	1051	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	1052	//minButton.setToolTipText("Minimize window");
582	1053	//minButton.addActionListener(this);
583	1054
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	1055	+ if (Globals.ADVANCED)
	1056	+ {
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
	1060	+ }
587	1061
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- fullButton.setToolTipText("Full-screen window");
590		- fullButton.addActionListener(this);
	1062	+ cButton gcButton;
591	1063
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
595	1073
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
599	1077
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
602		- saveButton.addActionListener(this);
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
603	1081
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
605		- liveCB.setToolTipText("Enable animation");
606		- liveCB.addItemListener(this);
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ screenfitButton.setToolTipText("Screen fit");
	1107	+ screenfitButton.addActionListener(this);
607	1108
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1111	+ restoreCameraButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
	1116	+
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ deleteVersionButton.setToolTipText("Delete current version");
	1119	+ deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
	1121	+
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ previousVersionButton.setToolTipText("Previous version");
	1124	+ previousVersionButton.addActionListener(this);
	1125	+ previousVersionButton.setEnabled(false);
	1126	+
	1127	+ cGridBag updown = new cGridBag().setVertical(true);
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
	1130	+ restoreButton.addActionListener(this);
	1131	+ restoreButton.setEnabled(false);
	1132	+
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
	1135	+ replaceButton.addActionListener(this);
	1136	+ replaceButton.setEnabled(false);
	1137	+
	1138	+ versionManagerPanel.add(updown);
	1139	+
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ nextVersionButton.setToolTipText("Next version");
	1142	+ nextVersionButton.addActionListener(this);
	1143	+ nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
609	1146	oneStepButton.setToolTipText("Animate one step forward");
610	1147	oneStepButton.addActionListener(this);
611	1148
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1149	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1150	+ liveCB.setToolTipText("Enable animation");
	1151	+ liveCB.addItemListener(this);
	1152	+
	1153	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	1154	fastCB.setToolTipText("Fast mode");
614	1155	fastCB.addItemListener(this);
615	1156
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);
	1157	+ //oe.toolboxPanel.Return();
	1158	+
	1159	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1160	+// trackCB.setToolTipText("Enable tracking");
	1161	+// trackCB.addItemListener(this);
623	1162
624	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	1164	// screenfitpointButton.addActionListener(this);
626	1165
627	1166	if (Globals.ADVANCED)
628	1167	{
629		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
630	1169	snapobjectButton.addActionListener(this);
631	1170	snapobjectButton.setToolTipText("Snap Object");
	1171	+
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ fourButton.addActionListener(this);
	1174	+ fourButton.setToolTipText("Show control panel only");
632	1175	}
633	1176
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	1178
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");
642		- 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");
651		- threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
655		- //
656	1179
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ rootButton.setToolTipText("Open selection in new tab");
659	1182	rootButton.addActionListener(this);
660	1183
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
662	1185	closeButton.setToolTipText("Close tab");
663	1186	closeButton.addActionListener(this);
664	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	1188	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	1189	+
	1190	+ cGridBag row1 = new cGridBag();
668	1191
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	1192	+ // INSERT
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
	1195	+ gridButton.addActionListener(this);
	1196	+
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ boxButton.setToolTipText("Create box");
	1199	+ boxButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
	1218	+ {
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ kleinButton.setToolTipText("Create Klein bottle");
	1221	+ kleinButton.addActionListener(this);
	1222	+ }
	1223	+
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ particlesButton.setToolTipText("Create particle system");
	1226	+ particlesButton.addActionListener(this);
	1227	+
	1228	+ oe.toolboxPanel.add(row1);
	1229	+
	1230	+ cGridBag row2 = new cGridBag();
	1231	+
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ groupButton.setToolTipText("Create group");
	1234	+ groupButton.addActionListener(this);
	1235	+
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ compositeButton.setToolTipText("Create composite");
	1238	+ compositeButton.addActionListener(this);
	1239	+
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ switchButton.setToolTipText("Create item switcher");
	1242	+ switchButton.addActionListener(this);
	1243	+
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ loopButton.setToolTipText("Create loop");
	1246	+ loopButton.addActionListener(this);
	1247	+
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ textureButton.setToolTipText("Create texture");
	1250	+ textureButton.addActionListener(this);
	1251	+
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ overlayButton.setToolTipText("Create overlay");
	1254	+ overlayButton.addActionListener(this);
	1255	+
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ lightButton.setToolTipText("Create light");
	1258	+ lightButton.addActionListener(this);
	1259	+
	1260	+ oe.toolboxPanel.add(row2);
	1261	+
	1262	+ cGridBag textures = new cGridBag();
	1263	+
	1264	+ CreateTexturePanel(textures);
	1265	+
	1266	+ int tabCount = resourcecontainer.getTabCount();
	1267	+
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
	1271	+ oe.toolboxPanel.add(textures);
	1272	+
	1273	+ textures.preferredHeight = 100;
	1274	+
	1275	+ CreateSkyboxPanel(oe.skyboxPanel);
	1276	+
	1277	+ // EDIT panel
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editButton.setToolTipText("Pin selection controls");
671	1280	editButton.addActionListener(this);
672	1281
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
675	1284	uneditButton.addActionListener(this);
676	1285
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1286	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1287	+ allParamsButton.setToolTipText("Show all controls");
679	1288	allParamsButton.addActionListener(this);
680	1289
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
683	1292	clearPanelButton.addActionListener(this);
684	1293
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- unselectButton.setToolTipText("Unselect");
687		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
688	1297
689		- commandsPanel.preferredHeight = 1;
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ flashSelectionButton.setToolTipText("Highlight selection");
	1300	+ flashSelectionButton.addActionListener(this);
690	1301
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1302	+ editCommandsPanel.preferredHeight = 1;
	1303	+
	1304	+ SetPinStates(false);
	1305	+// oe.treePanel.add(commandsPanel);
	1306	+// oe.treePanel.Return();
693	1307
694	1308	// oe.aConstraints.gridx += 1;
695	1309	// oe.aConstraints.weighty = 0;
..	..	@@ -704,34 +1318,24 @@
704	1318
705	1319	cGridBag jSPPanel = new cGridBag();
706	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
707	1323	JScrollPane jSP;
708	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1326	ResetModel();
711	1327
712	1328	oe.treePanel.add(jSPPanel);
713	1329	oe.treePanel.Return();
714	1330
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		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
731	1332	oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
732	1336
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
735	1339
736	1340	//jList.addListSelectionListener(this);
737	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1343,7 @@
739	1343	//jTree.setEditable(true);
740	1344	oe.jTree.setDragEnabled(true);
741	1345	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1347
744	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1349
..	..	@@ -751,29 +1355,49 @@
751	1355	dgr.addDragGestureListener(this);
752	1356	}catch(Exception e) {}
753	1357	*/
754		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
755	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1360	}
757	1361
758	1362	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1363	{
	1364	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1365	+ colorCB.setToolTipText("Copy color when dropped");
	1366	+ colorCB.addItemListener(this);
	1367	+
	1368	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1369	+ materialCB.setToolTipText("Copy material when dropped");
	1370	+ materialCB.addItemListener(this);
	1371	+
	1372	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1373	+ textureCB.setToolTipText("Copy texture when dropped");
	1374	+ textureCB.addItemListener(this);
	1375	+
	1376	+ panel.Return();
	1377	+
760	1378	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1379	boxCB.setToolTipText("Display bounding boxes");
762	1380	boxCB.addItemListener(this);
763	1381
764	1382	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1384	zoomBoxCB.addItemListener(this);
767	1385
768	1386	if (true) // Globals.ADVANCED)
769	1387	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1388	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1389	+// supportCB.setToolTipText("Enable rigging");
	1390	+// supportCB.addItemListener(this);
	1391	+
	1392	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1393	+ freezeCB.setToolTipText("Fast moving camera");
	1394	+ freezeCB.addItemListener(this);
773	1395
774	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1397	// localCB.addItemListener(this);
776	1398
	1399	+ panel.Return();
	1400	+
777	1401	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1402	crowdCB.setToolTipText("Used for crowds");
779	1403	crowdCB.addItemListener(this);
..	..	@@ -782,14 +1406,19 @@
782	1406	smoothCB.setToolTipText("Snapping delay");
783	1407	smoothCB.addItemListener(this);
784	1408
785		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786		- slowCB.setToolTipText("Smooth interpolation");
787		- slowCB.addItemListener(this);
	1409	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1410	+// slowCB.setToolTipText("Smooth interpolation");
	1411	+// slowCB.addItemListener(this);
	1412	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1413	+ minshaderCB.setToolTipText("Minimal fast shader");
	1414	+ minshaderCB.addItemListener(this);
788	1415
789	1416	// constraints.gridy += 1;
790	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1418	// speakerMocapCB.addItemListener(this);
792	1419
	1420	+ panel.Return();
	1421	+
793	1422	if (false)
794	1423	{
795	1424	// handled in scripts
..	..	@@ -804,34 +1433,82 @@
804	1433	//constraints.gridy += 1;
805	1434	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
807	1437	}
808	1438
809	1439	//constraints.gridx += 1;
810	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1441	// debugCB.addItemListener(this);
812	1442
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
813	1447	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
814	1449	oeilCB.addItemListener(this);
815	1450
	1451	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1452	+ shadowCB.setToolTipText("When live compute shadows");
	1453	+ shadowCB.addItemListener(this);
	1454	+
	1455	+ panel.Return();
	1456	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1457	+ toggleTextureCB.setToolTipText("Load textures");
	1458	+ toggleTextureCB.addItemListener(this);
	1459	+
	1460	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1461	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1462	+ toggleSwitchCB.addItemListener(this);
	1463	+
	1464	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1465	+ autokeepCB.setToolTipText("On structure change");
	1466	+ autokeepCB.addItemListener(this);
	1467	+
	1468	+ panel.Return();
	1469	+ if (Globals.ADVANCED)
	1470	+ {
816	1471	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1472	lookAtCB.setToolTipText("Look-at target");
818	1473	lookAtCB.addItemListener(this);
	1474	+ }
819	1475
820	1476	}
821	1477
822	1478	cGridBag fill = new cGridBag();
823		-
824	1479	fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
825	1484
826	1485	panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
827	1488
828	1489	}
829	1490
830	1491	void EditObject(Object3D obj)
831	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
832	1501	cRadio radioButton = new cRadio(obj.name);
	1502	+
	1503	+ // June 2019. Patch to avoid bug with transparency.
	1504	+ radioButton.hadMaterial = obj.material != null;
	1505	+ if (!radioButton.hadMaterial)
	1506	+ {
	1507	+ obj.material = new cMaterial();
	1508	+ }
	1509	+
833	1510	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
835	1512	radioButton.SetCamera(cameraView.renderCamera, false);
836	1513	radioButton.addActionListener(this);
837	1514	radioPanel.add(radioButton);
..	..	@@ -845,29 +1522,37 @@
845	1522
846	1523	oe.SetupViews();
847	1524
	1525	+ if (Globals.DEBUG)
848	1526	System.out.println("SetupViews");
849	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
850	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
851	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1530	}
853	1531
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;
	1532	+ cToggleButton liveCB;
	1533	+ cCheckBox supportCB;
	1534	+ cCheckBox localCB;
	1535	+ cCheckBox crowdCB;
	1536	+ cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
	1539	+ cToggleButton fastCB;
	1540	+ cCheckBox slowCB;
	1541	+ cCheckBox boxCB;
	1542	+ cCheckBox zoomBoxCB;
	1543	+ cCheckBox freezeCB;
	1544	+ //cToggleButton trackCB;
	1545	+ cCheckBox trackCB;
	1546	+ cCheckBox smoothfocusCB;
865	1547	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
871	1556
872	1557	// static int COLOR = 1;
873	1558	// static int MATERIAL = 2;
..	..	@@ -875,9 +1560,9 @@
875	1560
876	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1562
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
881	1566
882	1567	public void itemStateChanged(ItemEvent e)
883	1568	{
..	..	@@ -921,6 +1606,12 @@
921	1606	{
922	1607	cameraView.ToggleInertia();
923	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
924	1615	}
925	1616	else if(e.getSource() == localCB)
926	1617	{
..	..	@@ -970,6 +1661,18 @@
970	1661	{
971	1662	cameraView.ToggleOeil();
972	1663	}
	1664	+ else if(e.getSource() == shadowCB)
	1665	+ {
	1666	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == freezeCB)
	1669	+ {
	1670	+ Globals.FREEZEONMOVE ^= true;
	1671	+ }
	1672	+ else if(e.getSource() == autokeepCB)
	1673	+ {
	1674	+ Globals.REPLACEONMAKE ^= true;
	1675	+ }
973	1676	else if(e.getSource() == lookAtCB)
974	1677	{
975	1678	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1689,8 @@
986	1689
987	1690	/**/
988	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1695	// We can't move the root node or an empty selection
992	1696	return;
..	..	@@ -1049,8 +1753,6 @@
1049	1753	}
1050	1754	}
1051	1755
1052		- String string = (String) object;
1053		-
1054	1756	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1757	// if( object instanceof java.io.File[])
1056	1758	// {
..	..	@@ -1058,6 +1760,8 @@
1058	1760	// objEditor.DropFile((java.io.File[]) object, true);
1059	1761	// return;
1060	1762	// }
	1763	+
	1764	+ String string = object.toString();
1061	1765
1062	1766	// File path for Mac and Windows
1063	1767	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1807,33 @@
1103	1807
1104	1808	assert target == objEditor.jTree;
1105	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
1106	1811	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1813	} catch (Exception e) {
1109	1814	System.out.println("destinationPath : " + destinationPath);
1110	1815	return;
1111	1816	}
1112	1817
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
1114	1819	{
	1820	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1821	+
	1822	+ // Cannot move into itself
	1823	+ if (child == destinationLeaf)
	1824	+ return;
	1825	+ }
	1826	+
	1827	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+// {
1115	1829	loadClipboard(true);
1116	1830	objEditor.jTree.setSelectionPath(destinationPath);
1117	1831	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
1123	1837	}
1124	1838	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1839	// Called if the user has modified the current drop gesture
..	..	@@ -1175,7 +1889,12 @@
1175	1889	TreePath path;
1176	1890
1177	1891	public TransferableTreePath(TreePath tp) {
1178		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1179	1898	}
1180	1899
1181	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1224,22 +1943,30 @@
1224	1943	{
1225	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1945	//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);
	1946	+// gridItem = menu.add(new MenuItem("Grid"));
	1947	+// gridItem.addActionListener(this);
	1948	+// rectoidItem = menu.add(new MenuItem("Box"));
	1949	+// rectoidItem.addActionListener(this);
	1950	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1951	+// ellipsoidItem.addActionListener(this);
	1952	+// coneItem = menu.add(new MenuItem("Cone"));
	1953	+// coneItem.addActionListener(this);
	1954	+// torusItem = menu.add(new MenuItem("Torus"));
	1955	+// torusItem.addActionListener(this);
	1956	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1957	+// superItem.addActionListener(this);
	1958	+
	1959	+ cameraItem = menu.add(new MenuItem("Camera"));
	1960	+ cameraItem.addActionListener(this);
	1961	+
	1962	+ if (!Globals.ADVANCED)
	1963	+ {
1239	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1965	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
1243	1970	if (Globals.ADVANCED)
1244	1971	{
1245	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1992,15 @@
1265	1992	}
1266	1993	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1994	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);
	1995	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1996	+// overlayItem.addActionListener(this);
	1997	+// lightItem = menu.add(new MenuItem("Light"));
	1998	+// lightItem.addActionListener(this);
1272	1999	menu.add("-");
1273	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	2001	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1277	2004	doubleItem = menu.add(new MenuItem("Fork"));
1278	2005	doubleItem.addActionListener(this);
1279	2006	if (Globals.ADVANCED)
..	..	@@ -1289,6 +2016,9 @@
1289	2016	animationItem.addItemListener(this);
1290	2017	animationItem.setState(Globals.ANIMATION);
1291	2018
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
	2021	+
1292	2022	menu.add("-");
1293	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	2024	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +2031,8 @@
1301	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	2032	reduce34MorphItem.addActionListener(this);
1303	2033	menu.add("-");
	2034	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2035	+ memoryItem.addActionListener(this);
1304	2036	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	2037	computeAOItem.addActionListener(this);
1306	2038
..	..	@@ -1309,8 +2041,6 @@
1309	2041	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	2042	mirrorItem.addActionListener(this);
1311	2043	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	2045	analyzeItem.addActionListener(this);
1316	2046	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1396,24 +2126,24 @@
1396	2126	switch(axis)
1397	2127	{
1398	2128	case 0 :
1399		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1400		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1401		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1402		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1403	2133	norm = cVector.X;
1404	2134	break;
1405	2135	case 1 :
1406		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1407		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1408		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1409		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1410	2140	norm = cVector.Y;
1411	2141	break;
1412	2142	case 2 :
1413		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1414		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1415		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1416		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1417	2147	norm = cVector.Z;
1418	2148	break;
1419	2149	}
..	..	@@ -1454,9 +2184,38 @@
1454	2184	shadow.material = new cMaterial(obj.material);
1455	2185	shadow.material.diffuse = 0.0001f;
1456	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1457	2192
1458	2193	makeSomething(shadow);
1459	2194	}
	2195	+
	2196	+ private void ClearUnpinned()
	2197	+ {
	2198	+ //for (Object3D obj : listUI)
	2199	+ for (int i=listUI.size(); --i>=0;)
	2200	+ {
	2201	+ Object3D obj = listUI.elementAt(i);
	2202	+ if (!obj.pinned)
	2203	+ {
	2204	+ obj.CloseUI();
	2205	+ listUI.remove(i);
	2206	+ }
	2207	+ }
	2208	+ }
	2209	+
	2210	+ private void EditElement(Object3D elem, boolean newWindow)
	2211	+ {
	2212	+ // if (!(elem instanceof Composite))
	2213	+ // newWindow = false;
	2214	+ listUI.add(elem);
	2215	+ elem.openEditWindow(this, newWindow); //, false);
	2216	+ System.out.println("edit : " + elem);
	2217	+ elem.editWindow.refreshContents(true); // ? new
	2218	+ }
1460	2219
1461	2220	/**
1462	2221	* applyExample
..	..	@@ -1701,7 +2460,7 @@
1701	2460	{
1702	2461	ScreenFit();
1703	2462	} else
1704		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1705	2464	{
1706	2465	cVector v1 = new cVector();
1707	2466	cVector v2 = new cVector();
..	..	@@ -1710,11 +2469,11 @@
1710	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2470	objEditor.cameraView.repaint();
1712	2471	} else
1713		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1714	2473	{
1715	2474	makeSomething(new Box());
1716	2475	} else
1717		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1718	2477	{
1719	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2552,27 @@
1793	2552
1794	2553	makeSomething(obj);
1795	2554	} else
1796		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1797	2556	{
1798	2557	makeSomething(new Grid());
1799	2558	} else
1800		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2560	{
1802	2561	makeSomething(new Sphere());
1803	2562	} else
1804		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1805	2564	{
1806	2565	makeSomething(new Cone());
1807	2566	} else
1808		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1809	2568	{
1810	2569	makeSomething(new Torus());
1811	2570	} else
1812		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1813	2572	{
1814	2573	makeSomething(new Superellipsoid());
1815	2574	} else
1816		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1817	2576	{
1818	2577	makeSomething(new Klein());
1819	2578	} else
..	..	@@ -1833,7 +2592,7 @@
1833	2592	{
1834	2593	makeSomething(new BezierSurface());
1835	2594	} else
1836		- if (source == overlayItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1837	2596	{
1838	2597	/*
1839	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2640,27 @@
1881	2640	s.setup();
1882	2641	makeSomething(s);
1883	2642	} else
1884		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1885	2644	{
1886	2645	makeSomething(new Light());
1887	2646	} else
	2647	+// if (source == skybox1Button \|\|
	2648	+// source == skybox2Button \|\|
	2649	+// source == skybox3Button \|\|
	2650	+// source == skybox4Button \|\|
	2651	+// source == skybox5Button \|\|
	2652	+// source == skybox6Button \|\|
	2653	+// source == skybox7Button \|\|
	2654	+// source == skybox11Button \|\|
	2655	+// source == skybox12Button \|\|
	2656	+// source == skybox13Button \|\|
	2657	+// source == skybox14Button \|\|
	2658	+// source == skybox15Button \|\|
	2659	+// source == skybox16Button \|\|
	2660	+// source == skybox17Button)
	2661	+// {
	2662	+// ChangeSkybox(source);
	2663	+// } else
1888	2664	if (source == csgItem)
1889	2665	{
1890	2666	group(new CSG());
..	..	@@ -1931,30 +2707,38 @@
1931	2707
1932	2708	group(g);
1933	2709	} else
1934		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1935	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1936	2714	Composite csg = new GroupLeaf();
1937		- csg.count = 5;
1938	2715	group(csg);
1939		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1940	2718	csg.addChild(child);
1941	2719	child.addChild(csg);
	2720	+ }
1942	2721	} else
1943	2722	if (source == doubleItem)
1944	2723	{
1945		- Composite csg = new GroupLeaf();
1946		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1947	2727	group(csg);
1948		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1949	2730	csg.addChild(child);
1950	2731	child.addChild(csg);
1951		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1952	2733	csg.addChild(child);
1953	2734	child.addChild(csg);
	2735	+ }
1954	2736	} else
1955	2737	if (source == tripleItem)
1956	2738	{
1957		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1958	2742	csg.count = 4;
1959	2743	group(csg);
1960	2744	Composite child = new cGroup();
..	..	@@ -1966,11 +2750,12 @@
1966	2750	child = new cGroup();
1967	2751	csg.addChild(child);
1968	2752	child.addChild(csg);
	2753	+ }
1969	2754	} else
1970	2755	if (source == computeAOItem)
1971	2756	{
1972	2757	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1974	2759	} else
1975	2760	if (source == recompileItem)
1976	2761	{
..	..	@@ -1985,7 +2770,7 @@
1985	2770	if (source == invariantsItem)
1986	2771	{
1987	2772	System.out.println("Invariants:");
1988		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1989	2774	} else
1990	2775	if (source == memoryItem)
1991	2776	{
..	..	@@ -2012,21 +2797,56 @@
2012	2797	{
2013	2798	Maximize();
2014	2799	} else
2015		- if (source == fullButton)
	2800	+ if (source == fullScreenButton)
2016	2801	{
2017	2802	ToggleFullScreen();
2018	2803	} else
2019		- if (source == undoButton)
	2804	+ if (source == collapseButton)
2020	2805	{
2021		- Undo();
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
2022	2808	} else
2023		- if (source == redoButton)
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
	2816	+ if (source == previousVersionButton)
2024	2817	{
2025		- Redo();
	2818	+ // Go to previous version
	2819	+ //if (!Undo())
	2820	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ PreviousVersion();
2026	2822	} else
2027		- if (source == saveButton)
	2823	+ if (source == restoreButton)
2028	2824	{
2029		- Save();
	2825	+ // Restore current version
	2826	+ Restore();
	2827	+ //restoreButton.setEnabled(false);
	2828	+ } else
	2829	+ if (source == replaceButton)
	2830	+ {
	2831	+ // Overwrite current version
	2832	+ Replace();
	2833	+ //replaceButton.setEnabled(false);
	2834	+ } else
	2835	+ if (source == nextVersionButton)
	2836	+ {
	2837	+ // Go to next version
	2838	+ NextVersion();
	2839	+ } else
	2840	+ if (source == saveVersionButton)
	2841	+ {
	2842	+ // Save a new version
	2843	+ if (!Save(true))
	2844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
2030	2850	} else
2031	2851	if (source == oneStepButton)
2032	2852	{
..	..	@@ -2035,17 +2855,14 @@
2035	2855	} else
2036	2856	if (source == screenfitButton)
2037	2857	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2858	ScreenFit();
2040	2859	} else
2041	2860	if (source == screenfitpointButton)
2042	2861	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2862	ScreenFitPoint();
2045	2863	} else
2046	2864	if (source == snapobjectButton)
2047	2865	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2866	SnapObject();
2050	2867	} else
2051	2868	// if (event.getSource() == recompileButton)
..	..	@@ -2084,11 +2901,11 @@
2084	2901	} else
2085	2902	if (source == undoItem)
2086	2903	{
2087		- Undo();
	2904	+ PreviousVersion();
2088	2905	} else
2089	2906	if (source == redoItem)
2090	2907	{
2091		- Redo();
	2908	+ NextVersion();
2092	2909	} else
2093	2910	if (source == duplicateItem)
2094	2911	{
..	..	@@ -2409,7 +3226,7 @@
2409	3226	{
2410	3227	StepAll();
2411	3228	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	3230	{
2414	3231	//int indices[] = jList.getSelectedIndices();
2415	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +3238,9 @@
2421	3238	{
2422	3239	ClearSelection(true);
2423	3240	} else
2424		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2425	3242	{
2426		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2427	3244	} else
2428	3245	if (source == hideItem)
2429	3246	{
..	..	@@ -2441,11 +3258,11 @@
2441	3258	{
2442	3259	makeSomething(new Camera());
2443	3260	} else
2444		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2445	3262	{
2446	3263	group(new Composite());
2447	3264	} else
2448		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2449	3266	{
2450	3267	RandomNode random = new RandomNode();
2451	3268	group(random);
..	..	@@ -2547,7 +3364,7 @@
2547	3364	{
2548	3365	group(new cLinker());
2549	3366	} else
2550		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2551	3368	{
2552	3369	group(new TextureNode());
2553	3370	} else
..	..	@@ -2567,17 +3384,42 @@
2567	3384	{
2568	3385	CastShadow(2);
2569	3386	} else
2570		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3388	{
2572		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2573	3391	for (int i=0; i<group.selection.size(); i++)
2574	3392	{
2575		- Ungroup(group.selection.get(i));
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
	3396	+ {
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
	3406	+ break;
	3407	+ }
2576	3408	}
2577	3409
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3410	+ if (canUngroup)
	3411	+ {
	3412	+ for (int i=0; i<group.selection.size(); i++)
	3413	+ {
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
	3417	+ }
	3418	+
	3419	+ ClearSelection(false);
	3420	+
	3421	+ refreshContents();
	3422	+ }
2581	3423	} else
2582	3424	if (source == genUVItem)
2583	3425	{
..	..	@@ -2622,6 +3464,10 @@
2622	3464	if (source == clearMaterialsItem)
2623	3465	{
2624	3466	ClearMaterials();
	3467	+ } else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
2625	3471	} else
2626	3472	if (source == liveleavesItem)
2627	3473	{
..	..	@@ -2763,6 +3609,18 @@
2763	3609	{
2764	3610	TransformChildren();
2765	3611	} else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
	3623	+ } else
2766	3624	if (source == resetTransformItem)
2767	3625	{
2768	3626	ResetTransform();
..	..	@@ -2878,7 +3736,7 @@
2878	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3737	{
2880	3738	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2882	3740	}
2883	3741
2884	3742	refreshContents();
..	..	@@ -2894,6 +3752,31 @@
2894	3752
2895	3753	refreshContents();
2896	3754	} else
	3755	+ if (source == embedTexturesItem)
	3756	+ {
	3757	+ Object3D obj;
	3758	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3759	+ {
	3760	+ obj = (Object3D)e.nextElement();
	3761	+ obj.EmbedTextures(true);
	3762	+ }
	3763	+
	3764	+ refreshContents();
	3765	+ } else
	3766	+ if (source == deEmbedTexturesItem)
	3767	+ {
	3768	+ Object3D obj;
	3769	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3770	+ {
	3771	+ obj = (Object3D)e.nextElement();
	3772	+ obj.EmbedTextures(false);
	3773	+ }
	3774	+
	3775	+ CameraPane.texturepigment.clear();
	3776	+ CameraPane.texturebump.clear();
	3777	+
	3778	+ refreshContents();
	3779	+ } else
2897	3780	if (source == flashSelectionButton)
2898	3781	{
2899	3782	CameraPane.flash = true;
..	..	@@ -2905,38 +3788,11 @@
2905	3788	if (source == twoButton)
2906	3789	{
2907	3790	radio.layout = twoButton;
2908		- // bug
2909		- //gridPanel.setDividerLocation(1.0);
2910		- //bigPanel.setDividerLocation(0.0);
2911		-// bigThree.remove(scenePanel);
2912		-// bigThree.remove(centralPanel);
2913		-// bigThree.remove(XYZPanel);
2914		-// aWindowConstraints.gridx = 0;
2915		-// aWindowConstraints.gridy = 0;
2916		-// aWindowConstraints.gridwidth = 1;
2917		-// // aConstraints.gridheight = 3;
2918		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2919		-// aWindowConstraints.weightx = 0;
2920		-// aWindowConstraints.weighty = 1;
2921		-// //bigThree.add(jtp, aWindowConstraints);
2922		-// aWindowConstraints.weightx = 1;
2923		-// aWindowConstraints.gridwidth = 3;
2924		-// // aConstraints.gridheight = 3;
2925		-// aWindowConstraints.gridx = 1;
2926		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2927		-// bigThree.add(centralPanel, aWindowConstraints);
2928		-// aWindowConstraints.weightx = 0;
2929		-// aWindowConstraints.gridx = 4;
2930		-// aWindowConstraints.gridwidth = 1;
2931		-// // aConstraints.gridheight = 3;
2932		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2933		-// //bigThree.add(XYZPanel, aWindowConstraints);
2934		-// scenePanel.setVisible(false);
2935		-// centralPanel.setVisible(true);
2936		-// XYZPanel.setVisible(false);
2937		- bigThree.ClearUI();
2938		- bigThree.add(centralPanel);
2939		- bigThree.FlushUI();
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
	3794	+
	3795	+ Show3DView();
2940	3796
2941	3797	cameraView.requestFocusInWindow();
2942	3798
..	..	@@ -2959,6 +3815,9 @@
2959	3815	if (source == threeButton)
2960	3816	{
2961	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2962	3821
2963	3822	// bigThree.remove(scenePanel);
2964	3823	// bigThree.remove(centralPanel);
..	..	@@ -2988,8 +3847,8 @@
2988	3847	// centralPanel.setVisible(true);
2989	3848	// XYZPanel.setVisible(true);
2990	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2991	3851	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3852	bigThree.FlushUI();
2994	3853
2995	3854	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3856,9 @@
2997	3856	if (source == fourButton)
2998	3857	{
2999	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
3000	3862
3001	3863	// bigThree.remove(scenePanel);
3002	3864	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3897,9 @@
3035	3897	{
3036	3898	radio.layout = sixButton;
3037	3899
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
	3902	+
3038	3903	// bigThree.remove(scenePanel);
3039	3904	// bigThree.remove(centralPanel);
3040	3905	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3928,8 @@
3063	3928	// centralPanel.setVisible(true);
3064	3929	// XYZPanel.setVisible(false);
3065	3930	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
3068	3933	bigThree.FlushUI();
3069	3934
3070	3935	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3937,9 @@
3072	3937	if (source == sevenButton)
3073	3938	{
3074	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
3075	3943
3076	3944	// bigThree.remove(scenePanel);
3077	3945	// bigThree.remove(centralPanel);
..	..	@@ -3110,6 +3978,7 @@
3110	3978	} else
3111	3979	if (source == rootButton)
3112	3980	{
	3981	+ Replace();
3113	3982	Object3D obj;
3114	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3115	3984	{
..	..	@@ -3124,16 +3993,26 @@
3124	3993	if (source == closeButton)
3125	3994	{
3126	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
3127	3999	cRadio ab;
3128	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	4001	{
3130	4002	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
3133	4011	buttonGroup.remove(ab);
3134	4012	radioPanel.remove(ab);
3135	4013
3136		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
3137	4016	// ab.GetObject().objectUI = null; // ?????????
3138	4017
3139	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +4025,12 @@
3146	4025	} else
3147	4026	if (source == editItem \|\| source == editButton)
3148	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
3149	4034	EditSelection(false);
3150	4035	} else
3151	4036	if (source == uneditButton)
..	..	@@ -3154,9 +4039,10 @@
3154	4039	{
3155	4040	Object3D child = (Object3D)e.nextElement();
3156	4041	if(child.editWindow != null)
3157		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
3158	4043	child.CloseUI();
3159	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3160	4046
3161	4047	//child.editWindow = null; // ???????????
3162	4048	}
..	..	@@ -3171,16 +4057,18 @@
3171	4057	//copy.ClearUI();
3172	4058	for (Object3D obj : listUI)
3173	4059	{
	4060	+ obj.pinned = false;
3174	4061	obj.CloseUI();
3175	4062	}
3176	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3177	4065	refreshContents(true);
3178	4066	} else
3179	4067	if (source == allParamsButton)
3180	4068	{
3181	4069	assert(copy == group);
3182	4070
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	4072
3185	4073	for (Object3D obj : listUI)
3186	4074	{
..	..	@@ -3206,6 +4094,9 @@
3206	4094	} else
3207	4095	if(source instanceof cRadio)
3208	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3209	4100	group.parent = keepparent;
3210	4101	group.attributes = 0;
3211	4102	//group.editWindow = null;
..	..	@@ -3229,6 +4120,7 @@
3229	4120	}
3230	4121
3231	4122	copy = group;
	4123	+
3232	4124	//Globals.theRenderer.object = group;
3233	4125	if(!useclient)
3234	4126	{
..	..	@@ -3247,6 +4139,7 @@
3247	4139
3248	4140	// fix "+" issue
3249	4141	//group.editWindow = this;
	4142	+ group.manipWindow = this;
3250	4143
3251	4144	/*
3252	4145	currentLayout = radio.layout;
..	..	@@ -3254,6 +4147,40 @@
3254	4147	currentLayout = sevenButton;
3255	4148	*/
3256	4149	radio.layout.doClick();
	4150	+
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
	4177	+ ClearUnpinned();
	4178	+
	4179	+ //Grafreed.Assert(group != null);
	4180	+ //Grafreed.Assert(group.selection != null);
	4181	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4182	+ if (group.selection == null \|\| group.selection.size() == 1)
	4183	+ EditSelection(false);
3257	4184	keepparent = group.parent;
3258	4185	// PARENT = NULL or not???
3259	4186	//group.parent = null; // ROOT
..	..	@@ -3265,11 +4192,13 @@
3265	4192	} else if (event.getSource() == editCameraItem)
3266	4193	{
3267	4194	cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
3268	4196	cameraView.repaint();
3269	4197	return;
3270		- } else if (event.getSource() == revertCameraItem)
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	4199	{
3272	4200	cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
3273	4202	cameraView.repaint();
3274	4203	return;
3275	4204	// } else if (event.getSource() == textureButton)
..	..	@@ -3358,6 +4287,18 @@
3358	4287	refreshContents();
3359	4288	}
3360	4289
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
	4301	+
3361	4302	void ResetTransform()
3362	4303	{
3363	4304	ResetTransform(-1);
..	..	@@ -3373,42 +4314,8 @@
3373	4314	if (obj.toParent == null)
3374	4315	continue;
3375	4316
3376		- if (mask == -1)
3377		- {
3378		- if (obj instanceof Camera) // jan 2014
3379		- {
3380		- LA.matIdentity(obj.toParent);
3381		- LA.matIdentity(obj.fromParent);
3382		- }
3383		- else
3384		- {
3385		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3386		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3387		- }
3388		- TouchTransform(obj);
3389		- continue;
3390		- }
3391		- if ((mask&2) != 0) // Scale
3392		- {
3393		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3394		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3395		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3396		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3397		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3398		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3399		- }
3400		- if ((mask&4) != 0) // Rotation
3401		- {
3402		- // ?
3403		- }
3404		- if ((mask&1) != 0) // Translation
3405		- {
3406		- if (obj.toParent != null)
3407		- {
3408		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3409		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3410		- }
3411		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3412	4319	if (obj.parent == null)
3413	4320	{
3414	4321	System.out.println("NULL PARENT!");
..	..	@@ -3846,7 +4753,7 @@
3846	4753
3847	4754	try
3848	4755	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4757	}
3851	4758	catch (Exception e)
3852	4759	{
..	..	@@ -3916,6 +4823,12 @@
3916	4823	for (int i=0; i<group.selection.size(); i++)
3917	4824	{
3918	4825	Object3D obj = group.selection.get(i);
	4826	+
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
3919	4832
3920	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3921	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4208,6 +5121,12 @@
4208	5121	refreshContents();
4209	5122	}
4210	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4211	5130	void FlipV(boolean flip)
4212	5131	{
4213	5132	group.selection.FlipV(flip);
..	..	@@ -4321,28 +5240,25 @@
4321	5240	// }
4322	5241	// }
4323	5242
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	5243	void EditSelection(boolean newWindow)
4329	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4330	5251	// aConstraints.gridy = 0;
4331	5252	for (int i=0; i<group.selection.size(); i++)
4332	5253	{
4333	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	5257
4337	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	5259	if(elem != group \|\| !newWindow)
4339	5260	{
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
	5261	+ EditElement(elem, newWindow); // ? new
4346	5262	}
4347	5263	}
4348	5264	}
..	..	@@ -4405,9 +5321,7 @@
4405	5321
4406	5322	freezemodel = false;
4407	5323	}
4408		-
4409		- boolean flashIt = true;
4410		-
	5324	+
4411	5325	public void valueChanged(TreeSelectionEvent e)
4412	5326	//public boolean handleEvent(Event event)
4413	5327	{
..	..	@@ -4417,7 +5331,8 @@
4417	5331	//new Exception().printStackTrace();
4418	5332
4419	5333	freezemodel = true;
4420		-
	5334	+ ClearUnpinned();
	5335	+
4421	5336	/**/
4422	5337	//switch (event.id)
4423	5338	{
..	..	@@ -4450,7 +5365,7 @@
4450	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5366	// a camera
4452	5367	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4454	5369	{
4455	5370	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5374,13 @@
4459	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5375	}
4461	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4462	5384	refreshContents();
4463	5385	//return true;
4464	5386	}
..	..	@@ -4468,9 +5390,36 @@
4468	5390	freezemodel = false;
4469	5391	}
4470	5392
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
	5416	+ }
	5417	+
4471	5418	void refreshContents(boolean cp)
4472	5419	{
4473		- if (!Globals.MOUSEDRAGGED)
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5423	{
4475	5424	objEditor.ClearInfo(); // .GetMaterial());
4476	5425
..	..	@@ -4479,7 +5428,7 @@
4479	5428	Object3D child = (Object3D) group.selection.get(i);
4480	5429
4481	5430	objEditor.AddInfo(child, this, true);
4482		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
4483	5432	}
4484	5433
4485	5434	objEditor.SetText(); // jan 2014
..	..	@@ -4569,7 +5518,8 @@
4569	5518
4570	5519	if (cut)
4571	5520	{
4572		- Save();
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4573	5523	//int indices[] = jList.getSelectedIndices();
4574	5524	//for (int i = indices.length - 1; i >= 0; i--)
4575	5525	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5622,10 @@
4672	5622
4673	5623	void paste(boolean expand)
4674	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4675	5629	// if (GrafreeD.clipboard == null)
4676	5630	// return;
4677	5631	boolean first = true;
..	..	@@ -4731,6 +5685,7 @@
4731	5685	Grafreed.clipboard.get(0).parent = keepparent;
4732	5686	}
4733	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4734	5689	ResetModel();
4735	5690	refreshContents();
4736	5691	}
..	..	@@ -4866,6 +5821,10 @@
4866	5821
4867	5822	void group(Object3D csg, boolean grab)
4868	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4869	5828	if (//false) // why??
4870	5829	!group.selection.isEmpty())
4871	5830	{
..	..	@@ -4979,10 +5938,15 @@
4979	5938	//node.add(csg);
4980	5939	//makeSomething(node);
4981	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4982	5942	}
4983	5943
4984	5944	void Ungroup(Object3D g)
4985	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4986	5950	if (g instanceof HiddenObject)
4987	5951	{
4988	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5963,7 @@
4999	5963	objEditor.makeSomething(g.get(i), false);
5000	5964	}
5001	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
5002	5967	}
5003	5968
5004	5969	void ungroup()
..	..	@@ -5287,13 +6252,43 @@
5287	6252	cButton clearpanelButton;
5288	6253	cButton unselectButton;
5289	6254
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
5295		- cButton saveButton;
	6255	+ cButton restoreCameraButton;
	6256	+
5296	6257	cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
5297	6292
5298	6293	cButton screenfitButton;
5299	6294	cButton screenfitpointButton;
..	..	@@ -5315,12 +6310,12 @@
5315	6310	//JTree jTree;
5316	6311	private MenuItem lookAtItem;
5317	6312	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
5319		- private MenuItem cutItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
5320	6315	private MenuItem undoItem;
5321	6316	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
5323		- private MenuItem cloneItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5324	6319	private MenuItem cloneSupportItem;
5325	6320	private MenuItem overwriteGeoItem;
5326	6321	private MenuItem overwriteMatItem;
..	..	@@ -5341,13 +6336,13 @@
5341	6336	private MenuItem cloneGeometriesItem;
5342	6337	private MenuItem shareGeometriesItem;
5343	6338	private MenuItem mergeGeometriesItem;
5344		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5345	6340	private MenuItem pasteItem;
5346		- private MenuItem pasteIntoItem;
5347		- private MenuItem pasteLinkItem;
5348		- private MenuItem pasteCloneItem;
5349		- private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5351	6346	private MenuItem clearAllItem;
5352	6347	private MenuItem genUVItem;
5353	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5373,6 +6368,7 @@
5373	6368	private MenuItem clipMeshItem;
5374	6369	private MenuItem smoothMeshItem;
5375	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5376	6372
5377	6373	private MenuItem liveleavesItem;
5378	6374	private MenuItem unliveleavesItem;
..	..	@@ -5396,18 +6392,21 @@
5396	6392	private MenuItem maxTexturesItem;
5397	6393	private MenuItem panoTexturesItem;
5398	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5399	6398	private MenuItem resetCentroidItem;
5400	6399	private MenuItem resetCentroidXZItem;
5401	6400	private MenuItem resetTransformItem;
5402	6401	private MenuItem transformGeometryItem;
5403	6402	private MenuItem transformChildrenItem;
5404	6403	private MenuItem hideItem;
5405		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5406	6405	private MenuItem backItem;
5407	6406	private MenuItem frontItem;
5408	6407	private MenuItem cameraItem;
5409	6408	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5411	6410	private MenuItem physicsItem;
5412	6411	private MenuItem frameselectorItem;
5413	6412	private MenuItem scriptNodeItem;
..	..	@@ -5415,7 +6414,7 @@
5415	6414	private MenuItem switchTransfoItem;
5416	6415	private MenuItem morphItem;
5417	6416	private MenuItem linkerItem;
5418		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5419	6418	private MenuItem editItem;
5420	6419	private MenuItem openWindowItem;
5421	6420	private MenuItem editLeafItem;
..	..	@@ -5431,6 +6430,8 @@
5431	6430	private MenuItem attachBumpItem;
5432	6431	private MenuItem detachBumpItem;
5433	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5434	6435
5435	6436	private MenuItem particleItem;
5436	6437	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6482,5 @@
5481	6482
5482	6483	Menu cameraMenu;
5483	6484	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6485	+ MenuItem restoreCameraItem;
5485	6486	}