~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,36 +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		- menu.add("-");
180	561
181		- menu.add("-");
182		- 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"));
183	565	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	567	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	569	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	571	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
193	574
194	575	if (Globals.ADVANCED)
195	576	{
..	..	@@ -203,23 +584,23 @@
203	584	//zBufferItem.addActionListener(this);
204	585	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	586	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
208	589
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- 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);
213	602
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	604	toggleHandleItem.addItemListener(this);
224	605	toggleHandleItem.setState(CameraPane.HANDLES);
225	606
..	..	@@ -246,7 +627,7 @@
246	627
247	628	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	629	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
250	631
251	632	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	633	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,15 +655,13 @@
274	655	{
275	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	659	oe.cameraMenu.add("-");
280	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	661	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	662	lookAtItem.addActionListener(this);
284	663	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	664	+ //switchViewItem.addActionListener(this);
286	665	}
287	666
288	667	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,22 +705,37 @@
326	705	setMasterItem.addActionListener(this);
327	706	}
328	707
329		- oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
332	710	backItem = menu.add(new MenuItem("Back"));
333	711	backItem.addActionListener(this);
334	712	frontItem = menu.add(new MenuItem("Front"));
335	713	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- 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	+ {
338	722	hideItem = menu.add(new MenuItem("Hidden Group"));
339	723	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	726	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- 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	+ {
345	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	740	switchGeoItem.addActionListener(this);
347	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +743,6 @@
349	743	morphItem = menu.add(new MenuItem("Morph Group"));
350	744	morphItem.addActionListener(this);
351	745
352		- if (Globals.ADVANCED)
353		- {
354	746	menu.add("-");
355	747	physicsItem = menu.add(new MenuItem("Physics"));
356	748	physicsItem.addActionListener(this);
..	..	@@ -358,30 +750,29 @@
358	750	frameselectorItem.addActionListener(this);
359	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	752	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	753	}
364	754
365	755	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
368	758	billboardItem = menu.add(new MenuItem("Billboard"));
369	759	billboardItem.addActionListener(this);
370	760	csgItem = menu.add(new MenuItem("CSG"));
371	761	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	763	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	765	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
378	771	if (Globals.ADVANCED)
379	772	{
380	773	menu.add("-");
381	774	linkerItem = menu.add(new MenuItem("Linker"));
382	775	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	776	templateItem = menu.add(new MenuItem("Template"));
386	777	templateItem.addActionListener(this);
387	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +801,7 @@
410	801	genNormalsMESHItem.addActionListener(this);
411	802	if (Globals.ADVANCED)
412	803	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	805	genNormalsMINEItem.addActionListener(this);
415	806	}
416	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -444,6 +835,8 @@
444	835	}
445	836
446	837	oe.menuBar.add(menu = new Menu("Attributes"));
	838	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	839	+ clearVersionsItem.addActionListener(this);
447	840	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
448	841	clearMaterialsItem.addActionListener(this);
449	842	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -466,9 +859,9 @@
466	859	hideleavesItem.addActionListener(this);
467	860	showleavesItem = menu.add(new MenuItem("Show Leaves"));
468	861	showleavesItem.addActionListener(this);
469		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	862	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470	863	markleavesItem.addActionListener(this);
471		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	864	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472	865	unmarkleavesItem.addActionListener(this);
473	866	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474	867	rewindleavesItem.addActionListener(this);
..	..	@@ -503,10 +896,15 @@
503	896	attachBumpItem.addActionListener(this);
504	897	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	898	pigmentBumpItem.addActionListener(this);
	899	+ //embedTexturesItem
506	900	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	901	detachPigmentItem.addActionListener(this);
508	902	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	903	detachBumpItem.addActionListener(this);
	904	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	905	+ embedTexturesItem.addActionListener(this);
	906	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	907	+ deEmbedTexturesItem.addActionListener(this);
510	908	menu.add("-");
511	909	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	910	sortbysizeItem.addActionListener(this);
..	..	@@ -517,6 +915,9 @@
517	915	shareGeometriesItem.addActionListener(this);
518	916	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519	917	mergeGeometriesItem.addActionListener(this);
	918	+ menu.add("-");
	919	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	920	+ editLeafItem.addActionListener(this);
520	921	if (Globals.ADVANCED)
521	922	{
522	923	// Pretty much the same as duplicate and clone.
..	..	@@ -533,16 +934,97 @@
533	934	buildToolsMenu(menu);
534	935	}
535	936
	937	+ JTabbedPane resourcecontainer;
	938	+ cGridBag currenttab;
	939	+ //boolean added; // patch for jar
	940	+
	941	+ int totalcount = 0;
	942	+
	943	+ int tabcount = 0;
	944	+ int colcount = 0;
	945	+ int rowcount = 0;
	946	+ int texturecount = 0;
	947	+
	948	+ int columns = 5;
	949	+ int rows = 7;
	950	+
	951	+ public void ResourceCallBack(String[] path)
	952	+ {
	953	+// for (int i = 0; i < path.length; i++)
	954	+// System.out.print(path[i] + "/");
	955	+// System.out.println();
	956	+
	957	+ if (//rowcount == 0 \|\|
	958	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	959	+ {
	960	+ currenttab = new cGridBag();
	961	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	962	+ currenttab.setName(tabname);
	963	+ //added = false;
	964	+ resourcecontainer.add(currenttab);
	965	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	966	+ rowcount = 1;
	967	+ colcount = 0;
	968	+ texturecount = 0;
	969	+ }
	970	+
	971	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	972	+ {
	973	+ //if (!added)
	974	+ {
	975	+ //added = true;
	976	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	977	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	978	+ }
	979	+
	980	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	981	+ totalcount++;
	982	+
	983	+ if (++colcount >= columns)
	984	+ {
	985	+ colcount = 0;
	986	+ currenttab.Return();
	987	+
	988	+ if (rowcount++ >= rows)
	989	+ {
	990	+ rowcount = 0;
	991	+ }
	992	+ }
	993	+ }
	994	+ else
	995	+ {
	996	+// if (!path[path.length-1].equals("icons"))
	997	+// resourcecontainer.Return();
	998	+ }
	999	+ }
	1000	+
	1001	+ void CreateTexturePanel(cGridBag container)
	1002	+ {
	1003	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1004	+ container.add(resourcecontainer);
	1005	+
	1006	+ Grafreed.ParseResources("textures", this);
	1007	+
	1008	+ // 935. System.out.println("Total = " + totalcount);
	1009	+ }
	1010	+
536	1011	void SetupUI2(ObjEditor oe)
537	1012	{
	1013	+ // June 2019
	1014	+ if (oe == null)
	1015	+ {
	1016	+ //super.SetupUI2(this);
	1017	+ //return;
	1018	+ }
	1019	+
	1020	+ if (copy != group)
	1021	+ {
	1022	+ //super.SetupUI2(this);
	1023	+ }
	1024	+
538	1025	//new Exception().printStackTrace();
539	1026
540	1027	oe.radioPanel = new JPanel(new GridBagLayout());
541		- oe.aConstraints.weightx = 1;
542		- oe.aConstraints.weighty = 0;
543		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
544		- oe.aConstraints.gridwidth = 100;
545		- oe.aConstraints.gridheight = 1;
546	1028	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
547	1029
548	1030	oe.buttonGroup = new ButtonGroup();
..	..	@@ -563,109 +1045,268 @@
563	1045	oe.radioPanel.add(dummyButton);
564	1046	oe.buttonGroup.add(dummyButton);
565	1047	*/
	1048	+ cGridBag versionManagerPanel = new cGridBag();
	1049	+
	1050	+ versionManagerPanel.preferredHeight = 4;
	1051	+
566	1052	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	1053
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	1054	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ //minButton.setToolTipText("Minimize window");
	1056	+ //minButton.addActionListener(this);
571	1057
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.addActionListener(this);
	1058	+ if (Globals.ADVANCED)
	1059	+ {
	1060	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// maxButton.setToolTipText("Maximize window");
	1062	+// maxButton.addActionListener(this);
	1063	+ }
575	1064
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
578		- saveButton.addActionListener(this);
	1065	+ cButton gcButton;
579	1066
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
581		- liveCB.setToolTipText("Enable animation");
582		- liveCB.addItemListener(this);
	1067	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// gcButton.setToolTipText("Garbage collect");
	1069	+// gcButton.addActionListener(new ActionListener()
	1070	+// {
	1071	+// public void actionPerformed(ActionEvent e)
	1072	+// {
	1073	+// System.gc();
	1074	+// }
	1075	+// });
	1076	+
	1077	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ collapseButton.setToolTipText("Collapse toolbar");
	1079	+ collapseButton.addActionListener(this);
	1080	+
	1081	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1083	+ maximize3DButton.addActionListener(this);
	1084	+
	1085	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ twoButton.setToolTipText("Show 3D view only");
	1087	+ twoButton.addActionListener(this);
	1088	+ this.fullscreenLayout = twoButton;
	1089	+
	1090	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ threeButton.setToolTipText("Show controls and 3D view");
	1092	+ threeButton.addActionListener(this);
	1093	+ if (Globals.ADVANCED)
	1094	+ {
	1095	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ sixButton.setToolTipText("Show 3D view and controls");
	1097	+ sixButton.addActionListener(this);
	1098	+ }
	1099	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+// sevenButton.setToolTipText("3-column layout");
	1101	+// sevenButton.addActionListener(this);
	1102	+ //
	1103	+
	1104	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ fullButton.setToolTipText("Full-screen window");
	1106	+ fullButton.addActionListener(this);
	1107	+
	1108	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ screenfitButton.setToolTipText("Screen fit");
	1110	+ screenfitButton.addActionListener(this);
583	1111
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1114	+ restoreCameraButton.addActionListener(this);
	1115	+
	1116	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ saveVersionButton.setToolTipText("Duplicate current version");
	1118	+ saveVersionButton.addActionListener(this);
	1119	+
	1120	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ deleteVersionButton.setToolTipText("Delete current version");
	1122	+ deleteVersionButton.addActionListener(this);
	1123	+ deleteVersionButton.setEnabled(false);
	1124	+
	1125	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ previousVersionButton.setToolTipText("Previous version");
	1127	+ previousVersionButton.addActionListener(this);
	1128	+ previousVersionButton.setEnabled(false);
	1129	+
	1130	+ cGridBag updown = new cGridBag().setVertical(true);
	1131	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ restoreButton.setToolTipText("Undo (restore current version)");
	1133	+ restoreButton.addActionListener(this);
	1134	+ restoreButton.setEnabled(false);
	1135	+
	1136	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ replaceButton.setToolTipText("Save (replace current version)");
	1138	+ replaceButton.addActionListener(this);
	1139	+ replaceButton.setEnabled(false);
	1140	+
	1141	+ versionManagerPanel.add(updown);
	1142	+
	1143	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ nextVersionButton.setToolTipText("Next version");
	1145	+ nextVersionButton.addActionListener(this);
	1146	+ nextVersionButton.setEnabled(false);
	1147	+
	1148	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
585	1149	oneStepButton.setToolTipText("Animate one step forward");
586	1150	oneStepButton.addActionListener(this);
587	1151
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1152	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1153	+ liveCB.setToolTipText("Enable animation");
	1154	+ liveCB.addItemListener(this);
	1155	+
	1156	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	1157	fastCB.setToolTipText("Fast mode");
590	1158	fastCB.addItemListener(this);
591	1159
592		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
593		- trackCB.setToolTipText("Enable tracking");
594		- trackCB.addItemListener(this);
595		-
596		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- screenfitButton.setToolTipText("Screen fit");
598		- screenfitButton.addActionListener(this);
	1160	+ //oe.toolboxPanel.Return();
	1161	+
	1162	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1163	+// trackCB.setToolTipText("Enable tracking");
	1164	+// trackCB.addItemListener(this);
599	1165
600	1166	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	1167	// screenfitpointButton.addActionListener(this);
602	1168
603	1169	if (Globals.ADVANCED)
604	1170	{
605		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
606	1172	snapobjectButton.addActionListener(this);
607	1173	snapobjectButton.setToolTipText("Snap Object");
	1174	+
	1175	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ fourButton.addActionListener(this);
	1177	+ fourButton.setToolTipText("Show control panel only");
608	1178	}
609	1179
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	1180	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	1181
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- twoButton.setToolTipText("Show center view only");
618		- twoButton.addActionListener(this);
619		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- fourButton.addActionListener(this);
621		- fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623		- sixButton.setToolTipText("2-column layout left");
624		- sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- threeButton.setToolTipText("2-column layout right");
627		- threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- sevenButton.setToolTipText("3-column layout");
630		- sevenButton.addActionListener(this);
631		- //
632	1182
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- rootButton.setToolTipText("Edit selection in new tab");
	1183	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ rootButton.setToolTipText("Open selection in new tab");
635	1185	rootButton.addActionListener(this);
636	1186
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
638	1188	closeButton.setToolTipText("Close tab");
639	1189	closeButton.addActionListener(this);
640	1190	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	1191	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	1192	+
	1193	+ cGridBag row1 = new cGridBag();
644	1194
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	1195	+ // INSERT
	1196	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ gridButton.setToolTipText("Create ground");
	1198	+ gridButton.addActionListener(this);
	1199	+
	1200	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ boxButton.setToolTipText("Create box");
	1202	+ boxButton.addActionListener(this);
	1203	+
	1204	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1205	+ superButton.setToolTipText("Create superellipsoid");
	1206	+ superButton.addActionListener(this);
	1207	+
	1208	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ sphereButton.setToolTipText("Create sphere");
	1210	+ sphereButton.addActionListener(this);
	1211	+
	1212	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ coneButton.setToolTipText("Create cone");
	1214	+ coneButton.addActionListener(this);
	1215	+
	1216	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ torusButton.setToolTipText("Create torus");
	1218	+ torusButton.addActionListener(this);
	1219	+
	1220	+ if (Globals.ADVANCED)
	1221	+ {
	1222	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ kleinButton.setToolTipText("Create Klein bottle");
	1224	+ kleinButton.addActionListener(this);
	1225	+ }
	1226	+
	1227	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ particlesButton.setToolTipText("Create particle system");
	1229	+ particlesButton.addActionListener(this);
	1230	+
	1231	+ oe.toolboxPanel.add(row1);
	1232	+
	1233	+ cGridBag row2 = new cGridBag();
	1234	+
	1235	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ groupButton.setToolTipText("Create group");
	1237	+ groupButton.addActionListener(this);
	1238	+
	1239	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ compositeButton.setToolTipText("Create composite");
	1241	+ compositeButton.addActionListener(this);
	1242	+
	1243	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ switchButton.setToolTipText("Create item switcher");
	1245	+ switchButton.addActionListener(this);
	1246	+
	1247	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ loopButton.setToolTipText("Create loop");
	1249	+ loopButton.addActionListener(this);
	1250	+
	1251	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ textureButton.setToolTipText("Create texture");
	1253	+ textureButton.addActionListener(this);
	1254	+
	1255	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1256	+ overlayButton.setToolTipText("Create overlay");
	1257	+ overlayButton.addActionListener(this);
	1258	+
	1259	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ lightButton.setToolTipText("Create light");
	1261	+ lightButton.addActionListener(this);
	1262	+
	1263	+ oe.toolboxPanel.add(row2);
	1264	+
	1265	+ cGridBag textures = new cGridBag();
	1266	+
	1267	+ CreateTexturePanel(textures);
	1268	+
	1269	+ int tabCount = resourcecontainer.getTabCount();
	1270	+
	1271	+ if (tabCount > 0)
	1272	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1273	+
	1274	+ oe.toolboxPanel.add(textures);
	1275	+
	1276	+ textures.preferredHeight = 100;
	1277	+
	1278	+ CreateSkyboxPanel(oe.skyboxPanel);
	1279	+
	1280	+ // EDIT panel
	1281	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ editButton.setToolTipText("Pin selection controls");
647	1283	editButton.addActionListener(this);
648	1284
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	1285	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ uneditButton.setToolTipText("Unpin and remove selection controls");
651	1287	uneditButton.addActionListener(this);
652	1288
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	1289	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1290	+ allParamsButton.setToolTipText("Show all controls");
655	1291	allParamsButton.addActionListener(this);
656	1292
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- clearPanelButton.setToolTipText("Clear edit panel");
	1293	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1294	+ clearPanelButton.setToolTipText("Clear all controls");
659	1295	clearPanelButton.addActionListener(this);
660	1296
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- unselectButton.setToolTipText("Unselect");
663		- unselectButton.addActionListener(this);
	1297	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ //unselectButton.setToolTipText("Unselect");
	1299	+ //unselectButton.addActionListener(this);
664	1300
665		- commandsPanel.preferredHeight = 1;
	1301	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1302	+ flashSelectionButton.setToolTipText("Highlight selection");
	1303	+ flashSelectionButton.addActionListener(this);
666	1304
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	1305	+ editCommandsPanel.preferredHeight = 1;
	1306	+
	1307	+ SetPinStates(false);
	1308	+// oe.treePanel.add(commandsPanel);
	1309	+// oe.treePanel.Return();
669	1310
670	1311	// oe.aConstraints.gridx += 1;
671	1312	// oe.aConstraints.weighty = 0;
..	..	@@ -680,34 +1321,24 @@
680	1321
681	1322	cGridBag jSPPanel = new cGridBag();
682	1323
	1324	+ jSPPanel.preferredHeight = 20;
	1325	+
683	1326	JScrollPane jSP;
684	1327	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1328	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	1329	ResetModel();
687	1330
688	1331	oe.treePanel.add(jSPPanel);
689	1332	oe.treePanel.Return();
690	1333
691		- cGridBag copyOptionsPanel = new cGridBag();
692		-
693		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
694		- colorCB.setToolTipText("Copy color when dropped");
695		- colorCB.addItemListener(this);
696		-
697		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
698		- materialCB.setToolTipText("Copy material when dropped");
699		- materialCB.addItemListener(this);
700		-
701		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
702		- textureCB.setToolTipText("Copy texture when dropped");
703		- textureCB.addItemListener(this);
704		-
705		- copyOptionsPanel.preferredHeight = 1;
706		- oe.treePanel.add(copyOptionsPanel);
	1334	+ oe.treePanel.add(versionManagerPanel);
707	1335	oe.treePanel.Return();
	1336	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1337	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1338	+ versionSliderPane.preferredHeight = 3;
708	1339
709		-// mainPanel.setDividerLocation(0.5); //1.0);
710		-// mainPanel.setResizeWeight(0.5);
	1340	+// mainPanel.setDividerLocation(0.1); //1.0);
	1341	+ mainPanel.setResizeWeight(0.4);
711	1342
712	1343	//jList.addListSelectionListener(this);
713	1344	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -715,7 +1346,7 @@
715	1346	//jTree.setEditable(true);
716	1347	oe.jTree.setDragEnabled(true);
717	1348	//jTree.setPreferredSize(new Dimension(10,10));
718		- jSP.setPreferredSize(new Dimension(100,200));
	1349	+ //jSP.setPreferredSize(new Dimension(100,200));
719	1350
720	1351	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
721	1352
..	..	@@ -727,29 +1358,49 @@
727	1358	dgr.addDragGestureListener(this);
728	1359	}catch(Exception e) {}
729	1360	*/
730		- radio.layout = sevenButton;
	1361	+ radio.layout = threeButton; // sixButton;
731	1362	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	1363	}
733	1364
734	1365	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	1366	{
	1367	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1368	+ colorCB.setToolTipText("Copy color when dropped");
	1369	+ colorCB.addItemListener(this);
	1370	+
	1371	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1372	+ materialCB.setToolTipText("Copy material when dropped");
	1373	+ materialCB.addItemListener(this);
	1374	+
	1375	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1376	+ textureCB.setToolTipText("Copy texture when dropped");
	1377	+ textureCB.addItemListener(this);
	1378	+
	1379	+ panel.Return();
	1380	+
736	1381	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	1382	boxCB.setToolTipText("Display bounding boxes");
738	1383	boxCB.addItemListener(this);
739	1384
740	1385	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1386	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	1387	zoomBoxCB.addItemListener(this);
743	1388
744	1389	if (true) // Globals.ADVANCED)
745	1390	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	1391	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1392	+// supportCB.setToolTipText("Enable rigging");
	1393	+// supportCB.addItemListener(this);
	1394	+
	1395	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1396	+ freezeCB.setToolTipText("Fast moving camera");
	1397	+ freezeCB.addItemListener(this);
749	1398
750	1399	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	1400	// localCB.addItemListener(this);
752	1401
	1402	+ panel.Return();
	1403	+
753	1404	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	1405	crowdCB.setToolTipText("Used for crowds");
755	1406	crowdCB.addItemListener(this);
..	..	@@ -758,14 +1409,19 @@
758	1409	smoothCB.setToolTipText("Snapping delay");
759	1410	smoothCB.addItemListener(this);
760	1411
761		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
762		- slowCB.setToolTipText("Smooth interpolation");
763		- slowCB.addItemListener(this);
	1412	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1413	+// slowCB.setToolTipText("Smooth interpolation");
	1414	+// slowCB.addItemListener(this);
	1415	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1416	+ minshaderCB.setToolTipText("Minimal fast shader");
	1417	+ minshaderCB.addItemListener(this);
764	1418
765	1419	// constraints.gridy += 1;
766	1420	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	1421	// speakerMocapCB.addItemListener(this);
768	1422
	1423	+ panel.Return();
	1424	+
769	1425	if (false)
770	1426	{
771	1427	// handled in scripts
..	..	@@ -780,34 +1436,82 @@
780	1436	//constraints.gridy += 1;
781	1437	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	1438	smoothfocusCB.addItemListener(this);
	1439	+ panel.Return();
783	1440	}
784	1441
785	1442	//constraints.gridx += 1;
786	1443	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	1444	// debugCB.addItemListener(this);
788	1445
	1446	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1447	+ trackCB.setToolTipText("Enable tracking target");
	1448	+ trackCB.addItemListener(this);
	1449	+
789	1450	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1451	+ oeilCB.setToolTipText("Move camera when tracking");
790	1452	oeilCB.addItemListener(this);
791	1453
	1454	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1455	+ shadowCB.setToolTipText("When live compute shadows");
	1456	+ shadowCB.addItemListener(this);
	1457	+
	1458	+ panel.Return();
	1459	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1460	+ toggleTextureCB.setToolTipText("Load textures");
	1461	+ toggleTextureCB.addItemListener(this);
	1462	+
	1463	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1464	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1465	+ toggleSwitchCB.addItemListener(this);
	1466	+
	1467	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1468	+ autokeepCB.setToolTipText("On structure change");
	1469	+ autokeepCB.addItemListener(this);
	1470	+
	1471	+ panel.Return();
	1472	+ if (Globals.ADVANCED)
	1473	+ {
792	1474	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	1475	lookAtCB.setToolTipText("Look-at target");
794	1476	lookAtCB.addItemListener(this);
	1477	+ }
795	1478
796	1479	}
797	1480
798	1481	cGridBag fill = new cGridBag();
799		-
800	1482	fill.preferredHeight = 200;
	1483	+ cGridBag fill2 = new cGridBag();
	1484	+ fill2.preferredHeight = 200;
	1485	+ cGridBag fill3 = new cGridBag();
	1486	+ fill3.preferredHeight = 200;
801	1487
802	1488	panel.add(fill);
	1489	+ panel.add(fill2);
	1490	+ panel.add(fill3);
803	1491
804	1492	}
805	1493
806	1494	void EditObject(Object3D obj)
807	1495	{
	1496	+ assert(obj instanceof Composite);
	1497	+
	1498	+// if (obj.versionlist == null)
	1499	+// {
	1500	+// obj.versionlist = new Object3D[100];
	1501	+// obj.versionindex = -1;
	1502	+// }
	1503	+
808	1504	cRadio radioButton = new cRadio(obj.name);
	1505	+
	1506	+ // June 2019. Patch to avoid bug with transparency.
	1507	+ radioButton.hadMaterial = obj.material != null;
	1508	+ if (!radioButton.hadMaterial)
	1509	+ {
	1510	+ obj.material = new cMaterial();
	1511	+ }
	1512	+
809	1513	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1514	+ radioButton.layout = threeButton; // sixButton;
811	1515	radioButton.SetCamera(cameraView.renderCamera, false);
812	1516	radioButton.addActionListener(this);
813	1517	radioPanel.add(radioButton);
..	..	@@ -817,31 +1521,41 @@
817	1521
818	1522	void SetupViews(ObjEditor oe)
819	1523	{
	1524	+ theFrame = this;
	1525	+
820	1526	oe.SetupViews();
821	1527
	1528	+ if (Globals.DEBUG)
822	1529	System.out.println("SetupViews");
823	1530	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
824	1531	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
825	1532	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1533	}
827	1534
828		- JCheckBox liveCB;
829		- JCheckBox supportCB;
830		- JCheckBox localCB;
831		- JCheckBox crowdCB;
832		- JCheckBox smoothCB;
833		- JCheckBox fastCB;
834		- JCheckBox slowCB;
835		- JCheckBox boxCB;
836		- JCheckBox zoomBoxCB;
837		- JCheckBox trackCB;
838		- JCheckBox smoothfocusCB;
	1535	+ cToggleButton liveCB;
	1536	+ cCheckBox supportCB;
	1537	+ cCheckBox localCB;
	1538	+ cCheckBox crowdCB;
	1539	+ cCheckBox smoothCB;
	1540	+ cCheckBox minshaderCB;
	1541	+
	1542	+ cToggleButton fastCB;
	1543	+ cCheckBox slowCB;
	1544	+ cCheckBox boxCB;
	1545	+ cCheckBox zoomBoxCB;
	1546	+ cCheckBox freezeCB;
	1547	+ //cToggleButton trackCB;
	1548	+ cCheckBox trackCB;
	1549	+ cCheckBox smoothfocusCB;
839	1550	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1551	+ cCheckBox speakerCameraCB;
	1552	+ cCheckBox speakerFocusCB;
	1553	+ cCheckBox debugCB;
	1554	+
	1555	+ cCheckBox oeilCB;
	1556	+ cCheckBox shadowCB;
	1557	+ cCheckBox autokeepCB;
	1558	+ cCheckBox lookAtCB;
845	1559
846	1560	// static int COLOR = 1;
847	1561	// static int MATERIAL = 2;
..	..	@@ -849,9 +1563,9 @@
849	1563
850	1564	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1565
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1566	+ cCheckBox colorCB;
	1567	+ cCheckBox materialCB;
	1568	+ cCheckBox textureCB;
855	1569
856	1570	public void itemStateChanged(ItemEvent e)
857	1571	{
..	..	@@ -895,6 +1609,12 @@
895	1609	{
896	1610	cameraView.ToggleInertia();
897	1611	cameraView.repaint();
	1612	+ }
	1613	+ else if(e.getSource() == minshaderCB)
	1614	+ {
	1615	+ Globals.MINSHADER ^= true;
	1616	+ cameraView.programInitialized = false;
	1617	+ cameraView.repaint();
898	1618	}
899	1619	else if(e.getSource() == localCB)
900	1620	{
..	..	@@ -944,6 +1664,18 @@
944	1664	{
945	1665	cameraView.ToggleOeil();
946	1666	}
	1667	+ else if(e.getSource() == shadowCB)
	1668	+ {
	1669	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1670	+ }
	1671	+ else if(e.getSource() == freezeCB)
	1672	+ {
	1673	+ Globals.FREEZEONMOVE ^= true;
	1674	+ }
	1675	+ else if(e.getSource() == autokeepCB)
	1676	+ {
	1677	+ Globals.REPLACEONMAKE ^= true;
	1678	+ }
947	1679	else if(e.getSource() == lookAtCB)
948	1680	{
949	1681	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1692,8 @@
960	1692
961	1693	/**/
962	1694	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1695	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1696	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1697	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1698	// We can't move the root node or an empty selection
966	1699	return;
..	..	@@ -1023,8 +1756,6 @@
1023	1756	}
1024	1757	}
1025	1758
1026		- String string = (String) object;
1027		-
1028	1759	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1760	// if( object instanceof java.io.File[])
1030	1761	// {
..	..	@@ -1032,6 +1763,8 @@
1032	1763	// objEditor.DropFile((java.io.File[]) object, true);
1033	1764	// return;
1034	1765	// }
	1766	+
	1767	+ String string = object.toString();
1035	1768
1036	1769	// File path for Mac and Windows
1037	1770	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1810,33 @@
1077	1810
1078	1811	assert target == objEditor.jTree;
1079	1812	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1813	+ Object3D destinationLeaf;
1080	1814	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1815	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1816	} catch (Exception e) {
1083	1817	System.out.println("destinationPath : " + destinationPath);
1084	1818	return;
1085	1819	}
1086	1820
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1821	+ for (int i=group.selection.size(); --i>=0;)
1088	1822	{
	1823	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1824	+
	1825	+ // Cannot move into itself
	1826	+ if (child == destinationLeaf)
	1827	+ return;
	1828	+ }
	1829	+
	1830	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1831	+// {
1089	1832	loadClipboard(true);
1090	1833	objEditor.jTree.setSelectionPath(destinationPath);
1091	1834	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1835	+// } else {
	1836	+// loadClipboard(false);
	1837	+// objEditor.jTree.setSelectionPath(destinationPath);
	1838	+// pasteInto(false, false); // true); // ???
	1839	+// }
1097	1840	}
1098	1841	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1842	// Called if the user has modified the current drop gesture
..	..	@@ -1149,7 +1892,12 @@
1149	1892	TreePath path;
1150	1893
1151	1894	public TransferableTreePath(TreePath tp) {
1152		- path = tp;
	1895	+ Object[] objs = new Object[tp.getPathCount()];
	1896	+ for (int i=0; i<objs.length; i++)
	1897	+ {
	1898	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1899	+ }
	1900	+ path = new TreePath(objs);
1153	1901	}
1154	1902
1155	1903	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1198,22 +1946,30 @@
1198	1946	{
1199	1947	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1948	//heightFieldItem.addActionListener(this);
1201		- gridItem = menu.add(new MenuItem("Grid"));
1202		- gridItem.addActionListener(this);
1203		- rectoidItem = menu.add(new MenuItem("Box"));
1204		- rectoidItem.addActionListener(this);
1205		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1206		- ellipsoidItem.addActionListener(this);
1207		- coneItem = menu.add(new MenuItem("Cone"));
1208		- coneItem.addActionListener(this);
1209		- torusItem = menu.add(new MenuItem("Torus"));
1210		- torusItem.addActionListener(this);
1211		- superItem = menu.add(new MenuItem("Superellipsoid"));
1212		- superItem.addActionListener(this);
	1949	+// gridItem = menu.add(new MenuItem("Grid"));
	1950	+// gridItem.addActionListener(this);
	1951	+// rectoidItem = menu.add(new MenuItem("Box"));
	1952	+// rectoidItem.addActionListener(this);
	1953	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1954	+// ellipsoidItem.addActionListener(this);
	1955	+// coneItem = menu.add(new MenuItem("Cone"));
	1956	+// coneItem.addActionListener(this);
	1957	+// torusItem = menu.add(new MenuItem("Torus"));
	1958	+// torusItem.addActionListener(this);
	1959	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1960	+// superItem.addActionListener(this);
	1961	+
	1962	+ cameraItem = menu.add(new MenuItem("Camera"));
	1963	+ cameraItem.addActionListener(this);
	1964	+
	1965	+ if (!Globals.ADVANCED)
	1966	+ {
1213	1967	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1968	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1969	+ }
	1970	+
	1971	+// particleItem = menu.add(new MenuItem("Particle system"));
	1972	+// particleItem.addActionListener(this);
1217	1973	if (Globals.ADVANCED)
1218	1974	{
1219	1975	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1995,15 @@
1239	1995	}
1240	1996	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1997	bezierItem.addActionListener(this);
1242		- overlayItem = menu.add(new MenuItem("Overlay"));
1243		- overlayItem.addActionListener(this);
1244		- lightItem = menu.add(new MenuItem("Light"));
1245		- lightItem.addActionListener(this);
	1998	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1999	+// overlayItem.addActionListener(this);
	2000	+// lightItem = menu.add(new MenuItem("Light"));
	2001	+// lightItem.addActionListener(this);
1246	2002	menu.add("-");
1247	2003	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	2004	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	2005	+// loopItem = menu.add(new MenuItem("Loop"));
	2006	+// loopItem.addActionListener(this);
1251	2007	doubleItem = menu.add(new MenuItem("Fork"));
1252	2008	doubleItem.addActionListener(this);
1253	2009	if (Globals.ADVANCED)
..	..	@@ -1263,6 +2019,9 @@
1263	2019	animationItem.addItemListener(this);
1264	2020	animationItem.setState(Globals.ANIMATION);
1265	2021
	2022	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2023	+ archiveItem.addActionListener(this);
	2024	+
1266	2025	menu.add("-");
1267	2026	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	2027	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +2034,8 @@
1275	2034	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	2035	reduce34MorphItem.addActionListener(this);
1277	2036	menu.add("-");
	2037	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2038	+ memoryItem.addActionListener(this);
1278	2039	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	2040	computeAOItem.addActionListener(this);
1280	2041
..	..	@@ -1283,8 +2044,6 @@
1283	2044	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	2045	mirrorItem.addActionListener(this);
1285	2046	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	2047	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	2048	analyzeItem.addActionListener(this);
1290	2049	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +2187,38 @@
1428	2187	shadow.material = new cMaterial(obj.material);
1429	2188	shadow.material.diffuse = 0.0001f;
1430	2189	shadow.material.specular = 0.0001f;
	2190	+ shadow.material.opacity = 0.75f;
	2191	+
	2192	+ AllocProjectedVertices(shadow);
	2193	+
	2194	+ shadow.projectedVertices[1].x = 300;
1431	2195
1432	2196	makeSomething(shadow);
1433	2197	}
	2198	+
	2199	+ private void ClearUnpinned()
	2200	+ {
	2201	+ //for (Object3D obj : listUI)
	2202	+ for (int i=listUI.size(); --i>=0;)
	2203	+ {
	2204	+ Object3D obj = listUI.elementAt(i);
	2205	+ if (!obj.pinned)
	2206	+ {
	2207	+ obj.CloseUI();
	2208	+ listUI.remove(i);
	2209	+ }
	2210	+ }
	2211	+ }
	2212	+
	2213	+ private void EditElement(Object3D elem, boolean newWindow)
	2214	+ {
	2215	+ // if (!(elem instanceof Composite))
	2216	+ // newWindow = false;
	2217	+ listUI.add(elem);
	2218	+ elem.openEditWindow(this, newWindow); //, false);
	2219	+ System.out.println("edit : " + elem);
	2220	+ elem.editWindow.refreshContents(true); // ? new
	2221	+ }
1434	2222
1435	2223	/**
1436	2224	* applyExample
..	..	@@ -1675,7 +2463,7 @@
1675	2463	{
1676	2464	ScreenFit();
1677	2465	} else
1678		- if (source == switchItem)
	2466	+ if (source == switchViewItem)
1679	2467	{
1680	2468	cVector v1 = new cVector();
1681	2469	cVector v2 = new cVector();
..	..	@@ -1684,11 +2472,11 @@
1684	2472	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	2473	objEditor.cameraView.repaint();
1686	2474	} else
1687		- if (source == rectoidItem)
	2475	+ if (source == rectoidItem \|\| source == boxButton)
1688	2476	{
1689	2477	makeSomething(new Box());
1690	2478	} else
1691		- if (source == particleItem)
	2479	+ if (source == particleItem \|\| source == particlesButton)
1692	2480	{
1693	2481	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	2482	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2555,27 @@
1767	2555
1768	2556	makeSomething(obj);
1769	2557	} else
1770		- if (source == gridItem)
	2558	+ if (source == gridItem \|\| source == gridButton)
1771	2559	{
1772	2560	makeSomething(new Grid());
1773	2561	} else
1774		- if (source == ellipsoidItem)
	2562	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2563	{
1776	2564	makeSomething(new Sphere());
1777	2565	} else
1778		- if (source == coneItem)
	2566	+ if (source == coneItem \|\| source == coneButton)
1779	2567	{
1780	2568	makeSomething(new Cone());
1781	2569	} else
1782		- if (source == torusItem)
	2570	+ if (source == torusItem \|\| source == torusButton)
1783	2571	{
1784	2572	makeSomething(new Torus());
1785	2573	} else
1786		- if (source == superItem)
	2574	+ if (source == superItem \|\| source == superButton)
1787	2575	{
1788	2576	makeSomething(new Superellipsoid());
1789	2577	} else
1790		- if (source == kleinItem)
	2578	+ if (source == kleinItem \|\| source == kleinButton)
1791	2579	{
1792	2580	makeSomething(new Klein());
1793	2581	} else
..	..	@@ -1807,7 +2595,7 @@
1807	2595	{
1808	2596	makeSomething(new BezierSurface());
1809	2597	} else
1810		- if (source == overlayItem)
	2598	+ if (source == overlayItem \|\| source == overlayButton)
1811	2599	{
1812	2600	/*
1813	2601	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,10 +2643,27 @@
1855	2643	s.setup();
1856	2644	makeSomething(s);
1857	2645	} else
1858		- if (source == lightItem)
	2646	+ if (source == lightItem \|\| source == lightButton)
1859	2647	{
1860	2648	makeSomething(new Light());
1861	2649	} else
	2650	+// if (source == skybox1Button \|\|
	2651	+// source == skybox2Button \|\|
	2652	+// source == skybox3Button \|\|
	2653	+// source == skybox4Button \|\|
	2654	+// source == skybox5Button \|\|
	2655	+// source == skybox6Button \|\|
	2656	+// source == skybox7Button \|\|
	2657	+// source == skybox11Button \|\|
	2658	+// source == skybox12Button \|\|
	2659	+// source == skybox13Button \|\|
	2660	+// source == skybox14Button \|\|
	2661	+// source == skybox15Button \|\|
	2662	+// source == skybox16Button \|\|
	2663	+// source == skybox17Button)
	2664	+// {
	2665	+// ChangeSkybox(source);
	2666	+// } else
1862	2667	if (source == csgItem)
1863	2668	{
1864	2669	group(new CSG());
..	..	@@ -1905,30 +2710,38 @@
1905	2710
1906	2711	group(g);
1907	2712	} else
1908		- if (source == loopItem)
	2713	+ if (source == loopItem \|\| source == loopButton)
1909	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
1910	2717	Composite csg = new GroupLeaf();
1911	2718	csg.count = 5;
1912		- group(csg);
1913		- Composite child = new cGroup();
	2719	+ Composite child = new cGroup("Branch");
1914	2720	csg.addChild(child);
1915	2721	child.addChild(csg);
	2722	+ group(csg);
	2723	+ }
1916	2724	} else
1917	2725	if (source == doubleItem)
1918	2726	{
1919		- Composite csg = new GroupLeaf();
	2727	+ if (!group.selection.isEmpty())
	2728	+ {
	2729	+ Composite csg = new GroupLeaf("Fork");
1920	2730	csg.count = 5;
	2731	+ Composite child = new cGroup("Branch A");
	2732	+ csg.addChild(child);
	2733	+ child.addChild(csg);
	2734	+ child = new cGroup("Branch B");
	2735	+ csg.addChild(child);
	2736	+ child.addChild(csg);
1921	2737	group(csg);
1922		- Composite child = new cGroup();
1923		- csg.addChild(child);
1924		- child.addChild(csg);
1925		- child = new cGroup();
1926		- csg.addChild(child);
1927		- child.addChild(csg);
	2738	+ }
1928	2739	} else
1929	2740	if (source == tripleItem)
1930	2741	{
1931		- Composite csg = new GroupLeaf();
	2742	+ if (!group.selection.isEmpty())
	2743	+ {
	2744	+ Composite csg = new GroupLeaf("Trident");
1932	2745	csg.count = 4;
1933	2746	group(csg);
1934	2747	Composite child = new cGroup();
..	..	@@ -1940,11 +2753,12 @@
1940	2753	child = new cGroup();
1941	2754	csg.addChild(child);
1942	2755	child.addChild(csg);
	2756	+ }
1943	2757	} else
1944	2758	if (source == computeAOItem)
1945	2759	{
1946	2760	Globals.drawMode = CameraPane.OCCLUSION;
1947		- Globals.theRenderer.repaint();
	2761	+ cameraView.repaint();
1948	2762	} else
1949	2763	if (source == recompileItem)
1950	2764	{
..	..	@@ -1959,7 +2773,7 @@
1959	2773	if (source == invariantsItem)
1960	2774	{
1961	2775	System.out.println("Invariants:");
1962		- Grafreed.grafreeD.universe.invariants();
	2776	+ Grafreed.grafreed.universe.invariants();
1963	2777	} else
1964	2778	if (source == memoryItem)
1965	2779	{
..	..	@@ -1978,17 +2792,64 @@
1978	2792	{
1979	2793	DumpObject();
1980	2794	} else
1981		- if (source == undoButton)
	2795	+ if (source == minButton)
1982	2796	{
1983		- Undo();
	2797	+ Minimize();
1984	2798	} else
1985		- if (source == redoButton)
	2799	+ if (source == maxButton)
1986	2800	{
1987		- Redo();
	2801	+ Maximize();
1988	2802	} else
1989		- if (source == saveButton)
	2803	+ if (source == fullButton)
1990	2804	{
1991		- Save();
	2805	+ ToggleFullScreen();
	2806	+ } else
	2807	+ if (source == collapseButton)
	2808	+ {
	2809	+ this.expandedLayout = radio.layout;
	2810	+ CollapseToolbar();
	2811	+ } else
	2812	+ if (source == maximize3DButton)
	2813	+ {
	2814	+ this.expandedLayout = radio.layout;
	2815	+ radio.layout = twoButton;
	2816	+ Show3DView();
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == previousVersionButton)
	2820	+ {
	2821	+ // Go to previous version
	2822	+ //if (!Undo())
	2823	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2824	+ PreviousVersion();
	2825	+ } else
	2826	+ if (source == restoreButton)
	2827	+ {
	2828	+ // Restore current version
	2829	+ Restore();
	2830	+ //restoreButton.setEnabled(false);
	2831	+ } else
	2832	+ if (source == replaceButton)
	2833	+ {
	2834	+ // Overwrite current version
	2835	+ Replace();
	2836	+ //replaceButton.setEnabled(false);
	2837	+ } else
	2838	+ if (source == nextVersionButton)
	2839	+ {
	2840	+ // Go to next version
	2841	+ NextVersion();
	2842	+ } else
	2843	+ if (source == saveVersionButton)
	2844	+ {
	2845	+ // Save a new version
	2846	+ if (!Save(true))
	2847	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2848	+ } else
	2849	+ if (source == deleteVersionButton)
	2850	+ {
	2851	+ // Delete a new version
	2852	+ DeleteVersion();
1992	2853	} else
1993	2854	if (source == oneStepButton)
1994	2855	{
..	..	@@ -1997,17 +2858,14 @@
1997	2858	} else
1998	2859	if (source == screenfitButton)
1999	2860	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2861	ScreenFit();
2002	2862	} else
2003	2863	if (source == screenfitpointButton)
2004	2864	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2865	ScreenFitPoint();
2007	2866	} else
2008	2867	if (source == snapobjectButton)
2009	2868	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2869	SnapObject();
2012	2870	} else
2013	2871	// if (event.getSource() == recompileButton)
..	..	@@ -2046,11 +2904,11 @@
2046	2904	} else
2047	2905	if (source == undoItem)
2048	2906	{
2049		- Undo();
	2907	+ PreviousVersion();
2050	2908	} else
2051	2909	if (source == redoItem)
2052	2910	{
2053		- Redo();
	2911	+ NextVersion();
2054	2912	} else
2055	2913	if (source == duplicateItem)
2056	2914	{
..	..	@@ -2371,7 +3229,7 @@
2371	3229	{
2372	3230	StepAll();
2373	3231	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3232	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	3233	{
2376	3234	//int indices[] = jList.getSelectedIndices();
2377	3235	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +3241,9 @@
2383	3241	{
2384	3242	ClearSelection(true);
2385	3243	} else
2386		- if (source == grabItem)
	3244	+ if (source == grabItem \|\| source == groupButton)
2387	3245	{
2388		- group(new cGroup(), true);
	3246	+ group(new cGroup(), false); // true);
2389	3247	} else
2390	3248	if (source == hideItem)
2391	3249	{
..	..	@@ -2403,11 +3261,11 @@
2403	3261	{
2404	3262	makeSomething(new Camera());
2405	3263	} else
2406		- if (source == compositeItem)
	3264	+ if (source == compositeItem \|\| source == compositeButton)
2407	3265	{
2408	3266	group(new Composite());
2409	3267	} else
2410		- if (source == randomItem)
	3268	+ if (source == switchItem \|\| source == switchButton)
2411	3269	{
2412	3270	RandomNode random = new RandomNode();
2413	3271	group(random);
..	..	@@ -2509,7 +3367,7 @@
2509	3367	{
2510	3368	group(new cLinker());
2511	3369	} else
2512		- if (source == textureItem)
	3370	+ if (source == textureItem \|\| source == textureButton)
2513	3371	{
2514	3372	group(new TextureNode());
2515	3373	} else
..	..	@@ -2529,17 +3387,42 @@
2529	3387	{
2530	3388	CastShadow(2);
2531	3389	} else
2532		- if (source == ungroupItem)
	3390	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	3391	{
2534		- //ungroup();
	3392	+ boolean canUngroup = true;
	3393	+
2535	3394	for (int i=0; i<group.selection.size(); i++)
2536	3395	{
2537		- Ungroup(group.selection.get(i));
	3396	+ Object3D selectedItem = group.selection.get(i);
	3397	+
	3398	+ if (selectedItem.Size() == 0)
	3399	+ {
	3400	+ // Cannot ungroup leaves
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
	3404	+
	3405	+ if (selectedItem == group)
	3406	+ {
	3407	+ // Cannot ungroup root
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
2538	3411	}
2539	3412
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	3413	+ if (canUngroup)
	3414	+ {
	3415	+ for (int i=0; i<group.selection.size(); i++)
	3416	+ {
	3417	+ Object3D selectedItem = group.selection.get(i);
	3418	+
	3419	+ Ungroup(selectedItem);
	3420	+ }
	3421	+
	3422	+ ClearSelection(false);
	3423	+
	3424	+ refreshContents();
	3425	+ }
2543	3426	} else
2544	3427	if (source == genUVItem)
2545	3428	{
..	..	@@ -2584,6 +3467,10 @@
2584	3467	if (source == clearMaterialsItem)
2585	3468	{
2586	3469	ClearMaterials();
	3470	+ } else
	3471	+ if (source == clearVersionsItem)
	3472	+ {
	3473	+ ClearVersions();
2587	3474	} else
2588	3475	if (source == liveleavesItem)
2589	3476	{
..	..	@@ -2840,7 +3727,7 @@
2840	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2841	3728	{
2842	3729	obj = (Object3D)e.nextElement();
2843		- obj.SetBumpTexture(null);
	3730	+ obj.ResetBumpTexture();
2844	3731	}
2845	3732
2846	3733	refreshContents();
..	..	@@ -2856,6 +3743,31 @@
2856	3743
2857	3744	refreshContents();
2858	3745	} else
	3746	+ if (source == embedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(true);
	3753	+ }
	3754	+
	3755	+ refreshContents();
	3756	+ } else
	3757	+ if (source == deEmbedTexturesItem)
	3758	+ {
	3759	+ Object3D obj;
	3760	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3761	+ {
	3762	+ obj = (Object3D)e.nextElement();
	3763	+ obj.EmbedTextures(false);
	3764	+ }
	3765	+
	3766	+ CameraPane.texturepigment.clear();
	3767	+ CameraPane.texturebump.clear();
	3768	+
	3769	+ refreshContents();
	3770	+ } else
2859	3771	if (source == flashSelectionButton)
2860	3772	{
2861	3773	CameraPane.flash = true;
..	..	@@ -2867,42 +3779,36 @@
2867	3779	if (source == twoButton)
2868	3780	{
2869	3781	radio.layout = twoButton;
2870		- // bug
2871		- //gridPanel.setDividerLocation(1.0);
2872		- //bigPanel.setDividerLocation(0.0);
2873		-// bigThree.remove(scenePanel);
2874		-// bigThree.remove(centralPanel);
2875		-// bigThree.remove(XYZPanel);
2876		-// aWindowConstraints.gridx = 0;
2877		-// aWindowConstraints.gridy = 0;
2878		-// aWindowConstraints.gridwidth = 1;
2879		-// // aConstraints.gridheight = 3;
2880		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2881		-// aWindowConstraints.weightx = 0;
2882		-// aWindowConstraints.weighty = 1;
2883		-// //bigThree.add(jtp, aWindowConstraints);
2884		-// aWindowConstraints.weightx = 1;
2885		-// aWindowConstraints.gridwidth = 3;
2886		-// // aConstraints.gridheight = 3;
2887		-// aWindowConstraints.gridx = 1;
2888		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2889		-// bigThree.add(centralPanel, aWindowConstraints);
2890		-// aWindowConstraints.weightx = 0;
2891		-// aWindowConstraints.gridx = 4;
2892		-// aWindowConstraints.gridwidth = 1;
2893		-// // aConstraints.gridheight = 3;
2894		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2895		-// //bigThree.add(XYZPanel, aWindowConstraints);
2896		-// scenePanel.setVisible(false);
2897		-// centralPanel.setVisible(true);
2898		-// XYZPanel.setVisible(false);
2899		- bigThree.ClearUI();
2900		- bigThree.add(centralPanel);
2901		- bigThree.FlushUI();
	3782	+
	3783	+ if (CameraPane.FULLSCREEN)
	3784	+ fullscreenLayout = radio.layout;
	3785	+
	3786	+ Show3DView();
	3787	+
	3788	+ cameraView.requestFocusInWindow();
	3789	+
	3790	+// refreshContents(true);
	3791	+//
	3792	+// try
	3793	+// {
	3794	+// java.awt.Robot bot = new java.awt.Robot();
	3795	+// int mask = InputEvent.BUTTON1_MASK;
	3796	+// bot.mouseMove(100, 100);
	3797	+// bot.mousePress(mask);
	3798	+// bot.mouseRelease(mask);
	3799	+// }
	3800	+// catch (Exception e)
	3801	+// {
	3802	+//
	3803	+// }
	3804	+
2902	3805	} else
2903	3806	if (source == threeButton)
2904	3807	{
2905	3808	radio.layout = threeButton;
	3809	+
	3810	+ if (CameraPane.FULLSCREEN)
	3811	+ fullscreenLayout = radio.layout;
2906	3812
2907	3813	// bigThree.remove(scenePanel);
2908	3814	// bigThree.remove(centralPanel);
..	..	@@ -2932,13 +3838,18 @@
2932	3838	// centralPanel.setVisible(true);
2933	3839	// XYZPanel.setVisible(true);
2934	3840	bigThree.ClearUI();
	3841	+ bigThree.add(scenePanel);
2935	3842	bigThree.add(centralPanel);
2936		- bigThree.add(XYZPanel);
2937	3843	bigThree.FlushUI();
	3844	+
	3845	+ cameraView.requestFocusInWindow();
2938	3846	} else
2939	3847	if (source == fourButton)
2940	3848	{
2941	3849	radio.layout = fourButton;
	3850	+
	3851	+ if (CameraPane.FULLSCREEN)
	3852	+ fullscreenLayout = radio.layout;
2942	3853
2943	3854	// bigThree.remove(scenePanel);
2944	3855	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3881,15 @@
2970	3881	bigThree.ClearUI();
2971	3882	bigThree.add(scenePanel);
2972	3883	bigThree.FlushUI();
	3884	+
	3885	+ cameraView.requestFocusInWindow();
2973	3886	} else
2974	3887	if (source == sixButton)
2975	3888	{
2976	3889	radio.layout = sixButton;
	3890	+
	3891	+ if (CameraPane.FULLSCREEN)
	3892	+ fullscreenLayout = radio.layout;
2977	3893
2978	3894	// bigThree.remove(scenePanel);
2979	3895	// bigThree.remove(centralPanel);
..	..	@@ -3003,13 +3919,18 @@
3003	3919	// centralPanel.setVisible(true);
3004	3920	// XYZPanel.setVisible(false);
3005	3921	bigThree.ClearUI();
3006		- bigThree.add(scenePanel);
3007	3922	bigThree.add(centralPanel);
	3923	+ bigThree.add(scenePanel);
3008	3924	bigThree.FlushUI();
	3925	+
	3926	+ cameraView.requestFocusInWindow();
3009	3927	} else
3010	3928	if (source == sevenButton)
3011	3929	{
3012	3930	radio.layout = sevenButton;
	3931	+
	3932	+ if (CameraPane.FULLSCREEN)
	3933	+ fullscreenLayout = radio.layout;
3013	3934
3014	3935	// bigThree.remove(scenePanel);
3015	3936	// bigThree.remove(centralPanel);
..	..	@@ -3043,9 +3964,12 @@
3043	3964	bigThree.add(centralPanel);
3044	3965	bigThree.add(XYZPanel);
3045	3966	bigThree.FlushUI();
	3967	+
	3968	+ cameraView.requestFocusInWindow();
3046	3969	} else
3047	3970	if (source == rootButton)
3048	3971	{
	3972	+ Replace();
3049	3973	Object3D obj;
3050	3974	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3051	3975	{
..	..	@@ -3054,31 +3978,49 @@
3054	3978	EditObject(obj);
3055	3979	}
3056	3980
	3981	+ cameraView.requestFocusInWindow();
3057	3982	refreshContents(true);
3058	3983	} else
3059	3984	if (source == closeButton)
3060	3985	{
3061	3986	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3987	+ Replace();
	3988	+
3062	3989	cRadio ab;
3063	3990	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3991	{
3065	3992	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3993	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3994	{
	3995	+ // Patch to avoid bug with transparency.
	3996	+ if (!ab.hadMaterial)
	3997	+ {
	3998	+ ab.object.material = null;
	3999	+ }
	4000	+
3068	4001	buttonGroup.remove(ab);
3069	4002	radioPanel.remove(ab);
3070	4003
3071		- ab.GetObject().editWindow = null;
	4004	+ //ab.GetObject().editWindow = null;
	4005	+ ab.GetObject().manipWindow = null;
3072	4006	// ab.GetObject().objectUI = null; // ?????????
3073	4007
3074	4008	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	4009	break;
3076	4010	}
3077	4011	}
	4012	+
	4013	+ cameraView.requestFocusInWindow();
3078	4014	refreshContents(true);
3079	4015	} else
3080	4016	if (source == editItem \|\| source == editButton)
3081	4017	{
	4018	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4019	+ {
	4020	+ Object3D child = (Object3D)e.nextElement();
	4021	+ child.pinned = true;
	4022	+ }
	4023	+
3082	4024	EditSelection(false);
3083	4025	} else
3084	4026	if (source == uneditButton)
..	..	@@ -3087,9 +4029,10 @@
3087	4029	{
3088	4030	Object3D child = (Object3D)e.nextElement();
3089	4031	if(child.editWindow != null)
3090		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4032	+ child.pinned = false;
3091	4033	child.CloseUI();
3092	4034	listUI.remove(child);
	4035	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	4036
3094	4037	//child.editWindow = null; // ???????????
3095	4038	}
..	..	@@ -3104,16 +4047,18 @@
3104	4047	//copy.ClearUI();
3105	4048	for (Object3D obj : listUI)
3106	4049	{
	4050	+ obj.pinned = false;
3107	4051	obj.CloseUI();
3108	4052	}
3109	4053	listUI.clear();
	4054	+ SetPinStates(group.selection.size() > 0);
3110	4055	refreshContents(true);
3111	4056	} else
3112	4057	if (source == allParamsButton)
3113	4058	{
3114	4059	assert(copy == group);
3115	4060
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4061	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	4062
3118	4063	for (Object3D obj : listUI)
3119	4064	{
..	..	@@ -3139,6 +4084,8 @@
3139	4084	} else
3140	4085	if(source instanceof cRadio)
3141	4086	{
	4087	+ Replace();
	4088	+
3142	4089	group.parent = keepparent;
3143	4090	group.attributes = 0;
3144	4091	//group.editWindow = null;
..	..	@@ -3162,6 +4109,7 @@
3162	4109	}
3163	4110
3164	4111	copy = group;
	4112	+
3165	4113	//Globals.theRenderer.object = group;
3166	4114	if(!useclient)
3167	4115	{
..	..	@@ -3179,7 +4127,8 @@
3179	4127	}
3180	4128
3181	4129	// fix "+" issue
3182		- group.editWindow = this;
	4130	+ //group.editWindow = this;
	4131	+ group.manipWindow = this;
3183	4132
3184	4133	/*
3185	4134	currentLayout = radio.layout;
..	..	@@ -3187,20 +4136,57 @@
3187	4136	currentLayout = sevenButton;
3188	4137	*/
3189	4138	radio.layout.doClick();
	4139	+
	4140	+ assert(copy instanceof Composite);
	4141	+
	4142	+ if (copy.versionlist == null)
	4143	+ {
	4144	+ copy.versionindex = -1;
	4145	+
	4146	+ // Cannot work with loops
	4147	+ // To fix this issue, we first mark all nodes above the root,
	4148	+ // and check if any of these nodes are reachable below the root.
	4149	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4150	+
	4151	+ if (copy.versionlist == null && !copy.HasTags())
	4152	+ {
	4153	+ copy.versionlist = new Object3D[100];
	4154	+
	4155	+ //Save(true);
	4156	+ }
	4157	+ else
	4158	+ copy.versionindex = -2;
	4159	+
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4161	+ }
	4162	+
	4163	+ SetVersionStates();
	4164	+
	4165	+ ClearUnpinned();
	4166	+
	4167	+ //Grafreed.Assert(group != null);
	4168	+ //Grafreed.Assert(group.selection != null);
	4169	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4170	+ if (group.selection == null \|\| group.selection.size() == 1)
	4171	+ EditSelection(false);
3190	4172	keepparent = group.parent;
3191	4173	// PARENT = NULL or not???
3192	4174	//group.parent = null; // ROOT
3193	4175	//group.attributes = -1;
3194	4176	ResetModel();
	4177	+
	4178	+ cameraView.requestFocusInWindow();
3195	4179	refreshContents(true);
3196	4180	} else if (event.getSource() == editCameraItem)
3197	4181	{
3198	4182	cameraView.ProtectCamera();
	4183	+ cameraView.requestFocusInWindow();
3199	4184	cameraView.repaint();
3200	4185	return;
3201		- } else if (event.getSource() == revertCameraItem)
	4186	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	4187	{
3203	4188	cameraView.RevertCamera();
	4189	+ cameraView.requestFocusInWindow();
3204	4190	cameraView.repaint();
3205	4191	return;
3206	4192	// } else if (event.getSource() == textureButton)
..	..	@@ -3215,7 +4201,6 @@
3215	4201	}
3216	4202
3217	4203	boolean useclient = false;
3218		- cRadio radio;
3219	4204
3220	4205	void ToggleRoot()
3221	4206	{
..	..	@@ -3320,7 +4305,7 @@
3320	4305	TouchTransform(obj);
3321	4306	continue;
3322	4307	}
3323		- if ((mask&2) != 0) // Scale
	4308	+ if ((mask&2) != 0) // Scale/rotation
3324	4309	{
3325	4310	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3326	4311	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3328,10 +4313,6 @@
3328	4313	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3329	4314	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3330	4315	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3331		- }
3332		- if ((mask&4) != 0) // Rotation
3333		- {
3334		- // ?
3335	4316	}
3336	4317	if ((mask&1) != 0) // Translation
3337	4318	{
..	..	@@ -3778,7 +4759,7 @@
3778	4759
3779	4760	try
3780	4761	{
3781		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4762	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3782	4763	}
3783	4764	catch (Exception e)
3784	4765	{
..	..	@@ -4140,6 +5121,12 @@
4140	5121	refreshContents();
4141	5122	}
4142	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4143	5130	void FlipV(boolean flip)
4144	5131	{
4145	5132	group.selection.FlipV(flip);
..	..	@@ -4253,28 +5240,25 @@
4253	5240	// }
4254	5241	// }
4255	5242
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	5243	void EditSelection(boolean newWindow)
4261	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4262	5251	// aConstraints.gridy = 0;
4263	5252	for (int i=0; i<group.selection.size(); i++)
4264	5253	{
4265	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	5257
4269	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	5259	if(elem != group \|\| !newWindow)
4271	5260	{
4272		- // if (!(elem instanceof Composite))
4273		- // newWindow = false;
4274		- listUI.add(elem);
4275		- elem.openEditWindow(this, newWindow); //, false);
4276		- System.out.println("edit : " + elem);
4277		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4278	5262	}
4279	5263	}
4280	5264	}
..	..	@@ -4337,9 +5321,7 @@
4337	5321
4338	5322	freezemodel = false;
4339	5323	}
4340		-
4341		- boolean flashIt = true;
4342		-
	5324	+
4343	5325	public void valueChanged(TreeSelectionEvent e)
4344	5326	//public boolean handleEvent(Event event)
4345	5327	{
..	..	@@ -4349,7 +5331,8 @@
4349	5331	//new Exception().printStackTrace();
4350	5332
4351	5333	freezemodel = true;
4352		-
	5334	+ ClearUnpinned();
	5335	+
4353	5336	/**/
4354	5337	//switch (event.id)
4355	5338	{
..	..	@@ -4382,7 +5365,7 @@
4382	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	5366	// a camera
4384	5367	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	5369	{
4387	5370	CameraPane.camerachangeframe = 0; // don't refuse it
4388	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +5374,13 @@
4391	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	5375	}
4393	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4394	5384	refreshContents();
4395	5385	//return true;
4396	5386	}
..	..	@@ -4400,9 +5390,36 @@
4400	5390	freezemodel = false;
4401	5391	}
4402	5392
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(allComposites);
	5416	+ }
	5417	+
4403	5418	void refreshContents(boolean cp)
4404	5419	{
4405		- if (!Globals.MOUSEDRAGGED)
	5420	+ if (Globals.ADVANCED)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	5423	{
4407	5424	objEditor.ClearInfo(); // .GetMaterial());
4408	5425
..	..	@@ -4411,7 +5428,7 @@
4411	5428	Object3D child = (Object3D) group.selection.get(i);
4412	5429
4413	5430	objEditor.AddInfo(child, this, true);
4414		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
4415	5432	}
4416	5433
4417	5434	objEditor.SetText(); // jan 2014
..	..	@@ -4501,7 +5518,8 @@
4501	5518
4502	5519	if (cut)
4503	5520	{
4504		- Save();
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4505	5523	//int indices[] = jList.getSelectedIndices();
4506	5524	//for (int i = indices.length - 1; i >= 0; i--)
4507	5525	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5622,10 @@
4604	5622
4605	5623	void paste(boolean expand)
4606	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4607	5629	// if (GrafreeD.clipboard == null)
4608	5630	// return;
4609	5631	boolean first = true;
..	..	@@ -4663,6 +5685,7 @@
4663	5685	Grafreed.clipboard.get(0).parent = keepparent;
4664	5686	}
4665	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4666	5689	ResetModel();
4667	5690	refreshContents();
4668	5691	}
..	..	@@ -4798,6 +5821,10 @@
4798	5821
4799	5822	void group(Object3D csg, boolean grab)
4800	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4801	5828	if (//false) // why??
4802	5829	!group.selection.isEmpty())
4803	5830	{
..	..	@@ -4911,10 +5938,15 @@
4911	5938	//node.add(csg);
4912	5939	//makeSomething(node);
4913	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4914	5942	}
4915	5943
4916	5944	void Ungroup(Object3D g)
4917	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4918	5950	if (g instanceof HiddenObject)
4919	5951	{
4920	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5963,7 @@
4931	5963	objEditor.makeSomething(g.get(i), false);
4932	5964	}
4933	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4934	5967	}
4935	5968
4936	5969	void ungroup()
..	..	@@ -5219,10 +6252,43 @@
5219	6252	cButton clearpanelButton;
5220	6253	cButton unselectButton;
5221	6254
5222		- cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
	6255	+ cButton restoreCameraButton;
	6256	+
5225	6257	cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
5226	6292
5227	6293	cButton screenfitButton;
5228	6294	cButton screenfitpointButton;
..	..	@@ -5235,14 +6301,6 @@
5235	6301
5236	6302	cButton setsupportButton;
5237	6303
5238		- cButton twoButton;
5239		- cButton sixButton;
5240		- cButton threeButton;
5241		- cButton sevenButton;
5242		- cButton fourButton; // full panel
5243		- cButton oneButton; // full XYZ
5244		- //cButton currentLayout;
5245		-
5246	6304	//
5247	6305	//Composite
5248	6306	Object3D // to do !!
..	..	@@ -5252,12 +6310,12 @@
5252	6310	//JTree jTree;
5253	6311	private MenuItem lookAtItem;
5254	6312	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
5256		- private MenuItem cutItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
5257	6315	private MenuItem undoItem;
5258	6316	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
5260		- private MenuItem cloneItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5261	6319	private MenuItem cloneSupportItem;
5262	6320	private MenuItem overwriteGeoItem;
5263	6321	private MenuItem overwriteMatItem;
..	..	@@ -5278,13 +6336,13 @@
5278	6336	private MenuItem cloneGeometriesItem;
5279	6337	private MenuItem shareGeometriesItem;
5280	6338	private MenuItem mergeGeometriesItem;
5281		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5282	6340	private MenuItem pasteItem;
5283		- private MenuItem pasteIntoItem;
5284		- private MenuItem pasteLinkItem;
5285		- private MenuItem pasteCloneItem;
5286		- private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5288	6346	private MenuItem clearAllItem;
5289	6347	private MenuItem genUVItem;
5290	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5310,6 +6368,7 @@
5310	6368	private MenuItem clipMeshItem;
5311	6369	private MenuItem smoothMeshItem;
5312	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5313	6372
5314	6373	private MenuItem liveleavesItem;
5315	6374	private MenuItem unliveleavesItem;
..	..	@@ -5339,12 +6398,12 @@
5339	6398	private MenuItem transformGeometryItem;
5340	6399	private MenuItem transformChildrenItem;
5341	6400	private MenuItem hideItem;
5342		- private MenuItem grabItem;
	6401	+ private JMenuItem grabItem;
5343	6402	private MenuItem backItem;
5344	6403	private MenuItem frontItem;
5345	6404	private MenuItem cameraItem;
5346	6405	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	6406	+ private MenuItem switchItem;
5348	6407	private MenuItem physicsItem;
5349	6408	private MenuItem frameselectorItem;
5350	6409	private MenuItem scriptNodeItem;
..	..	@@ -5352,7 +6411,7 @@
5352	6411	private MenuItem switchTransfoItem;
5353	6412	private MenuItem morphItem;
5354	6413	private MenuItem linkerItem;
5355		- private MenuItem ungroupItem;
	6414	+ private JMenuItem ungroupItem;
5356	6415	private MenuItem editItem;
5357	6416	private MenuItem openWindowItem;
5358	6417	private MenuItem editLeafItem;
..	..	@@ -5368,6 +6427,8 @@
5368	6427	private MenuItem attachBumpItem;
5369	6428	private MenuItem detachBumpItem;
5370	6429	private MenuItem pigmentBumpItem;
	6430	+ private MenuItem embedTexturesItem;
	6431	+ private MenuItem deEmbedTexturesItem;
5371	6432
5372	6433	private MenuItem particleItem;
5373	6434	private MenuItem ragdollItem;
..	..	@@ -5418,5 +6479,5 @@
5418	6479
5419	6480	Menu cameraMenu;
5420	6481	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	6482	+ MenuItem restoreCameraItem;
5422	6483	}