~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", !Grafreed.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, !Grafreed.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();
	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,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -164,33 +540,38 @@
164	540	// menu.add("-");
165	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166	542	duplicateItem.addActionListener(this);
167		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168	545	cloneItem.addActionListener(this);
169		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
170	547	{
171	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172	549	cloneSupportItem.addActionListener(this);
173	550	}
	551	+ oe.jTree.popup.addSeparator();
174	552	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	554	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	556	copyItem.addActionListener(this);
179	557	pasteItem = menu.add(new MenuItem("Paste"));
180	558	pasteItem.addActionListener(this);
181	559
182		- menu.add("-");
183		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
184	563	pasteIntoItem.addActionListener(this);
185		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186	565	pasteLinkItem.addActionListener(this);
187		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188	567	pasteCloneItem.addActionListener(this);
189		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
190	569	// pasteExpandItem.addActionListener(this);
191		- menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
194	575
195	576	if (Globals.ADVANCED)
196	577	{
..	..	@@ -204,23 +585,23 @@
204	585	//zBufferItem.addActionListener(this);
205	586	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	587	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
209	590
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	603
215		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216		- toggleTextureItem.addItemListener(this);
217		- toggleTextureItem.setState(CameraPane.textureon);
218		-
219		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220		- toggleSwitchItem.addItemListener(this);
221		- toggleSwitchItem.setState(CameraPane.SWITCH);
222		-
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	605	toggleHandleItem.addItemListener(this);
225	606	toggleHandleItem.setState(CameraPane.HANDLES);
226	607
..	..	@@ -275,15 +656,13 @@
275	656	{
276	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
280	660	oe.cameraMenu.add("-");
281	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	662	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	663	lookAtItem.addActionListener(this);
285	664	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	665	+ //switchViewItem.addActionListener(this);
287	666	}
288	667
289	668	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,27 +707,27 @@
328	707	}
329	708
330	709	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
333	712	backItem = menu.add(new MenuItem("Back"));
334	713	backItem.addActionListener(this);
335	714	frontItem = menu.add(new MenuItem("Front"));
336	715	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
339	718
340	719	if (Globals.ADVANCED)
341	720	{
342	721	hideItem = menu.add(new MenuItem("Hidden Group"));
343	722	hideItem.addActionListener(this);
344	723	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	725	ungroupItem.addActionListener(this);
347	726
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
352	731	if (Globals.ADVANCED)
353	732	{
354	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +744,11 @@
365	744	frameselectorItem.addActionListener(this);
366	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	746	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	747	}
371	748
372	749	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
375	752	billboardItem = menu.add(new MenuItem("Billboard"));
376	753	billboardItem.addActionListener(this);
377	754	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,13 +759,14 @@
382	759	shadowYItem.addActionListener(this);
383	760	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
385	765	if (Globals.ADVANCED)
386	766	{
387	767	menu.add("-");
388	768	linkerItem = menu.add(new MenuItem("Linker"));
389	769	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	770	templateItem = menu.add(new MenuItem("Template"));
393	771	templateItem.addActionListener(this);
394	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -417,7 +795,7 @@
417	795	genNormalsMESHItem.addActionListener(this);
418	796	if (Globals.ADVANCED)
419	797	{
420		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421	799	genNormalsMINEItem.addActionListener(this);
422	800	}
423	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -510,10 +888,15 @@
510	888	attachBumpItem.addActionListener(this);
511	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
513	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514	893	detachPigmentItem.addActionListener(this);
515	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
517	900	menu.add("-");
518	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519	902	sortbysizeItem.addActionListener(this);
..	..	@@ -524,6 +907,9 @@
524	907	shareGeometriesItem.addActionListener(this);
525	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
526	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
527	913	if (Globals.ADVANCED)
528	914	{
529	915	// Pretty much the same as duplicate and clone.
..	..	@@ -540,6 +926,74 @@
540	926	buildToolsMenu(menu);
541	927	}
542	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
	996	+
543	997	void SetupUI2(ObjEditor oe)
544	998	{
545	999	// June 2019
..	..	@@ -557,11 +1011,6 @@
557	1011	//new Exception().printStackTrace();
558	1012
559	1013	oe.radioPanel = new JPanel(new GridBagLayout());
560		- oe.aConstraints.weightx = 1;
561		- oe.aConstraints.weighty = 0;
562		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
563		- oe.aConstraints.gridwidth = 100;
564		- oe.aConstraints.gridheight = 1;
565	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
566	1015
567	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -582,53 +1031,122 @@
582	1031	oe.radioPanel.add(dummyButton);
583	1032	oe.buttonGroup.add(dummyButton);
584	1033	*/
	1034	+ cGridBag copyOptionsPanel = new cGridBag();
	1035	+
	1036	+ copyOptionsPanel.preferredHeight = 2;
	1037	+
585	1038	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	1039
587	1040	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	1041	//minButton.setToolTipText("Minimize window");
589	1042	//minButton.addActionListener(this);
590	1043
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	1044	+ if (Globals.ADVANCED)
	1045	+ {
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
	1049	+ }
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
594	1089
595	1090	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	1091	fullButton.setToolTipText("Full-screen window");
597	1092	fullButton.addActionListener(this);
598	1093
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
602		-
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604		- redoButton.setToolTipText("Redo changes");
605		- redoButton.addActionListener(this);
606		-
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- saveButton.setToolTipText("Save changes");
609		- saveButton.addActionListener(this);
610		-
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612		- liveCB.setToolTipText("Enable animation");
613		- liveCB.addItemListener(this);
	1094	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ screenfitButton.setToolTipText("Screen fit");
	1096	+ screenfitButton.addActionListener(this);
614	1097
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1100	+ restoreCameraButton.addActionListener(this);
	1101	+
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
	1105	+
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
	1114	+
	1115	+ cGridBag updown = new cGridBag().setVertical(true);
	1116	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
	1118	+ restoreButton.addActionListener(this);
	1119	+ //restoreButton.setEnabled(false);
	1120	+
	1121	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
	1123	+ replaceButton.addActionListener(this);
	1124	+ //replaceButton.setEnabled(false);
	1125	+
	1126	+ copyOptionsPanel.add(updown);
	1127	+
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	1134	oneStepButton.setToolTipText("Animate one step forward");
617	1135	oneStepButton.addActionListener(this);
618	1136
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
	1141	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	1142	fastCB.setToolTipText("Fast mode");
621	1143	fastCB.addItemListener(this);
622	1144
623		- oe.toolboxPanel.Return();
	1145	+ //oe.toolboxPanel.Return();
624	1146
625		- oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
626		- trackCB.setToolTipText("Enable tracking");
627		- trackCB.addItemListener(this);
628		-
629		- oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- screenfitButton.setToolTipText("Screen fit");
631		- screenfitButton.addActionListener(this);
	1147	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1148	+// trackCB.setToolTipText("Enable tracking");
	1149	+// trackCB.addItemListener(this);
632	1150
633	1151	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	1152	// screenfitpointButton.addActionListener(this);
..	..	@@ -638,35 +1156,17 @@
638	1156	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639	1157	snapobjectButton.addActionListener(this);
640	1158	snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1161	+ fourButton.addActionListener(this);
	1162	+ fourButton.setToolTipText("Show control panel only");
641	1163	}
642	1164
643		- oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- flashSelectionButton.setToolTipText("Highlight selection");
645		- flashSelectionButton.addActionListener(this);
646		-
647	1165	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	1166
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
651		- twoButton.addActionListener(this);
652		- this.fullscreenLayout = twoButton;
653		-
654		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
655		- fourButton.addActionListener(this);
656		- fourButton.setToolTipText("Show left panel only");
657		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- sixButton.setToolTipText("2-column layout left");
659		- sixButton.addActionListener(this);
660		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661		- threeButton.setToolTipText("2-column layout right");
662		- threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
666		- //
667	1167
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	1168	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ rootButton.setToolTipText("Open selection in new tab");
670	1170	rootButton.addActionListener(this);
671	1171
672	1172	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -675,30 +1175,30 @@
675	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
676	1176	//clearButton.addActionListener(this);
677	1177
	1178	+ cGridBag row1 = new cGridBag();
	1179	+
678	1180	// INSERT
679		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680		- gridButton.setToolTipText("Create grid");
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
681	1183	gridButton.addActionListener(this);
682	1184
683		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1186	boxButton.setToolTipText("Create box");
685	1187	boxButton.addActionListener(this);
686	1188
687		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1190	sphereButton.setToolTipText("Create sphere");
689	1191	sphereButton.addActionListener(this);
690	1192
691		- oe.toolboxPanel.Return();
692		-
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1194	coneButton.setToolTipText("Create cone");
695	1195	coneButton.addActionListener(this);
696	1196
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1198	torusButton.setToolTipText("Create torus");
699	1199	torusButton.addActionListener(this);
700	1200
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1202	superButton.setToolTipText("Create superellipsoid");
703	1203	superButton.addActionListener(this);
704	1204
..	..	@@ -709,41 +1209,82 @@
709	1209	kleinButton.addActionListener(this);
710	1210	}
711	1211
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1213	particlesButton.setToolTipText("Create particle system");
714	1214	particlesButton.addActionListener(this);
715	1215
716		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ oe.toolboxPanel.add(row1);
	1217	+
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ groupButton.setToolTipText("Create group");
	1222	+ groupButton.addActionListener(this);
	1223	+
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ compositeButton.setToolTipText("Create composite");
	1226	+ compositeButton.addActionListener(this);
	1227	+
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ switchButton.setToolTipText("Create item switcher");
	1230	+ switchButton.addActionListener(this);
	1231	+
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ loopButton.setToolTipText("Create loop");
	1234	+ loopButton.addActionListener(this);
	1235	+
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ textureButton.setToolTipText("Create texture");
	1238	+ textureButton.addActionListener(this);
	1239	+
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	1241	overlayButton.setToolTipText("Create overlay");
718	1242	overlayButton.addActionListener(this);
719	1243
720		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1245	lightButton.setToolTipText("Create light");
722	1246	lightButton.addActionListener(this);
723	1247
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
	1259	+
724	1260	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	1261	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ editButton.setToolTipText("Pin selection controls");
727	1263	editButton.addActionListener(this);
728	1264
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	1265	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
731	1267	uneditButton.addActionListener(this);
732	1268
733	1269	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	1270	+ allParamsButton.setToolTipText("Show all controls");
735	1271	allParamsButton.addActionListener(this);
736	1272
737		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738		- clearPanelButton.setToolTipText("Clear edit panel");
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
739	1275	clearPanelButton.addActionListener(this);
740	1276
741		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742		- unselectButton.setToolTipText("Unselect");
743		- unselectButton.addActionListener(this);
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
744	1280
	1281	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ flashSelectionButton.setToolTipText("Highlight selection");
	1283	+ flashSelectionButton.addActionListener(this);
	1284	+
745	1285	editCommandsPanel.preferredHeight = 1;
746	1286
	1287	+ SetPinStates(false);
747	1288	// oe.treePanel.add(commandsPanel);
748	1289	// oe.treePanel.Return();
749	1290
..	..	@@ -768,26 +1309,14 @@
768	1309	oe.treePanel.add(jSPPanel);
769	1310	oe.treePanel.Return();
770	1311
771		- cGridBag copyOptionsPanel = new cGridBag();
772		-
773		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
774		- colorCB.setToolTipText("Copy color when dropped");
775		- colorCB.addItemListener(this);
776		-
777		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
778		- materialCB.setToolTipText("Copy material when dropped");
779		- materialCB.addItemListener(this);
780		-
781		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
782		- textureCB.setToolTipText("Copy texture when dropped");
783		- textureCB.addItemListener(this);
784		-
785		- copyOptionsPanel.preferredHeight = 1;
786	1312	oe.treePanel.add(copyOptionsPanel);
787	1313	oe.treePanel.Return();
	1314	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1315	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1316	+ sliderPane.preferredHeight = 1;
788	1317
789		-// mainPanel.setDividerLocation(0.5); //1.0);
790		-// mainPanel.setResizeWeight(0.5);
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
791	1320
792	1321	//jList.addListSelectionListener(this);
793	1322	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -795,7 +1324,7 @@
795	1324	//jTree.setEditable(true);
796	1325	oe.jTree.setDragEnabled(true);
797	1326	//jTree.setPreferredSize(new Dimension(10,10));
798		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
799	1328
800	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
801	1330
..	..	@@ -807,29 +1336,49 @@
807	1336	dgr.addDragGestureListener(this);
808	1337	}catch(Exception e) {}
809	1338	*/
810		- radio.layout = sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
811	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	1341	}
813	1342
814	1343	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	1344	{
	1345	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1346	+ colorCB.setToolTipText("Copy color when dropped");
	1347	+ colorCB.addItemListener(this);
	1348	+
	1349	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1350	+ materialCB.setToolTipText("Copy material when dropped");
	1351	+ materialCB.addItemListener(this);
	1352	+
	1353	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1354	+ textureCB.setToolTipText("Copy texture when dropped");
	1355	+ textureCB.addItemListener(this);
	1356	+
	1357	+ panel.Return();
	1358	+
816	1359	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	1360	boxCB.setToolTipText("Display bounding boxes");
818	1361	boxCB.addItemListener(this);
819	1362
820	1363	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1364	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	1365	zoomBoxCB.addItemListener(this);
823	1366
824	1367	if (true) // Globals.ADVANCED)
825	1368	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	1369	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1370	+// supportCB.setToolTipText("Enable rigging");
	1371	+// supportCB.addItemListener(this);
	1372	+
	1373	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1374	+ freezeCB.setToolTipText("Fast moving camera");
	1375	+ freezeCB.addItemListener(this);
829	1376
830	1377	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	1378	// localCB.addItemListener(this);
832	1379
	1380	+ panel.Return();
	1381	+
833	1382	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	1383	crowdCB.setToolTipText("Used for crowds");
835	1384	crowdCB.addItemListener(this);
..	..	@@ -838,14 +1387,19 @@
838	1387	smoothCB.setToolTipText("Snapping delay");
839	1388	smoothCB.addItemListener(this);
840	1389
841		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
842		- slowCB.setToolTipText("Smooth interpolation");
843		- slowCB.addItemListener(this);
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
844	1396
845	1397	// constraints.gridy += 1;
846	1398	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	1399	// speakerMocapCB.addItemListener(this);
848	1400
	1401	+ panel.Return();
	1402	+
849	1403	if (false)
850	1404	{
851	1405	// handled in scripts
..	..	@@ -860,24 +1414,39 @@
860	1414	//constraints.gridy += 1;
861	1415	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	1416	smoothfocusCB.addItemListener(this);
	1417	+ panel.Return();
863	1418	}
864	1419
865	1420	//constraints.gridx += 1;
866	1421	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	1422	// debugCB.addItemListener(this);
868	1423
	1424	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1425	+ trackCB.setToolTipText("Enable tracking target");
	1426	+ trackCB.addItemListener(this);
	1427	+
869	1428	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	1429	+ oeilCB.setToolTipText("Move camera when tracking");
871	1430	oeilCB.addItemListener(this);
872	1431
873	1432	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	1433	+ shadowCB.setToolTipText("When live compute shadows");
875	1434	shadowCB.addItemListener(this);
876	1435
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	1436	+ panel.Return();
	1437	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1438	+ toggleTextureCB.setToolTipText("Load textures");
	1439	+ toggleTextureCB.addItemListener(this);
	1440	+
	1441	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1442	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1443	+ toggleSwitchCB.addItemListener(this);
	1444	+
	1445	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1446	+ autokeepCB.setToolTipText("On structure change");
	1447	+ autokeepCB.addItemListener(this);
880	1448
	1449	+ panel.Return();
881	1450	if (Globals.ADVANCED)
882	1451	{
883	1452	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,18 +1457,31 @@
888	1457	}
889	1458
890	1459	cGridBag fill = new cGridBag();
891		-
892	1460	fill.preferredHeight = 200;
	1461	+ cGridBag fill2 = new cGridBag();
	1462	+ fill2.preferredHeight = 200;
	1463	+ cGridBag fill3 = new cGridBag();
	1464	+ fill3.preferredHeight = 200;
893	1465
894	1466	panel.add(fill);
	1467	+ panel.add(fill2);
	1468	+ panel.add(fill3);
895	1469
896	1470	}
897	1471
898	1472	void EditObject(Object3D obj)
899	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
900	1482	cRadio radioButton = new cRadio(obj.name);
901	1483
902		- // Patch to avoid bug with transparency.
	1484	+ // June 2019. Patch to avoid bug with transparency.
903	1485	radioButton.hadMaterial = obj.material != null;
904	1486	if (!radioButton.hadMaterial)
905	1487	{
..	..	@@ -907,7 +1489,7 @@
907	1489	}
908	1490
909	1491	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1492	+ radioButton.layout = threeButton; // sixButton;
911	1493	radioButton.SetCamera(cameraView.renderCamera, false);
912	1494	radioButton.addActionListener(this);
913	1495	radioPanel.add(radioButton);
..	..	@@ -932,11 +1514,15 @@
932	1514	cCheckBox localCB;
933	1515	cCheckBox crowdCB;
934	1516	cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
935	1519	cToggleButton fastCB;
936	1520	cCheckBox slowCB;
937	1521	cCheckBox boxCB;
938	1522	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1523	+ cCheckBox freezeCB;
	1524	+ //cToggleButton trackCB;
	1525	+ cCheckBox trackCB;
940	1526	cCheckBox smoothfocusCB;
941	1527	// JCheckBox speakerMocapCB;
942	1528	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1531,7 @@
945	1531
946	1532	cCheckBox oeilCB;
947	1533	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1534	+ cCheckBox autokeepCB;
949	1535	cCheckBox lookAtCB;
950	1536
951	1537	// static int COLOR = 1;
..	..	@@ -1001,6 +1587,12 @@
1001	1587	cameraView.ToggleInertia();
1002	1588	cameraView.repaint();
1003	1589	}
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
	1595	+ }
1004	1596	else if(e.getSource() == localCB)
1005	1597	{
1006	1598	cameraView.ToggleLocal();
..	..	@@ -1053,9 +1645,13 @@
1053	1645	{
1054	1646	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1647	}
1056		- else if(e.getSource() == autosaveCB)
	1648	+ else if(e.getSource() == freezeCB)
1057	1649	{
1058		- Globals.SAVEONMAKE ^= true;
	1650	+ Globals.FREEZEONMOVE ^= true;
	1651	+ }
	1652	+ else if(e.getSource() == autokeepCB)
	1653	+ {
	1654	+ Globals.REPLACEONMAKE ^= true;
1059	1655	}
1060	1656	else if(e.getSource() == lookAtCB)
1061	1657	{
..	..	@@ -1137,8 +1733,6 @@
1137	1733	}
1138	1734	}
1139	1735
1140		- String string = (String) object;
1141		-
1142	1736	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1737	// if( object instanceof java.io.File[])
1144	1738	// {
..	..	@@ -1146,6 +1740,8 @@
1146	1740	// objEditor.DropFile((java.io.File[]) object, true);
1147	1741	// return;
1148	1742	// }
	1743	+
	1744	+ String string = object.toString();
1149	1745
1150	1746	// File path for Mac and Windows
1151	1747	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1787,23 @@
1191	1787
1192	1788	assert target == objEditor.jTree;
1193	1789	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1790	+ Object3D destinationLeaf;
1194	1791	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1792	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1793	} catch (Exception e) {
1197	1794	System.out.println("destinationPath : " + destinationPath);
1198	1795	return;
1199	1796	}
1200	1797
	1798	+ for (int i=group.selection.size(); --i>=0;)
	1799	+ {
	1800	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1801	+
	1802	+ // Cannot move into itself
	1803	+ if (child == destinationLeaf)
	1804	+ return;
	1805	+ }
	1806	+
1201	1807	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1808	// {
1203	1809	loadClipboard(true);
..	..	@@ -1263,7 +1869,12 @@
1263	1869	TreePath path;
1264	1870
1265	1871	public TransferableTreePath(TreePath tp) {
1266		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1267	1878	}
1268	1879
1269	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1312,22 +1923,30 @@
1312	1923	{
1313	1924	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1925	//heightFieldItem.addActionListener(this);
1315		- gridItem = menu.add(new MenuItem("Grid"));
1316		- gridItem.addActionListener(this);
1317		- rectoidItem = menu.add(new MenuItem("Box"));
1318		- rectoidItem.addActionListener(this);
1319		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1320		- ellipsoidItem.addActionListener(this);
1321		- coneItem = menu.add(new MenuItem("Cone"));
1322		- coneItem.addActionListener(this);
1323		- torusItem = menu.add(new MenuItem("Torus"));
1324		- torusItem.addActionListener(this);
1325		- superItem = menu.add(new MenuItem("Superellipsoid"));
1326		- superItem.addActionListener(this);
	1926	+// gridItem = menu.add(new MenuItem("Grid"));
	1927	+// gridItem.addActionListener(this);
	1928	+// rectoidItem = menu.add(new MenuItem("Box"));
	1929	+// rectoidItem.addActionListener(this);
	1930	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1931	+// ellipsoidItem.addActionListener(this);
	1932	+// coneItem = menu.add(new MenuItem("Cone"));
	1933	+// coneItem.addActionListener(this);
	1934	+// torusItem = menu.add(new MenuItem("Torus"));
	1935	+// torusItem.addActionListener(this);
	1936	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1937	+// superItem.addActionListener(this);
	1938	+
	1939	+ cameraItem = menu.add(new MenuItem("Camera"));
	1940	+ cameraItem.addActionListener(this);
	1941	+
	1942	+ if (!Globals.ADVANCED)
	1943	+ {
1327	1944	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1945	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1946	+ }
	1947	+
	1948	+// particleItem = menu.add(new MenuItem("Particle system"));
	1949	+// particleItem.addActionListener(this);
1331	1950	if (Globals.ADVANCED)
1332	1951	{
1333	1952	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1972,15 @@
1353	1972	}
1354	1973	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1974	bezierItem.addActionListener(this);
1356		- overlayItem = menu.add(new MenuItem("Overlay"));
1357		- overlayItem.addActionListener(this);
1358		- lightItem = menu.add(new MenuItem("Light"));
1359		- lightItem.addActionListener(this);
	1975	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1976	+// overlayItem.addActionListener(this);
	1977	+// lightItem = menu.add(new MenuItem("Light"));
	1978	+// lightItem.addActionListener(this);
1360	1979	menu.add("-");
1361	1980	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1981	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1982	+// loopItem = menu.add(new MenuItem("Loop"));
	1983	+// loopItem.addActionListener(this);
1365	1984	doubleItem = menu.add(new MenuItem("Fork"));
1366	1985	doubleItem.addActionListener(this);
1367	1986	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1996,9 @@
1377	1996	animationItem.addItemListener(this);
1378	1997	animationItem.setState(Globals.ANIMATION);
1379	1998
	1999	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2000	+ archiveItem.addActionListener(this);
	2001	+
1380	2002	menu.add("-");
1381	2003	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	2004	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +2011,8 @@
1389	2011	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	2012	reduce34MorphItem.addActionListener(this);
1391	2013	menu.add("-");
	2014	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2015	+ memoryItem.addActionListener(this);
1392	2016	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	2017	computeAOItem.addActionListener(this);
1394	2018
..	..	@@ -1397,8 +2021,6 @@
1397	2021	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	2022	mirrorItem.addActionListener(this);
1399	2023	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	2024	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	2025	analyzeItem.addActionListener(this);
1404	2026	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +2168,30 @@
1546	2168
1547	2169	makeSomething(shadow);
1548	2170	}
	2171	+
	2172	+ private void ClearUnpinned()
	2173	+ {
	2174	+ //for (Object3D obj : listUI)
	2175	+ for (int i=listUI.size(); --i>=0;)
	2176	+ {
	2177	+ Object3D obj = listUI.elementAt(i);
	2178	+ if (!obj.pinned)
	2179	+ {
	2180	+ obj.CloseUI();
	2181	+ listUI.remove(i);
	2182	+ }
	2183	+ }
	2184	+ }
	2185	+
	2186	+ private void EditElement(Object3D elem, boolean newWindow)
	2187	+ {
	2188	+ // if (!(elem instanceof Composite))
	2189	+ // newWindow = false;
	2190	+ listUI.add(elem);
	2191	+ elem.openEditWindow(this, newWindow); //, false);
	2192	+ System.out.println("edit : " + elem);
	2193	+ elem.editWindow.refreshContents(true); // ? new
	2194	+ }
1549	2195
1550	2196	/**
1551	2197	* applyExample
..	..	@@ -1790,7 +2436,7 @@
1790	2436	{
1791	2437	ScreenFit();
1792	2438	} else
1793		- if (source == switchItem)
	2439	+ if (source == switchViewItem)
1794	2440	{
1795	2441	cVector v1 = new cVector();
1796	2442	cVector v2 = new cVector();
..	..	@@ -1974,6 +2620,23 @@
1974	2620	{
1975	2621	makeSomething(new Light());
1976	2622	} else
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
1977	2640	if (source == csgItem)
1978	2641	{
1979	2642	group(new CSG());
..	..	@@ -2020,30 +2683,38 @@
2020	2683
2021	2684	group(g);
2022	2685	} else
2023		- if (source == loopItem)
	2686	+ if (source == loopItem \|\| source == loopButton)
2024	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
2025	2690	Composite csg = new GroupLeaf();
2026	2691	csg.count = 5;
2027		- group(csg);
2028		- Composite child = new cGroup();
	2692	+ Composite child = new cGroup("Branch");
2029	2693	csg.addChild(child);
2030	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
2031	2697	} else
2032	2698	if (source == doubleItem)
2033	2699	{
2034		- Composite csg = new GroupLeaf();
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
	2702	+ Composite csg = new GroupLeaf("Fork");
2035	2703	csg.count = 5;
	2704	+ Composite child = new cGroup("Branch A");
	2705	+ csg.addChild(child);
	2706	+ child.addChild(csg);
	2707	+ child = new cGroup("Branch B");
	2708	+ csg.addChild(child);
	2709	+ child.addChild(csg);
2036	2710	group(csg);
2037		- Composite child = new cGroup();
2038		- csg.addChild(child);
2039		- child.addChild(csg);
2040		- child = new cGroup();
2041		- csg.addChild(child);
2042		- child.addChild(csg);
	2711	+ }
2043	2712	} else
2044	2713	if (source == tripleItem)
2045	2714	{
2046		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Trident");
2047	2718	csg.count = 4;
2048	2719	group(csg);
2049	2720	Composite child = new cGroup();
..	..	@@ -2055,11 +2726,12 @@
2055	2726	child = new cGroup();
2056	2727	csg.addChild(child);
2057	2728	child.addChild(csg);
	2729	+ }
2058	2730	} else
2059	2731	if (source == computeAOItem)
2060	2732	{
2061	2733	Globals.drawMode = CameraPane.OCCLUSION;
2062		- Globals.theRenderer.repaint();
	2734	+ cameraView.repaint();
2063	2735	} else
2064	2736	if (source == recompileItem)
2065	2737	{
..	..	@@ -2074,7 +2746,7 @@
2074	2746	if (source == invariantsItem)
2075	2747	{
2076	2748	System.out.println("Invariants:");
2077		- Grafreed.grafreeD.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
2078	2750	} else
2079	2751	if (source == memoryItem)
2080	2752	{
..	..	@@ -2105,17 +2777,52 @@
2105	2777	{
2106	2778	ToggleFullScreen();
2107	2779	} else
2108		- if (source == undoButton)
	2780	+ if (source == collapseButton)
2109	2781	{
2110		- Undo();
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
2111	2784	} else
2112		- if (source == redoButton)
	2785	+ if (source == maximize3DButton)
2113	2786	{
2114		- Redo();
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
2115	2791	} else
2116		- if (source == saveButton)
	2792	+ if (source == previousVersionButton)
2117	2793	{
2118		- Save();
	2794	+ // Go to previous version
	2795	+ //if (!Undo())
	2796	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2797	+ PreviousVersion();
	2798	+ } else
	2799	+ if (source == restoreButton)
	2800	+ {
	2801	+ // Restore current version
	2802	+ Restore();
	2803	+ //restoreButton.setEnabled(false);
	2804	+ } else
	2805	+ if (source == replaceButton)
	2806	+ {
	2807	+ // Overwrite current version
	2808	+ Replace();
	2809	+ //replaceButton.setEnabled(false);
	2810	+ } else
	2811	+ if (source == nextVersionButton)
	2812	+ {
	2813	+ // Go to next version
	2814	+ NextVersion();
	2815	+ } else
	2816	+ if (source == saveVersionButton)
	2817	+ {
	2818	+ // Save a new version
	2819	+ if (!Save(true))
	2820	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
2119	2826	} else
2120	2827	if (source == oneStepButton)
2121	2828	{
..	..	@@ -2124,17 +2831,14 @@
2124	2831	} else
2125	2832	if (source == screenfitButton)
2126	2833	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2834	ScreenFit();
2129	2835	} else
2130	2836	if (source == screenfitpointButton)
2131	2837	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2838	ScreenFitPoint();
2134	2839	} else
2135	2840	if (source == snapobjectButton)
2136	2841	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2842	SnapObject();
2139	2843	} else
2140	2844	// if (event.getSource() == recompileButton)
..	..	@@ -2173,11 +2877,11 @@
2173	2877	} else
2174	2878	if (source == undoItem)
2175	2879	{
2176		- Undo();
	2880	+ PreviousVersion();
2177	2881	} else
2178	2882	if (source == redoItem)
2179	2883	{
2180		- Redo();
	2884	+ NextVersion();
2181	2885	} else
2182	2886	if (source == duplicateItem)
2183	2887	{
..	..	@@ -2498,7 +3202,7 @@
2498	3202	{
2499	3203	StepAll();
2500	3204	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3205	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	3206	{
2503	3207	//int indices[] = jList.getSelectedIndices();
2504	3208	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +3214,9 @@
2510	3214	{
2511	3215	ClearSelection(true);
2512	3216	} else
2513		- if (source == grabItem)
	3217	+ if (source == grabItem \|\| source == groupButton)
2514	3218	{
2515		- group(new cGroup(), true);
	3219	+ group(new cGroup(), false); // true);
2516	3220	} else
2517	3221	if (source == hideItem)
2518	3222	{
..	..	@@ -2530,11 +3234,11 @@
2530	3234	{
2531	3235	makeSomething(new Camera());
2532	3236	} else
2533		- if (source == compositeItem)
	3237	+ if (source == compositeItem \|\| source == compositeButton)
2534	3238	{
2535	3239	group(new Composite());
2536	3240	} else
2537		- if (source == randomItem)
	3241	+ if (source == switchItem \|\| source == switchButton)
2538	3242	{
2539	3243	RandomNode random = new RandomNode();
2540	3244	group(random);
..	..	@@ -2636,7 +3340,7 @@
2636	3340	{
2637	3341	group(new cLinker());
2638	3342	} else
2639		- if (source == textureItem)
	3343	+ if (source == textureItem \|\| source == textureButton)
2640	3344	{
2641	3345	group(new TextureNode());
2642	3346	} else
..	..	@@ -2658,15 +3362,40 @@
2658	3362	} else
2659	3363	if (source == ungroupItem \|\| source == ungroupButton)
2660	3364	{
2661		- //ungroup();
	3365	+ boolean canUngroup = true;
	3366	+
2662	3367	for (int i=0; i<group.selection.size(); i++)
2663	3368	{
2664		- Ungroup(group.selection.get(i));
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
	3372	+ {
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
	3382	+ break;
	3383	+ }
2665	3384	}
2666	3385
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	3386	+ if (canUngroup)
	3387	+ {
	3388	+ for (int i=0; i<group.selection.size(); i++)
	3389	+ {
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
	3393	+ }
	3394	+
	3395	+ ClearSelection(false);
	3396	+
	3397	+ refreshContents();
	3398	+ }
2670	3399	} else
2671	3400	if (source == genUVItem)
2672	3401	{
..	..	@@ -2967,7 +3696,7 @@
2967	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3697	{
2969	3698	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
2971	3700	}
2972	3701
2973	3702	refreshContents();
..	..	@@ -2981,6 +3710,31 @@
2981	3710	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3711	}
2983	3712
	3713	+ refreshContents();
	3714	+ } else
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
2984	3738	refreshContents();
2985	3739	} else
2986	3740	if (source == flashSelectionButton)
..	..	@@ -2998,38 +3752,7 @@
2998	3752	if (CameraPane.FULLSCREEN)
2999	3753	fullscreenLayout = radio.layout;
3000	3754
3001		- // bug
3002		- //gridPanel.setDividerLocation(1.0);
3003		- //bigPanel.setDividerLocation(0.0);
3004		-// bigThree.remove(scenePanel);
3005		-// bigThree.remove(centralPanel);
3006		-// bigThree.remove(XYZPanel);
3007		-// aWindowConstraints.gridx = 0;
3008		-// aWindowConstraints.gridy = 0;
3009		-// aWindowConstraints.gridwidth = 1;
3010		-// // aConstraints.gridheight = 3;
3011		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3012		-// aWindowConstraints.weightx = 0;
3013		-// aWindowConstraints.weighty = 1;
3014		-// //bigThree.add(jtp, aWindowConstraints);
3015		-// aWindowConstraints.weightx = 1;
3016		-// aWindowConstraints.gridwidth = 3;
3017		-// // aConstraints.gridheight = 3;
3018		-// aWindowConstraints.gridx = 1;
3019		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3020		-// bigThree.add(centralPanel, aWindowConstraints);
3021		-// aWindowConstraints.weightx = 0;
3022		-// aWindowConstraints.gridx = 4;
3023		-// aWindowConstraints.gridwidth = 1;
3024		-// // aConstraints.gridheight = 3;
3025		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3026		-// //bigThree.add(XYZPanel, aWindowConstraints);
3027		-// scenePanel.setVisible(false);
3028		-// centralPanel.setVisible(true);
3029		-// XYZPanel.setVisible(false);
3030		- bigThree.ClearUI();
3031		- bigThree.add(centralPanel);
3032		- bigThree.FlushUI();
	3755	+ Show3DView();
3033	3756
3034	3757	cameraView.requestFocusInWindow();
3035	3758
..	..	@@ -3084,8 +3807,8 @@
3084	3807	// centralPanel.setVisible(true);
3085	3808	// XYZPanel.setVisible(true);
3086	3809	bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
3087	3811	bigThree.add(centralPanel);
3088		- bigThree.add(XYZPanel);
3089	3812	bigThree.FlushUI();
3090	3813
3091	3814	cameraView.requestFocusInWindow();
..	..	@@ -3165,8 +3888,8 @@
3165	3888	// centralPanel.setVisible(true);
3166	3889	// XYZPanel.setVisible(false);
3167	3890	bigThree.ClearUI();
3168		- bigThree.add(scenePanel);
3169	3891	bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
3170	3893	bigThree.FlushUI();
3171	3894
3172	3895	cameraView.requestFocusInWindow();
..	..	@@ -3215,6 +3938,7 @@
3215	3938	} else
3216	3939	if (source == rootButton)
3217	3940	{
	3941	+ Replace();
3218	3942	Object3D obj;
3219	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3220	3944	{
..	..	@@ -3258,6 +3982,12 @@
3258	3982	} else
3259	3983	if (source == editItem \|\| source == editButton)
3260	3984	{
	3985	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3986	+ {
	3987	+ Object3D child = (Object3D)e.nextElement();
	3988	+ child.pinned = true;
	3989	+ }
	3990	+
3261	3991	EditSelection(false);
3262	3992	} else
3263	3993	if (source == uneditButton)
..	..	@@ -3266,9 +3996,10 @@
3266	3996	{
3267	3997	Object3D child = (Object3D)e.nextElement();
3268	3998	if(child.editWindow != null)
3269		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3999	+ child.pinned = false;
3270	4000	child.CloseUI();
3271	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3272	4003
3273	4004	//child.editWindow = null; // ???????????
3274	4005	}
..	..	@@ -3283,16 +4014,18 @@
3283	4014	//copy.ClearUI();
3284	4015	for (Object3D obj : listUI)
3285	4016	{
	4017	+ obj.pinned = false;
3286	4018	obj.CloseUI();
3287	4019	}
3288	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
3289	4022	refreshContents(true);
3290	4023	} else
3291	4024	if (source == allParamsButton)
3292	4025	{
3293	4026	assert(copy == group);
3294	4027
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4028	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	4029
3297	4030	for (Object3D obj : listUI)
3298	4031	{
..	..	@@ -3341,6 +4074,7 @@
3341	4074	}
3342	4075
3343	4076	copy = group;
	4077	+
3344	4078	//Globals.theRenderer.object = group;
3345	4079	if(!useclient)
3346	4080	{
..	..	@@ -3367,6 +4101,26 @@
3367	4101	currentLayout = sevenButton;
3368	4102	*/
3369	4103	radio.layout.doClick();
	4104	+
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
	4117	+ ClearUnpinned();
	4118	+
	4119	+ //Grafreed.Assert(group != null);
	4120	+ //Grafreed.Assert(group.selection != null);
	4121	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4122	+ if (group.selection == null \|\| group.selection.size() == 1)
	4123	+ EditSelection(false);
3370	4124	keepparent = group.parent;
3371	4125	// PARENT = NULL or not???
3372	4126	//group.parent = null; // ROOT
..	..	@@ -3378,11 +4132,13 @@
3378	4132	} else if (event.getSource() == editCameraItem)
3379	4133	{
3380	4134	cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
3381	4136	cameraView.repaint();
3382	4137	return;
3383		- } else if (event.getSource() == revertCameraItem)
	4138	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	4139	{
3385	4140	cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
3386	4142	cameraView.repaint();
3387	4143	return;
3388	4144	// } else if (event.getSource() == textureButton)
..	..	@@ -3959,7 +4715,7 @@
3959	4715
3960	4716	try
3961	4717	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4719	}
3964	4720	catch (Exception e)
3965	4721	{
..	..	@@ -4434,12 +5190,14 @@
4434	5190	// }
4435	5191	// }
4436	5192
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	5193	void EditSelection(boolean newWindow)
4442	5194	{
	5195	+ if (group.selection == null)
	5196	+ {
	5197	+ EditElement(group, newWindow); // ? new
	5198	+ return;
	5199	+ }
	5200	+
4443	5201	// aConstraints.gridy = 0;
4444	5202	for (int i=0; i<group.selection.size(); i++)
4445	5203	{
..	..	@@ -4450,12 +5208,7 @@
4450	5208	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	5209	if(elem != group \|\| !newWindow)
4452	5210	{
4453		- // if (!(elem instanceof Composite))
4454		- // newWindow = false;
4455		- listUI.add(elem);
4456		- elem.openEditWindow(this, newWindow); //, false);
4457		- System.out.println("edit : " + elem);
4458		- elem.editWindow.refreshContents(true); // ? new
	5211	+ EditElement(elem, newWindow); // ? new
4459	5212	}
4460	5213	}
4461	5214	}
..	..	@@ -4518,9 +5271,7 @@
4518	5271
4519	5272	freezemodel = false;
4520	5273	}
4521		-
4522		- boolean flashIt = true;
4523		-
	5274	+
4524	5275	public void valueChanged(TreeSelectionEvent e)
4525	5276	//public boolean handleEvent(Event event)
4526	5277	{
..	..	@@ -4530,7 +5281,8 @@
4530	5281	//new Exception().printStackTrace();
4531	5282
4532	5283	freezemodel = true;
4533		-
	5284	+ ClearUnpinned();
	5285	+
4534	5286	/**/
4535	5287	//switch (event.id)
4536	5288	{
..	..	@@ -4563,7 +5315,7 @@
4563	5315	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	5316	// a camera
4565	5317	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5318	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	5319	{
4568	5320	CameraPane.camerachangeframe = 0; // don't refuse it
4569	5321	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +5324,13 @@
4572	5324	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	5325	}
4574	5326
	5327	+ if (tps != null && tps.length == 1)
	5328	+ {
	5329	+ EditSelection(false);
	5330	+ }
	5331	+
	5332	+ SetPinStates(tps != null && tps.length > 0);
	5333	+
4575	5334	refreshContents();
4576	5335	//return true;
4577	5336	}
..	..	@@ -4581,9 +5340,34 @@
4581	5340	freezemodel = false;
4582	5341	}
4583	5342
	5343	+ void SetPinStates(boolean enabled)
	5344	+ {
	5345	+ editButton.setEnabled(enabled);
	5346	+ uneditButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
	5348	+ flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
	5365	+ }
	5366	+
4584	5367	void refreshContents(boolean cp)
4585	5368	{
4586		- if (!Globals.MOUSEDRAGGED)
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	5371	{
4588	5372	objEditor.ClearInfo(); // .GetMaterial());
4589	5373
..	..	@@ -4592,7 +5376,7 @@
4592	5376	Object3D child = (Object3D) group.selection.get(i);
4593	5377
4594	5378	objEditor.AddInfo(child, this, true);
4595		- System.err.println("info : " + child.GetPath());
	5379	+// System.err.println("info : " + child.GetPath());
4596	5380	}
4597	5381
4598	5382	objEditor.SetText(); // jan 2014
..	..	@@ -4682,8 +5466,8 @@
4682	5466
4683	5467	if (cut)
4684	5468	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	5469	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5470	+// Save();
4687	5471	//int indices[] = jList.getSelectedIndices();
4688	5472	//for (int i = indices.length - 1; i >= 0; i--)
4689	5473	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5570,10 @@
4786	5570
4787	5571	void paste(boolean expand)
4788	5572	{
	5573	+ if (Globals.REPLACEONMAKE)
	5574	+ Save();
	5575	+ boolean keep = Globals.REPLACEONMAKE;
	5576	+ Globals.REPLACEONMAKE = false;
4789	5577	// if (GrafreeD.clipboard == null)
4790	5578	// return;
4791	5579	boolean first = true;
..	..	@@ -4845,6 +5633,7 @@
4845	5633	Grafreed.clipboard.get(0).parent = keepparent;
4846	5634	}
4847	5635
	5636	+ Globals.REPLACEONMAKE = keep;
4848	5637	ResetModel();
4849	5638	refreshContents();
4850	5639	}
..	..	@@ -4980,6 +5769,10 @@
4980	5769
4981	5770	void group(Object3D csg, boolean grab)
4982	5771	{
	5772	+ if (Globals.REPLACEONMAKE)
	5773	+ Save();
	5774	+ boolean keep = Globals.REPLACEONMAKE;
	5775	+ Globals.REPLACEONMAKE = false;
4983	5776	if (//false) // why??
4984	5777	!group.selection.isEmpty())
4985	5778	{
..	..	@@ -5093,10 +5886,15 @@
5093	5886	//node.add(csg);
5094	5887	//makeSomething(node);
5095	5888	makeSomething(csg);
	5889	+ Globals.REPLACEONMAKE = keep;
5096	5890	}
5097	5891
5098	5892	void Ungroup(Object3D g)
5099	5893	{
	5894	+ if (Globals.REPLACEONMAKE)
	5895	+ Save();
	5896	+ boolean keep = Globals.REPLACEONMAKE;
	5897	+ Globals.REPLACEONMAKE = false;
5100	5898	if (g instanceof HiddenObject)
5101	5899	{
5102	5900	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5911,7 @@
5113	5911	objEditor.makeSomething(g.get(i), false);
5114	5912	}
5115	5913	}
	5914	+ Globals.REPLACEONMAKE = keep;
5116	5915	}
5117	5916
5118	5917	void ungroup()
..	..	@@ -5401,17 +6200,32 @@
5401	6200	cButton clearpanelButton;
5402	6201	cButton unselectButton;
5403	6202
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
5409		- cButton saveButton;
	6203	+ cButton restoreCameraButton;
	6204	+
5410	6205	cButton oneStepButton;
5411	6206
5412	6207	cButton groupButton;
5413	6208	cButton ungroupButton;
5414	6209	cButton compositeButton;
	6210	+ cButton switchButton;
	6211	+ cButton loopButton;
	6212	+ cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
5415	6229
5416	6230	cButton gridButton;
5417	6231	cButton boxButton;
..	..	@@ -5444,12 +6258,12 @@
5444	6258	//JTree jTree;
5445	6259	private MenuItem lookAtItem;
5446	6260	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
5448		- private MenuItem cutItem;
	6261	+ private MenuItem switchViewItem;
	6262	+ private JMenuItem cutItem;
5449	6263	private MenuItem undoItem;
5450	6264	private MenuItem redoItem;
5451	6265	private JMenuItem duplicateItem;
5452		- private MenuItem cloneItem;
	6266	+ private JMenuItem cloneItem;
5453	6267	private MenuItem cloneSupportItem;
5454	6268	private MenuItem overwriteGeoItem;
5455	6269	private MenuItem overwriteMatItem;
..	..	@@ -5470,13 +6284,13 @@
5470	6284	private MenuItem cloneGeometriesItem;
5471	6285	private MenuItem shareGeometriesItem;
5472	6286	private MenuItem mergeGeometriesItem;
5473		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
5474	6288	private MenuItem pasteItem;
5475		- private MenuItem pasteIntoItem;
5476		- private MenuItem pasteLinkItem;
5477		- private MenuItem pasteCloneItem;
5478		- private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
5480	6294	private MenuItem clearAllItem;
5481	6295	private MenuItem genUVItem;
5482	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +6350,7 @@
5536	6350	private MenuItem frontItem;
5537	6351	private MenuItem cameraItem;
5538	6352	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	6353	+ private MenuItem switchItem;
5540	6354	private MenuItem physicsItem;
5541	6355	private MenuItem frameselectorItem;
5542	6356	private MenuItem scriptNodeItem;
..	..	@@ -5544,7 +6358,7 @@
5544	6358	private MenuItem switchTransfoItem;
5545	6359	private MenuItem morphItem;
5546	6360	private MenuItem linkerItem;
5547		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
5548	6362	private MenuItem editItem;
5549	6363	private MenuItem openWindowItem;
5550	6364	private MenuItem editLeafItem;
..	..	@@ -5560,6 +6374,8 @@
5560	6374	private MenuItem attachBumpItem;
5561	6375	private MenuItem detachBumpItem;
5562	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
5563	6379
5564	6380	private MenuItem particleItem;
5565	6381	private MenuItem ragdollItem;
..	..	@@ -5610,5 +6426,5 @@
5610	6426
5611	6427	Menu cameraMenu;
5612	6428	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	6429	+ MenuItem restoreCameraItem;
5614	6430	}