~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"));
..	..	@@ -466,9 +857,9 @@
466	857	hideleavesItem.addActionListener(this);
467	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
468	859	showleavesItem.addActionListener(this);
469		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470	861	markleavesItem.addActionListener(this);
471		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472	863	unmarkleavesItem.addActionListener(this);
473	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474	865	rewindleavesItem.addActionListener(this);
..	..	@@ -503,10 +894,15 @@
503	894	attachBumpItem.addActionListener(this);
504	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
506	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	899	detachPigmentItem.addActionListener(this);
508	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
510	906	menu.add("-");
511	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	908	sortbysizeItem.addActionListener(this);
..	..	@@ -517,6 +913,9 @@
517	913	shareGeometriesItem.addActionListener(this);
518	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
520	919	if (Globals.ADVANCED)
521	920	{
522	921	// Pretty much the same as duplicate and clone.
..	..	@@ -533,16 +932,97 @@
533	932	buildToolsMenu(menu);
534	933	}
535	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int totalcount = 0;
	940	+
	941	+ int tabcount = 0;
	942	+ int colcount = 0;
	943	+ int rowcount = 0;
	944	+ int texturecount = 0;
	945	+
	946	+ int columns = 5;
	947	+ int rows = 7;
	948	+
	949	+ public void ResourceCallBack(String[] path)
	950	+ {
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	957	+ {
	958	+ currenttab = new cGridBag();
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	960	+ currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	964	+ rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
	967	+ }
	968	+
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	970	+ {
	971	+ //if (!added)
	972	+ {
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	976	+ }
	977	+
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
	981	+ if (++colcount >= columns)
	982	+ {
	983	+ colcount = 0;
	984	+ currenttab.Return();
	985	+
	986	+ if (rowcount++ >= rows)
	987	+ {
	988	+ rowcount = 0;
	989	+ }
	990	+ }
	991	+ }
	992	+ else
	993	+ {
	994	+// if (!path[path.length-1].equals("icons"))
	995	+// resourcecontainer.Return();
	996	+ }
	997	+ }
	998	+
	999	+ void CreateTexturePanel(cGridBag container)
	1000	+ {
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1002	+ container.add(resourcecontainer);
	1003	+
	1004	+ Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
	1007	+ }
	1008	+
536	1009	void SetupUI2(ObjEditor oe)
537	1010	{
	1011	+ // June 2019
	1012	+ if (oe == null)
	1013	+ {
	1014	+ //super.SetupUI2(this);
	1015	+ //return;
	1016	+ }
	1017	+
	1018	+ if (copy != group)
	1019	+ {
	1020	+ //super.SetupUI2(this);
	1021	+ }
	1022	+
538	1023	//new Exception().printStackTrace();
539	1024
540	1025	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	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
547	1027
548	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -563,109 +1043,268 @@
563	1043	oe.radioPanel.add(dummyButton);
564	1044	oe.buttonGroup.add(dummyButton);
565	1045	*/
	1046	+ cGridBag versionManagerPanel = new cGridBag();
	1047	+
	1048	+ versionManagerPanel.preferredHeight = 4;
	1049	+
566	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	1051
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	1052	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ //minButton.setToolTipText("Minimize window");
	1054	+ //minButton.addActionListener(this);
571	1055
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.addActionListener(this);
	1056	+ if (Globals.ADVANCED)
	1057	+ {
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
	1061	+ }
575	1062
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
578		- saveButton.addActionListener(this);
	1063	+ cButton gcButton;
579	1064
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
581		- liveCB.setToolTipText("Enable animation");
582		- liveCB.addItemListener(this);
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ fullButton.setToolTipText("Full-screen window");
	1104	+ fullButton.addActionListener(this);
	1105	+
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ screenfitButton.setToolTipText("Screen fit");
	1108	+ screenfitButton.addActionListener(this);
583	1109
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1112	+ restoreCameraButton.addActionListener(this);
	1113	+
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ saveVersionButton.setToolTipText("Duplicate current version");
	1116	+ saveVersionButton.addActionListener(this);
	1117	+
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ deleteVersionButton.setToolTipText("Delete current version");
	1120	+ deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
	1122	+
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ previousVersionButton.setToolTipText("Previous version");
	1125	+ previousVersionButton.addActionListener(this);
	1126	+ previousVersionButton.setEnabled(false);
	1127	+
	1128	+ cGridBag updown = new cGridBag().setVertical(true);
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ restoreButton.setToolTipText("Undo (restore current version)");
	1131	+ restoreButton.addActionListener(this);
	1132	+ restoreButton.setEnabled(false);
	1133	+
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ replaceButton.setToolTipText("Save (replace current version)");
	1136	+ replaceButton.addActionListener(this);
	1137	+ replaceButton.setEnabled(false);
	1138	+
	1139	+ versionManagerPanel.add(updown);
	1140	+
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ nextVersionButton.setToolTipText("Next version");
	1143	+ nextVersionButton.addActionListener(this);
	1144	+ nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
585	1147	oneStepButton.setToolTipText("Animate one step forward");
586	1148	oneStepButton.addActionListener(this);
587	1149
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1150	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1151	+ liveCB.setToolTipText("Enable animation");
	1152	+ liveCB.addItemListener(this);
	1153	+
	1154	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	1155	fastCB.setToolTipText("Fast mode");
590	1156	fastCB.addItemListener(this);
591	1157
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);
	1158	+ //oe.toolboxPanel.Return();
	1159	+
	1160	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1161	+// trackCB.setToolTipText("Enable tracking");
	1162	+// trackCB.addItemListener(this);
599	1163
600	1164	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	1165	// screenfitpointButton.addActionListener(this);
602	1166
603	1167	if (Globals.ADVANCED)
604	1168	{
605		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
606	1170	snapobjectButton.addActionListener(this);
607	1171	snapobjectButton.setToolTipText("Snap Object");
	1172	+
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ fourButton.addActionListener(this);
	1175	+ fourButton.setToolTipText("Show control panel only");
608	1176	}
609	1177
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	1178	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	1179
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	1180
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- rootButton.setToolTipText("Edit selection in new tab");
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ rootButton.setToolTipText("Open selection in new tab");
635	1183	rootButton.addActionListener(this);
636	1184
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
638	1186	closeButton.setToolTipText("Close tab");
639	1187	closeButton.addActionListener(this);
640	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	1189	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	1190	+
	1191	+ cGridBag row1 = new cGridBag();
644	1192
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	1193	+ // INSERT
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
	1196	+ gridButton.addActionListener(this);
	1197	+
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ boxButton.setToolTipText("Create box");
	1200	+ boxButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
	1218	+ if (Globals.ADVANCED)
	1219	+ {
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ kleinButton.setToolTipText("Create Klein bottle");
	1222	+ kleinButton.addActionListener(this);
	1223	+ }
	1224	+
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ particlesButton.setToolTipText("Create particle system");
	1227	+ particlesButton.addActionListener(this);
	1228	+
	1229	+ oe.toolboxPanel.add(row1);
	1230	+
	1231	+ cGridBag row2 = new cGridBag();
	1232	+
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ groupButton.setToolTipText("Create group");
	1235	+ groupButton.addActionListener(this);
	1236	+
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ compositeButton.setToolTipText("Create composite");
	1239	+ compositeButton.addActionListener(this);
	1240	+
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ switchButton.setToolTipText("Create item switcher");
	1243	+ switchButton.addActionListener(this);
	1244	+
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ loopButton.setToolTipText("Create loop");
	1247	+ loopButton.addActionListener(this);
	1248	+
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ textureButton.setToolTipText("Create texture");
	1251	+ textureButton.addActionListener(this);
	1252	+
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ overlayButton.setToolTipText("Create overlay");
	1255	+ overlayButton.addActionListener(this);
	1256	+
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ lightButton.setToolTipText("Create light");
	1259	+ lightButton.addActionListener(this);
	1260	+
	1261	+ oe.toolboxPanel.add(row2);
	1262	+
	1263	+ cGridBag textures = new cGridBag();
	1264	+
	1265	+ CreateTexturePanel(textures);
	1266	+
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
	1272	+ oe.toolboxPanel.add(textures);
	1273	+
	1274	+ textures.preferredHeight = 100;
	1275	+
	1276	+ CreateSkyboxPanel(oe.skyboxPanel);
	1277	+
	1278	+ // EDIT panel
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1280	+ editButton.setToolTipText("Pin selection controls");
647	1281	editButton.addActionListener(this);
648	1282
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
651	1285	uneditButton.addActionListener(this);
652	1286
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	1287	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1288	+ allParamsButton.setToolTipText("Show all controls");
655	1289	allParamsButton.addActionListener(this);
656	1290
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- clearPanelButton.setToolTipText("Clear edit panel");
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
659	1293	clearPanelButton.addActionListener(this);
660	1294
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- unselectButton.setToolTipText("Unselect");
663		- unselectButton.addActionListener(this);
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
664	1298
665		- commandsPanel.preferredHeight = 1;
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ flashSelectionButton.setToolTipText("Highlight selection");
	1301	+ flashSelectionButton.addActionListener(this);
666	1302
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	1303	+ editCommandsPanel.preferredHeight = 1;
	1304	+
	1305	+ SetPinStates(false);
	1306	+// oe.treePanel.add(commandsPanel);
	1307	+// oe.treePanel.Return();
669	1308
670	1309	// oe.aConstraints.gridx += 1;
671	1310	// oe.aConstraints.weighty = 0;
..	..	@@ -680,34 +1319,24 @@
680	1319
681	1320	cGridBag jSPPanel = new cGridBag();
682	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
683	1324	JScrollPane jSP;
684	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1326	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	1327	ResetModel();
687	1328
688	1329	oe.treePanel.add(jSPPanel);
689	1330	oe.treePanel.Return();
690	1331
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);
	1332	+ oe.treePanel.add(versionManagerPanel);
707	1333	oe.treePanel.Return();
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
708	1337
709		-// mainPanel.setDividerLocation(0.5); //1.0);
710		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
711	1340
712	1341	//jList.addListSelectionListener(this);
713	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -715,7 +1344,7 @@
715	1344	//jTree.setEditable(true);
716	1345	oe.jTree.setDragEnabled(true);
717	1346	//jTree.setPreferredSize(new Dimension(10,10));
718		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
719	1348
720	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
721	1350
..	..	@@ -727,29 +1356,49 @@
727	1356	dgr.addDragGestureListener(this);
728	1357	}catch(Exception e) {}
729	1358	*/
730		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
731	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	1361	}
733	1362
734	1363	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	1364	{
	1365	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1366	+ colorCB.setToolTipText("Copy color when dropped");
	1367	+ colorCB.addItemListener(this);
	1368	+
	1369	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1370	+ materialCB.setToolTipText("Copy material when dropped");
	1371	+ materialCB.addItemListener(this);
	1372	+
	1373	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1374	+ textureCB.setToolTipText("Copy texture when dropped");
	1375	+ textureCB.addItemListener(this);
	1376	+
	1377	+ panel.Return();
	1378	+
736	1379	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	1380	boxCB.setToolTipText("Display bounding boxes");
738	1381	boxCB.addItemListener(this);
739	1382
740	1383	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1384	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	1385	zoomBoxCB.addItemListener(this);
743	1386
744	1387	if (true) // Globals.ADVANCED)
745	1388	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	1389	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1390	+// supportCB.setToolTipText("Enable rigging");
	1391	+// supportCB.addItemListener(this);
	1392	+
	1393	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1394	+ freezeCB.setToolTipText("Fast moving camera");
	1395	+ freezeCB.addItemListener(this);
749	1396
750	1397	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	1398	// localCB.addItemListener(this);
752	1399
	1400	+ panel.Return();
	1401	+
753	1402	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	1403	crowdCB.setToolTipText("Used for crowds");
755	1404	crowdCB.addItemListener(this);
..	..	@@ -758,14 +1407,19 @@
758	1407	smoothCB.setToolTipText("Snapping delay");
759	1408	smoothCB.addItemListener(this);
760	1409
761		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
762		- slowCB.setToolTipText("Smooth interpolation");
763		- slowCB.addItemListener(this);
	1410	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1411	+// slowCB.setToolTipText("Smooth interpolation");
	1412	+// slowCB.addItemListener(this);
	1413	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1414	+ minshaderCB.setToolTipText("Minimal fast shader");
	1415	+ minshaderCB.addItemListener(this);
764	1416
765	1417	// constraints.gridy += 1;
766	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	1419	// speakerMocapCB.addItemListener(this);
768	1420
	1421	+ panel.Return();
	1422	+
769	1423	if (false)
770	1424	{
771	1425	// handled in scripts
..	..	@@ -780,34 +1434,82 @@
780	1434	//constraints.gridy += 1;
781	1435	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	1436	smoothfocusCB.addItemListener(this);
	1437	+ panel.Return();
783	1438	}
784	1439
785	1440	//constraints.gridx += 1;
786	1441	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	1442	// debugCB.addItemListener(this);
788	1443
	1444	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1445	+ trackCB.setToolTipText("Enable tracking target");
	1446	+ trackCB.addItemListener(this);
	1447	+
789	1448	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1449	+ oeilCB.setToolTipText("Move camera when tracking");
790	1450	oeilCB.addItemListener(this);
791	1451
	1452	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1453	+ shadowCB.setToolTipText("When live compute shadows");
	1454	+ shadowCB.addItemListener(this);
	1455	+
	1456	+ panel.Return();
	1457	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1458	+ toggleTextureCB.setToolTipText("Load textures");
	1459	+ toggleTextureCB.addItemListener(this);
	1460	+
	1461	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1462	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1463	+ toggleSwitchCB.addItemListener(this);
	1464	+
	1465	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1466	+ autokeepCB.setToolTipText("On structure change");
	1467	+ autokeepCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ if (Globals.ADVANCED)
	1471	+ {
792	1472	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	1473	lookAtCB.setToolTipText("Look-at target");
794	1474	lookAtCB.addItemListener(this);
	1475	+ }
795	1476
796	1477	}
797	1478
798	1479	cGridBag fill = new cGridBag();
799		-
800	1480	fill.preferredHeight = 200;
	1481	+ cGridBag fill2 = new cGridBag();
	1482	+ fill2.preferredHeight = 200;
	1483	+ cGridBag fill3 = new cGridBag();
	1484	+ fill3.preferredHeight = 200;
801	1485
802	1486	panel.add(fill);
	1487	+ panel.add(fill2);
	1488	+ panel.add(fill3);
803	1489
804	1490	}
805	1491
806	1492	void EditObject(Object3D obj)
807	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
808	1502	cRadio radioButton = new cRadio(obj.name);
	1503	+
	1504	+ // June 2019. Patch to avoid bug with transparency.
	1505	+ radioButton.hadMaterial = obj.material != null;
	1506	+ if (!radioButton.hadMaterial)
	1507	+ {
	1508	+ obj.material = new cMaterial();
	1509	+ }
	1510	+
809	1511	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
811	1513	radioButton.SetCamera(cameraView.renderCamera, false);
812	1514	radioButton.addActionListener(this);
813	1515	radioPanel.add(radioButton);
..	..	@@ -817,31 +1519,41 @@
817	1519
818	1520	void SetupViews(ObjEditor oe)
819	1521	{
	1522	+ theFrame = this;
	1523	+
820	1524	oe.SetupViews();
821	1525
	1526	+ if (Globals.DEBUG)
822	1527	System.out.println("SetupViews");
823	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
824	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
825	1530	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1531	}
827	1532
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;
	1533	+ cToggleButton liveCB;
	1534	+ cCheckBox supportCB;
	1535	+ cCheckBox localCB;
	1536	+ cCheckBox crowdCB;
	1537	+ cCheckBox smoothCB;
	1538	+ cCheckBox minshaderCB;
	1539	+
	1540	+ cToggleButton fastCB;
	1541	+ cCheckBox slowCB;
	1542	+ cCheckBox boxCB;
	1543	+ cCheckBox zoomBoxCB;
	1544	+ cCheckBox freezeCB;
	1545	+ //cToggleButton trackCB;
	1546	+ cCheckBox trackCB;
	1547	+ cCheckBox smoothfocusCB;
839	1548	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1549	+ cCheckBox speakerCameraCB;
	1550	+ cCheckBox speakerFocusCB;
	1551	+ cCheckBox debugCB;
	1552	+
	1553	+ cCheckBox oeilCB;
	1554	+ cCheckBox shadowCB;
	1555	+ cCheckBox autokeepCB;
	1556	+ cCheckBox lookAtCB;
845	1557
846	1558	// static int COLOR = 1;
847	1559	// static int MATERIAL = 2;
..	..	@@ -849,9 +1561,9 @@
849	1561
850	1562	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1563
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1564	+ cCheckBox colorCB;
	1565	+ cCheckBox materialCB;
	1566	+ cCheckBox textureCB;
855	1567
856	1568	public void itemStateChanged(ItemEvent e)
857	1569	{
..	..	@@ -895,6 +1607,12 @@
895	1607	{
896	1608	cameraView.ToggleInertia();
897	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
898	1616	}
899	1617	else if(e.getSource() == localCB)
900	1618	{
..	..	@@ -944,6 +1662,18 @@
944	1662	{
945	1663	cameraView.ToggleOeil();
946	1664	}
	1665	+ else if(e.getSource() == shadowCB)
	1666	+ {
	1667	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1668	+ }
	1669	+ else if(e.getSource() == freezeCB)
	1670	+ {
	1671	+ Globals.FREEZEONMOVE ^= true;
	1672	+ }
	1673	+ else if(e.getSource() == autokeepCB)
	1674	+ {
	1675	+ Globals.REPLACEONMAKE ^= true;
	1676	+ }
947	1677	else if(e.getSource() == lookAtCB)
948	1678	{
949	1679	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1690,8 @@
960	1690
961	1691	/**/
962	1692	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1694	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1695	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1696	// We can't move the root node or an empty selection
966	1697	return;
..	..	@@ -1023,8 +1754,6 @@
1023	1754	}
1024	1755	}
1025	1756
1026		- String string = (String) object;
1027		-
1028	1757	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1758	// if( object instanceof java.io.File[])
1030	1759	// {
..	..	@@ -1032,6 +1761,8 @@
1032	1761	// objEditor.DropFile((java.io.File[]) object, true);
1033	1762	// return;
1034	1763	// }
	1764	+
	1765	+ String string = object.toString();
1035	1766
1036	1767	// File path for Mac and Windows
1037	1768	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1808,33 @@
1077	1808
1078	1809	assert target == objEditor.jTree;
1079	1810	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1811	+ Object3D destinationLeaf;
1080	1812	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1813	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1814	} catch (Exception e) {
1083	1815	System.out.println("destinationPath : " + destinationPath);
1084	1816	return;
1085	1817	}
1086	1818
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+ for (int i=group.selection.size(); --i>=0;)
1088	1820	{
	1821	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1822	+
	1823	+ // Cannot move into itself
	1824	+ if (child == destinationLeaf)
	1825	+ return;
	1826	+ }
	1827	+
	1828	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1829	+// {
1089	1830	loadClipboard(true);
1090	1831	objEditor.jTree.setSelectionPath(destinationPath);
1091	1832	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1833	+// } else {
	1834	+// loadClipboard(false);
	1835	+// objEditor.jTree.setSelectionPath(destinationPath);
	1836	+// pasteInto(false, false); // true); // ???
	1837	+// }
1097	1838	}
1098	1839	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1840	// Called if the user has modified the current drop gesture
..	..	@@ -1149,7 +1890,12 @@
1149	1890	TreePath path;
1150	1891
1151	1892	public TransferableTreePath(TreePath tp) {
1152		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1153	1899	}
1154	1900
1155	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1198,22 +1944,30 @@
1198	1944	{
1199	1945	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1946	//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);
	1947	+// gridItem = menu.add(new MenuItem("Grid"));
	1948	+// gridItem.addActionListener(this);
	1949	+// rectoidItem = menu.add(new MenuItem("Box"));
	1950	+// rectoidItem.addActionListener(this);
	1951	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1952	+// ellipsoidItem.addActionListener(this);
	1953	+// coneItem = menu.add(new MenuItem("Cone"));
	1954	+// coneItem.addActionListener(this);
	1955	+// torusItem = menu.add(new MenuItem("Torus"));
	1956	+// torusItem.addActionListener(this);
	1957	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1958	+// superItem.addActionListener(this);
	1959	+
	1960	+ cameraItem = menu.add(new MenuItem("Camera"));
	1961	+ cameraItem.addActionListener(this);
	1962	+
	1963	+ if (!Globals.ADVANCED)
	1964	+ {
1213	1965	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1966	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1967	+ }
	1968	+
	1969	+// particleItem = menu.add(new MenuItem("Particle system"));
	1970	+// particleItem.addActionListener(this);
1217	1971	if (Globals.ADVANCED)
1218	1972	{
1219	1973	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1993,15 @@
1239	1993	}
1240	1994	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1995	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);
	1996	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1997	+// overlayItem.addActionListener(this);
	1998	+// lightItem = menu.add(new MenuItem("Light"));
	1999	+// lightItem.addActionListener(this);
1246	2000	menu.add("-");
1247	2001	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	2002	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	2003	+// loopItem = menu.add(new MenuItem("Loop"));
	2004	+// loopItem.addActionListener(this);
1251	2005	doubleItem = menu.add(new MenuItem("Fork"));
1252	2006	doubleItem.addActionListener(this);
1253	2007	if (Globals.ADVANCED)
..	..	@@ -1263,6 +2017,9 @@
1263	2017	animationItem.addItemListener(this);
1264	2018	animationItem.setState(Globals.ANIMATION);
1265	2019
	2020	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2021	+ archiveItem.addActionListener(this);
	2022	+
1266	2023	menu.add("-");
1267	2024	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	2025	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +2032,8 @@
1275	2032	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	2033	reduce34MorphItem.addActionListener(this);
1277	2034	menu.add("-");
	2035	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2036	+ memoryItem.addActionListener(this);
1278	2037	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	2038	computeAOItem.addActionListener(this);
1280	2039
..	..	@@ -1283,8 +2042,6 @@
1283	2042	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	2043	mirrorItem.addActionListener(this);
1285	2044	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	2045	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	2046	analyzeItem.addActionListener(this);
1290	2047	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +2185,38 @@
1428	2185	shadow.material = new cMaterial(obj.material);
1429	2186	shadow.material.diffuse = 0.0001f;
1430	2187	shadow.material.specular = 0.0001f;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1431	2193
1432	2194	makeSomething(shadow);
1433	2195	}
	2196	+
	2197	+ private void ClearUnpinned()
	2198	+ {
	2199	+ //for (Object3D obj : listUI)
	2200	+ for (int i=listUI.size(); --i>=0;)
	2201	+ {
	2202	+ Object3D obj = listUI.elementAt(i);
	2203	+ if (!obj.pinned)
	2204	+ {
	2205	+ obj.CloseUI();
	2206	+ listUI.remove(i);
	2207	+ }
	2208	+ }
	2209	+ }
	2210	+
	2211	+ private void EditElement(Object3D elem, boolean newWindow)
	2212	+ {
	2213	+ // if (!(elem instanceof Composite))
	2214	+ // newWindow = false;
	2215	+ listUI.add(elem);
	2216	+ elem.openEditWindow(this, newWindow); //, false);
	2217	+ System.out.println("edit : " + elem);
	2218	+ elem.editWindow.refreshContents(true); // ? new
	2219	+ }
1434	2220
1435	2221	/**
1436	2222	* applyExample
..	..	@@ -1675,7 +2461,7 @@
1675	2461	{
1676	2462	ScreenFit();
1677	2463	} else
1678		- if (source == switchItem)
	2464	+ if (source == switchViewItem)
1679	2465	{
1680	2466	cVector v1 = new cVector();
1681	2467	cVector v2 = new cVector();
..	..	@@ -1684,11 +2470,11 @@
1684	2470	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	2471	objEditor.cameraView.repaint();
1686	2472	} else
1687		- if (source == rectoidItem)
	2473	+ if (source == rectoidItem \|\| source == boxButton)
1688	2474	{
1689	2475	makeSomething(new Box());
1690	2476	} else
1691		- if (source == particleItem)
	2477	+ if (source == particleItem \|\| source == particlesButton)
1692	2478	{
1693	2479	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	2480	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2553,27 @@
1767	2553
1768	2554	makeSomething(obj);
1769	2555	} else
1770		- if (source == gridItem)
	2556	+ if (source == gridItem \|\| source == gridButton)
1771	2557	{
1772	2558	makeSomething(new Grid());
1773	2559	} else
1774		- if (source == ellipsoidItem)
	2560	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2561	{
1776	2562	makeSomething(new Sphere());
1777	2563	} else
1778		- if (source == coneItem)
	2564	+ if (source == coneItem \|\| source == coneButton)
1779	2565	{
1780	2566	makeSomething(new Cone());
1781	2567	} else
1782		- if (source == torusItem)
	2568	+ if (source == torusItem \|\| source == torusButton)
1783	2569	{
1784	2570	makeSomething(new Torus());
1785	2571	} else
1786		- if (source == superItem)
	2572	+ if (source == superItem \|\| source == superButton)
1787	2573	{
1788	2574	makeSomething(new Superellipsoid());
1789	2575	} else
1790		- if (source == kleinItem)
	2576	+ if (source == kleinItem \|\| source == kleinButton)
1791	2577	{
1792	2578	makeSomething(new Klein());
1793	2579	} else
..	..	@@ -1807,7 +2593,7 @@
1807	2593	{
1808	2594	makeSomething(new BezierSurface());
1809	2595	} else
1810		- if (source == overlayItem)
	2596	+ if (source == overlayItem \|\| source == overlayButton)
1811	2597	{
1812	2598	/*
1813	2599	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,10 +2641,27 @@
1855	2641	s.setup();
1856	2642	makeSomething(s);
1857	2643	} else
1858		- if (source == lightItem)
	2644	+ if (source == lightItem \|\| source == lightButton)
1859	2645	{
1860	2646	makeSomething(new Light());
1861	2647	} else
	2648	+// if (source == skybox1Button \|\|
	2649	+// source == skybox2Button \|\|
	2650	+// source == skybox3Button \|\|
	2651	+// source == skybox4Button \|\|
	2652	+// source == skybox5Button \|\|
	2653	+// source == skybox6Button \|\|
	2654	+// source == skybox7Button \|\|
	2655	+// source == skybox11Button \|\|
	2656	+// source == skybox12Button \|\|
	2657	+// source == skybox13Button \|\|
	2658	+// source == skybox14Button \|\|
	2659	+// source == skybox15Button \|\|
	2660	+// source == skybox16Button \|\|
	2661	+// source == skybox17Button)
	2662	+// {
	2663	+// ChangeSkybox(source);
	2664	+// } else
1862	2665	if (source == csgItem)
1863	2666	{
1864	2667	group(new CSG());
..	..	@@ -1905,30 +2708,38 @@
1905	2708
1906	2709	group(g);
1907	2710	} else
1908		- if (source == loopItem)
	2711	+ if (source == loopItem \|\| source == loopButton)
1909	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
1910	2715	Composite csg = new GroupLeaf();
1911	2716	csg.count = 5;
1912		- group(csg);
1913		- Composite child = new cGroup();
	2717	+ Composite child = new cGroup("Branch");
1914	2718	csg.addChild(child);
1915	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
1916	2722	} else
1917	2723	if (source == doubleItem)
1918	2724	{
1919		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Fork");
1920	2728	csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
	2730	+ csg.addChild(child);
	2731	+ child.addChild(csg);
	2732	+ child = new cGroup("Branch B");
	2733	+ csg.addChild(child);
	2734	+ child.addChild(csg);
1921	2735	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);
	2736	+ }
1928	2737	} else
1929	2738	if (source == tripleItem)
1930	2739	{
1931		- Composite csg = new GroupLeaf();
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
	2742	+ Composite csg = new GroupLeaf("Trident");
1932	2743	csg.count = 4;
1933	2744	group(csg);
1934	2745	Composite child = new cGroup();
..	..	@@ -1940,11 +2751,12 @@
1940	2751	child = new cGroup();
1941	2752	csg.addChild(child);
1942	2753	child.addChild(csg);
	2754	+ }
1943	2755	} else
1944	2756	if (source == computeAOItem)
1945	2757	{
1946	2758	Globals.drawMode = CameraPane.OCCLUSION;
1947		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
1948	2760	} else
1949	2761	if (source == recompileItem)
1950	2762	{
..	..	@@ -1959,7 +2771,7 @@
1959	2771	if (source == invariantsItem)
1960	2772	{
1961	2773	System.out.println("Invariants:");
1962		- Grafreed.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
1963	2775	} else
1964	2776	if (source == memoryItem)
1965	2777	{
..	..	@@ -1978,17 +2790,64 @@
1978	2790	{
1979	2791	DumpObject();
1980	2792	} else
1981		- if (source == undoButton)
	2793	+ if (source == minButton)
1982	2794	{
1983		- Undo();
	2795	+ Minimize();
1984	2796	} else
1985		- if (source == redoButton)
	2797	+ if (source == maxButton)
1986	2798	{
1987		- Redo();
	2799	+ Maximize();
1988	2800	} else
1989		- if (source == saveButton)
	2801	+ if (source == fullButton)
1990	2802	{
1991		- Save();
	2803	+ ToggleFullScreen();
	2804	+ } else
	2805	+ if (source == collapseButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
	2809	+ } else
	2810	+ if (source == maximize3DButton)
	2811	+ {
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
	2816	+ } else
	2817	+ if (source == previousVersionButton)
	2818	+ {
	2819	+ // Go to previous version
	2820	+ //if (!Undo())
	2821	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ PreviousVersion();
	2823	+ } else
	2824	+ if (source == restoreButton)
	2825	+ {
	2826	+ // Restore current version
	2827	+ Restore();
	2828	+ //restoreButton.setEnabled(false);
	2829	+ } else
	2830	+ if (source == replaceButton)
	2831	+ {
	2832	+ // Overwrite current version
	2833	+ Replace();
	2834	+ //replaceButton.setEnabled(false);
	2835	+ } else
	2836	+ if (source == nextVersionButton)
	2837	+ {
	2838	+ // Go to next version
	2839	+ NextVersion();
	2840	+ } else
	2841	+ if (source == saveVersionButton)
	2842	+ {
	2843	+ // Save a new version
	2844	+ if (!Save(true))
	2845	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2846	+ } else
	2847	+ if (source == deleteVersionButton)
	2848	+ {
	2849	+ // Delete a new version
	2850	+ DeleteVersion();
1992	2851	} else
1993	2852	if (source == oneStepButton)
1994	2853	{
..	..	@@ -1997,17 +2856,14 @@
1997	2856	} else
1998	2857	if (source == screenfitButton)
1999	2858	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2859	ScreenFit();
2002	2860	} else
2003	2861	if (source == screenfitpointButton)
2004	2862	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2863	ScreenFitPoint();
2007	2864	} else
2008	2865	if (source == snapobjectButton)
2009	2866	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2867	SnapObject();
2012	2868	} else
2013	2869	// if (event.getSource() == recompileButton)
..	..	@@ -2046,11 +2902,11 @@
2046	2902	} else
2047	2903	if (source == undoItem)
2048	2904	{
2049		- Undo();
	2905	+ PreviousVersion();
2050	2906	} else
2051	2907	if (source == redoItem)
2052	2908	{
2053		- Redo();
	2909	+ NextVersion();
2054	2910	} else
2055	2911	if (source == duplicateItem)
2056	2912	{
..	..	@@ -2371,7 +3227,7 @@
2371	3227	{
2372	3228	StepAll();
2373	3229	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	3231	{
2376	3232	//int indices[] = jList.getSelectedIndices();
2377	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +3239,9 @@
2383	3239	{
2384	3240	ClearSelection(true);
2385	3241	} else
2386		- if (source == grabItem)
	3242	+ if (source == grabItem \|\| source == groupButton)
2387	3243	{
2388		- group(new cGroup(), true);
	3244	+ group(new cGroup(), false); // true);
2389	3245	} else
2390	3246	if (source == hideItem)
2391	3247	{
..	..	@@ -2403,11 +3259,11 @@
2403	3259	{
2404	3260	makeSomething(new Camera());
2405	3261	} else
2406		- if (source == compositeItem)
	3262	+ if (source == compositeItem \|\| source == compositeButton)
2407	3263	{
2408	3264	group(new Composite());
2409	3265	} else
2410		- if (source == randomItem)
	3266	+ if (source == switchItem \|\| source == switchButton)
2411	3267	{
2412	3268	RandomNode random = new RandomNode();
2413	3269	group(random);
..	..	@@ -2509,7 +3365,7 @@
2509	3365	{
2510	3366	group(new cLinker());
2511	3367	} else
2512		- if (source == textureItem)
	3368	+ if (source == textureItem \|\| source == textureButton)
2513	3369	{
2514	3370	group(new TextureNode());
2515	3371	} else
..	..	@@ -2529,17 +3385,42 @@
2529	3385	{
2530	3386	CastShadow(2);
2531	3387	} else
2532		- if (source == ungroupItem)
	3388	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	3389	{
2534		- //ungroup();
	3390	+ boolean canUngroup = true;
	3391	+
2535	3392	for (int i=0; i<group.selection.size(); i++)
2536	3393	{
2537		- Ungroup(group.selection.get(i));
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
	3397	+ {
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
	3407	+ break;
	3408	+ }
2538	3409	}
2539	3410
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	3411	+ if (canUngroup)
	3412	+ {
	3413	+ for (int i=0; i<group.selection.size(); i++)
	3414	+ {
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
	3418	+ }
	3419	+
	3420	+ ClearSelection(false);
	3421	+
	3422	+ refreshContents();
	3423	+ }
2543	3424	} else
2544	3425	if (source == genUVItem)
2545	3426	{
..	..	@@ -2840,7 +3721,7 @@
2840	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2841	3722	{
2842	3723	obj = (Object3D)e.nextElement();
2843		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
2844	3725	}
2845	3726
2846	3727	refreshContents();
..	..	@@ -2856,6 +3737,31 @@
2856	3737
2857	3738	refreshContents();
2858	3739	} else
	3740	+ if (source == embedTexturesItem)
	3741	+ {
	3742	+ Object3D obj;
	3743	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3744	+ {
	3745	+ obj = (Object3D)e.nextElement();
	3746	+ obj.EmbedTextures(true);
	3747	+ }
	3748	+
	3749	+ refreshContents();
	3750	+ } else
	3751	+ if (source == deEmbedTexturesItem)
	3752	+ {
	3753	+ Object3D obj;
	3754	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3755	+ {
	3756	+ obj = (Object3D)e.nextElement();
	3757	+ obj.EmbedTextures(false);
	3758	+ }
	3759	+
	3760	+ CameraPane.texturepigment.clear();
	3761	+ CameraPane.texturebump.clear();
	3762	+
	3763	+ refreshContents();
	3764	+ } else
2859	3765	if (source == flashSelectionButton)
2860	3766	{
2861	3767	CameraPane.flash = true;
..	..	@@ -2867,42 +3773,36 @@
2867	3773	if (source == twoButton)
2868	3774	{
2869	3775	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();
	3776	+
	3777	+ if (CameraPane.FULLSCREEN)
	3778	+ fullscreenLayout = radio.layout;
	3779	+
	3780	+ Show3DView();
	3781	+
	3782	+ cameraView.requestFocusInWindow();
	3783	+
	3784	+// refreshContents(true);
	3785	+//
	3786	+// try
	3787	+// {
	3788	+// java.awt.Robot bot = new java.awt.Robot();
	3789	+// int mask = InputEvent.BUTTON1_MASK;
	3790	+// bot.mouseMove(100, 100);
	3791	+// bot.mousePress(mask);
	3792	+// bot.mouseRelease(mask);
	3793	+// }
	3794	+// catch (Exception e)
	3795	+// {
	3796	+//
	3797	+// }
	3798	+
2902	3799	} else
2903	3800	if (source == threeButton)
2904	3801	{
2905	3802	radio.layout = threeButton;
	3803	+
	3804	+ if (CameraPane.FULLSCREEN)
	3805	+ fullscreenLayout = radio.layout;
2906	3806
2907	3807	// bigThree.remove(scenePanel);
2908	3808	// bigThree.remove(centralPanel);
..	..	@@ -2932,13 +3832,18 @@
2932	3832	// centralPanel.setVisible(true);
2933	3833	// XYZPanel.setVisible(true);
2934	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
2935	3836	bigThree.add(centralPanel);
2936		- bigThree.add(XYZPanel);
2937	3837	bigThree.FlushUI();
	3838	+
	3839	+ cameraView.requestFocusInWindow();
2938	3840	} else
2939	3841	if (source == fourButton)
2940	3842	{
2941	3843	radio.layout = fourButton;
	3844	+
	3845	+ if (CameraPane.FULLSCREEN)
	3846	+ fullscreenLayout = radio.layout;
2942	3847
2943	3848	// bigThree.remove(scenePanel);
2944	3849	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3875,15 @@
2970	3875	bigThree.ClearUI();
2971	3876	bigThree.add(scenePanel);
2972	3877	bigThree.FlushUI();
	3878	+
	3879	+ cameraView.requestFocusInWindow();
2973	3880	} else
2974	3881	if (source == sixButton)
2975	3882	{
2976	3883	radio.layout = sixButton;
	3884	+
	3885	+ if (CameraPane.FULLSCREEN)
	3886	+ fullscreenLayout = radio.layout;
2977	3887
2978	3888	// bigThree.remove(scenePanel);
2979	3889	// bigThree.remove(centralPanel);
..	..	@@ -3003,13 +3913,18 @@
3003	3913	// centralPanel.setVisible(true);
3004	3914	// XYZPanel.setVisible(false);
3005	3915	bigThree.ClearUI();
3006		- bigThree.add(scenePanel);
3007	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
3008	3918	bigThree.FlushUI();
	3919	+
	3920	+ cameraView.requestFocusInWindow();
3009	3921	} else
3010	3922	if (source == sevenButton)
3011	3923	{
3012	3924	radio.layout = sevenButton;
	3925	+
	3926	+ if (CameraPane.FULLSCREEN)
	3927	+ fullscreenLayout = radio.layout;
3013	3928
3014	3929	// bigThree.remove(scenePanel);
3015	3930	// bigThree.remove(centralPanel);
..	..	@@ -3043,9 +3958,12 @@
3043	3958	bigThree.add(centralPanel);
3044	3959	bigThree.add(XYZPanel);
3045	3960	bigThree.FlushUI();
	3961	+
	3962	+ cameraView.requestFocusInWindow();
3046	3963	} else
3047	3964	if (source == rootButton)
3048	3965	{
	3966	+ Replace();
3049	3967	Object3D obj;
3050	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3051	3969	{
..	..	@@ -3054,31 +3972,49 @@
3054	3972	EditObject(obj);
3055	3973	}
3056	3974
	3975	+ cameraView.requestFocusInWindow();
3057	3976	refreshContents(true);
3058	3977	} else
3059	3978	if (source == closeButton)
3060	3979	{
3061	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
3062	3983	cRadio ab;
3063	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3985	{
3065	3986	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3987	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3988	{
	3989	+ // Patch to avoid bug with transparency.
	3990	+ if (!ab.hadMaterial)
	3991	+ {
	3992	+ ab.object.material = null;
	3993	+ }
	3994	+
3068	3995	buttonGroup.remove(ab);
3069	3996	radioPanel.remove(ab);
3070	3997
3071		- ab.GetObject().editWindow = null;
	3998	+ //ab.GetObject().editWindow = null;
	3999	+ ab.GetObject().manipWindow = null;
3072	4000	// ab.GetObject().objectUI = null; // ?????????
3073	4001
3074	4002	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	4003	break;
3076	4004	}
3077	4005	}
	4006	+
	4007	+ cameraView.requestFocusInWindow();
3078	4008	refreshContents(true);
3079	4009	} else
3080	4010	if (source == editItem \|\| source == editButton)
3081	4011	{
	4012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4013	+ {
	4014	+ Object3D child = (Object3D)e.nextElement();
	4015	+ child.pinned = true;
	4016	+ }
	4017	+
3082	4018	EditSelection(false);
3083	4019	} else
3084	4020	if (source == uneditButton)
..	..	@@ -3087,9 +4023,10 @@
3087	4023	{
3088	4024	Object3D child = (Object3D)e.nextElement();
3089	4025	if(child.editWindow != null)
3090		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4026	+ child.pinned = false;
3091	4027	child.CloseUI();
3092	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	4030
3094	4031	//child.editWindow = null; // ???????????
3095	4032	}
..	..	@@ -3104,16 +4041,18 @@
3104	4041	//copy.ClearUI();
3105	4042	for (Object3D obj : listUI)
3106	4043	{
	4044	+ obj.pinned = false;
3107	4045	obj.CloseUI();
3108	4046	}
3109	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
3110	4049	refreshContents(true);
3111	4050	} else
3112	4051	if (source == allParamsButton)
3113	4052	{
3114	4053	assert(copy == group);
3115	4054
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4055	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	4056
3118	4057	for (Object3D obj : listUI)
3119	4058	{
..	..	@@ -3139,6 +4078,8 @@
3139	4078	} else
3140	4079	if(source instanceof cRadio)
3141	4080	{
	4081	+ Replace();
	4082	+
3142	4083	group.parent = keepparent;
3143	4084	group.attributes = 0;
3144	4085	//group.editWindow = null;
..	..	@@ -3162,6 +4103,7 @@
3162	4103	}
3163	4104
3164	4105	copy = group;
	4106	+
3165	4107	//Globals.theRenderer.object = group;
3166	4108	if(!useclient)
3167	4109	{
..	..	@@ -3179,7 +4121,8 @@
3179	4121	}
3180	4122
3181	4123	// fix "+" issue
3182		- group.editWindow = this;
	4124	+ //group.editWindow = this;
	4125	+ group.manipWindow = this;
3183	4126
3184	4127	/*
3185	4128	currentLayout = radio.layout;
..	..	@@ -3187,20 +4130,55 @@
3187	4130	currentLayout = sevenButton;
3188	4131	*/
3189	4132	radio.layout.doClick();
	4133	+
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
	4157	+ ClearUnpinned();
	4158	+
	4159	+ //Grafreed.Assert(group != null);
	4160	+ //Grafreed.Assert(group.selection != null);
	4161	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4162	+ if (group.selection == null \|\| group.selection.size() == 1)
	4163	+ EditSelection(false);
3190	4164	keepparent = group.parent;
3191	4165	// PARENT = NULL or not???
3192	4166	//group.parent = null; // ROOT
3193	4167	//group.attributes = -1;
3194	4168	ResetModel();
	4169	+
	4170	+ cameraView.requestFocusInWindow();
3195	4171	refreshContents(true);
3196	4172	} else if (event.getSource() == editCameraItem)
3197	4173	{
3198	4174	cameraView.ProtectCamera();
	4175	+ cameraView.requestFocusInWindow();
3199	4176	cameraView.repaint();
3200	4177	return;
3201		- } else if (event.getSource() == revertCameraItem)
	4178	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	4179	{
3203	4180	cameraView.RevertCamera();
	4181	+ cameraView.requestFocusInWindow();
3204	4182	cameraView.repaint();
3205	4183	return;
3206	4184	// } else if (event.getSource() == textureButton)
..	..	@@ -3215,7 +4193,6 @@
3215	4193	}
3216	4194
3217	4195	boolean useclient = false;
3218		- cRadio radio;
3219	4196
3220	4197	void ToggleRoot()
3221	4198	{
..	..	@@ -3320,7 +4297,7 @@
3320	4297	TouchTransform(obj);
3321	4298	continue;
3322	4299	}
3323		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3324	4301	{
3325	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3326	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3328,10 +4305,6 @@
3328	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3329	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3330	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3331		- }
3332		- if ((mask&4) != 0) // Rotation
3333		- {
3334		- // ?
3335	4308	}
3336	4309	if ((mask&1) != 0) // Translation
3337	4310	{
..	..	@@ -3778,7 +4751,7 @@
3778	4751
3779	4752	try
3780	4753	{
3781		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4754	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3782	4755	}
3783	4756	catch (Exception e)
3784	4757	{
..	..	@@ -4253,28 +5226,25 @@
4253	5226	// }
4254	5227	// }
4255	5228
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	5229	void EditSelection(boolean newWindow)
4261	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4262	5237	// aConstraints.gridy = 0;
4263	5238	for (int i=0; i<group.selection.size(); i++)
4264	5239	{
4265	5240	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	5241	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5242	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	5243
4269	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	5245	if(elem != group \|\| !newWindow)
4271	5246	{
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
	5247	+ EditElement(elem, newWindow); // ? new
4278	5248	}
4279	5249	}
4280	5250	}
..	..	@@ -4337,9 +5307,7 @@
4337	5307
4338	5308	freezemodel = false;
4339	5309	}
4340		-
4341		- boolean flashIt = true;
4342		-
	5310	+
4343	5311	public void valueChanged(TreeSelectionEvent e)
4344	5312	//public boolean handleEvent(Event event)
4345	5313	{
..	..	@@ -4349,7 +5317,8 @@
4349	5317	//new Exception().printStackTrace();
4350	5318
4351	5319	freezemodel = true;
4352		-
	5320	+ ClearUnpinned();
	5321	+
4353	5322	/**/
4354	5323	//switch (event.id)
4355	5324	{
..	..	@@ -4382,7 +5351,7 @@
4382	5351	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	5352	// a camera
4384	5353	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5354	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	5355	{
4387	5356	CameraPane.camerachangeframe = 0; // don't refuse it
4388	5357	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +5360,13 @@
4391	5360	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	5361	}
4393	5362
	5363	+ if (tps != null && tps.length == 1)
	5364	+ {
	5365	+ EditSelection(false);
	5366	+ }
	5367	+
	5368	+ SetPinStates(tps != null && tps.length > 0);
	5369	+
4394	5370	refreshContents();
4395	5371	//return true;
4396	5372	}
..	..	@@ -4400,9 +5376,36 @@
4400	5376	freezemodel = false;
4401	5377	}
4402	5378
	5379	+ void SetPinStates(boolean enabled)
	5380	+ {
	5381	+ editButton.setEnabled(enabled);
	5382	+ uneditButton.setEnabled(enabled);
	5383	+ //unselectButton.setEnabled(enabled);
	5384	+ flashSelectionButton.setEnabled(enabled);
	5385	+
	5386	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
	5402	+ }
	5403	+
4403	5404	void refreshContents(boolean cp)
4404	5405	{
4405		- if (!Globals.MOUSEDRAGGED)
	5406	+ if (Globals.ADVANCED)
	5407	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5408	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	5409	{
4407	5410	objEditor.ClearInfo(); // .GetMaterial());
4408	5411
..	..	@@ -4411,7 +5414,7 @@
4411	5414	Object3D child = (Object3D) group.selection.get(i);
4412	5415
4413	5416	objEditor.AddInfo(child, this, true);
4414		- System.err.println("info : " + child.GetPath());
	5417	+// System.err.println("info : " + child.GetPath());
4415	5418	}
4416	5419
4417	5420	objEditor.SetText(); // jan 2014
..	..	@@ -4501,7 +5504,8 @@
4501	5504
4502	5505	if (cut)
4503	5506	{
4504		- Save();
	5507	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5508	+// Save();
4505	5509	//int indices[] = jList.getSelectedIndices();
4506	5510	//for (int i = indices.length - 1; i >= 0; i--)
4507	5511	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5608,10 @@
4604	5608
4605	5609	void paste(boolean expand)
4606	5610	{
	5611	+ if (Globals.REPLACEONMAKE)
	5612	+ Save();
	5613	+ boolean keep = Globals.REPLACEONMAKE;
	5614	+ Globals.REPLACEONMAKE = false;
4607	5615	// if (GrafreeD.clipboard == null)
4608	5616	// return;
4609	5617	boolean first = true;
..	..	@@ -4663,6 +5671,7 @@
4663	5671	Grafreed.clipboard.get(0).parent = keepparent;
4664	5672	}
4665	5673
	5674	+ Globals.REPLACEONMAKE = keep;
4666	5675	ResetModel();
4667	5676	refreshContents();
4668	5677	}
..	..	@@ -4798,6 +5807,10 @@
4798	5807
4799	5808	void group(Object3D csg, boolean grab)
4800	5809	{
	5810	+ if (Globals.REPLACEONMAKE)
	5811	+ Save();
	5812	+ boolean keep = Globals.REPLACEONMAKE;
	5813	+ Globals.REPLACEONMAKE = false;
4801	5814	if (//false) // why??
4802	5815	!group.selection.isEmpty())
4803	5816	{
..	..	@@ -4911,10 +5924,15 @@
4911	5924	//node.add(csg);
4912	5925	//makeSomething(node);
4913	5926	makeSomething(csg);
	5927	+ Globals.REPLACEONMAKE = keep;
4914	5928	}
4915	5929
4916	5930	void Ungroup(Object3D g)
4917	5931	{
	5932	+ if (Globals.REPLACEONMAKE)
	5933	+ Save();
	5934	+ boolean keep = Globals.REPLACEONMAKE;
	5935	+ Globals.REPLACEONMAKE = false;
4918	5936	if (g instanceof HiddenObject)
4919	5937	{
4920	5938	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5949,7 @@
4931	5949	objEditor.makeSomething(g.get(i), false);
4932	5950	}
4933	5951	}
	5952	+ Globals.REPLACEONMAKE = keep;
4934	5953	}
4935	5954
4936	5955	void ungroup()
..	..	@@ -5219,10 +6238,43 @@
5219	6238	cButton clearpanelButton;
5220	6239	cButton unselectButton;
5221	6240
5222		- cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
	6241	+ cButton restoreCameraButton;
	6242	+
5225	6243	cButton oneStepButton;
	6244	+
	6245	+ cButton groupButton;
	6246	+ cButton ungroupButton;
	6247	+ cButton compositeButton;
	6248	+ cButton switchButton;
	6249	+ cButton loopButton;
	6250	+ cButton textureButton;
	6251	+
	6252	+ cButton skybox1Button;
	6253	+ cButton skybox2Button;
	6254	+ cButton skybox3Button;
	6255	+ cButton skybox4Button;
	6256	+ cButton skybox5Button;
	6257	+ cButton skybox6Button;
	6258	+ cButton skybox7Button;
	6259	+
	6260	+ cButton skybox11Button;
	6261	+ cButton skybox12Button;
	6262	+ cButton skybox13Button;
	6263	+ cButton skybox14Button;
	6264	+ cButton skybox15Button;
	6265	+ cButton skybox16Button;
	6266	+ cButton skybox17Button;
	6267	+
	6268	+ cButton gridButton;
	6269	+ cButton boxButton;
	6270	+ cButton sphereButton;
	6271	+ cButton coneButton;
	6272	+ cButton torusButton;
	6273	+ cButton superButton;
	6274	+ cButton kleinButton;
	6275	+ cButton particlesButton;
	6276	+ cButton overlayButton;
	6277	+ cButton lightButton;
5226	6278
5227	6279	cButton screenfitButton;
5228	6280	cButton screenfitpointButton;
..	..	@@ -5235,14 +6287,6 @@
5235	6287
5236	6288	cButton setsupportButton;
5237	6289
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	6290	//
5247	6291	//Composite
5248	6292	Object3D // to do !!
..	..	@@ -5252,12 +6296,12 @@
5252	6296	//JTree jTree;
5253	6297	private MenuItem lookAtItem;
5254	6298	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
5256		- private MenuItem cutItem;
	6299	+ private MenuItem switchViewItem;
	6300	+ private JMenuItem cutItem;
5257	6301	private MenuItem undoItem;
5258	6302	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
5260		- private MenuItem cloneItem;
	6303	+ private JMenuItem duplicateItem;
	6304	+ private JMenuItem cloneItem;
5261	6305	private MenuItem cloneSupportItem;
5262	6306	private MenuItem overwriteGeoItem;
5263	6307	private MenuItem overwriteMatItem;
..	..	@@ -5278,13 +6322,13 @@
5278	6322	private MenuItem cloneGeometriesItem;
5279	6323	private MenuItem shareGeometriesItem;
5280	6324	private MenuItem mergeGeometriesItem;
5281		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5282	6326	private MenuItem pasteItem;
5283		- private MenuItem pasteIntoItem;
5284		- private MenuItem pasteLinkItem;
5285		- private MenuItem pasteCloneItem;
5286		- private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5288	6332	private MenuItem clearAllItem;
5289	6333	private MenuItem genUVItem;
5290	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5339,12 +6383,12 @@
5339	6383	private MenuItem transformGeometryItem;
5340	6384	private MenuItem transformChildrenItem;
5341	6385	private MenuItem hideItem;
5342		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5343	6387	private MenuItem backItem;
5344	6388	private MenuItem frontItem;
5345	6389	private MenuItem cameraItem;
5346	6390	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	6391	+ private MenuItem switchItem;
5348	6392	private MenuItem physicsItem;
5349	6393	private MenuItem frameselectorItem;
5350	6394	private MenuItem scriptNodeItem;
..	..	@@ -5352,7 +6396,7 @@
5352	6396	private MenuItem switchTransfoItem;
5353	6397	private MenuItem morphItem;
5354	6398	private MenuItem linkerItem;
5355		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5356	6400	private MenuItem editItem;
5357	6401	private MenuItem openWindowItem;
5358	6402	private MenuItem editLeafItem;
..	..	@@ -5368,6 +6412,8 @@
5368	6412	private MenuItem attachBumpItem;
5369	6413	private MenuItem detachBumpItem;
5370	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5371	6417
5372	6418	private MenuItem particleItem;
5373	6419	private MenuItem ragdollItem;
..	..	@@ -5418,5 +6464,5 @@
5418	6464
5419	6465	Menu cameraMenu;
5420	6466	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	6467	+ MenuItem restoreCameraItem;
5422	6468	}