~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,360 @@
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	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -80,10 +445,22 @@
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +471,7 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +528,8 @@
150	528
151	529	void SetupMenu2(GroupEditor oe)
152	530	{
	531	+ oe.jTree = new cTree();
	532	+
153	533	Menu menu;
154	534	oe.menuBar.add(menu = new Menu("Edit"));
155	535	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,35 +540,37 @@
160	540	// redoItem = menu.add(new MenuItem("Redo"));
161	541	// redoItem.addActionListener(this);
162	542	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	544	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	547	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
168	549	{
169	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	551	cloneSupportItem.addActionListener(this);
171	552	}
	553	+ oe.jTree.popup.addSeparator();
172	554	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	556	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	558	copyItem.addActionListener(this);
177	559	pasteItem = menu.add(new MenuItem("Paste"));
178	560	pasteItem.addActionListener(this);
179	561
180		- menu.add("-");
181		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
182	565	pasteIntoItem.addActionListener(this);
183		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184	567	pasteLinkItem.addActionListener(this);
185		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186	569	pasteCloneItem.addActionListener(this);
187		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
188	571	// pasteExpandItem.addActionListener(this);
189		- menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
192	574
193	575	if (Globals.ADVANCED)
194	576	{
..	..	@@ -202,23 +584,23 @@
202	584	//zBufferItem.addActionListener(this);
203	585	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	586	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
207	589
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	602
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"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	604	toggleHandleItem.addItemListener(this);
223	605	toggleHandleItem.setState(CameraPane.HANDLES);
224	606
..	..	@@ -273,15 +655,13 @@
273	655	{
274	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	657	//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"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	659	oe.cameraMenu.add("-");
279	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280	661	openWindowItem.addActionListener(this);
281		- editLeafItem.addActionListener(this);
282	662	lookAtItem.addActionListener(this);
283	663	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	664	+ //switchViewItem.addActionListener(this);
285	665	}
286	666
287	667	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -325,22 +705,37 @@
325	705	setMasterItem.addActionListener(this);
326	706	}
327	707
328		- oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
331	710	backItem = menu.add(new MenuItem("Back"));
332	711	backItem.addActionListener(this);
333	712	frontItem = menu.add(new MenuItem("Front"));
334	713	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
337	722	hideItem = menu.add(new MenuItem("Hidden Group"));
338	723	hideItem.addActionListener(this);
339		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340	726	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
344	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	740	switchGeoItem.addActionListener(this);
346	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +743,6 @@
348	743	morphItem = menu.add(new MenuItem("Morph Group"));
349	744	morphItem.addActionListener(this);
350	745
351		- if (Globals.ADVANCED)
352		- {
353	746	menu.add("-");
354	747	physicsItem = menu.add(new MenuItem("Physics"));
355	748	physicsItem.addActionListener(this);
..	..	@@ -357,13 +750,11 @@
357	750	frameselectorItem.addActionListener(this);
358	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	752	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	753	}
363	754
364	755	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
367	758	billboardItem = menu.add(new MenuItem("Billboard"));
368	759	billboardItem.addActionListener(this);
369	760	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +765,14 @@
374	765	shadowYItem.addActionListener(this);
375	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
377	771	if (Globals.ADVANCED)
378	772	{
379	773	menu.add("-");
380	774	linkerItem = menu.add(new MenuItem("Linker"));
381	775	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	776	templateItem = menu.add(new MenuItem("Template"));
385	777	templateItem.addActionListener(this);
386	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +801,7 @@
409	801	genNormalsMESHItem.addActionListener(this);
410	802	if (Globals.ADVANCED)
411	803	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	805	genNormalsMINEItem.addActionListener(this);
414	806	}
415	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -443,6 +835,8 @@
443	835	}
444	836
445	837	oe.menuBar.add(menu = new Menu("Attributes"));
	838	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	839	+ clearVersionsItem.addActionListener(this);
446	840	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
447	841	clearMaterialsItem.addActionListener(this);
448	842	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -465,9 +859,9 @@
465	859	hideleavesItem.addActionListener(this);
466	860	showleavesItem = menu.add(new MenuItem("Show Leaves"));
467	861	showleavesItem.addActionListener(this);
468		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	862	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
469	863	markleavesItem.addActionListener(this);
470		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	864	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
471	865	unmarkleavesItem.addActionListener(this);
472	866	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473	867	rewindleavesItem.addActionListener(this);
..	..	@@ -502,10 +896,15 @@
502	896	attachBumpItem.addActionListener(this);
503	897	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	898	pigmentBumpItem.addActionListener(this);
	899	+ //embedTexturesItem
505	900	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	901	detachPigmentItem.addActionListener(this);
507	902	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	903	detachBumpItem.addActionListener(this);
	904	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	905	+ embedTexturesItem.addActionListener(this);
	906	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	907	+ deEmbedTexturesItem.addActionListener(this);
509	908	menu.add("-");
510	909	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	910	sortbysizeItem.addActionListener(this);
..	..	@@ -516,6 +915,9 @@
516	915	shareGeometriesItem.addActionListener(this);
517	916	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518	917	mergeGeometriesItem.addActionListener(this);
	918	+ menu.add("-");
	919	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	920	+ editLeafItem.addActionListener(this);
519	921	if (Globals.ADVANCED)
520	922	{
521	923	// Pretty much the same as duplicate and clone.
..	..	@@ -532,6 +934,80 @@
532	934	buildToolsMenu(menu);
533	935	}
534	936
	937	+ JTabbedPane resourcecontainer;
	938	+ cGridBag currenttab;
	939	+ //boolean added; // patch for jar
	940	+
	941	+ int totalcount = 0;
	942	+
	943	+ int tabcount = 0;
	944	+ int colcount = 0;
	945	+ int rowcount = 0;
	946	+ int texturecount = 0;
	947	+
	948	+ int columns = 5;
	949	+ int rows = 7;
	950	+
	951	+ public void ResourceCallBack(String[] path)
	952	+ {
	953	+// for (int i = 0; i < path.length; i++)
	954	+// System.out.print(path[i] + "/");
	955	+// System.out.println();
	956	+
	957	+ if (//rowcount == 0 \|\|
	958	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	959	+ {
	960	+ currenttab = new cGridBag();
	961	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	962	+ currenttab.setName(tabname);
	963	+ //added = false;
	964	+ resourcecontainer.add(currenttab);
	965	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	966	+ rowcount = 1;
	967	+ colcount = 0;
	968	+ texturecount = 0;
	969	+ }
	970	+
	971	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	972	+ {
	973	+ //if (!added)
	974	+ {
	975	+ //added = true;
	976	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	977	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	978	+ }
	979	+
	980	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	981	+ totalcount++;
	982	+
	983	+ if (++colcount >= columns)
	984	+ {
	985	+ colcount = 0;
	986	+ currenttab.Return();
	987	+
	988	+ if (rowcount++ >= rows)
	989	+ {
	990	+ rowcount = 0;
	991	+ }
	992	+ }
	993	+ }
	994	+ else
	995	+ {
	996	+// if (!path[path.length-1].equals("icons"))
	997	+// resourcecontainer.Return();
	998	+ }
	999	+ }
	1000	+
	1001	+ void CreateTexturePanel(cGridBag container)
	1002	+ {
	1003	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1004	+ container.add(resourcecontainer);
	1005	+
	1006	+ Grafreed.ParseResources("textures", this);
	1007	+
	1008	+ // 935. System.out.println("Total = " + totalcount);
	1009	+ }
	1010	+
535	1011	void SetupUI2(ObjEditor oe)
536	1012	{
537	1013	// June 2019
..	..	@@ -549,11 +1025,6 @@
549	1025	//new Exception().printStackTrace();
550	1026
551	1027	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	1028	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
558	1029
559	1030	oe.buttonGroup = new ButtonGroup();
..	..	@@ -574,117 +1045,266 @@
574	1045	oe.radioPanel.add(dummyButton);
575	1046	oe.buttonGroup.add(dummyButton);
576	1047	*/
	1048	+ cGridBag versionManagerPanel = new cGridBag();
	1049	+
	1050	+ versionManagerPanel.preferredHeight = 4;
	1051	+
577	1052	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	1053
579	1054	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1055	//minButton.setToolTipText("Minimize window");
581	1056	//minButton.addActionListener(this);
582	1057
583		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	1058	+ if (Globals.ADVANCED)
	1059	+ {
	1060	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// maxButton.setToolTipText("Maximize window");
	1062	+// maxButton.addActionListener(this);
	1063	+ }
586	1064
587		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ cButton gcButton;
	1066	+
	1067	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// gcButton.setToolTipText("Garbage collect");
	1069	+// gcButton.addActionListener(new ActionListener()
	1070	+// {
	1071	+// public void actionPerformed(ActionEvent e)
	1072	+// {
	1073	+// System.gc();
	1074	+// }
	1075	+// });
	1076	+
	1077	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ collapseButton.setToolTipText("Collapse toolbar");
	1079	+ collapseButton.addActionListener(this);
	1080	+
	1081	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1083	+ maximize3DButton.addActionListener(this);
	1084	+
	1085	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ twoButton.setToolTipText("Show 3D view only");
	1087	+ twoButton.addActionListener(this);
	1088	+ this.fullscreenLayout = twoButton;
	1089	+
	1090	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ threeButton.setToolTipText("Show controls and 3D view");
	1092	+ threeButton.addActionListener(this);
	1093	+ if (Globals.ADVANCED)
	1094	+ {
	1095	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ sixButton.setToolTipText("Show 3D view and controls");
	1097	+ sixButton.addActionListener(this);
	1098	+ }
	1099	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+// sevenButton.setToolTipText("3-column layout");
	1101	+// sevenButton.addActionListener(this);
	1102	+ //
	1103	+
	1104	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
588	1105	fullButton.setToolTipText("Full-screen window");
589	1106	fullButton.addActionListener(this);
590	1107
591		- oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
594		-
595		- oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
601		- saveButton.addActionListener(this);
602		-
603		- oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604		- liveCB.setToolTipText("Enable animation");
605		- liveCB.addItemListener(this);
	1108	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ screenfitButton.setToolTipText("Screen fit");
	1110	+ screenfitButton.addActionListener(this);
606	1111
607		- oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
608		- fastCB.setToolTipText("Fast mode");
609		- fastCB.addItemListener(this);
610		-
611		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1114	+ restoreCameraButton.addActionListener(this);
	1115	+
	1116	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ saveVersionButton.setToolTipText("Duplicate current version");
	1118	+ saveVersionButton.addActionListener(this);
	1119	+
	1120	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ deleteVersionButton.setToolTipText("Delete current version");
	1122	+ deleteVersionButton.addActionListener(this);
	1123	+ deleteVersionButton.setEnabled(false);
	1124	+
	1125	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ previousVersionButton.setToolTipText("Previous version");
	1127	+ previousVersionButton.addActionListener(this);
	1128	+ previousVersionButton.setEnabled(false);
	1129	+
	1130	+ cGridBag updown = new cGridBag().setVertical(true);
	1131	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ restoreButton.setToolTipText("Undo (restore current version)");
	1133	+ restoreButton.addActionListener(this);
	1134	+ restoreButton.setEnabled(false);
	1135	+
	1136	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ replaceButton.setToolTipText("Save (replace current version)");
	1138	+ replaceButton.addActionListener(this);
	1139	+ replaceButton.setEnabled(false);
	1140	+
	1141	+ versionManagerPanel.add(updown);
	1142	+
	1143	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ nextVersionButton.setToolTipText("Next version");
	1145	+ nextVersionButton.addActionListener(this);
	1146	+ nextVersionButton.setEnabled(false);
	1147	+
	1148	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
612	1149	oneStepButton.setToolTipText("Animate one step forward");
613	1150	oneStepButton.addActionListener(this);
614	1151
615		- oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
	1152	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1153	+ liveCB.setToolTipText("Enable animation");
	1154	+ liveCB.addItemListener(this);
618	1155
619		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	1156	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1157	+ fastCB.setToolTipText("Fast mode");
	1158	+ fastCB.addItemListener(this);
	1159	+
	1160	+ //oe.toolboxPanel.Return();
	1161	+
	1162	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1163	+// trackCB.setToolTipText("Enable tracking");
	1164	+// trackCB.addItemListener(this);
622	1165
623	1166	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	1167	// screenfitpointButton.addActionListener(this);
625	1168
626	1169	if (Globals.ADVANCED)
627	1170	{
628		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
629	1172	snapobjectButton.addActionListener(this);
630	1173	snapobjectButton.setToolTipText("Snap Object");
	1174	+
	1175	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ fourButton.addActionListener(this);
	1177	+ fourButton.setToolTipText("Show control panel only");
631	1178	}
632	1179
633		- oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Highlight selection");
635		- flashSelectionButton.addActionListener(this);
	1180	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	1181
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	1182
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	1183	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ rootButton.setToolTipText("Open selection in new tab");
658	1185	rootButton.addActionListener(this);
659	1186
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
661	1188	closeButton.setToolTipText("Close tab");
662	1189	closeButton.addActionListener(this);
663	1190	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1191	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1192	+
	1193	+ cGridBag row1 = new cGridBag();
	1194	+
	1195	+ // INSERT
	1196	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ gridButton.setToolTipText("Create ground");
	1198	+ gridButton.addActionListener(this);
	1199	+
	1200	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ boxButton.setToolTipText("Create box");
	1202	+ boxButton.addActionListener(this);
	1203	+
	1204	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1205	+ superButton.setToolTipText("Create superellipsoid");
	1206	+ superButton.addActionListener(this);
	1207	+
	1208	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ sphereButton.setToolTipText("Create sphere");
	1210	+ sphereButton.addActionListener(this);
	1211	+
	1212	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ coneButton.setToolTipText("Create cone");
	1214	+ coneButton.addActionListener(this);
	1215	+
	1216	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ torusButton.setToolTipText("Create torus");
	1218	+ torusButton.addActionListener(this);
	1219	+
	1220	+ if (Globals.ADVANCED)
	1221	+ {
	1222	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ kleinButton.setToolTipText("Create Klein bottle");
	1224	+ kleinButton.addActionListener(this);
	1225	+ }
	1226	+
	1227	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ particlesButton.setToolTipText("Create particle system");
	1229	+ particlesButton.addActionListener(this);
	1230	+
	1231	+ oe.toolboxPanel.add(row1);
	1232	+
	1233	+ cGridBag row2 = new cGridBag();
	1234	+
	1235	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ groupButton.setToolTipText("Create group");
	1237	+ groupButton.addActionListener(this);
	1238	+
	1239	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ compositeButton.setToolTipText("Create composite");
	1241	+ compositeButton.addActionListener(this);
	1242	+
	1243	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ switchButton.setToolTipText("Create item switcher");
	1245	+ switchButton.addActionListener(this);
	1246	+
	1247	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ loopButton.setToolTipText("Create loop");
	1249	+ loopButton.addActionListener(this);
	1250	+
	1251	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ textureButton.setToolTipText("Create texture");
	1253	+ textureButton.addActionListener(this);
	1254	+
	1255	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1256	+ overlayButton.setToolTipText("Create overlay");
	1257	+ overlayButton.addActionListener(this);
	1258	+
	1259	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ lightButton.setToolTipText("Create light");
	1261	+ lightButton.addActionListener(this);
	1262	+
	1263	+ oe.toolboxPanel.add(row2);
	1264	+
	1265	+ cGridBag textures = new cGridBag();
	1266	+
	1267	+ CreateTexturePanel(textures);
	1268	+
	1269	+ int tabCount = resourcecontainer.getTabCount();
	1270	+
	1271	+ if (tabCount > 0)
	1272	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1273	+
	1274	+ oe.toolboxPanel.add(textures);
	1275	+
	1276	+ textures.preferredHeight = 100;
	1277	+
	1278	+ CreateSkyboxPanel(oe.skyboxPanel);
	1279	+
	1280	+ // EDIT panel
	1281	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ editButton.setToolTipText("Pin selection controls");
668	1283	editButton.addActionListener(this);
669	1284
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1285	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ uneditButton.setToolTipText("Unpin and remove selection controls");
672	1287	uneditButton.addActionListener(this);
673	1288
674	1289	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1290	+ allParamsButton.setToolTipText("Show all controls");
676	1291	allParamsButton.addActionListener(this);
677	1292
678		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- clearPanelButton.setToolTipText("Clear edit panel");
	1293	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1294	+ clearPanelButton.setToolTipText("Clear all controls");
680	1295	clearPanelButton.addActionListener(this);
681	1296
682		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683		- unselectButton.setToolTipText("Unselect");
684		- unselectButton.addActionListener(this);
	1297	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ //unselectButton.setToolTipText("Unselect");
	1299	+ //unselectButton.addActionListener(this);
685	1300
	1301	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1302	+ flashSelectionButton.setToolTipText("Highlight selection");
	1303	+ flashSelectionButton.addActionListener(this);
	1304	+
686	1305	editCommandsPanel.preferredHeight = 1;
687	1306
	1307	+ SetPinStates(false);
688	1308	// oe.treePanel.add(commandsPanel);
689	1309	// oe.treePanel.Return();
690	1310
..	..	@@ -701,34 +1321,24 @@
701	1321
702	1322	cGridBag jSPPanel = new cGridBag();
703	1323
	1324	+ jSPPanel.preferredHeight = 20;
	1325	+
704	1326	JScrollPane jSP;
705	1327	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1328	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1329	ResetModel();
708	1330
709	1331	oe.treePanel.add(jSPPanel);
710	1332	oe.treePanel.Return();
711	1333
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);
	1334	+ oe.treePanel.add(versionManagerPanel);
728	1335	oe.treePanel.Return();
	1336	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1337	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1338	+ versionSliderPane.preferredHeight = 3;
729	1339
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1340	+// mainPanel.setDividerLocation(0.1); //1.0);
	1341	+ mainPanel.setResizeWeight(0.4);
732	1342
733	1343	//jList.addListSelectionListener(this);
734	1344	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1346,7 @@
736	1346	//jTree.setEditable(true);
737	1347	oe.jTree.setDragEnabled(true);
738	1348	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1349	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1350
741	1351	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1352
..	..	@@ -748,29 +1358,49 @@
748	1358	dgr.addDragGestureListener(this);
749	1359	}catch(Exception e) {}
750	1360	*/
751		- radio.layout = sevenButton;
	1361	+ radio.layout = threeButton; // sixButton;
752	1362	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1363	}
754	1364
755	1365	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1366	{
	1367	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1368	+ colorCB.setToolTipText("Copy color when dropped");
	1369	+ colorCB.addItemListener(this);
	1370	+
	1371	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1372	+ materialCB.setToolTipText("Copy material when dropped");
	1373	+ materialCB.addItemListener(this);
	1374	+
	1375	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1376	+ textureCB.setToolTipText("Copy texture when dropped");
	1377	+ textureCB.addItemListener(this);
	1378	+
	1379	+ panel.Return();
	1380	+
757	1381	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1382	boxCB.setToolTipText("Display bounding boxes");
759	1383	boxCB.addItemListener(this);
760	1384
761	1385	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1386	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1387	zoomBoxCB.addItemListener(this);
764	1388
765	1389	if (true) // Globals.ADVANCED)
766	1390	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1391	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1392	+// supportCB.setToolTipText("Enable rigging");
	1393	+// supportCB.addItemListener(this);
	1394	+
	1395	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1396	+ freezeCB.setToolTipText("Fast moving camera");
	1397	+ freezeCB.addItemListener(this);
770	1398
771	1399	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1400	// localCB.addItemListener(this);
773	1401
	1402	+ panel.Return();
	1403	+
774	1404	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1405	crowdCB.setToolTipText("Used for crowds");
776	1406	crowdCB.addItemListener(this);
..	..	@@ -779,14 +1409,19 @@
779	1409	smoothCB.setToolTipText("Snapping delay");
780	1410	smoothCB.addItemListener(this);
781	1411
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- slowCB.addItemListener(this);
	1412	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1413	+// slowCB.setToolTipText("Smooth interpolation");
	1414	+// slowCB.addItemListener(this);
	1415	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1416	+ minshaderCB.setToolTipText("Minimal fast shader");
	1417	+ minshaderCB.addItemListener(this);
785	1418
786	1419	// constraints.gridy += 1;
787	1420	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1421	// speakerMocapCB.addItemListener(this);
789	1422
	1423	+ panel.Return();
	1424	+
790	1425	if (false)
791	1426	{
792	1427	// handled in scripts
..	..	@@ -801,24 +1436,39 @@
801	1436	//constraints.gridy += 1;
802	1437	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1438	smoothfocusCB.addItemListener(this);
	1439	+ panel.Return();
804	1440	}
805	1441
806	1442	//constraints.gridx += 1;
807	1443	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1444	// debugCB.addItemListener(this);
809	1445
	1446	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1447	+ trackCB.setToolTipText("Enable tracking target");
	1448	+ trackCB.addItemListener(this);
	1449	+
810	1450	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	1451	+ oeilCB.setToolTipText("Move camera when tracking");
812	1452	oeilCB.addItemListener(this);
813	1453
814	1454	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	1455	+ shadowCB.setToolTipText("When live compute shadows");
816	1456	shadowCB.addItemListener(this);
817	1457
818		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
819		- autosaveCB.setToolTipText("Auto-save on structure change");
820		- autosaveCB.addItemListener(this);
	1458	+ panel.Return();
	1459	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1460	+ toggleTextureCB.setToolTipText("Load textures");
	1461	+ toggleTextureCB.addItemListener(this);
	1462	+
	1463	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1464	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1465	+ toggleSwitchCB.addItemListener(this);
	1466	+
	1467	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1468	+ autokeepCB.setToolTipText("On structure change");
	1469	+ autokeepCB.addItemListener(this);
821	1470
	1471	+ panel.Return();
822	1472	if (Globals.ADVANCED)
823	1473	{
824	1474	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -829,18 +1479,31 @@
829	1479	}
830	1480
831	1481	cGridBag fill = new cGridBag();
832		-
833	1482	fill.preferredHeight = 200;
	1483	+ cGridBag fill2 = new cGridBag();
	1484	+ fill2.preferredHeight = 200;
	1485	+ cGridBag fill3 = new cGridBag();
	1486	+ fill3.preferredHeight = 200;
834	1487
835	1488	panel.add(fill);
	1489	+ panel.add(fill2);
	1490	+ panel.add(fill3);
836	1491
837	1492	}
838	1493
839	1494	void EditObject(Object3D obj)
840	1495	{
	1496	+ assert(obj instanceof Composite);
	1497	+
	1498	+// if (obj.versionlist == null)
	1499	+// {
	1500	+// obj.versionlist = new Object3D[100];
	1501	+// obj.versionindex = -1;
	1502	+// }
	1503	+
841	1504	cRadio radioButton = new cRadio(obj.name);
842	1505
843		- // Patch to avoid bug with transparency.
	1506	+ // June 2019. Patch to avoid bug with transparency.
844	1507	radioButton.hadMaterial = obj.material != null;
845	1508	if (!radioButton.hadMaterial)
846	1509	{
..	..	@@ -848,7 +1511,7 @@
848	1511	}
849	1512
850	1513	radioButton.SetObject(obj);
851		- radioButton.layout = sevenButton;
	1514	+ radioButton.layout = threeButton; // sixButton;
852	1515	radioButton.SetCamera(cameraView.renderCamera, false);
853	1516	radioButton.addActionListener(this);
854	1517	radioPanel.add(radioButton);
..	..	@@ -862,21 +1525,26 @@
862	1525
863	1526	oe.SetupViews();
864	1527
	1528	+ if (Globals.DEBUG)
865	1529	System.out.println("SetupViews");
866	1530	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
867	1531	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
868	1532	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
869	1533	}
870	1534
871		- cCheckBox liveCB;
	1535	+ cToggleButton liveCB;
872	1536	cCheckBox supportCB;
873	1537	cCheckBox localCB;
874	1538	cCheckBox crowdCB;
875	1539	cCheckBox smoothCB;
876		- cCheckBox fastCB;
	1540	+ cCheckBox minshaderCB;
	1541	+
	1542	+ cToggleButton fastCB;
877	1543	cCheckBox slowCB;
878	1544	cCheckBox boxCB;
879	1545	cCheckBox zoomBoxCB;
	1546	+ cCheckBox freezeCB;
	1547	+ //cToggleButton trackCB;
880	1548	cCheckBox trackCB;
881	1549	cCheckBox smoothfocusCB;
882	1550	// JCheckBox speakerMocapCB;
..	..	@@ -886,7 +1554,7 @@
886	1554
887	1555	cCheckBox oeilCB;
888	1556	cCheckBox shadowCB;
889		- cCheckBox autosaveCB;
	1557	+ cCheckBox autokeepCB;
890	1558	cCheckBox lookAtCB;
891	1559
892	1560	// static int COLOR = 1;
..	..	@@ -942,6 +1610,12 @@
942	1610	cameraView.ToggleInertia();
943	1611	cameraView.repaint();
944	1612	}
	1613	+ else if(e.getSource() == minshaderCB)
	1614	+ {
	1615	+ Globals.MINSHADER ^= true;
	1616	+ cameraView.programInitialized = false;
	1617	+ cameraView.repaint();
	1618	+ }
945	1619	else if(e.getSource() == localCB)
946	1620	{
947	1621	cameraView.ToggleLocal();
..	..	@@ -994,9 +1668,13 @@
994	1668	{
995	1669	Globals.COMPUTESHADOWWHENLIVE ^= true;
996	1670	}
997		- else if(e.getSource() == autosaveCB)
	1671	+ else if(e.getSource() == freezeCB)
998	1672	{
999		- Globals.SAVEONMAKE ^= true;
	1673	+ Globals.FREEZEONMOVE ^= true;
	1674	+ }
	1675	+ else if(e.getSource() == autokeepCB)
	1676	+ {
	1677	+ Globals.REPLACEONMAKE ^= true;
1000	1678	}
1001	1679	else if(e.getSource() == lookAtCB)
1002	1680	{
..	..	@@ -1014,7 +1692,8 @@
1014	1692
1015	1693	/**/
1016	1694	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1017		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1695	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1696	+ TreePath path = objEditor.jTree.getSelectionPath();
1018	1697	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1019	1698	// We can't move the root node or an empty selection
1020	1699	return;
..	..	@@ -1077,8 +1756,6 @@
1077	1756	}
1078	1757	}
1079	1758
1080		- String string = (String) object;
1081		-
1082	1759	System.out.println("Transfer = " + object + "; drop : " + target);
1083	1760	// if( object instanceof java.io.File[])
1084	1761	// {
..	..	@@ -1086,6 +1763,8 @@
1086	1763	// objEditor.DropFile((java.io.File[]) object, true);
1087	1764	// return;
1088	1765	// }
	1766	+
	1767	+ String string = object.toString();
1089	1768
1090	1769	// File path for Mac and Windows
1091	1770	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1131,23 +1810,33 @@
1131	1810
1132	1811	assert target == objEditor.jTree;
1133	1812	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1813	+ Object3D destinationLeaf;
1134	1814	try {
1135		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1815	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1136	1816	} catch (Exception e) {
1137	1817	System.out.println("destinationPath : " + destinationPath);
1138	1818	return;
1139	1819	}
1140	1820
1141		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1821	+ for (int i=group.selection.size(); --i>=0;)
1142	1822	{
	1823	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1824	+
	1825	+ // Cannot move into itself
	1826	+ if (child == destinationLeaf)
	1827	+ return;
	1828	+ }
	1829	+
	1830	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1831	+// {
1143	1832	loadClipboard(true);
1144	1833	objEditor.jTree.setSelectionPath(destinationPath);
1145	1834	pasteInto(false, false);
1146		- } else {
1147		- loadClipboard(false);
1148		- objEditor.jTree.setSelectionPath(destinationPath);
1149		- pasteInto(false, false); // true); // ???
1150		- }
	1835	+// } else {
	1836	+// loadClipboard(false);
	1837	+// objEditor.jTree.setSelectionPath(destinationPath);
	1838	+// pasteInto(false, false); // true); // ???
	1839	+// }
1151	1840	}
1152	1841	public void dropActionChanged(DropTargetDragEvent dtde)
1153	1842	// Called if the user has modified the current drop gesture
..	..	@@ -1203,7 +1892,12 @@
1203	1892	TreePath path;
1204	1893
1205	1894	public TransferableTreePath(TreePath tp) {
1206		- path = tp;
	1895	+ Object[] objs = new Object[tp.getPathCount()];
	1896	+ for (int i=0; i<objs.length; i++)
	1897	+ {
	1898	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1899	+ }
	1900	+ path = new TreePath(objs);
1207	1901	}
1208	1902
1209	1903	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1252,22 +1946,30 @@
1252	1946	{
1253	1947	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1254	1948	//heightFieldItem.addActionListener(this);
1255		- gridItem = menu.add(new MenuItem("Grid"));
1256		- gridItem.addActionListener(this);
1257		- rectoidItem = menu.add(new MenuItem("Box"));
1258		- rectoidItem.addActionListener(this);
1259		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1260		- ellipsoidItem.addActionListener(this);
1261		- coneItem = menu.add(new MenuItem("Cone"));
1262		- coneItem.addActionListener(this);
1263		- torusItem = menu.add(new MenuItem("Torus"));
1264		- torusItem.addActionListener(this);
1265		- superItem = menu.add(new MenuItem("Superellipsoid"));
1266		- superItem.addActionListener(this);
	1949	+// gridItem = menu.add(new MenuItem("Grid"));
	1950	+// gridItem.addActionListener(this);
	1951	+// rectoidItem = menu.add(new MenuItem("Box"));
	1952	+// rectoidItem.addActionListener(this);
	1953	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1954	+// ellipsoidItem.addActionListener(this);
	1955	+// coneItem = menu.add(new MenuItem("Cone"));
	1956	+// coneItem.addActionListener(this);
	1957	+// torusItem = menu.add(new MenuItem("Torus"));
	1958	+// torusItem.addActionListener(this);
	1959	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1960	+// superItem.addActionListener(this);
	1961	+
	1962	+ cameraItem = menu.add(new MenuItem("Camera"));
	1963	+ cameraItem.addActionListener(this);
	1964	+
	1965	+ if (!Globals.ADVANCED)
	1966	+ {
1267	1967	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1268	1968	kleinItem.addActionListener(this);
1269		- particleItem = menu.add(new MenuItem("Particle system"));
1270		- particleItem.addActionListener(this);
	1969	+ }
	1970	+
	1971	+// particleItem = menu.add(new MenuItem("Particle system"));
	1972	+// particleItem.addActionListener(this);
1271	1973	if (Globals.ADVANCED)
1272	1974	{
1273	1975	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1293,15 +1995,15 @@
1293	1995	}
1294	1996	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1295	1997	bezierItem.addActionListener(this);
1296		- overlayItem = menu.add(new MenuItem("Overlay"));
1297		- overlayItem.addActionListener(this);
1298		- lightItem = menu.add(new MenuItem("Light"));
1299		- lightItem.addActionListener(this);
	1998	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1999	+// overlayItem.addActionListener(this);
	2000	+// lightItem = menu.add(new MenuItem("Light"));
	2001	+// lightItem.addActionListener(this);
1300	2002	menu.add("-");
1301	2003	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1302	2004	//superLoopItem.addActionListener(this);
1303		- loopItem = menu.add(new MenuItem("Loop"));
1304		- loopItem.addActionListener(this);
	2005	+// loopItem = menu.add(new MenuItem("Loop"));
	2006	+// loopItem.addActionListener(this);
1305	2007	doubleItem = menu.add(new MenuItem("Fork"));
1306	2008	doubleItem.addActionListener(this);
1307	2009	if (Globals.ADVANCED)
..	..	@@ -1317,6 +2019,9 @@
1317	2019	animationItem.addItemListener(this);
1318	2020	animationItem.setState(Globals.ANIMATION);
1319	2021
	2022	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2023	+ archiveItem.addActionListener(this);
	2024	+
1320	2025	menu.add("-");
1321	2026	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1322	2027	parseverticesItem.addActionListener(this);
..	..	@@ -1329,6 +2034,8 @@
1329	2034	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1330	2035	reduce34MorphItem.addActionListener(this);
1331	2036	menu.add("-");
	2037	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2038	+ memoryItem.addActionListener(this);
1332	2039	menu.add(computeAOItem = new MenuItem("Compute AO"));
1333	2040	computeAOItem.addActionListener(this);
1334	2041
..	..	@@ -1337,8 +2044,6 @@
1337	2044	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1338	2045	mirrorItem.addActionListener(this);
1339	2046	menu.add("-");
1340		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1341		- memoryItem.addActionListener(this);
1342	2047	menu.add(analyzeItem = new MenuItem("Analyze"));
1343	2048	analyzeItem.addActionListener(this);
1344	2049	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1482,10 +2187,38 @@
1482	2187	shadow.material = new cMaterial(obj.material);
1483	2188	shadow.material.diffuse = 0.0001f;
1484	2189	shadow.material.specular = 0.0001f;
1485		- //shadow.projectedVertices[1].x = 300;
	2190	+ shadow.material.opacity = 0.75f;
	2191	+
	2192	+ AllocProjectedVertices(shadow);
	2193	+
	2194	+ shadow.projectedVertices[1].x = 300;
1486	2195
1487	2196	makeSomething(shadow);
1488	2197	}
	2198	+
	2199	+ private void ClearUnpinned()
	2200	+ {
	2201	+ //for (Object3D obj : listUI)
	2202	+ for (int i=listUI.size(); --i>=0;)
	2203	+ {
	2204	+ Object3D obj = listUI.elementAt(i);
	2205	+ if (!obj.pinned)
	2206	+ {
	2207	+ obj.CloseUI();
	2208	+ listUI.remove(i);
	2209	+ }
	2210	+ }
	2211	+ }
	2212	+
	2213	+ private void EditElement(Object3D elem, boolean newWindow)
	2214	+ {
	2215	+ // if (!(elem instanceof Composite))
	2216	+ // newWindow = false;
	2217	+ listUI.add(elem);
	2218	+ elem.openEditWindow(this, newWindow); //, false);
	2219	+ System.out.println("edit : " + elem);
	2220	+ elem.editWindow.refreshContents(true); // ? new
	2221	+ }
1489	2222
1490	2223	/**
1491	2224	* applyExample
..	..	@@ -1730,7 +2463,7 @@
1730	2463	{
1731	2464	ScreenFit();
1732	2465	} else
1733		- if (source == switchItem)
	2466	+ if (source == switchViewItem)
1734	2467	{
1735	2468	cVector v1 = new cVector();
1736	2469	cVector v2 = new cVector();
..	..	@@ -1739,11 +2472,11 @@
1739	2472	objEditor.cameraView.renderCamera.setAim(v2, v1);
1740	2473	objEditor.cameraView.repaint();
1741	2474	} else
1742		- if (source == rectoidItem)
	2475	+ if (source == rectoidItem \|\| source == boxButton)
1743	2476	{
1744	2477	makeSomething(new Box());
1745	2478	} else
1746		- if (source == particleItem)
	2479	+ if (source == particleItem \|\| source == particlesButton)
1747	2480	{
1748	2481	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1749	2482	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1822,27 +2555,27 @@
1822	2555
1823	2556	makeSomething(obj);
1824	2557	} else
1825		- if (source == gridItem)
	2558	+ if (source == gridItem \|\| source == gridButton)
1826	2559	{
1827	2560	makeSomething(new Grid());
1828	2561	} else
1829		- if (source == ellipsoidItem)
	2562	+ if (source == ellipsoidItem \|\| source == sphereButton)
1830	2563	{
1831	2564	makeSomething(new Sphere());
1832	2565	} else
1833		- if (source == coneItem)
	2566	+ if (source == coneItem \|\| source == coneButton)
1834	2567	{
1835	2568	makeSomething(new Cone());
1836	2569	} else
1837		- if (source == torusItem)
	2570	+ if (source == torusItem \|\| source == torusButton)
1838	2571	{
1839	2572	makeSomething(new Torus());
1840	2573	} else
1841		- if (source == superItem)
	2574	+ if (source == superItem \|\| source == superButton)
1842	2575	{
1843	2576	makeSomething(new Superellipsoid());
1844	2577	} else
1845		- if (source == kleinItem)
	2578	+ if (source == kleinItem \|\| source == kleinButton)
1846	2579	{
1847	2580	makeSomething(new Klein());
1848	2581	} else
..	..	@@ -1862,7 +2595,7 @@
1862	2595	{
1863	2596	makeSomething(new BezierSurface());
1864	2597	} else
1865		- if (source == overlayItem)
	2598	+ if (source == overlayItem \|\| source == overlayButton)
1866	2599	{
1867	2600	/*
1868	2601	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1910,10 +2643,27 @@
1910	2643	s.setup();
1911	2644	makeSomething(s);
1912	2645	} else
1913		- if (source == lightItem)
	2646	+ if (source == lightItem \|\| source == lightButton)
1914	2647	{
1915	2648	makeSomething(new Light());
1916	2649	} else
	2650	+// if (source == skybox1Button \|\|
	2651	+// source == skybox2Button \|\|
	2652	+// source == skybox3Button \|\|
	2653	+// source == skybox4Button \|\|
	2654	+// source == skybox5Button \|\|
	2655	+// source == skybox6Button \|\|
	2656	+// source == skybox7Button \|\|
	2657	+// source == skybox11Button \|\|
	2658	+// source == skybox12Button \|\|
	2659	+// source == skybox13Button \|\|
	2660	+// source == skybox14Button \|\|
	2661	+// source == skybox15Button \|\|
	2662	+// source == skybox16Button \|\|
	2663	+// source == skybox17Button)
	2664	+// {
	2665	+// ChangeSkybox(source);
	2666	+// } else
1917	2667	if (source == csgItem)
1918	2668	{
1919	2669	group(new CSG());
..	..	@@ -1960,30 +2710,38 @@
1960	2710
1961	2711	group(g);
1962	2712	} else
1963		- if (source == loopItem)
	2713	+ if (source == loopItem \|\| source == loopButton)
1964	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
1965	2717	Composite csg = new GroupLeaf();
1966	2718	csg.count = 5;
1967		- group(csg);
1968		- Composite child = new cGroup();
	2719	+ Composite child = new cGroup("Branch");
1969	2720	csg.addChild(child);
1970	2721	child.addChild(csg);
	2722	+ group(csg);
	2723	+ }
1971	2724	} else
1972	2725	if (source == doubleItem)
1973	2726	{
1974		- Composite csg = new GroupLeaf();
	2727	+ if (!group.selection.isEmpty())
	2728	+ {
	2729	+ Composite csg = new GroupLeaf("Fork");
1975	2730	csg.count = 5;
	2731	+ Composite child = new cGroup("Branch A");
	2732	+ csg.addChild(child);
	2733	+ child.addChild(csg);
	2734	+ child = new cGroup("Branch B");
	2735	+ csg.addChild(child);
	2736	+ child.addChild(csg);
1976	2737	group(csg);
1977		- Composite child = new cGroup();
1978		- csg.addChild(child);
1979		- child.addChild(csg);
1980		- child = new cGroup();
1981		- csg.addChild(child);
1982		- child.addChild(csg);
	2738	+ }
1983	2739	} else
1984	2740	if (source == tripleItem)
1985	2741	{
1986		- Composite csg = new GroupLeaf();
	2742	+ if (!group.selection.isEmpty())
	2743	+ {
	2744	+ Composite csg = new GroupLeaf("Trident");
1987	2745	csg.count = 4;
1988	2746	group(csg);
1989	2747	Composite child = new cGroup();
..	..	@@ -1995,11 +2753,12 @@
1995	2753	child = new cGroup();
1996	2754	csg.addChild(child);
1997	2755	child.addChild(csg);
	2756	+ }
1998	2757	} else
1999	2758	if (source == computeAOItem)
2000	2759	{
2001	2760	Globals.drawMode = CameraPane.OCCLUSION;
2002		- Globals.theRenderer.repaint();
	2761	+ cameraView.repaint();
2003	2762	} else
2004	2763	if (source == recompileItem)
2005	2764	{
..	..	@@ -2014,7 +2773,7 @@
2014	2773	if (source == invariantsItem)
2015	2774	{
2016	2775	System.out.println("Invariants:");
2017		- Grafreed.grafreeD.universe.invariants();
	2776	+ Grafreed.grafreed.universe.invariants();
2018	2777	} else
2019	2778	if (source == memoryItem)
2020	2779	{
..	..	@@ -2045,17 +2804,52 @@
2045	2804	{
2046	2805	ToggleFullScreen();
2047	2806	} else
2048		- if (source == undoButton)
	2807	+ if (source == collapseButton)
2049	2808	{
2050		- Undo();
	2809	+ this.expandedLayout = radio.layout;
	2810	+ CollapseToolbar();
2051	2811	} else
2052		- if (source == redoButton)
	2812	+ if (source == maximize3DButton)
2053	2813	{
2054		- Redo();
	2814	+ this.expandedLayout = radio.layout;
	2815	+ radio.layout = twoButton;
	2816	+ Show3DView();
	2817	+ CollapseToolbar();
2055	2818	} else
2056		- if (source == saveButton)
	2819	+ if (source == previousVersionButton)
2057	2820	{
2058		- Save();
	2821	+ // Go to previous version
	2822	+ //if (!Undo())
	2823	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2824	+ PreviousVersion();
	2825	+ } else
	2826	+ if (source == restoreButton)
	2827	+ {
	2828	+ // Restore current version
	2829	+ Restore();
	2830	+ //restoreButton.setEnabled(false);
	2831	+ } else
	2832	+ if (source == replaceButton)
	2833	+ {
	2834	+ // Overwrite current version
	2835	+ Replace();
	2836	+ //replaceButton.setEnabled(false);
	2837	+ } else
	2838	+ if (source == nextVersionButton)
	2839	+ {
	2840	+ // Go to next version
	2841	+ NextVersion();
	2842	+ } else
	2843	+ if (source == saveVersionButton)
	2844	+ {
	2845	+ // Save a new version
	2846	+ if (!Save(true))
	2847	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2848	+ } else
	2849	+ if (source == deleteVersionButton)
	2850	+ {
	2851	+ // Delete a new version
	2852	+ DeleteVersion();
2059	2853	} else
2060	2854	if (source == oneStepButton)
2061	2855	{
..	..	@@ -2064,17 +2858,14 @@
2064	2858	} else
2065	2859	if (source == screenfitButton)
2066	2860	{
2067		- //Reload(lastConverter, lastFilename, true);
2068	2861	ScreenFit();
2069	2862	} else
2070	2863	if (source == screenfitpointButton)
2071	2864	{
2072		- //Reload(lastConverter, lastFilename, true);
2073	2865	ScreenFitPoint();
2074	2866	} else
2075	2867	if (source == snapobjectButton)
2076	2868	{
2077		- //Reload(lastConverter, lastFilename, true);
2078	2869	SnapObject();
2079	2870	} else
2080	2871	// if (event.getSource() == recompileButton)
..	..	@@ -2113,11 +2904,11 @@
2113	2904	} else
2114	2905	if (source == undoItem)
2115	2906	{
2116		- Undo();
	2907	+ PreviousVersion();
2117	2908	} else
2118	2909	if (source == redoItem)
2119	2910	{
2120		- Redo();
	2911	+ NextVersion();
2121	2912	} else
2122	2913	if (source == duplicateItem)
2123	2914	{
..	..	@@ -2438,7 +3229,7 @@
2438	3229	{
2439	3230	StepAll();
2440	3231	} else
2441		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3232	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2442	3233	{
2443	3234	//int indices[] = jList.getSelectedIndices();
2444	3235	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2450,9 +3241,9 @@
2450	3241	{
2451	3242	ClearSelection(true);
2452	3243	} else
2453		- if (source == grabItem)
	3244	+ if (source == grabItem \|\| source == groupButton)
2454	3245	{
2455		- group(new cGroup(), true);
	3246	+ group(new cGroup(), false); // true);
2456	3247	} else
2457	3248	if (source == hideItem)
2458	3249	{
..	..	@@ -2470,11 +3261,11 @@
2470	3261	{
2471	3262	makeSomething(new Camera());
2472	3263	} else
2473		- if (source == compositeItem)
	3264	+ if (source == compositeItem \|\| source == compositeButton)
2474	3265	{
2475	3266	group(new Composite());
2476	3267	} else
2477		- if (source == randomItem)
	3268	+ if (source == switchItem \|\| source == switchButton)
2478	3269	{
2479	3270	RandomNode random = new RandomNode();
2480	3271	group(random);
..	..	@@ -2576,7 +3367,7 @@
2576	3367	{
2577	3368	group(new cLinker());
2578	3369	} else
2579		- if (source == textureItem)
	3370	+ if (source == textureItem \|\| source == textureButton)
2580	3371	{
2581	3372	group(new TextureNode());
2582	3373	} else
..	..	@@ -2596,17 +3387,42 @@
2596	3387	{
2597	3388	CastShadow(2);
2598	3389	} else
2599		- if (source == ungroupItem)
	3390	+ if (source == ungroupItem \|\| source == ungroupButton)
2600	3391	{
2601		- //ungroup();
	3392	+ boolean canUngroup = true;
	3393	+
2602	3394	for (int i=0; i<group.selection.size(); i++)
2603	3395	{
2604		- Ungroup(group.selection.get(i));
	3396	+ Object3D selectedItem = group.selection.get(i);
	3397	+
	3398	+ if (selectedItem.Size() == 0)
	3399	+ {
	3400	+ // Cannot ungroup leaves
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
	3404	+
	3405	+ if (selectedItem == group)
	3406	+ {
	3407	+ // Cannot ungroup root
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
2605	3411	}
2606	3412
2607		- ClearSelection(false);
2608		-
2609		- refreshContents();
	3413	+ if (canUngroup)
	3414	+ {
	3415	+ for (int i=0; i<group.selection.size(); i++)
	3416	+ {
	3417	+ Object3D selectedItem = group.selection.get(i);
	3418	+
	3419	+ Ungroup(selectedItem);
	3420	+ }
	3421	+
	3422	+ ClearSelection(false);
	3423	+
	3424	+ refreshContents();
	3425	+ }
2610	3426	} else
2611	3427	if (source == genUVItem)
2612	3428	{
..	..	@@ -2651,6 +3467,10 @@
2651	3467	if (source == clearMaterialsItem)
2652	3468	{
2653	3469	ClearMaterials();
	3470	+ } else
	3471	+ if (source == clearVersionsItem)
	3472	+ {
	3473	+ ClearVersions();
2654	3474	} else
2655	3475	if (source == liveleavesItem)
2656	3476	{
..	..	@@ -2907,7 +3727,7 @@
2907	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2908	3728	{
2909	3729	obj = (Object3D)e.nextElement();
2910		- obj.SetBumpTexture(null);
	3730	+ obj.ResetBumpTexture();
2911	3731	}
2912	3732
2913	3733	refreshContents();
..	..	@@ -2923,6 +3743,31 @@
2923	3743
2924	3744	refreshContents();
2925	3745	} else
	3746	+ if (source == embedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(true);
	3753	+ }
	3754	+
	3755	+ refreshContents();
	3756	+ } else
	3757	+ if (source == deEmbedTexturesItem)
	3758	+ {
	3759	+ Object3D obj;
	3760	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3761	+ {
	3762	+ obj = (Object3D)e.nextElement();
	3763	+ obj.EmbedTextures(false);
	3764	+ }
	3765	+
	3766	+ CameraPane.texturepigment.clear();
	3767	+ CameraPane.texturebump.clear();
	3768	+
	3769	+ refreshContents();
	3770	+ } else
2926	3771	if (source == flashSelectionButton)
2927	3772	{
2928	3773	CameraPane.flash = true;
..	..	@@ -2934,38 +3779,11 @@
2934	3779	if (source == twoButton)
2935	3780	{
2936	3781	radio.layout = twoButton;
2937		- // bug
2938		- //gridPanel.setDividerLocation(1.0);
2939		- //bigPanel.setDividerLocation(0.0);
2940		-// bigThree.remove(scenePanel);
2941		-// bigThree.remove(centralPanel);
2942		-// bigThree.remove(XYZPanel);
2943		-// aWindowConstraints.gridx = 0;
2944		-// aWindowConstraints.gridy = 0;
2945		-// aWindowConstraints.gridwidth = 1;
2946		-// // aConstraints.gridheight = 3;
2947		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2948		-// aWindowConstraints.weightx = 0;
2949		-// aWindowConstraints.weighty = 1;
2950		-// //bigThree.add(jtp, aWindowConstraints);
2951		-// aWindowConstraints.weightx = 1;
2952		-// aWindowConstraints.gridwidth = 3;
2953		-// // aConstraints.gridheight = 3;
2954		-// aWindowConstraints.gridx = 1;
2955		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2956		-// bigThree.add(centralPanel, aWindowConstraints);
2957		-// aWindowConstraints.weightx = 0;
2958		-// aWindowConstraints.gridx = 4;
2959		-// aWindowConstraints.gridwidth = 1;
2960		-// // aConstraints.gridheight = 3;
2961		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2962		-// //bigThree.add(XYZPanel, aWindowConstraints);
2963		-// scenePanel.setVisible(false);
2964		-// centralPanel.setVisible(true);
2965		-// XYZPanel.setVisible(false);
2966		- bigThree.ClearUI();
2967		- bigThree.add(centralPanel);
2968		- bigThree.FlushUI();
	3782	+
	3783	+ if (CameraPane.FULLSCREEN)
	3784	+ fullscreenLayout = radio.layout;
	3785	+
	3786	+ Show3DView();
2969	3787
2970	3788	cameraView.requestFocusInWindow();
2971	3789
..	..	@@ -2988,6 +3806,9 @@
2988	3806	if (source == threeButton)
2989	3807	{
2990	3808	radio.layout = threeButton;
	3809	+
	3810	+ if (CameraPane.FULLSCREEN)
	3811	+ fullscreenLayout = radio.layout;
2991	3812
2992	3813	// bigThree.remove(scenePanel);
2993	3814	// bigThree.remove(centralPanel);
..	..	@@ -3017,8 +3838,8 @@
3017	3838	// centralPanel.setVisible(true);
3018	3839	// XYZPanel.setVisible(true);
3019	3840	bigThree.ClearUI();
	3841	+ bigThree.add(scenePanel);
3020	3842	bigThree.add(centralPanel);
3021		- bigThree.add(XYZPanel);
3022	3843	bigThree.FlushUI();
3023	3844
3024	3845	cameraView.requestFocusInWindow();
..	..	@@ -3026,6 +3847,9 @@
3026	3847	if (source == fourButton)
3027	3848	{
3028	3849	radio.layout = fourButton;
	3850	+
	3851	+ if (CameraPane.FULLSCREEN)
	3852	+ fullscreenLayout = radio.layout;
3029	3853
3030	3854	// bigThree.remove(scenePanel);
3031	3855	// bigThree.remove(centralPanel);
..	..	@@ -3064,6 +3888,9 @@
3064	3888	{
3065	3889	radio.layout = sixButton;
3066	3890
	3891	+ if (CameraPane.FULLSCREEN)
	3892	+ fullscreenLayout = radio.layout;
	3893	+
3067	3894	// bigThree.remove(scenePanel);
3068	3895	// bigThree.remove(centralPanel);
3069	3896	// bigThree.remove(XYZPanel);
..	..	@@ -3092,8 +3919,8 @@
3092	3919	// centralPanel.setVisible(true);
3093	3920	// XYZPanel.setVisible(false);
3094	3921	bigThree.ClearUI();
3095		- bigThree.add(scenePanel);
3096	3922	bigThree.add(centralPanel);
	3923	+ bigThree.add(scenePanel);
3097	3924	bigThree.FlushUI();
3098	3925
3099	3926	cameraView.requestFocusInWindow();
..	..	@@ -3101,6 +3928,9 @@
3101	3928	if (source == sevenButton)
3102	3929	{
3103	3930	radio.layout = sevenButton;
	3931	+
	3932	+ if (CameraPane.FULLSCREEN)
	3933	+ fullscreenLayout = radio.layout;
3104	3934
3105	3935	// bigThree.remove(scenePanel);
3106	3936	// bigThree.remove(centralPanel);
..	..	@@ -3139,6 +3969,7 @@
3139	3969	} else
3140	3970	if (source == rootButton)
3141	3971	{
	3972	+ Replace();
3142	3973	Object3D obj;
3143	3974	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3144	3975	{
..	..	@@ -3153,6 +3984,8 @@
3153	3984	if (source == closeButton)
3154	3985	{
3155	3986	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3987	+ Replace();
	3988	+
3156	3989	cRadio ab;
3157	3990	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3158	3991	{
..	..	@@ -3182,6 +4015,12 @@
3182	4015	} else
3183	4016	if (source == editItem \|\| source == editButton)
3184	4017	{
	4018	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4019	+ {
	4020	+ Object3D child = (Object3D)e.nextElement();
	4021	+ child.pinned = true;
	4022	+ }
	4023	+
3185	4024	EditSelection(false);
3186	4025	} else
3187	4026	if (source == uneditButton)
..	..	@@ -3190,9 +4029,10 @@
3190	4029	{
3191	4030	Object3D child = (Object3D)e.nextElement();
3192	4031	if(child.editWindow != null)
3193		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4032	+ child.pinned = false;
3194	4033	child.CloseUI();
3195	4034	listUI.remove(child);
	4035	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3196	4036
3197	4037	//child.editWindow = null; // ???????????
3198	4038	}
..	..	@@ -3207,16 +4047,18 @@
3207	4047	//copy.ClearUI();
3208	4048	for (Object3D obj : listUI)
3209	4049	{
	4050	+ obj.pinned = false;
3210	4051	obj.CloseUI();
3211	4052	}
3212	4053	listUI.clear();
	4054	+ SetPinStates(group.selection.size() > 0);
3213	4055	refreshContents(true);
3214	4056	} else
3215	4057	if (source == allParamsButton)
3216	4058	{
3217	4059	assert(copy == group);
3218	4060
3219		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4061	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3220	4062
3221	4063	for (Object3D obj : listUI)
3222	4064	{
..	..	@@ -3242,6 +4084,8 @@
3242	4084	} else
3243	4085	if(source instanceof cRadio)
3244	4086	{
	4087	+ Replace();
	4088	+
3245	4089	group.parent = keepparent;
3246	4090	group.attributes = 0;
3247	4091	//group.editWindow = null;
..	..	@@ -3265,6 +4109,7 @@
3265	4109	}
3266	4110
3267	4111	copy = group;
	4112	+
3268	4113	//Globals.theRenderer.object = group;
3269	4114	if(!useclient)
3270	4115	{
..	..	@@ -3291,6 +4136,39 @@
3291	4136	currentLayout = sevenButton;
3292	4137	*/
3293	4138	radio.layout.doClick();
	4139	+
	4140	+ assert(copy instanceof Composite);
	4141	+
	4142	+ if (copy.versionlist == null)
	4143	+ {
	4144	+ copy.versionindex = -1;
	4145	+
	4146	+ // Cannot work with loops
	4147	+ // To fix this issue, we first mark all nodes above the root,
	4148	+ // and check if any of these nodes are reachable below the root.
	4149	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4150	+
	4151	+ if (copy.versionlist == null && !copy.HasTags())
	4152	+ {
	4153	+ copy.versionlist = new Object3D[100];
	4154	+
	4155	+ //Save(true);
	4156	+ }
	4157	+ else
	4158	+ copy.versionindex = -2;
	4159	+
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4161	+ }
	4162	+
	4163	+ SetVersionStates();
	4164	+
	4165	+ ClearUnpinned();
	4166	+
	4167	+ //Grafreed.Assert(group != null);
	4168	+ //Grafreed.Assert(group.selection != null);
	4169	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4170	+ if (group.selection == null \|\| group.selection.size() == 1)
	4171	+ EditSelection(false);
3294	4172	keepparent = group.parent;
3295	4173	// PARENT = NULL or not???
3296	4174	//group.parent = null; // ROOT
..	..	@@ -3302,11 +4180,13 @@
3302	4180	} else if (event.getSource() == editCameraItem)
3303	4181	{
3304	4182	cameraView.ProtectCamera();
	4183	+ cameraView.requestFocusInWindow();
3305	4184	cameraView.repaint();
3306	4185	return;
3307		- } else if (event.getSource() == revertCameraItem)
	4186	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3308	4187	{
3309	4188	cameraView.RevertCamera();
	4189	+ cameraView.requestFocusInWindow();
3310	4190	cameraView.repaint();
3311	4191	return;
3312	4192	// } else if (event.getSource() == textureButton)
..	..	@@ -3425,7 +4305,7 @@
3425	4305	TouchTransform(obj);
3426	4306	continue;
3427	4307	}
3428		- if ((mask&2) != 0) // Scale
	4308	+ if ((mask&2) != 0) // Scale/rotation
3429	4309	{
3430	4310	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3431	4311	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3433,10 +4313,6 @@
3433	4313	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3434	4314	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3435	4315	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3436		- }
3437		- if ((mask&4) != 0) // Rotation
3438		- {
3439		- // ?
3440	4316	}
3441	4317	if ((mask&1) != 0) // Translation
3442	4318	{
..	..	@@ -3883,7 +4759,7 @@
3883	4759
3884	4760	try
3885	4761	{
3886		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4762	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3887	4763	}
3888	4764	catch (Exception e)
3889	4765	{
..	..	@@ -4245,6 +5121,12 @@
4245	5121	refreshContents();
4246	5122	}
4247	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4248	5130	void FlipV(boolean flip)
4249	5131	{
4250	5132	group.selection.FlipV(flip);
..	..	@@ -4358,28 +5240,25 @@
4358	5240	// }
4359	5241	// }
4360	5242
4361		- static boolean allparams = true;
4362		-
4363		- static Vector<Object3D> listUI = new Vector<Object3D>();
4364		-
4365	5243	void EditSelection(boolean newWindow)
4366	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4367	5251	// aConstraints.gridy = 0;
4368	5252	for (int i=0; i<group.selection.size(); i++)
4369	5253	{
4370	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4371	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4373	5257
4374	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4375	5259	if(elem != group \|\| !newWindow)
4376	5260	{
4377		- // if (!(elem instanceof Composite))
4378		- // newWindow = false;
4379		- listUI.add(elem);
4380		- elem.openEditWindow(this, newWindow); //, false);
4381		- System.out.println("edit : " + elem);
4382		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4383	5262	}
4384	5263	}
4385	5264	}
..	..	@@ -4442,9 +5321,7 @@
4442	5321
4443	5322	freezemodel = false;
4444	5323	}
4445		-
4446		- boolean flashIt = true;
4447		-
	5324	+
4448	5325	public void valueChanged(TreeSelectionEvent e)
4449	5326	//public boolean handleEvent(Event event)
4450	5327	{
..	..	@@ -4454,7 +5331,8 @@
4454	5331	//new Exception().printStackTrace();
4455	5332
4456	5333	freezemodel = true;
4457		-
	5334	+ ClearUnpinned();
	5335	+
4458	5336	/**/
4459	5337	//switch (event.id)
4460	5338	{
..	..	@@ -4487,7 +5365,7 @@
4487	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4488	5366	// a camera
4489	5367	{
4490		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4491	5369	{
4492	5370	CameraPane.camerachangeframe = 0; // don't refuse it
4493	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4496,6 +5374,13 @@
4496	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4497	5375	}
4498	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4499	5384	refreshContents();
4500	5385	//return true;
4501	5386	}
..	..	@@ -4505,9 +5390,36 @@
4505	5390	freezemodel = false;
4506	5391	}
4507	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(allComposites);
	5416	+ }
	5417	+
4508	5418	void refreshContents(boolean cp)
4509	5419	{
4510		- if (!Globals.MOUSEDRAGGED)
	5420	+ if (Globals.ADVANCED)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4511	5423	{
4512	5424	objEditor.ClearInfo(); // .GetMaterial());
4513	5425
..	..	@@ -4516,7 +5428,7 @@
4516	5428	Object3D child = (Object3D) group.selection.get(i);
4517	5429
4518	5430	objEditor.AddInfo(child, this, true);
4519		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
4520	5432	}
4521	5433
4522	5434	objEditor.SetText(); // jan 2014
..	..	@@ -4606,8 +5518,8 @@
4606	5518
4607	5519	if (cut)
4608	5520	{
4609		- if (Globals.SAVEONMAKE)
4610		- Save();
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4611	5523	//int indices[] = jList.getSelectedIndices();
4612	5524	//for (int i = indices.length - 1; i >= 0; i--)
4613	5525	//jList.remove(indices[i]);
..	..	@@ -4710,6 +5622,10 @@
4710	5622
4711	5623	void paste(boolean expand)
4712	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4713	5629	// if (GrafreeD.clipboard == null)
4714	5630	// return;
4715	5631	boolean first = true;
..	..	@@ -4769,6 +5685,7 @@
4769	5685	Grafreed.clipboard.get(0).parent = keepparent;
4770	5686	}
4771	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4772	5689	ResetModel();
4773	5690	refreshContents();
4774	5691	}
..	..	@@ -4904,6 +5821,10 @@
4904	5821
4905	5822	void group(Object3D csg, boolean grab)
4906	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4907	5828	if (//false) // why??
4908	5829	!group.selection.isEmpty())
4909	5830	{
..	..	@@ -5017,10 +5938,15 @@
5017	5938	//node.add(csg);
5018	5939	//makeSomething(node);
5019	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
5020	5942	}
5021	5943
5022	5944	void Ungroup(Object3D g)
5023	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
5024	5950	if (g instanceof HiddenObject)
5025	5951	{
5026	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -5037,6 +5963,7 @@
5037	5963	objEditor.makeSomething(g.get(i), false);
5038	5964	}
5039	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
5040	5967	}
5041	5968
5042	5969	void ungroup()
..	..	@@ -5325,13 +6252,43 @@
5325	6252	cButton clearpanelButton;
5326	6253	cButton unselectButton;
5327	6254
5328		- cButton minButton;
5329		- cButton maxButton;
5330		- cButton fullButton;
5331		- cButton undoButton;
5332		- cButton redoButton;
5333		- cButton saveButton;
	6255	+ cButton restoreCameraButton;
	6256	+
5334	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;
5335	6292
5336	6293	cButton screenfitButton;
5337	6294	cButton screenfitpointButton;
..	..	@@ -5353,12 +6310,12 @@
5353	6310	//JTree jTree;
5354	6311	private MenuItem lookAtItem;
5355	6312	private MenuItem lookFromItem;
5356		- private MenuItem switchItem;
5357		- private MenuItem cutItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
5358	6315	private MenuItem undoItem;
5359	6316	private MenuItem redoItem;
5360		- private MenuItem duplicateItem;
5361		- private MenuItem cloneItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5362	6319	private MenuItem cloneSupportItem;
5363	6320	private MenuItem overwriteGeoItem;
5364	6321	private MenuItem overwriteMatItem;
..	..	@@ -5379,13 +6336,13 @@
5379	6336	private MenuItem cloneGeometriesItem;
5380	6337	private MenuItem shareGeometriesItem;
5381	6338	private MenuItem mergeGeometriesItem;
5382		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5383	6340	private MenuItem pasteItem;
5384		- private MenuItem pasteIntoItem;
5385		- private MenuItem pasteLinkItem;
5386		- private MenuItem pasteCloneItem;
5387		- private MenuItem pasteExpandItem;
5388		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5389	6346	private MenuItem clearAllItem;
5390	6347	private MenuItem genUVItem;
5391	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5411,6 +6368,7 @@
5411	6368	private MenuItem clipMeshItem;
5412	6369	private MenuItem smoothMeshItem;
5413	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5414	6372
5415	6373	private MenuItem liveleavesItem;
5416	6374	private MenuItem unliveleavesItem;
..	..	@@ -5440,12 +6398,12 @@
5440	6398	private MenuItem transformGeometryItem;
5441	6399	private MenuItem transformChildrenItem;
5442	6400	private MenuItem hideItem;
5443		- private MenuItem grabItem;
	6401	+ private JMenuItem grabItem;
5444	6402	private MenuItem backItem;
5445	6403	private MenuItem frontItem;
5446	6404	private MenuItem cameraItem;
5447	6405	private MenuItem compositeItem;
5448		- private MenuItem randomItem;
	6406	+ private MenuItem switchItem;
5449	6407	private MenuItem physicsItem;
5450	6408	private MenuItem frameselectorItem;
5451	6409	private MenuItem scriptNodeItem;
..	..	@@ -5453,7 +6411,7 @@
5453	6411	private MenuItem switchTransfoItem;
5454	6412	private MenuItem morphItem;
5455	6413	private MenuItem linkerItem;
5456		- private MenuItem ungroupItem;
	6414	+ private JMenuItem ungroupItem;
5457	6415	private MenuItem editItem;
5458	6416	private MenuItem openWindowItem;
5459	6417	private MenuItem editLeafItem;
..	..	@@ -5469,6 +6427,8 @@
5469	6427	private MenuItem attachBumpItem;
5470	6428	private MenuItem detachBumpItem;
5471	6429	private MenuItem pigmentBumpItem;
	6430	+ private MenuItem embedTexturesItem;
	6431	+ private MenuItem deEmbedTexturesItem;
5472	6432
5473	6433	private MenuItem particleItem;
5474	6434	private MenuItem ragdollItem;
..	..	@@ -5519,5 +6479,5 @@
5519	6479
5520	6480	Menu cameraMenu;
5521	6481	MenuItem editCameraItem;
5522		- MenuItem revertCameraItem;
	6482	+ MenuItem restoreCameraItem;
5523	6483	}