~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,35 +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	551
180		- menu.add("-");
181		- 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"));
182	555	pasteIntoItem.addActionListener(this);
183		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184	557	pasteLinkItem.addActionListener(this);
185		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186	559	pasteCloneItem.addActionListener(this);
187		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
188	561	// pasteExpandItem.addActionListener(this);
189		- menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
192	564
193	565	if (Globals.ADVANCED)
194	566	{
..	..	@@ -202,23 +574,23 @@
202	574	//zBufferItem.addActionListener(this);
203	575	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	576	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
207	579
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- 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);
212	592
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	594	toggleHandleItem.addItemListener(this);
223	595	toggleHandleItem.setState(CameraPane.HANDLES);
224	596
..	..	@@ -273,15 +645,13 @@
273	645	{
274	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	649	oe.cameraMenu.add("-");
279	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280	651	openWindowItem.addActionListener(this);
281		- editLeafItem.addActionListener(this);
282	652	lookAtItem.addActionListener(this);
283	653	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	654	+ //switchViewItem.addActionListener(this);
285	655	}
286	656
287	657	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -325,22 +695,37 @@
325	695	setMasterItem.addActionListener(this);
326	696	}
327	697
328		- oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
331	700	backItem = menu.add(new MenuItem("Back"));
332	701	backItem.addActionListener(this);
333	702	frontItem = menu.add(new MenuItem("Front"));
334	703	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- 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	+ {
337	712	hideItem = menu.add(new MenuItem("Hidden Group"));
338	713	hideItem.addActionListener(this);
339		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340	716	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- 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	+ {
344	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	730	switchGeoItem.addActionListener(this);
346	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +733,6 @@
348	733	morphItem = menu.add(new MenuItem("Morph Group"));
349	734	morphItem.addActionListener(this);
350	735
351		- if (Globals.ADVANCED)
352		- {
353	736	menu.add("-");
354	737	physicsItem = menu.add(new MenuItem("Physics"));
355	738	physicsItem.addActionListener(this);
..	..	@@ -357,13 +740,11 @@
357	740	frameselectorItem.addActionListener(this);
358	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	742	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	743	}
363	744
364	745	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
367	748	billboardItem = menu.add(new MenuItem("Billboard"));
368	749	billboardItem.addActionListener(this);
369	750	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,24 +755,32 @@
374	755	shadowYItem.addActionListener(this);
375	756	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
377	761	if (Globals.ADVANCED)
378	762	{
379	763	menu.add("-");
380	764	linkerItem = menu.add(new MenuItem("Linker"));
381	765	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	766	templateItem = menu.add(new MenuItem("Template"));
385	767	templateItem.addActionListener(this);
386	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
387	769	pointflowItem.addActionListener(this);
388	770	}
389	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("-");
390	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
391	780	resetTransformItem.addActionListener(this);
392	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
393	782	resetCentroidItem.addActionListener(this);
394		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
395	784	resetCentroidXZItem.addActionListener(this);
396	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
397	786	transformGeometryItem.addActionListener(this);
..	..	@@ -409,7 +798,7 @@
409	798	genNormalsMESHItem.addActionListener(this);
410	799	if (Globals.ADVANCED)
411	800	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	802	genNormalsMINEItem.addActionListener(this);
414	803	}
415	804	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -443,6 +832,8 @@
443	832	}
444	833
445	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
446	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
447	838	clearMaterialsItem.addActionListener(this);
448	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -465,9 +856,9 @@
465	856	hideleavesItem.addActionListener(this);
466	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
467	858	showleavesItem.addActionListener(this);
468		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
469	860	markleavesItem.addActionListener(this);
470		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
471	862	unmarkleavesItem.addActionListener(this);
472	863	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473	864	rewindleavesItem.addActionListener(this);
..	..	@@ -502,10 +893,15 @@
502	893	attachBumpItem.addActionListener(this);
503	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
505	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	898	detachPigmentItem.addActionListener(this);
507	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	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);
509	905	menu.add("-");
510	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	907	sortbysizeItem.addActionListener(this);
..	..	@@ -516,6 +912,9 @@
516	912	shareGeometriesItem.addActionListener(this);
517	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
519	918	if (Globals.ADVANCED)
520	919	{
521	920	// Pretty much the same as duplicate and clone.
..	..	@@ -532,6 +931,80 @@
532	931	buildToolsMenu(menu);
533	932	}
534	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	+
535	1008	void SetupUI2(ObjEditor oe)
536	1009	{
537	1010	// June 2019
..	..	@@ -549,11 +1022,6 @@
549	1022	//new Exception().printStackTrace();
550	1023
551	1024	oe.radioPanel = new JPanel(new GridBagLayout());
552		- oe.aConstraints.weightx = 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
555		- oe.aConstraints.gridwidth = 100;
556		- oe.aConstraints.gridheight = 1;
557	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
558	1026
559	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -574,117 +1042,266 @@
574	1042	oe.radioPanel.add(dummyButton);
575	1043	oe.buttonGroup.add(dummyButton);
576	1044	*/
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
	1048	+
577	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	1050
579	1051	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1052	//minButton.setToolTipText("Minimize window");
581	1053	//minButton.addActionListener(this);
582	1054
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- 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	+ }
586	1061
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588		- fullButton.setToolTipText("Full-screen window");
589		- fullButton.addActionListener(this);
	1062	+ cButton gcButton;
590	1063
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- 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	+// });
594	1073
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- 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);
598	1077
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
601		- 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);
602	1081
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
604		- liveCB.setToolTipText("Enable animation");
605		- 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);
606	1108
607		- 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);
608	1146	oneStepButton.setToolTipText("Animate one step forward");
609	1147	oneStepButton.addActionListener(this);
610	1148
611		- 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);
612	1154	fastCB.setToolTipText("Fast mode");
613	1155	fastCB.addItemListener(this);
614	1156
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	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);
622	1162
623	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	1164	// screenfitpointButton.addActionListener(this);
625	1165
626	1166	if (Globals.ADVANCED)
627	1167	{
628		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
629	1169	snapobjectButton.addActionListener(this);
630	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");
631	1175	}
632	1176
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	1178
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638		-
639		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640		- twoButton.setToolTipText("Show center view only");
641		- twoButton.addActionListener(this);
642		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- fourButton.addActionListener(this);
644		- fourButton.setToolTipText("Show left panel only");
645		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
647		- sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
650		- threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
654		- //
655	1179
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- 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");
658	1182	rootButton.addActionListener(this);
659	1183
660		- 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);
661	1185	closeButton.setToolTipText("Close tab");
662	1186	closeButton.addActionListener(this);
663	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1188	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1189	+
	1190	+ cGridBag row1 = new cGridBag();
	1191	+
	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");
668	1280	editButton.addActionListener(this);
669	1281
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
672	1284	uneditButton.addActionListener(this);
673	1285
674	1286	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1287	+ allParamsButton.setToolTipText("Show all controls");
676	1288	allParamsButton.addActionListener(this);
677	1289
678		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
680	1292	clearPanelButton.addActionListener(this);
681	1293
682		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683		- unselectButton.setToolTipText("Unselect");
684		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
685	1297
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ flashSelectionButton.setToolTipText("Highlight selection");
	1300	+ flashSelectionButton.addActionListener(this);
	1301	+
686	1302	editCommandsPanel.preferredHeight = 1;
687	1303
	1304	+ SetPinStates(false);
688	1305	// oe.treePanel.add(commandsPanel);
689	1306	// oe.treePanel.Return();
690	1307
..	..	@@ -701,34 +1318,24 @@
701	1318
702	1319	cGridBag jSPPanel = new cGridBag();
703	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
704	1323	JScrollPane jSP;
705	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1326	ResetModel();
708	1327
709	1328	oe.treePanel.add(jSPPanel);
710	1329	oe.treePanel.Return();
711	1330
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
728	1332	oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
729	1336
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
732	1339
733	1340	//jList.addListSelectionListener(this);
734	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1343,7 @@
736	1343	//jTree.setEditable(true);
737	1344	oe.jTree.setDragEnabled(true);
738	1345	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1347
741	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1349
..	..	@@ -748,29 +1355,49 @@
748	1355	dgr.addDragGestureListener(this);
749	1356	}catch(Exception e) {}
750	1357	*/
751		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
752	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1360	}
754	1361
755	1362	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	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	+
757	1378	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1379	boxCB.setToolTipText("Display bounding boxes");
759	1380	boxCB.addItemListener(this);
760	1381
761	1382	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1384	zoomBoxCB.addItemListener(this);
764	1385
765	1386	if (true) // Globals.ADVANCED)
766	1387	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- 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);
770	1395
771	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1397	// localCB.addItemListener(this);
773	1398
	1399	+ panel.Return();
	1400	+
774	1401	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1402	crowdCB.setToolTipText("Used for crowds");
776	1403	crowdCB.addItemListener(this);
..	..	@@ -779,14 +1406,19 @@
779	1406	smoothCB.setToolTipText("Snapping delay");
780	1407	smoothCB.addItemListener(this);
781	1408
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- 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);
785	1415
786	1416	// constraints.gridy += 1;
787	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1418	// speakerMocapCB.addItemListener(this);
789	1419
	1420	+ panel.Return();
	1421	+
790	1422	if (false)
791	1423	{
792	1424	// handled in scripts
..	..	@@ -801,34 +1433,82 @@
801	1433	//constraints.gridy += 1;
802	1434	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
804	1437	}
805	1438
806	1439	//constraints.gridx += 1;
807	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1441	// debugCB.addItemListener(this);
809	1442
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
810	1447	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
811	1449	oeilCB.addItemListener(this);
812	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	+ {
813	1471	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	1472	lookAtCB.setToolTipText("Look-at target");
815	1473	lookAtCB.addItemListener(this);
	1474	+ }
816	1475
817	1476	}
818	1477
819	1478	cGridBag fill = new cGridBag();
820		-
821	1479	fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
822	1484
823	1485	panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
824	1488
825	1489	}
826	1490
827	1491	void EditObject(Object3D obj)
828	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	+
829	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	+
830	1510	radioButton.SetObject(obj);
831		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
832	1512	radioButton.SetCamera(cameraView.renderCamera, false);
833	1513	radioButton.addActionListener(this);
834	1514	radioPanel.add(radioButton);
..	..	@@ -842,29 +1522,37 @@
842	1522
843	1523	oe.SetupViews();
844	1524
	1525	+ if (Globals.DEBUG)
845	1526	System.out.println("SetupViews");
846	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
847	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
848	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1530	}
850	1531
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	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;
862	1547	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
868	1556
869	1557	// static int COLOR = 1;
870	1558	// static int MATERIAL = 2;
..	..	@@ -872,9 +1560,9 @@
872	1560
873	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1562
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
878	1566
879	1567	public void itemStateChanged(ItemEvent e)
880	1568	{
..	..	@@ -918,6 +1606,12 @@
918	1606	{
919	1607	cameraView.ToggleInertia();
920	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
921	1615	}
922	1616	else if(e.getSource() == localCB)
923	1617	{
..	..	@@ -967,6 +1661,18 @@
967	1661	{
968	1662	cameraView.ToggleOeil();
969	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	+ }
970	1676	else if(e.getSource() == lookAtCB)
971	1677	{
972	1678	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1689,8 @@
983	1689
984	1690	/**/
985	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1695	// We can't move the root node or an empty selection
989	1696	return;
..	..	@@ -1046,8 +1753,6 @@
1046	1753	}
1047	1754	}
1048	1755
1049		- String string = (String) object;
1050		-
1051	1756	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1757	// if( object instanceof java.io.File[])
1053	1758	// {
..	..	@@ -1055,6 +1760,8 @@
1055	1760	// objEditor.DropFile((java.io.File[]) object, true);
1056	1761	// return;
1057	1762	// }
	1763	+
	1764	+ String string = object.toString();
1058	1765
1059	1766	// File path for Mac and Windows
1060	1767	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1807,33 @@
1100	1807
1101	1808	assert target == objEditor.jTree;
1102	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
1103	1811	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1813	} catch (Exception e) {
1106	1814	System.out.println("destinationPath : " + destinationPath);
1107	1815	return;
1108	1816	}
1109	1817
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
1111	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	+// {
1112	1829	loadClipboard(true);
1113	1830	objEditor.jTree.setSelectionPath(destinationPath);
1114	1831	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
1120	1837	}
1121	1838	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1839	// Called if the user has modified the current drop gesture
..	..	@@ -1172,7 +1889,12 @@
1172	1889	TreePath path;
1173	1890
1174	1891	public TransferableTreePath(TreePath tp) {
1175		- 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);
1176	1898	}
1177	1899
1178	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1221,22 +1943,30 @@
1221	1943	{
1222	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1945	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	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	+ {
1236	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1965	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
1240	1970	if (Globals.ADVANCED)
1241	1971	{
1242	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1992,15 @@
1262	1992	}
1263	1993	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1994	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1995	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1996	+// overlayItem.addActionListener(this);
	1997	+// lightItem = menu.add(new MenuItem("Light"));
	1998	+// lightItem.addActionListener(this);
1269	1999	menu.add("-");
1270	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	2001	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1274	2004	doubleItem = menu.add(new MenuItem("Fork"));
1275	2005	doubleItem.addActionListener(this);
1276	2006	if (Globals.ADVANCED)
..	..	@@ -1286,6 +2016,9 @@
1286	2016	animationItem.addItemListener(this);
1287	2017	animationItem.setState(Globals.ANIMATION);
1288	2018
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
	2021	+
1289	2022	menu.add("-");
1290	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	2024	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +2031,8 @@
1298	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	2032	reduce34MorphItem.addActionListener(this);
1300	2033	menu.add("-");
	2034	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2035	+ memoryItem.addActionListener(this);
1301	2036	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	2037	computeAOItem.addActionListener(this);
1303	2038
..	..	@@ -1306,8 +2041,6 @@
1306	2041	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	2042	mirrorItem.addActionListener(this);
1308	2043	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	2045	analyzeItem.addActionListener(this);
1313	2046	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1393,24 +2126,24 @@
1393	2126	switch(axis)
1394	2127	{
1395	2128	case 0 :
1396		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1397		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1398		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1399		- 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;
1400	2133	norm = cVector.X;
1401	2134	break;
1402	2135	case 1 :
1403		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1404		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1405		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1406		- 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;
1407	2140	norm = cVector.Y;
1408	2141	break;
1409	2142	case 2 :
1410		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1411		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1412		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1413		- 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;
1414	2147	norm = cVector.Z;
1415	2148	break;
1416	2149	}
..	..	@@ -1451,10 +2184,38 @@
1451	2184	shadow.material = new cMaterial(obj.material);
1452	2185	shadow.material.diffuse = 0.0001f;
1453	2186	shadow.material.specular = 0.0001f;
1454		- //shadow.projectedVertices[1].x = 300;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1455	2192
1456	2193	makeSomething(shadow);
1457	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	+ }
1458	2219
1459	2220	/**
1460	2221	* applyExample
..	..	@@ -1699,7 +2460,7 @@
1699	2460	{
1700	2461	ScreenFit();
1701	2462	} else
1702		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1703	2464	{
1704	2465	cVector v1 = new cVector();
1705	2466	cVector v2 = new cVector();
..	..	@@ -1708,11 +2469,11 @@
1708	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	2470	objEditor.cameraView.repaint();
1710	2471	} else
1711		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1712	2473	{
1713	2474	makeSomething(new Box());
1714	2475	} else
1715		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1716	2477	{
1717	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2552,27 @@
1791	2552
1792	2553	makeSomething(obj);
1793	2554	} else
1794		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1795	2556	{
1796	2557	makeSomething(new Grid());
1797	2558	} else
1798		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2560	{
1800	2561	makeSomething(new Sphere());
1801	2562	} else
1802		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1803	2564	{
1804	2565	makeSomething(new Cone());
1805	2566	} else
1806		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1807	2568	{
1808	2569	makeSomething(new Torus());
1809	2570	} else
1810		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1811	2572	{
1812	2573	makeSomething(new Superellipsoid());
1813	2574	} else
1814		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1815	2576	{
1816	2577	makeSomething(new Klein());
1817	2578	} else
..	..	@@ -1831,7 +2592,7 @@
1831	2592	{
1832	2593	makeSomething(new BezierSurface());
1833	2594	} else
1834		- if (source == overlayItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1835	2596	{
1836	2597	/*
1837	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,10 +2640,27 @@
1879	2640	s.setup();
1880	2641	makeSomething(s);
1881	2642	} else
1882		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1883	2644	{
1884	2645	makeSomething(new Light());
1885	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
1886	2664	if (source == csgItem)
1887	2665	{
1888	2666	group(new CSG());
..	..	@@ -1929,30 +2707,38 @@
1929	2707
1930	2708	group(g);
1931	2709	} else
1932		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1933	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1934	2714	Composite csg = new GroupLeaf();
1935		- csg.count = 5;
1936	2715	group(csg);
1937		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1938	2718	csg.addChild(child);
1939	2719	child.addChild(csg);
	2720	+ }
1940	2721	} else
1941	2722	if (source == doubleItem)
1942	2723	{
1943		- Composite csg = new GroupLeaf();
1944		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1945	2727	group(csg);
1946		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1947	2730	csg.addChild(child);
1948	2731	child.addChild(csg);
1949		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1950	2733	csg.addChild(child);
1951	2734	child.addChild(csg);
	2735	+ }
1952	2736	} else
1953	2737	if (source == tripleItem)
1954	2738	{
1955		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1956	2742	csg.count = 4;
1957	2743	group(csg);
1958	2744	Composite child = new cGroup();
..	..	@@ -1964,11 +2750,12 @@
1964	2750	child = new cGroup();
1965	2751	csg.addChild(child);
1966	2752	child.addChild(csg);
	2753	+ }
1967	2754	} else
1968	2755	if (source == computeAOItem)
1969	2756	{
1970	2757	Globals.drawMode = CameraPane.OCCLUSION;
1971		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1972	2759	} else
1973	2760	if (source == recompileItem)
1974	2761	{
..	..	@@ -1983,7 +2770,7 @@
1983	2770	if (source == invariantsItem)
1984	2771	{
1985	2772	System.out.println("Invariants:");
1986		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1987	2774	} else
1988	2775	if (source == memoryItem)
1989	2776	{
..	..	@@ -2010,21 +2797,56 @@
2010	2797	{
2011	2798	Maximize();
2012	2799	} else
2013		- if (source == fullButton)
	2800	+ if (source == fullScreenButton)
2014	2801	{
2015	2802	ToggleFullScreen();
2016	2803	} else
2017		- if (source == undoButton)
	2804	+ if (source == collapseButton)
2018	2805	{
2019		- Undo();
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
2020	2808	} else
2021		- 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)
2022	2817	{
2023		- Redo();
	2818	+ // Go to previous version
	2819	+ //if (!Undo())
	2820	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ PreviousVersion();
2024	2822	} else
2025		- if (source == saveButton)
	2823	+ if (source == restoreButton)
2026	2824	{
2027		- 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();
2028	2850	} else
2029	2851	if (source == oneStepButton)
2030	2852	{
..	..	@@ -2033,17 +2855,14 @@
2033	2855	} else
2034	2856	if (source == screenfitButton)
2035	2857	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2858	ScreenFit();
2038	2859	} else
2039	2860	if (source == screenfitpointButton)
2040	2861	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2862	ScreenFitPoint();
2043	2863	} else
2044	2864	if (source == snapobjectButton)
2045	2865	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2866	SnapObject();
2048	2867	} else
2049	2868	// if (event.getSource() == recompileButton)
..	..	@@ -2082,11 +2901,11 @@
2082	2901	} else
2083	2902	if (source == undoItem)
2084	2903	{
2085		- Undo();
	2904	+ PreviousVersion();
2086	2905	} else
2087	2906	if (source == redoItem)
2088	2907	{
2089		- Redo();
	2908	+ NextVersion();
2090	2909	} else
2091	2910	if (source == duplicateItem)
2092	2911	{
..	..	@@ -2407,7 +3226,7 @@
2407	3226	{
2408	3227	StepAll();
2409	3228	} else
2410		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2411	3230	{
2412	3231	//int indices[] = jList.getSelectedIndices();
2413	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2419,9 +3238,9 @@
2419	3238	{
2420	3239	ClearSelection(true);
2421	3240	} else
2422		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2423	3242	{
2424		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2425	3244	} else
2426	3245	if (source == hideItem)
2427	3246	{
..	..	@@ -2439,11 +3258,11 @@
2439	3258	{
2440	3259	makeSomething(new Camera());
2441	3260	} else
2442		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2443	3262	{
2444	3263	group(new Composite());
2445	3264	} else
2446		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2447	3266	{
2448	3267	RandomNode random = new RandomNode();
2449	3268	group(random);
..	..	@@ -2545,7 +3364,7 @@
2545	3364	{
2546	3365	group(new cLinker());
2547	3366	} else
2548		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2549	3368	{
2550	3369	group(new TextureNode());
2551	3370	} else
..	..	@@ -2565,17 +3384,42 @@
2565	3384	{
2566	3385	CastShadow(2);
2567	3386	} else
2568		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	3388	{
2570		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2571	3391	for (int i=0; i<group.selection.size(); i++)
2572	3392	{
2573		- 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	+ }
2574	3408	}
2575	3409
2576		- ClearSelection(false);
2577		-
2578		- 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	+ }
2579	3423	} else
2580	3424	if (source == genUVItem)
2581	3425	{
..	..	@@ -2620,6 +3464,10 @@
2620	3464	if (source == clearMaterialsItem)
2621	3465	{
2622	3466	ClearMaterials();
	3467	+ } else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
2623	3471	} else
2624	3472	if (source == liveleavesItem)
2625	3473	{
..	..	@@ -2761,6 +3609,18 @@
2761	3609	{
2762	3610	TransformChildren();
2763	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
2764	3624	if (source == resetTransformItem)
2765	3625	{
2766	3626	ResetTransform();
..	..	@@ -2876,7 +3736,7 @@
2876	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2877	3737	{
2878	3738	obj = (Object3D)e.nextElement();
2879		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2880	3740	}
2881	3741
2882	3742	refreshContents();
..	..	@@ -2892,6 +3752,31 @@
2892	3752
2893	3753	refreshContents();
2894	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
2895	3780	if (source == flashSelectionButton)
2896	3781	{
2897	3782	CameraPane.flash = true;
..	..	@@ -2903,38 +3788,11 @@
2903	3788	if (source == twoButton)
2904	3789	{
2905	3790	radio.layout = twoButton;
2906		- // bug
2907		- //gridPanel.setDividerLocation(1.0);
2908		- //bigPanel.setDividerLocation(0.0);
2909		-// bigThree.remove(scenePanel);
2910		-// bigThree.remove(centralPanel);
2911		-// bigThree.remove(XYZPanel);
2912		-// aWindowConstraints.gridx = 0;
2913		-// aWindowConstraints.gridy = 0;
2914		-// aWindowConstraints.gridwidth = 1;
2915		-// // aConstraints.gridheight = 3;
2916		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2917		-// aWindowConstraints.weightx = 0;
2918		-// aWindowConstraints.weighty = 1;
2919		-// //bigThree.add(jtp, aWindowConstraints);
2920		-// aWindowConstraints.weightx = 1;
2921		-// aWindowConstraints.gridwidth = 3;
2922		-// // aConstraints.gridheight = 3;
2923		-// aWindowConstraints.gridx = 1;
2924		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2925		-// bigThree.add(centralPanel, aWindowConstraints);
2926		-// aWindowConstraints.weightx = 0;
2927		-// aWindowConstraints.gridx = 4;
2928		-// aWindowConstraints.gridwidth = 1;
2929		-// // aConstraints.gridheight = 3;
2930		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2931		-// //bigThree.add(XYZPanel, aWindowConstraints);
2932		-// scenePanel.setVisible(false);
2933		-// centralPanel.setVisible(true);
2934		-// XYZPanel.setVisible(false);
2935		- bigThree.ClearUI();
2936		- bigThree.add(centralPanel);
2937		- bigThree.FlushUI();
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
	3794	+
	3795	+ Show3DView();
2938	3796
2939	3797	cameraView.requestFocusInWindow();
2940	3798
..	..	@@ -2957,6 +3815,9 @@
2957	3815	if (source == threeButton)
2958	3816	{
2959	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2960	3821
2961	3822	// bigThree.remove(scenePanel);
2962	3823	// bigThree.remove(centralPanel);
..	..	@@ -2986,8 +3847,8 @@
2986	3847	// centralPanel.setVisible(true);
2987	3848	// XYZPanel.setVisible(true);
2988	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2989	3851	bigThree.add(centralPanel);
2990		- bigThree.add(XYZPanel);
2991	3852	bigThree.FlushUI();
2992	3853
2993	3854	cameraView.requestFocusInWindow();
..	..	@@ -2995,6 +3856,9 @@
2995	3856	if (source == fourButton)
2996	3857	{
2997	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2998	3862
2999	3863	// bigThree.remove(scenePanel);
3000	3864	// bigThree.remove(centralPanel);
..	..	@@ -3033,6 +3897,9 @@
3033	3897	{
3034	3898	radio.layout = sixButton;
3035	3899
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
	3902	+
3036	3903	// bigThree.remove(scenePanel);
3037	3904	// bigThree.remove(centralPanel);
3038	3905	// bigThree.remove(XYZPanel);
..	..	@@ -3061,8 +3928,8 @@
3061	3928	// centralPanel.setVisible(true);
3062	3929	// XYZPanel.setVisible(false);
3063	3930	bigThree.ClearUI();
3064		- bigThree.add(scenePanel);
3065	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
3066	3933	bigThree.FlushUI();
3067	3934
3068	3935	cameraView.requestFocusInWindow();
..	..	@@ -3070,6 +3937,9 @@
3070	3937	if (source == sevenButton)
3071	3938	{
3072	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
3073	3943
3074	3944	// bigThree.remove(scenePanel);
3075	3945	// bigThree.remove(centralPanel);
..	..	@@ -3108,6 +3978,7 @@
3108	3978	} else
3109	3979	if (source == rootButton)
3110	3980	{
	3981	+ Replace();
3111	3982	Object3D obj;
3112	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3113	3984	{
..	..	@@ -3122,16 +3993,26 @@
3122	3993	if (source == closeButton)
3123	3994	{
3124	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
3125	3999	cRadio ab;
3126	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	4001	{
3128	4002	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
3131	4011	buttonGroup.remove(ab);
3132	4012	radioPanel.remove(ab);
3133	4013
3134		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
3135	4016	// ab.GetObject().objectUI = null; // ?????????
3136	4017
3137	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +4025,12 @@
3144	4025	} else
3145	4026	if (source == editItem \|\| source == editButton)
3146	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
3147	4034	EditSelection(false);
3148	4035	} else
3149	4036	if (source == uneditButton)
..	..	@@ -3152,9 +4039,10 @@
3152	4039	{
3153	4040	Object3D child = (Object3D)e.nextElement();
3154	4041	if(child.editWindow != null)
3155		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
3156	4043	child.CloseUI();
3157	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3158	4046
3159	4047	//child.editWindow = null; // ???????????
3160	4048	}
..	..	@@ -3169,16 +4057,18 @@
3169	4057	//copy.ClearUI();
3170	4058	for (Object3D obj : listUI)
3171	4059	{
	4060	+ obj.pinned = false;
3172	4061	obj.CloseUI();
3173	4062	}
3174	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3175	4065	refreshContents(true);
3176	4066	} else
3177	4067	if (source == allParamsButton)
3178	4068	{
3179	4069	assert(copy == group);
3180	4070
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	4072
3183	4073	for (Object3D obj : listUI)
3184	4074	{
..	..	@@ -3204,6 +4094,9 @@
3204	4094	} else
3205	4095	if(source instanceof cRadio)
3206	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3207	4100	group.parent = keepparent;
3208	4101	group.attributes = 0;
3209	4102	//group.editWindow = null;
..	..	@@ -3227,6 +4120,7 @@
3227	4120	}
3228	4121
3229	4122	copy = group;
	4123	+
3230	4124	//Globals.theRenderer.object = group;
3231	4125	if(!useclient)
3232	4126	{
..	..	@@ -3245,6 +4139,7 @@
3245	4139
3246	4140	// fix "+" issue
3247	4141	//group.editWindow = this;
	4142	+ group.manipWindow = this;
3248	4143
3249	4144	/*
3250	4145	currentLayout = radio.layout;
..	..	@@ -3252,6 +4147,40 @@
3252	4147	currentLayout = sevenButton;
3253	4148	*/
3254	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);
3255	4184	keepparent = group.parent;
3256	4185	// PARENT = NULL or not???
3257	4186	//group.parent = null; // ROOT
..	..	@@ -3263,11 +4192,13 @@
3263	4192	} else if (event.getSource() == editCameraItem)
3264	4193	{
3265	4194	cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
3266	4196	cameraView.repaint();
3267	4197	return;
3268		- } else if (event.getSource() == revertCameraItem)
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	4199	{
3270	4200	cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
3271	4202	cameraView.repaint();
3272	4203	return;
3273	4204	// } else if (event.getSource() == textureButton)
..	..	@@ -3356,6 +4287,18 @@
3356	4287	refreshContents();
3357	4288	}
3358	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	+
3359	4302	void ResetTransform()
3360	4303	{
3361	4304	ResetTransform(-1);
..	..	@@ -3371,42 +4314,8 @@
3371	4314	if (obj.toParent == null)
3372	4315	continue;
3373	4316
3374		- if (mask == -1)
3375		- {
3376		- if (obj instanceof Camera) // jan 2014
3377		- {
3378		- LA.matIdentity(obj.toParent);
3379		- LA.matIdentity(obj.fromParent);
3380		- }
3381		- else
3382		- {
3383		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3384		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3385		- }
3386		- TouchTransform(obj);
3387		- continue;
3388		- }
3389		- if ((mask&2) != 0) // Scale
3390		- {
3391		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3392		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3393		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3394		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3395		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3396		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3397		- }
3398		- if ((mask&4) != 0) // Rotation
3399		- {
3400		- // ?
3401		- }
3402		- if ((mask&1) != 0) // Translation
3403		- {
3404		- if (obj.toParent != null)
3405		- {
3406		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3407		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3408		- }
3409		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3410	4319	if (obj.parent == null)
3411	4320	{
3412	4321	System.out.println("NULL PARENT!");
..	..	@@ -3844,7 +4753,7 @@
3844	4753
3845	4754	try
3846	4755	{
3847		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3848	4757	}
3849	4758	catch (Exception e)
3850	4759	{
..	..	@@ -3914,6 +4823,12 @@
3914	4823	for (int i=0; i<group.selection.size(); i++)
3915	4824	{
3916	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	+ }
3917	4832
3918	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3919	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4206,6 +5121,12 @@
4206	5121	refreshContents();
4207	5122	}
4208	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4209	5130	void FlipV(boolean flip)
4210	5131	{
4211	5132	group.selection.FlipV(flip);
..	..	@@ -4319,28 +5240,25 @@
4319	5240	// }
4320	5241	// }
4321	5242
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	5243	void EditSelection(boolean newWindow)
4327	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4328	5251	// aConstraints.gridy = 0;
4329	5252	for (int i=0; i<group.selection.size(); i++)
4330	5253	{
4331	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	5257
4335	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	5259	if(elem != group \|\| !newWindow)
4337	5260	{
4338		- // if (!(elem instanceof Composite))
4339		- // newWindow = false;
4340		- listUI.add(elem);
4341		- elem.openEditWindow(this, newWindow); //, false);
4342		- System.out.println("edit : " + elem);
4343		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4344	5262	}
4345	5263	}
4346	5264	}
..	..	@@ -4403,9 +5321,7 @@
4403	5321
4404	5322	freezemodel = false;
4405	5323	}
4406		-
4407		- boolean flashIt = true;
4408		-
	5324	+
4409	5325	public void valueChanged(TreeSelectionEvent e)
4410	5326	//public boolean handleEvent(Event event)
4411	5327	{
..	..	@@ -4415,7 +5331,8 @@
4415	5331	//new Exception().printStackTrace();
4416	5332
4417	5333	freezemodel = true;
4418		-
	5334	+ ClearUnpinned();
	5335	+
4419	5336	/**/
4420	5337	//switch (event.id)
4421	5338	{
..	..	@@ -4448,7 +5365,7 @@
4448	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	5366	// a camera
4450	5367	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4452	5369	{
4453	5370	CameraPane.camerachangeframe = 0; // don't refuse it
4454	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +5374,13 @@
4457	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	5375	}
4459	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4460	5384	refreshContents();
4461	5385	//return true;
4462	5386	}
..	..	@@ -4466,9 +5390,36 @@
4466	5390	freezemodel = false;
4467	5391	}
4468	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	+
4469	5418	void refreshContents(boolean cp)
4470	5419	{
4471		- if (!Globals.MOUSEDRAGGED)
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	5423	{
4473	5424	objEditor.ClearInfo(); // .GetMaterial());
4474	5425
..	..	@@ -4477,7 +5428,7 @@
4477	5428	Object3D child = (Object3D) group.selection.get(i);
4478	5429
4479	5430	objEditor.AddInfo(child, this, true);
4480		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
4481	5432	}
4482	5433
4483	5434	objEditor.SetText(); // jan 2014
..	..	@@ -4567,7 +5518,8 @@
4567	5518
4568	5519	if (cut)
4569	5520	{
4570		- Save();
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4571	5523	//int indices[] = jList.getSelectedIndices();
4572	5524	//for (int i = indices.length - 1; i >= 0; i--)
4573	5525	//jList.remove(indices[i]);
..	..	@@ -4670,6 +5622,10 @@
4670	5622
4671	5623	void paste(boolean expand)
4672	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4673	5629	// if (GrafreeD.clipboard == null)
4674	5630	// return;
4675	5631	boolean first = true;
..	..	@@ -4729,6 +5685,7 @@
4729	5685	Grafreed.clipboard.get(0).parent = keepparent;
4730	5686	}
4731	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4732	5689	ResetModel();
4733	5690	refreshContents();
4734	5691	}
..	..	@@ -4864,6 +5821,10 @@
4864	5821
4865	5822	void group(Object3D csg, boolean grab)
4866	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4867	5828	if (//false) // why??
4868	5829	!group.selection.isEmpty())
4869	5830	{
..	..	@@ -4977,10 +5938,15 @@
4977	5938	//node.add(csg);
4978	5939	//makeSomething(node);
4979	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4980	5942	}
4981	5943
4982	5944	void Ungroup(Object3D g)
4983	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4984	5950	if (g instanceof HiddenObject)
4985	5951	{
4986	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5963,7 @@
4997	5963	objEditor.makeSomething(g.get(i), false);
4998	5964	}
4999	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
5000	5967	}
5001	5968
5002	5969	void ungroup()
..	..	@@ -5285,13 +6252,43 @@
5285	6252	cButton clearpanelButton;
5286	6253	cButton unselectButton;
5287	6254
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
5293		- cButton saveButton;
	6255	+ cButton restoreCameraButton;
	6256	+
5294	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;
5295	6292
5296	6293	cButton screenfitButton;
5297	6294	cButton screenfitpointButton;
..	..	@@ -5313,12 +6310,12 @@
5313	6310	//JTree jTree;
5314	6311	private MenuItem lookAtItem;
5315	6312	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
5317		- private MenuItem cutItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
5318	6315	private MenuItem undoItem;
5319	6316	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
5321		- private MenuItem cloneItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5322	6319	private MenuItem cloneSupportItem;
5323	6320	private MenuItem overwriteGeoItem;
5324	6321	private MenuItem overwriteMatItem;
..	..	@@ -5339,13 +6336,13 @@
5339	6336	private MenuItem cloneGeometriesItem;
5340	6337	private MenuItem shareGeometriesItem;
5341	6338	private MenuItem mergeGeometriesItem;
5342		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5343	6340	private MenuItem pasteItem;
5344		- private MenuItem pasteIntoItem;
5345		- private MenuItem pasteLinkItem;
5346		- private MenuItem pasteCloneItem;
5347		- private MenuItem pasteExpandItem;
5348		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5349	6346	private MenuItem clearAllItem;
5350	6347	private MenuItem genUVItem;
5351	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5371,6 +6368,7 @@
5371	6368	private MenuItem clipMeshItem;
5372	6369	private MenuItem smoothMeshItem;
5373	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5374	6372
5375	6373	private MenuItem liveleavesItem;
5376	6374	private MenuItem unliveleavesItem;
..	..	@@ -5394,18 +6392,21 @@
5394	6392	private MenuItem maxTexturesItem;
5395	6393	private MenuItem panoTexturesItem;
5396	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5397	6398	private MenuItem resetCentroidItem;
5398	6399	private MenuItem resetCentroidXZItem;
5399	6400	private MenuItem resetTransformItem;
5400	6401	private MenuItem transformGeometryItem;
5401	6402	private MenuItem transformChildrenItem;
5402	6403	private MenuItem hideItem;
5403		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5404	6405	private MenuItem backItem;
5405	6406	private MenuItem frontItem;
5406	6407	private MenuItem cameraItem;
5407	6408	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5409	6410	private MenuItem physicsItem;
5410	6411	private MenuItem frameselectorItem;
5411	6412	private MenuItem scriptNodeItem;
..	..	@@ -5413,7 +6414,7 @@
5413	6414	private MenuItem switchTransfoItem;
5414	6415	private MenuItem morphItem;
5415	6416	private MenuItem linkerItem;
5416		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5417	6418	private MenuItem editItem;
5418	6419	private MenuItem openWindowItem;
5419	6420	private MenuItem editLeafItem;
..	..	@@ -5429,6 +6430,8 @@
5429	6430	private MenuItem attachBumpItem;
5430	6431	private MenuItem detachBumpItem;
5431	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5432	6435
5433	6436	private MenuItem particleItem;
5434	6437	private MenuItem ragdollItem;
..	..	@@ -5479,5 +6482,5 @@
5479	6482
5480	6483	Menu cameraMenu;
5481	6484	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	6485	+ MenuItem restoreCameraItem;
5483	6486	}