~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,24 +765,32 @@
374	765	shadowYItem.addActionListener(this);
375	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	767	shadowZItem.addActionListener(this);
	768	+
377	769	if (Globals.ADVANCED)
378	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
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"));
387	779	pointflowItem.addActionListener(this);
388	780	}
389	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
390	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
391	790	resetTransformItem.addActionListener(this);
392	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
393	792	resetCentroidItem.addActionListener(this);
394		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
395	794	resetCentroidXZItem.addActionListener(this);
396	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
397	796	transformGeometryItem.addActionListener(this);
..	..	@@ -409,7 +808,7 @@
409	808	genNormalsMESHItem.addActionListener(this);
410	809	if (Globals.ADVANCED)
411	810	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	812	genNormalsMINEItem.addActionListener(this);
414	813	}
415	814	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -443,6 +842,8 @@
443	842	}
444	843
445	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
446	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
447	848	clearMaterialsItem.addActionListener(this);
448	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -465,9 +866,9 @@
465	866	hideleavesItem.addActionListener(this);
466	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
467	868	showleavesItem.addActionListener(this);
468		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
469	870	markleavesItem.addActionListener(this);
470		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
471	872	unmarkleavesItem.addActionListener(this);
472	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473	874	rewindleavesItem.addActionListener(this);
..	..	@@ -502,10 +903,15 @@
502	903	attachBumpItem.addActionListener(this);
503	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
505	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	908	detachPigmentItem.addActionListener(this);
507	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
509	915	menu.add("-");
510	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	917	sortbysizeItem.addActionListener(this);
..	..	@@ -516,6 +922,9 @@
516	922	shareGeometriesItem.addActionListener(this);
517	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
519	928	if (Globals.ADVANCED)
520	929	{
521	930	// Pretty much the same as duplicate and clone.
..	..	@@ -532,6 +941,80 @@
532	941	buildToolsMenu(menu);
533	942	}
534	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
535	1018	void SetupUI2(ObjEditor oe)
536	1019	{
537	1020	// June 2019
..	..	@@ -549,11 +1032,6 @@
549	1032	//new Exception().printStackTrace();
550	1033
551	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
558	1036
559	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -574,117 +1052,266 @@
574	1052	oe.radioPanel.add(dummyButton);
575	1053	oe.buttonGroup.add(dummyButton);
576	1054	*/
	1055	+ cGridBag versionManagerPanel = new cGridBag();
	1056	+
	1057	+ versionManagerPanel.preferredHeight = 4;
	1058	+
577	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	1060
579	1061	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1062	//minButton.setToolTipText("Minimize window");
581	1063	//minButton.addActionListener(this);
582	1064
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
	1070	+ }
586	1071
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
588	1112	fullButton.setToolTipText("Full-screen window");
589	1113	fullButton.addActionListener(this);
590	1114
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
594		-
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
601		- saveButton.addActionListener(this);
602		-
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
604		- liveCB.setToolTipText("Enable animation");
605		- liveCB.addItemListener(this);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ screenfitButton.setToolTipText("Screen fit");
	1117	+ screenfitButton.addActionListener(this);
606	1118
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1121	+ restoreCameraButton.addActionListener(this);
	1122	+
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
	1136	+
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
	1142	+
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
	1147	+
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
608	1156	oneStepButton.setToolTipText("Animate one step forward");
609	1157	oneStepButton.addActionListener(this);
610	1158
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
	1161	+ liveCB.addItemListener(this);
	1162	+
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	1164	fastCB.setToolTipText("Fast mode");
613	1165	fastCB.addItemListener(this);
614	1166
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	1167	+ //oe.toolboxPanel.Return();
	1168	+
	1169	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1170	+// trackCB.setToolTipText("Enable tracking");
	1171	+// trackCB.addItemListener(this);
622	1172
623	1173	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	1174	// screenfitpointButton.addActionListener(this);
625	1175
626	1176	if (Globals.ADVANCED)
627	1177	{
628		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
629	1179	snapobjectButton.addActionListener(this);
630	1180	snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ fourButton.addActionListener(this);
	1184	+ fourButton.setToolTipText("Show control panel only");
631	1185	}
632	1186
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	1187	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	1188
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	1189
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
658	1192	rootButton.addActionListener(this);
659	1193
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
661	1195	closeButton.setToolTipText("Close tab");
662	1196	closeButton.addActionListener(this);
663	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1198	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1199	+
	1200	+ cGridBag row1 = new cGridBag();
	1201	+
	1202	+ // INSERT
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
	1205	+ gridButton.addActionListener(this);
	1206	+
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ boxButton.setToolTipText("Create box");
	1209	+ boxButton.addActionListener(this);
	1210	+
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ superButton.setToolTipText("Create superellipsoid");
	1213	+ superButton.addActionListener(this);
	1214	+
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
	1228	+ {
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ kleinButton.setToolTipText("Create Klein bottle");
	1231	+ kleinButton.addActionListener(this);
	1232	+ }
	1233	+
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ particlesButton.setToolTipText("Create particle system");
	1236	+ particlesButton.addActionListener(this);
	1237	+
	1238	+ oe.toolboxPanel.add(row1);
	1239	+
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ groupButton.setToolTipText("Create group");
	1244	+ groupButton.addActionListener(this);
	1245	+
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ compositeButton.setToolTipText("Create composite");
	1248	+ compositeButton.addActionListener(this);
	1249	+
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ switchButton.setToolTipText("Create item switcher");
	1252	+ switchButton.addActionListener(this);
	1253	+
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ loopButton.setToolTipText("Create loop");
	1256	+ loopButton.addActionListener(this);
	1257	+
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ textureButton.setToolTipText("Create texture");
	1260	+ textureButton.addActionListener(this);
	1261	+
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ overlayButton.setToolTipText("Create overlay");
	1264	+ overlayButton.addActionListener(this);
	1265	+
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ lightButton.setToolTipText("Create light");
	1268	+ lightButton.addActionListener(this);
	1269	+
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
	1286	+
	1287	+ // EDIT panel
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1289	+ editButton.setToolTipText("Pin selection controls");
668	1290	editButton.addActionListener(this);
669	1291
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
672	1294	uneditButton.addActionListener(this);
673	1295
674	1296	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1297	+ allParamsButton.setToolTipText("Show all controls");
676	1298	allParamsButton.addActionListener(this);
677	1299
678		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
680	1302	clearPanelButton.addActionListener(this);
681	1303
682		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683		- unselectButton.setToolTipText("Unselect");
684		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
685	1307
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ flashSelectionButton.setToolTipText("Highlight selection");
	1310	+ flashSelectionButton.addActionListener(this);
	1311	+
686	1312	editCommandsPanel.preferredHeight = 1;
687	1313
	1314	+ SetPinStates(false);
688	1315	// oe.treePanel.add(commandsPanel);
689	1316	// oe.treePanel.Return();
690	1317
..	..	@@ -701,34 +1328,24 @@
701	1328
702	1329	cGridBag jSPPanel = new cGridBag();
703	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
704	1333	JScrollPane jSP;
705	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1335	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1336	ResetModel();
708	1337
709	1338	oe.treePanel.add(jSPPanel);
710	1339	oe.treePanel.Return();
711	1340
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);
	1341	+ oe.treePanel.add(versionManagerPanel);
728	1342	oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
729	1346
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
732	1349
733	1350	//jList.addListSelectionListener(this);
734	1351	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1353,7 @@
736	1353	//jTree.setEditable(true);
737	1354	oe.jTree.setDragEnabled(true);
738	1355	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1357
741	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1359
..	..	@@ -748,29 +1365,49 @@
748	1365	dgr.addDragGestureListener(this);
749	1366	}catch(Exception e) {}
750	1367	*/
751		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
752	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1370	}
754	1371
755	1372	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1373	{
	1374	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1375	+ colorCB.setToolTipText("Copy color when dropped");
	1376	+ colorCB.addItemListener(this);
	1377	+
	1378	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1379	+ materialCB.setToolTipText("Copy material when dropped");
	1380	+ materialCB.addItemListener(this);
	1381	+
	1382	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1383	+ textureCB.setToolTipText("Copy texture when dropped");
	1384	+ textureCB.addItemListener(this);
	1385	+
	1386	+ panel.Return();
	1387	+
757	1388	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1389	boxCB.setToolTipText("Display bounding boxes");
759	1390	boxCB.addItemListener(this);
760	1391
761	1392	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1393	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1394	zoomBoxCB.addItemListener(this);
764	1395
765	1396	if (true) // Globals.ADVANCED)
766	1397	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1398	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1399	+// supportCB.setToolTipText("Enable rigging");
	1400	+// supportCB.addItemListener(this);
	1401	+
	1402	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1403	+ freezeCB.setToolTipText("Fast moving camera");
	1404	+ freezeCB.addItemListener(this);
770	1405
771	1406	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1407	// localCB.addItemListener(this);
773	1408
	1409	+ panel.Return();
	1410	+
774	1411	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1412	crowdCB.setToolTipText("Used for crowds");
776	1413	crowdCB.addItemListener(this);
..	..	@@ -779,14 +1416,19 @@
779	1416	smoothCB.setToolTipText("Snapping delay");
780	1417	smoothCB.addItemListener(this);
781	1418
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
785	1425
786	1426	// constraints.gridy += 1;
787	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1428	// speakerMocapCB.addItemListener(this);
789	1429
	1430	+ panel.Return();
	1431	+
790	1432	if (false)
791	1433	{
792	1434	// handled in scripts
..	..	@@ -801,20 +1443,39 @@
801	1443	//constraints.gridy += 1;
802	1444	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1445	smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
804	1447	}
805	1448
806	1449	//constraints.gridx += 1;
807	1450	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1451	// debugCB.addItemListener(this);
809	1452
	1453	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1454	+ trackCB.setToolTipText("Enable tracking target");
	1455	+ trackCB.addItemListener(this);
	1456	+
810	1457	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	1458	+ oeilCB.setToolTipText("Move camera when tracking");
812	1459	oeilCB.addItemListener(this);
813	1460
814	1461	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	1462	+ shadowCB.setToolTipText("When live compute shadows");
816	1463	shadowCB.addItemListener(this);
817	1464
	1465	+ panel.Return();
	1466	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1467	+ toggleTextureCB.setToolTipText("Load textures");
	1468	+ toggleTextureCB.addItemListener(this);
	1469	+
	1470	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1471	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1472	+ toggleSwitchCB.addItemListener(this);
	1473	+
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
	1477	+
	1478	+ panel.Return();
818	1479	if (Globals.ADVANCED)
819	1480	{
820	1481	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -825,18 +1486,31 @@
825	1486	}
826	1487
827	1488	cGridBag fill = new cGridBag();
828		-
829	1489	fill.preferredHeight = 200;
	1490	+ cGridBag fill2 = new cGridBag();
	1491	+ fill2.preferredHeight = 200;
	1492	+ cGridBag fill3 = new cGridBag();
	1493	+ fill3.preferredHeight = 200;
830	1494
831	1495	panel.add(fill);
	1496	+ panel.add(fill2);
	1497	+ panel.add(fill3);
832	1498
833	1499	}
834	1500
835	1501	void EditObject(Object3D obj)
836	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
837	1511	cRadio radioButton = new cRadio(obj.name);
838	1512
839		- // Patch to avoid bug with transparency.
	1513	+ // June 2019. Patch to avoid bug with transparency.
840	1514	radioButton.hadMaterial = obj.material != null;
841	1515	if (!radioButton.hadMaterial)
842	1516	{
..	..	@@ -844,7 +1518,7 @@
844	1518	}
845	1519
846	1520	radioButton.SetObject(obj);
847		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
848	1522	radioButton.SetCamera(cameraView.renderCamera, false);
849	1523	radioButton.addActionListener(this);
850	1524	radioPanel.add(radioButton);
..	..	@@ -858,31 +1532,37 @@
858	1532
859	1533	oe.SetupViews();
860	1534
	1535	+ if (Globals.DEBUG)
861	1536	System.out.println("SetupViews");
862	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
863	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
864	1539	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
865	1540	}
866	1541
867		- JCheckBox liveCB;
868		- JCheckBox supportCB;
869		- JCheckBox localCB;
870		- JCheckBox crowdCB;
871		- JCheckBox smoothCB;
872		- JCheckBox fastCB;
873		- JCheckBox slowCB;
874		- JCheckBox boxCB;
875		- JCheckBox zoomBoxCB;
876		- JCheckBox trackCB;
877		- JCheckBox smoothfocusCB;
878		-// JCheckBox speakerMocapCB;
879		- JCheckBox speakerCameraCB;
880		- JCheckBox speakerFocusCB;
881		- JCheckBox debugCB;
	1542	+ cToggleButton liveCB;
	1543	+ cCheckBox supportCB;
	1544	+ cCheckBox localCB;
	1545	+ cCheckBox crowdCB;
	1546	+ cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
882	1548
883		- JCheckBox oeilCB;
884		- JCheckBox shadowCB;
885		- JCheckBox lookAtCB;
	1549	+ cToggleButton fastCB;
	1550	+ cCheckBox slowCB;
	1551	+ cCheckBox boxCB;
	1552	+ cCheckBox zoomBoxCB;
	1553	+ cCheckBox freezeCB;
	1554	+ //cToggleButton trackCB;
	1555	+ cCheckBox trackCB;
	1556	+ cCheckBox smoothfocusCB;
	1557	+// JCheckBox speakerMocapCB;
	1558	+ cCheckBox speakerCameraCB;
	1559	+ cCheckBox speakerFocusCB;
	1560	+ cCheckBox debugCB;
	1561	+
	1562	+ cCheckBox oeilCB;
	1563	+ cCheckBox shadowCB;
	1564	+ cCheckBox autokeepCB;
	1565	+ cCheckBox lookAtCB;
886	1566
887	1567	// static int COLOR = 1;
888	1568	// static int MATERIAL = 2;
..	..	@@ -890,9 +1570,9 @@
890	1570
891	1571	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
892	1572
893		- JCheckBox colorCB;
894		- JCheckBox materialCB;
895		- JCheckBox textureCB;
	1573	+ cCheckBox colorCB;
	1574	+ cCheckBox materialCB;
	1575	+ cCheckBox textureCB;
896	1576
897	1577	public void itemStateChanged(ItemEvent e)
898	1578	{
..	..	@@ -936,6 +1616,12 @@
936	1616	{
937	1617	cameraView.ToggleInertia();
938	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
939	1625	}
940	1626	else if(e.getSource() == localCB)
941	1627	{
..	..	@@ -989,6 +1675,14 @@
989	1675	{
990	1676	Globals.COMPUTESHADOWWHENLIVE ^= true;
991	1677	}
	1678	+ else if(e.getSource() == freezeCB)
	1679	+ {
	1680	+ Globals.FREEZEONMOVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == autokeepCB)
	1683	+ {
	1684	+ Globals.REPLACEONMAKE ^= true;
	1685	+ }
992	1686	else if(e.getSource() == lookAtCB)
993	1687	{
994	1688	cameraView.ToggleLookAt();
..	..	@@ -1005,7 +1699,8 @@
1005	1699
1006	1700	/**/
1007	1701	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1008		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1702	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1703	+ TreePath path = objEditor.jTree.getSelectionPath();
1009	1704	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1010	1705	// We can't move the root node or an empty selection
1011	1706	return;
..	..	@@ -1068,8 +1763,6 @@
1068	1763	}
1069	1764	}
1070	1765
1071		- String string = (String) object;
1072		-
1073	1766	System.out.println("Transfer = " + object + "; drop : " + target);
1074	1767	// if( object instanceof java.io.File[])
1075	1768	// {
..	..	@@ -1077,6 +1770,8 @@
1077	1770	// objEditor.DropFile((java.io.File[]) object, true);
1078	1771	// return;
1079	1772	// }
	1773	+
	1774	+ String string = object.toString();
1080	1775
1081	1776	// File path for Mac and Windows
1082	1777	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1122,23 +1817,33 @@
1122	1817
1123	1818	assert target == objEditor.jTree;
1124	1819	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1820	+ Object3D destinationLeaf;
1125	1821	try {
1126		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1822	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1127	1823	} catch (Exception e) {
1128	1824	System.out.println("destinationPath : " + destinationPath);
1129	1825	return;
1130	1826	}
1131	1827
1132		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+ for (int i=group.selection.size(); --i>=0;)
1133	1829	{
	1830	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1831	+
	1832	+ // Cannot move into itself
	1833	+ if (child == destinationLeaf)
	1834	+ return;
	1835	+ }
	1836	+
	1837	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1838	+// {
1134	1839	loadClipboard(true);
1135	1840	objEditor.jTree.setSelectionPath(destinationPath);
1136	1841	pasteInto(false, false);
1137		- } else {
1138		- loadClipboard(false);
1139		- objEditor.jTree.setSelectionPath(destinationPath);
1140		- pasteInto(false, false); // true); // ???
1141		- }
	1842	+// } else {
	1843	+// loadClipboard(false);
	1844	+// objEditor.jTree.setSelectionPath(destinationPath);
	1845	+// pasteInto(false, false); // true); // ???
	1846	+// }
1142	1847	}
1143	1848	public void dropActionChanged(DropTargetDragEvent dtde)
1144	1849	// Called if the user has modified the current drop gesture
..	..	@@ -1194,7 +1899,12 @@
1194	1899	TreePath path;
1195	1900
1196	1901	public TransferableTreePath(TreePath tp) {
1197		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1198	1908	}
1199	1909
1200	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1243,22 +1953,30 @@
1243	1953	{
1244	1954	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1245	1955	//heightFieldItem.addActionListener(this);
1246		- gridItem = menu.add(new MenuItem("Grid"));
1247		- gridItem.addActionListener(this);
1248		- rectoidItem = menu.add(new MenuItem("Box"));
1249		- rectoidItem.addActionListener(this);
1250		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1251		- ellipsoidItem.addActionListener(this);
1252		- coneItem = menu.add(new MenuItem("Cone"));
1253		- coneItem.addActionListener(this);
1254		- torusItem = menu.add(new MenuItem("Torus"));
1255		- torusItem.addActionListener(this);
1256		- superItem = menu.add(new MenuItem("Superellipsoid"));
1257		- superItem.addActionListener(this);
	1956	+// gridItem = menu.add(new MenuItem("Grid"));
	1957	+// gridItem.addActionListener(this);
	1958	+// rectoidItem = menu.add(new MenuItem("Box"));
	1959	+// rectoidItem.addActionListener(this);
	1960	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1961	+// ellipsoidItem.addActionListener(this);
	1962	+// coneItem = menu.add(new MenuItem("Cone"));
	1963	+// coneItem.addActionListener(this);
	1964	+// torusItem = menu.add(new MenuItem("Torus"));
	1965	+// torusItem.addActionListener(this);
	1966	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1967	+// superItem.addActionListener(this);
	1968	+
	1969	+ cameraItem = menu.add(new MenuItem("Camera"));
	1970	+ cameraItem.addActionListener(this);
	1971	+
	1972	+ if (!Globals.ADVANCED)
	1973	+ {
1258	1974	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1259	1975	kleinItem.addActionListener(this);
1260		- particleItem = menu.add(new MenuItem("Particle system"));
1261		- particleItem.addActionListener(this);
	1976	+ }
	1977	+
	1978	+// particleItem = menu.add(new MenuItem("Particle system"));
	1979	+// particleItem.addActionListener(this);
1262	1980	if (Globals.ADVANCED)
1263	1981	{
1264	1982	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1284,15 +2002,15 @@
1284	2002	}
1285	2003	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1286	2004	bezierItem.addActionListener(this);
1287		- overlayItem = menu.add(new MenuItem("Overlay"));
1288		- overlayItem.addActionListener(this);
1289		- lightItem = menu.add(new MenuItem("Light"));
1290		- lightItem.addActionListener(this);
	2005	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2006	+// overlayItem.addActionListener(this);
	2007	+// lightItem = menu.add(new MenuItem("Light"));
	2008	+// lightItem.addActionListener(this);
1291	2009	menu.add("-");
1292	2010	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1293	2011	//superLoopItem.addActionListener(this);
1294		- loopItem = menu.add(new MenuItem("Loop"));
1295		- loopItem.addActionListener(this);
	2012	+// loopItem = menu.add(new MenuItem("Loop"));
	2013	+// loopItem.addActionListener(this);
1296	2014	doubleItem = menu.add(new MenuItem("Fork"));
1297	2015	doubleItem.addActionListener(this);
1298	2016	if (Globals.ADVANCED)
..	..	@@ -1308,6 +2026,9 @@
1308	2026	animationItem.addItemListener(this);
1309	2027	animationItem.setState(Globals.ANIMATION);
1310	2028
	2029	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2030	+ archiveItem.addActionListener(this);
	2031	+
1311	2032	menu.add("-");
1312	2033	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1313	2034	parseverticesItem.addActionListener(this);
..	..	@@ -1320,6 +2041,8 @@
1320	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1321	2042	reduce34MorphItem.addActionListener(this);
1322	2043	menu.add("-");
	2044	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2045	+ memoryItem.addActionListener(this);
1323	2046	menu.add(computeAOItem = new MenuItem("Compute AO"));
1324	2047	computeAOItem.addActionListener(this);
1325	2048
..	..	@@ -1328,8 +2051,6 @@
1328	2051	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1329	2052	mirrorItem.addActionListener(this);
1330	2053	menu.add("-");
1331		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1332		- memoryItem.addActionListener(this);
1333	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1334	2055	analyzeItem.addActionListener(this);
1335	2056	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1415,24 +2136,24 @@
1415	2136	switch(axis)
1416	2137	{
1417	2138	case 0 :
1418		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1419		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1420		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1421		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1422	2143	norm = cVector.X;
1423	2144	break;
1424	2145	case 1 :
1425		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1426		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1427		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1428		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1429	2150	norm = cVector.Y;
1430	2151	break;
1431	2152	case 2 :
1432		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1433		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1434		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1435		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1436	2157	norm = cVector.Z;
1437	2158	break;
1438	2159	}
..	..	@@ -1473,10 +2194,38 @@
1473	2194	shadow.material = new cMaterial(obj.material);
1474	2195	shadow.material.diffuse = 0.0001f;
1475	2196	shadow.material.specular = 0.0001f;
1476		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1477	2202
1478	2203	makeSomething(shadow);
1479	2204	}
	2205	+
	2206	+ private void ClearUnpinned()
	2207	+ {
	2208	+ //for (Object3D obj : listUI)
	2209	+ for (int i=listUI.size(); --i>=0;)
	2210	+ {
	2211	+ Object3D obj = listUI.elementAt(i);
	2212	+ if (!obj.pinned)
	2213	+ {
	2214	+ obj.CloseUI();
	2215	+ listUI.remove(i);
	2216	+ }
	2217	+ }
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
	2228	+ }
1480	2229
1481	2230	/**
1482	2231	* applyExample
..	..	@@ -1721,7 +2470,7 @@
1721	2470	{
1722	2471	ScreenFit();
1723	2472	} else
1724		- if (source == switchItem)
	2473	+ if (source == switchViewItem)
1725	2474	{
1726	2475	cVector v1 = new cVector();
1727	2476	cVector v2 = new cVector();
..	..	@@ -1730,11 +2479,11 @@
1730	2479	objEditor.cameraView.renderCamera.setAim(v2, v1);
1731	2480	objEditor.cameraView.repaint();
1732	2481	} else
1733		- if (source == rectoidItem)
	2482	+ if (source == rectoidItem \|\| source == boxButton)
1734	2483	{
1735	2484	makeSomething(new Box());
1736	2485	} else
1737		- if (source == particleItem)
	2486	+ if (source == particleItem \|\| source == particlesButton)
1738	2487	{
1739	2488	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1740	2489	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1813,27 +2562,27 @@
1813	2562
1814	2563	makeSomething(obj);
1815	2564	} else
1816		- if (source == gridItem)
	2565	+ if (source == gridItem \|\| source == gridButton)
1817	2566	{
1818	2567	makeSomething(new Grid());
1819	2568	} else
1820		- if (source == ellipsoidItem)
	2569	+ if (source == ellipsoidItem \|\| source == sphereButton)
1821	2570	{
1822	2571	makeSomething(new Sphere());
1823	2572	} else
1824		- if (source == coneItem)
	2573	+ if (source == coneItem \|\| source == coneButton)
1825	2574	{
1826	2575	makeSomething(new Cone());
1827	2576	} else
1828		- if (source == torusItem)
	2577	+ if (source == torusItem \|\| source == torusButton)
1829	2578	{
1830	2579	makeSomething(new Torus());
1831	2580	} else
1832		- if (source == superItem)
	2581	+ if (source == superItem \|\| source == superButton)
1833	2582	{
1834	2583	makeSomething(new Superellipsoid());
1835	2584	} else
1836		- if (source == kleinItem)
	2585	+ if (source == kleinItem \|\| source == kleinButton)
1837	2586	{
1838	2587	makeSomething(new Klein());
1839	2588	} else
..	..	@@ -1853,7 +2602,7 @@
1853	2602	{
1854	2603	makeSomething(new BezierSurface());
1855	2604	} else
1856		- if (source == overlayItem)
	2605	+ if (source == overlayItem \|\| source == overlayButton)
1857	2606	{
1858	2607	/*
1859	2608	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1901,10 +2650,27 @@
1901	2650	s.setup();
1902	2651	makeSomething(s);
1903	2652	} else
1904		- if (source == lightItem)
	2653	+ if (source == lightItem \|\| source == lightButton)
1905	2654	{
1906	2655	makeSomething(new Light());
1907	2656	} else
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
1908	2674	if (source == csgItem)
1909	2675	{
1910	2676	group(new CSG());
..	..	@@ -1951,30 +2717,38 @@
1951	2717
1952	2718	group(g);
1953	2719	} else
1954		- if (source == loopItem)
	2720	+ if (source == loopItem \|\| source == loopButton)
1955	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
1956	2724	Composite csg = new GroupLeaf();
1957	2725	csg.count = 5;
1958		- group(csg);
1959		- Composite child = new cGroup();
	2726	+ Composite child = new cGroup("Branch");
1960	2727	csg.addChild(child);
1961	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
1962	2731	} else
1963	2732	if (source == doubleItem)
1964	2733	{
1965		- Composite csg = new GroupLeaf();
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
	2736	+ Composite csg = new GroupLeaf("Fork");
1966	2737	csg.count = 5;
	2738	+ Composite child = new cGroup("Branch A");
	2739	+ csg.addChild(child);
	2740	+ child.addChild(csg);
	2741	+ child = new cGroup("Branch B");
	2742	+ csg.addChild(child);
	2743	+ child.addChild(csg);
1967	2744	group(csg);
1968		- Composite child = new cGroup();
1969		- csg.addChild(child);
1970		- child.addChild(csg);
1971		- child = new cGroup();
1972		- csg.addChild(child);
1973		- child.addChild(csg);
	2745	+ }
1974	2746	} else
1975	2747	if (source == tripleItem)
1976	2748	{
1977		- Composite csg = new GroupLeaf();
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
	2751	+ Composite csg = new GroupLeaf("Trident");
1978	2752	csg.count = 4;
1979	2753	group(csg);
1980	2754	Composite child = new cGroup();
..	..	@@ -1986,11 +2760,12 @@
1986	2760	child = new cGroup();
1987	2761	csg.addChild(child);
1988	2762	child.addChild(csg);
	2763	+ }
1989	2764	} else
1990	2765	if (source == computeAOItem)
1991	2766	{
1992	2767	Globals.drawMode = CameraPane.OCCLUSION;
1993		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
1994	2769	} else
1995	2770	if (source == recompileItem)
1996	2771	{
..	..	@@ -2005,7 +2780,7 @@
2005	2780	if (source == invariantsItem)
2006	2781	{
2007	2782	System.out.println("Invariants:");
2008		- Grafreed.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
2009	2784	} else
2010	2785	if (source == memoryItem)
2011	2786	{
..	..	@@ -2036,17 +2811,52 @@
2036	2811	{
2037	2812	ToggleFullScreen();
2038	2813	} else
2039		- if (source == undoButton)
	2814	+ if (source == collapseButton)
2040	2815	{
2041		- Undo();
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
2042	2818	} else
2043		- if (source == redoButton)
	2819	+ if (source == maximize3DButton)
2044	2820	{
2045		- Redo();
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
2046	2825	} else
2047		- if (source == saveButton)
	2826	+ if (source == previousVersionButton)
2048	2827	{
2049		- Save();
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
	2853	+ if (!Save(true))
	2854	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
2050	2860	} else
2051	2861	if (source == oneStepButton)
2052	2862	{
..	..	@@ -2055,17 +2865,14 @@
2055	2865	} else
2056	2866	if (source == screenfitButton)
2057	2867	{
2058		- //Reload(lastConverter, lastFilename, true);
2059	2868	ScreenFit();
2060	2869	} else
2061	2870	if (source == screenfitpointButton)
2062	2871	{
2063		- //Reload(lastConverter, lastFilename, true);
2064	2872	ScreenFitPoint();
2065	2873	} else
2066	2874	if (source == snapobjectButton)
2067	2875	{
2068		- //Reload(lastConverter, lastFilename, true);
2069	2876	SnapObject();
2070	2877	} else
2071	2878	// if (event.getSource() == recompileButton)
..	..	@@ -2104,11 +2911,11 @@
2104	2911	} else
2105	2912	if (source == undoItem)
2106	2913	{
2107		- Undo();
	2914	+ PreviousVersion();
2108	2915	} else
2109	2916	if (source == redoItem)
2110	2917	{
2111		- Redo();
	2918	+ NextVersion();
2112	2919	} else
2113	2920	if (source == duplicateItem)
2114	2921	{
..	..	@@ -2429,7 +3236,7 @@
2429	3236	{
2430	3237	StepAll();
2431	3238	} else
2432		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2433	3240	{
2434	3241	//int indices[] = jList.getSelectedIndices();
2435	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2441,9 +3248,9 @@
2441	3248	{
2442	3249	ClearSelection(true);
2443	3250	} else
2444		- if (source == grabItem)
	3251	+ if (source == grabItem \|\| source == groupButton)
2445	3252	{
2446		- group(new cGroup(), true);
	3253	+ group(new cGroup(), false); // true);
2447	3254	} else
2448	3255	if (source == hideItem)
2449	3256	{
..	..	@@ -2461,11 +3268,11 @@
2461	3268	{
2462	3269	makeSomething(new Camera());
2463	3270	} else
2464		- if (source == compositeItem)
	3271	+ if (source == compositeItem \|\| source == compositeButton)
2465	3272	{
2466	3273	group(new Composite());
2467	3274	} else
2468		- if (source == randomItem)
	3275	+ if (source == switchItem \|\| source == switchButton)
2469	3276	{
2470	3277	RandomNode random = new RandomNode();
2471	3278	group(random);
..	..	@@ -2567,7 +3374,7 @@
2567	3374	{
2568	3375	group(new cLinker());
2569	3376	} else
2570		- if (source == textureItem)
	3377	+ if (source == textureItem \|\| source == textureButton)
2571	3378	{
2572	3379	group(new TextureNode());
2573	3380	} else
..	..	@@ -2587,17 +3394,42 @@
2587	3394	{
2588	3395	CastShadow(2);
2589	3396	} else
2590		- if (source == ungroupItem)
	3397	+ if (source == ungroupItem \|\| source == ungroupButton)
2591	3398	{
2592		- //ungroup();
	3399	+ boolean canUngroup = true;
	3400	+
2593	3401	for (int i=0; i<group.selection.size(); i++)
2594	3402	{
2595		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
	3406	+ {
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
	3416	+ break;
	3417	+ }
2596	3418	}
2597	3419
2598		- ClearSelection(false);
2599		-
2600		- refreshContents();
	3420	+ if (canUngroup)
	3421	+ {
	3422	+ for (int i=0; i<group.selection.size(); i++)
	3423	+ {
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
	3427	+ }
	3428	+
	3429	+ ClearSelection(false);
	3430	+
	3431	+ refreshContents();
	3432	+ }
2601	3433	} else
2602	3434	if (source == genUVItem)
2603	3435	{
..	..	@@ -2642,6 +3474,10 @@
2642	3474	if (source == clearMaterialsItem)
2643	3475	{
2644	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
2645	3481	} else
2646	3482	if (source == liveleavesItem)
2647	3483	{
..	..	@@ -2783,6 +3619,18 @@
2783	3619	{
2784	3620	TransformChildren();
2785	3621	} else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
	3633	+ } else
2786	3634	if (source == resetTransformItem)
2787	3635	{
2788	3636	ResetTransform();
..	..	@@ -2898,7 +3746,7 @@
2898	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2899	3747	{
2900	3748	obj = (Object3D)e.nextElement();
2901		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
2902	3750	}
2903	3751
2904	3752	refreshContents();
..	..	@@ -2914,6 +3762,31 @@
2914	3762
2915	3763	refreshContents();
2916	3764	} else
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
	3788	+ refreshContents();
	3789	+ } else
2917	3790	if (source == flashSelectionButton)
2918	3791	{
2919	3792	CameraPane.flash = true;
..	..	@@ -2925,38 +3798,11 @@
2925	3798	if (source == twoButton)
2926	3799	{
2927	3800	radio.layout = twoButton;
2928		- // bug
2929		- //gridPanel.setDividerLocation(1.0);
2930		- //bigPanel.setDividerLocation(0.0);
2931		-// bigThree.remove(scenePanel);
2932		-// bigThree.remove(centralPanel);
2933		-// bigThree.remove(XYZPanel);
2934		-// aWindowConstraints.gridx = 0;
2935		-// aWindowConstraints.gridy = 0;
2936		-// aWindowConstraints.gridwidth = 1;
2937		-// // aConstraints.gridheight = 3;
2938		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2939		-// aWindowConstraints.weightx = 0;
2940		-// aWindowConstraints.weighty = 1;
2941		-// //bigThree.add(jtp, aWindowConstraints);
2942		-// aWindowConstraints.weightx = 1;
2943		-// aWindowConstraints.gridwidth = 3;
2944		-// // aConstraints.gridheight = 3;
2945		-// aWindowConstraints.gridx = 1;
2946		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2947		-// bigThree.add(centralPanel, aWindowConstraints);
2948		-// aWindowConstraints.weightx = 0;
2949		-// aWindowConstraints.gridx = 4;
2950		-// aWindowConstraints.gridwidth = 1;
2951		-// // aConstraints.gridheight = 3;
2952		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2953		-// //bigThree.add(XYZPanel, aWindowConstraints);
2954		-// scenePanel.setVisible(false);
2955		-// centralPanel.setVisible(true);
2956		-// XYZPanel.setVisible(false);
2957		- bigThree.ClearUI();
2958		- bigThree.add(centralPanel);
2959		- bigThree.FlushUI();
	3801	+
	3802	+ if (CameraPane.FULLSCREEN)
	3803	+ fullscreenLayout = radio.layout;
	3804	+
	3805	+ Show3DView();
2960	3806
2961	3807	cameraView.requestFocusInWindow();
2962	3808
..	..	@@ -2979,6 +3825,9 @@
2979	3825	if (source == threeButton)
2980	3826	{
2981	3827	radio.layout = threeButton;
	3828	+
	3829	+ if (CameraPane.FULLSCREEN)
	3830	+ fullscreenLayout = radio.layout;
2982	3831
2983	3832	// bigThree.remove(scenePanel);
2984	3833	// bigThree.remove(centralPanel);
..	..	@@ -3008,8 +3857,8 @@
3008	3857	// centralPanel.setVisible(true);
3009	3858	// XYZPanel.setVisible(true);
3010	3859	bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
3011	3861	bigThree.add(centralPanel);
3012		- bigThree.add(XYZPanel);
3013	3862	bigThree.FlushUI();
3014	3863
3015	3864	cameraView.requestFocusInWindow();
..	..	@@ -3017,6 +3866,9 @@
3017	3866	if (source == fourButton)
3018	3867	{
3019	3868	radio.layout = fourButton;
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
3020	3872
3021	3873	// bigThree.remove(scenePanel);
3022	3874	// bigThree.remove(centralPanel);
..	..	@@ -3055,6 +3907,9 @@
3055	3907	{
3056	3908	radio.layout = sixButton;
3057	3909
	3910	+ if (CameraPane.FULLSCREEN)
	3911	+ fullscreenLayout = radio.layout;
	3912	+
3058	3913	// bigThree.remove(scenePanel);
3059	3914	// bigThree.remove(centralPanel);
3060	3915	// bigThree.remove(XYZPanel);
..	..	@@ -3083,8 +3938,8 @@
3083	3938	// centralPanel.setVisible(true);
3084	3939	// XYZPanel.setVisible(false);
3085	3940	bigThree.ClearUI();
3086		- bigThree.add(scenePanel);
3087	3941	bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
3088	3943	bigThree.FlushUI();
3089	3944
3090	3945	cameraView.requestFocusInWindow();
..	..	@@ -3092,6 +3947,9 @@
3092	3947	if (source == sevenButton)
3093	3948	{
3094	3949	radio.layout = sevenButton;
	3950	+
	3951	+ if (CameraPane.FULLSCREEN)
	3952	+ fullscreenLayout = radio.layout;
3095	3953
3096	3954	// bigThree.remove(scenePanel);
3097	3955	// bigThree.remove(centralPanel);
..	..	@@ -3130,6 +3988,7 @@
3130	3988	} else
3131	3989	if (source == rootButton)
3132	3990	{
	3991	+ Replace();
3133	3992	Object3D obj;
3134	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3135	3994	{
..	..	@@ -3144,6 +4003,9 @@
3144	4003	if (source == closeButton)
3145	4004	{
3146	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3147	4009	cRadio ab;
3148	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3149	4011	{
..	..	@@ -3159,7 +4021,8 @@
3159	4021	buttonGroup.remove(ab);
3160	4022	radioPanel.remove(ab);
3161	4023
3162		- ab.GetObject().editWindow = null;
	4024	+ //ab.GetObject().editWindow = null;
	4025	+ ab.GetObject().manipWindow = null;
3163	4026	// ab.GetObject().objectUI = null; // ?????????
3164	4027
3165	4028	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3172,6 +4035,12 @@
3172	4035	} else
3173	4036	if (source == editItem \|\| source == editButton)
3174	4037	{
	4038	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4039	+ {
	4040	+ Object3D child = (Object3D)e.nextElement();
	4041	+ child.pinned = true;
	4042	+ }
	4043	+
3175	4044	EditSelection(false);
3176	4045	} else
3177	4046	if (source == uneditButton)
..	..	@@ -3180,9 +4049,10 @@
3180	4049	{
3181	4050	Object3D child = (Object3D)e.nextElement();
3182	4051	if(child.editWindow != null)
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4052	+ child.pinned = false;
3184	4053	child.CloseUI();
3185	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3186	4056
3187	4057	//child.editWindow = null; // ???????????
3188	4058	}
..	..	@@ -3197,16 +4067,18 @@
3197	4067	//copy.ClearUI();
3198	4068	for (Object3D obj : listUI)
3199	4069	{
	4070	+ obj.pinned = false;
3200	4071	obj.CloseUI();
3201	4072	}
3202	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
3203	4075	refreshContents(true);
3204	4076	} else
3205	4077	if (source == allParamsButton)
3206	4078	{
3207	4079	assert(copy == group);
3208	4080
3209		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4081	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3210	4082
3211	4083	for (Object3D obj : listUI)
3212	4084	{
..	..	@@ -3232,6 +4104,9 @@
3232	4104	} else
3233	4105	if(source instanceof cRadio)
3234	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3235	4110	group.parent = keepparent;
3236	4111	group.attributes = 0;
3237	4112	//group.editWindow = null;
..	..	@@ -3255,6 +4130,7 @@
3255	4130	}
3256	4131
3257	4132	copy = group;
	4133	+
3258	4134	//Globals.theRenderer.object = group;
3259	4135	if(!useclient)
3260	4136	{
..	..	@@ -3273,6 +4149,7 @@
3273	4149
3274	4150	// fix "+" issue
3275	4151	//group.editWindow = this;
	4152	+ group.manipWindow = this;
3276	4153
3277	4154	/*
3278	4155	currentLayout = radio.layout;
..	..	@@ -3280,6 +4157,39 @@
3280	4157	currentLayout = sevenButton;
3281	4158	*/
3282	4159	radio.layout.doClick();
	4160	+
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
	4186	+ ClearUnpinned();
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
	4192	+ EditSelection(false);
3283	4193	keepparent = group.parent;
3284	4194	// PARENT = NULL or not???
3285	4195	//group.parent = null; // ROOT
..	..	@@ -3291,11 +4201,13 @@
3291	4201	} else if (event.getSource() == editCameraItem)
3292	4202	{
3293	4203	cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
3294	4205	cameraView.repaint();
3295	4206	return;
3296		- } else if (event.getSource() == revertCameraItem)
	4207	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3297	4208	{
3298	4209	cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
3299	4211	cameraView.repaint();
3300	4212	return;
3301	4213	// } else if (event.getSource() == textureButton)
..	..	@@ -3384,6 +4296,18 @@
3384	4296	refreshContents();
3385	4297	}
3386	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
3387	4311	void ResetTransform()
3388	4312	{
3389	4313	ResetTransform(-1);
..	..	@@ -3399,42 +4323,8 @@
3399	4323	if (obj.toParent == null)
3400	4324	continue;
3401	4325
3402		- if (mask == -1)
3403		- {
3404		- if (obj instanceof Camera) // jan 2014
3405		- {
3406		- LA.matIdentity(obj.toParent);
3407		- LA.matIdentity(obj.fromParent);
3408		- }
3409		- else
3410		- {
3411		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3412		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3413		- }
3414		- TouchTransform(obj);
3415		- continue;
3416		- }
3417		- if ((mask&2) != 0) // Scale
3418		- {
3419		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3420		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3421		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3422		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3423		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3424		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3425		- }
3426		- if ((mask&4) != 0) // Rotation
3427		- {
3428		- // ?
3429		- }
3430		- if ((mask&1) != 0) // Translation
3431		- {
3432		- if (obj.toParent != null)
3433		- {
3434		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3435		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3436		- }
3437		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3438	4328	if (obj.parent == null)
3439	4329	{
3440	4330	System.out.println("NULL PARENT!");
..	..	@@ -3872,7 +4762,7 @@
3872	4762
3873	4763	try
3874	4764	{
3875		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3876	4766	}
3877	4767	catch (Exception e)
3878	4768	{
..	..	@@ -3942,6 +4832,12 @@
3942	4832	for (int i=0; i<group.selection.size(); i++)
3943	4833	{
3944	4834	Object3D obj = group.selection.get(i);
	4835	+
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
3945	4841
3946	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3947	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4234,6 +5130,12 @@
4234	5130	refreshContents();
4235	5131	}
4236	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4237	5139	void FlipV(boolean flip)
4238	5140	{
4239	5141	group.selection.FlipV(flip);
..	..	@@ -4347,28 +5249,25 @@
4347	5249	// }
4348	5250	// }
4349	5251
4350		- static boolean allparams = true;
4351		-
4352		- static Vector<Object3D> listUI = new Vector<Object3D>();
4353		-
4354	5252	void EditSelection(boolean newWindow)
4355	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
4356	5260	// aConstraints.gridy = 0;
4357	5261	for (int i=0; i<group.selection.size(); i++)
4358	5262	{
4359	5263	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4360	5264	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4361		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5265	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4362	5266
4363	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
4364	5268	if(elem != group \|\| !newWindow)
4365	5269	{
4366		- // if (!(elem instanceof Composite))
4367		- // newWindow = false;
4368		- listUI.add(elem);
4369		- elem.openEditWindow(this, newWindow); //, false);
4370		- System.out.println("edit : " + elem);
4371		- elem.editWindow.refreshContents(true); // ? new
	5270	+ EditElement(elem, newWindow); // ? new
4372	5271	}
4373	5272	}
4374	5273	}
..	..	@@ -4431,9 +5330,7 @@
4431	5330
4432	5331	freezemodel = false;
4433	5332	}
4434		-
4435		- boolean flashIt = true;
4436		-
	5333	+
4437	5334	public void valueChanged(TreeSelectionEvent e)
4438	5335	//public boolean handleEvent(Event event)
4439	5336	{
..	..	@@ -4443,7 +5340,8 @@
4443	5340	//new Exception().printStackTrace();
4444	5341
4445	5342	freezemodel = true;
4446		-
	5343	+ ClearUnpinned();
	5344	+
4447	5345	/**/
4448	5346	//switch (event.id)
4449	5347	{
..	..	@@ -4476,7 +5374,7 @@
4476	5374	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4477	5375	// a camera
4478	5376	{
4479		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5377	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4480	5378	{
4481	5379	CameraPane.camerachangeframe = 0; // don't refuse it
4482	5380	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4485,6 +5383,13 @@
4485	5383	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4486	5384	}
4487	5385
	5386	+ if (tps != null && tps.length == 1)
	5387	+ {
	5388	+ EditSelection(false);
	5389	+ }
	5390	+
	5391	+ SetPinStates(tps != null && tps.length > 0);
	5392	+
4488	5393	refreshContents();
4489	5394	//return true;
4490	5395	}
..	..	@@ -4494,9 +5399,36 @@
4494	5399	freezemodel = false;
4495	5400	}
4496	5401
	5402	+ void SetPinStates(boolean enabled)
	5403	+ {
	5404	+ editButton.setEnabled(enabled);
	5405	+ uneditButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
	5407	+ flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
	5425	+ }
	5426	+
4497	5427	void refreshContents(boolean cp)
4498	5428	{
4499		- if (!Globals.MOUSEDRAGGED)
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5431	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4500	5432	{
4501	5433	objEditor.ClearInfo(); // .GetMaterial());
4502	5434
..	..	@@ -4505,7 +5437,7 @@
4505	5437	Object3D child = (Object3D) group.selection.get(i);
4506	5438
4507	5439	objEditor.AddInfo(child, this, true);
4508		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
4509	5441	}
4510	5442
4511	5443	objEditor.SetText(); // jan 2014
..	..	@@ -4595,7 +5527,8 @@
4595	5527
4596	5528	if (cut)
4597	5529	{
4598		- Save();
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4599	5532	//int indices[] = jList.getSelectedIndices();
4600	5533	//for (int i = indices.length - 1; i >= 0; i--)
4601	5534	//jList.remove(indices[i]);
..	..	@@ -4698,6 +5631,10 @@
4698	5631
4699	5632	void paste(boolean expand)
4700	5633	{
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
4701	5638	// if (GrafreeD.clipboard == null)
4702	5639	// return;
4703	5640	boolean first = true;
..	..	@@ -4757,6 +5694,7 @@
4757	5694	Grafreed.clipboard.get(0).parent = keepparent;
4758	5695	}
4759	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4760	5698	ResetModel();
4761	5699	refreshContents();
4762	5700	}
..	..	@@ -4892,6 +5830,10 @@
4892	5830
4893	5831	void group(Object3D csg, boolean grab)
4894	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
4895	5837	if (//false) // why??
4896	5838	!group.selection.isEmpty())
4897	5839	{
..	..	@@ -5005,10 +5947,15 @@
5005	5947	//node.add(csg);
5006	5948	//makeSomething(node);
5007	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
5008	5951	}
5009	5952
5010	5953	void Ungroup(Object3D g)
5011	5954	{
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
5012	5959	if (g instanceof HiddenObject)
5013	5960	{
5014	5961	HiddenObject h = (HiddenObject) g;
..	..	@@ -5025,6 +5972,7 @@
5025	5972	objEditor.makeSomething(g.get(i), false);
5026	5973	}
5027	5974	}
	5975	+ Globals.REPLACEONMAKE = keep;
5028	5976	}
5029	5977
5030	5978	void ungroup()
..	..	@@ -5313,13 +6261,43 @@
5313	6261	cButton clearpanelButton;
5314	6262	cButton unselectButton;
5315	6263
5316		- cButton minButton;
5317		- cButton maxButton;
5318		- cButton fullButton;
5319		- cButton undoButton;
5320		- cButton redoButton;
5321		- cButton saveButton;
	6264	+ cButton restoreCameraButton;
	6265	+
5322	6266	cButton oneStepButton;
	6267	+
	6268	+ cButton groupButton;
	6269	+ cButton ungroupButton;
	6270	+ cButton compositeButton;
	6271	+ cButton switchButton;
	6272	+ cButton loopButton;
	6273	+ cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
	6290	+
	6291	+ cButton gridButton;
	6292	+ cButton boxButton;
	6293	+ cButton sphereButton;
	6294	+ cButton coneButton;
	6295	+ cButton torusButton;
	6296	+ cButton superButton;
	6297	+ cButton kleinButton;
	6298	+ cButton particlesButton;
	6299	+ cButton overlayButton;
	6300	+ cButton lightButton;
5323	6301
5324	6302	cButton screenfitButton;
5325	6303	cButton screenfitpointButton;
..	..	@@ -5341,12 +6319,12 @@
5341	6319	//JTree jTree;
5342	6320	private MenuItem lookAtItem;
5343	6321	private MenuItem lookFromItem;
5344		- private MenuItem switchItem;
5345		- private MenuItem cutItem;
	6322	+ private MenuItem switchViewItem;
	6323	+ private JMenuItem cutItem;
5346	6324	private MenuItem undoItem;
5347	6325	private MenuItem redoItem;
5348		- private MenuItem duplicateItem;
5349		- private MenuItem cloneItem;
	6326	+ private JMenuItem duplicateItem;
	6327	+ private JMenuItem cloneItem;
5350	6328	private MenuItem cloneSupportItem;
5351	6329	private MenuItem overwriteGeoItem;
5352	6330	private MenuItem overwriteMatItem;
..	..	@@ -5367,13 +6345,13 @@
5367	6345	private MenuItem cloneGeometriesItem;
5368	6346	private MenuItem shareGeometriesItem;
5369	6347	private MenuItem mergeGeometriesItem;
5370		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5371	6349	private MenuItem pasteItem;
5372		- private MenuItem pasteIntoItem;
5373		- private MenuItem pasteLinkItem;
5374		- private MenuItem pasteCloneItem;
5375		- private MenuItem pasteExpandItem;
5376		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5377	6355	private MenuItem clearAllItem;
5378	6356	private MenuItem genUVItem;
5379	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5399,6 +6377,7 @@
5399	6377	private MenuItem clipMeshItem;
5400	6378	private MenuItem smoothMeshItem;
5401	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5402	6381
5403	6382	private MenuItem liveleavesItem;
5404	6383	private MenuItem unliveleavesItem;
..	..	@@ -5422,18 +6401,21 @@
5422	6401	private MenuItem maxTexturesItem;
5423	6402	private MenuItem panoTexturesItem;
5424	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5425	6407	private MenuItem resetCentroidItem;
5426	6408	private MenuItem resetCentroidXZItem;
5427	6409	private MenuItem resetTransformItem;
5428	6410	private MenuItem transformGeometryItem;
5429	6411	private MenuItem transformChildrenItem;
5430	6412	private MenuItem hideItem;
5431		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5432	6414	private MenuItem backItem;
5433	6415	private MenuItem frontItem;
5434	6416	private MenuItem cameraItem;
5435	6417	private MenuItem compositeItem;
5436		- private MenuItem randomItem;
	6418	+ private MenuItem switchItem;
5437	6419	private MenuItem physicsItem;
5438	6420	private MenuItem frameselectorItem;
5439	6421	private MenuItem scriptNodeItem;
..	..	@@ -5441,7 +6423,7 @@
5441	6423	private MenuItem switchTransfoItem;
5442	6424	private MenuItem morphItem;
5443	6425	private MenuItem linkerItem;
5444		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5445	6427	private MenuItem editItem;
5446	6428	private MenuItem openWindowItem;
5447	6429	private MenuItem editLeafItem;
..	..	@@ -5457,6 +6439,8 @@
5457	6439	private MenuItem attachBumpItem;
5458	6440	private MenuItem detachBumpItem;
5459	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5460	6444
5461	6445	private MenuItem particleItem;
5462	6446	private MenuItem ragdollItem;
..	..	@@ -5507,5 +6491,5 @@
5507	6491
5508	6492	Menu cameraMenu;
5509	6493	MenuItem editCameraItem;
5510		- MenuItem revertCameraItem;
	6494	+ MenuItem restoreCameraItem;
5511	6495	}