~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -150,45 +526,52 @@
150	526
151	527	void SetupMenu2(GroupEditor oe)
152	528	{
	529	+ oe.jTree = new cTree();
	530	+
153	531	Menu menu;
154	532	oe.menuBar.add(menu = new Menu("Edit"));
155	533	//editItem = menu.add(new MenuItem("Edit"));
156	534	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	542	duplicateItem.addActionListener(this);
164		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
165	545	cloneItem.addActionListener(this);
166		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
167	547	{
168	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
169	549	cloneSupportItem.addActionListener(this);
170	550	}
	551	+ oe.jTree.popup.addSeparator();
171	552	menu.add("-");
172		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
173	554	cutItem.addActionListener(this);
174		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
175	556	copyItem.addActionListener(this);
176	557	pasteItem = menu.add(new MenuItem("Paste"));
177	558	pasteItem.addActionListener(this);
178		- menu.add("-");
179	559
180		- menu.add("-");
181		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
182	563	pasteIntoItem.addActionListener(this);
183		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184	565	pasteLinkItem.addActionListener(this);
185		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186	567	pasteCloneItem.addActionListener(this);
187		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
188	569	// pasteExpandItem.addActionListener(this);
189		- menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
192	575
193	576	if (Globals.ADVANCED)
194	577	{
..	..	@@ -202,23 +585,23 @@
202	585	//zBufferItem.addActionListener(this);
203	586	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	587	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
207	590
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	603
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	605	toggleHandleItem.addItemListener(this);
223	606	toggleHandleItem.setState(CameraPane.HANDLES);
224	607
..	..	@@ -245,7 +628,7 @@
245	628
246	629	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	630	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	631	+ toggleDebugItem.setState(Globals.DEBUG);
249	632
250	633	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	634	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,22 +649,20 @@
266	649	// animationItem.addItemListener(this);
267	650	// animationItem.setState(CameraPane.ANIMATION);
268	651	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	652	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	653	editCameraItem.addActionListener(this);
271	654
272	655	if (Globals.ADVANCED)
273	656	{
274	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	660	oe.cameraMenu.add("-");
279	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280	662	openWindowItem.addActionListener(this);
281		- editLeafItem.addActionListener(this);
282	663	lookAtItem.addActionListener(this);
283	664	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	665	+ //switchViewItem.addActionListener(this);
285	666	}
286	667
287	668	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +707,29 @@
326	707	}
327	708
328	709	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
331	712	backItem = menu.add(new MenuItem("Back"));
332	713	backItem.addActionListener(this);
333	714	frontItem = menu.add(new MenuItem("Front"));
334	715	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
337	721	hideItem = menu.add(new MenuItem("Hidden Group"));
338	722	hideItem.addActionListener(this);
339		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340	725	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
344	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	734	switchGeoItem.addActionListener(this);
346	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +737,6 @@
348	737	morphItem = menu.add(new MenuItem("Morph Group"));
349	738	morphItem.addActionListener(this);
350	739
351		- if (Globals.ADVANCED)
352		- {
353	740	menu.add("-");
354	741	physicsItem = menu.add(new MenuItem("Physics"));
355	742	physicsItem.addActionListener(this);
..	..	@@ -357,30 +744,29 @@
357	744	frameselectorItem.addActionListener(this);
358	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	746	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	747	}
363	748
364	749	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
367	752	billboardItem = menu.add(new MenuItem("Billboard"));
368	753	billboardItem.addActionListener(this);
369	754	csgItem = menu.add(new MenuItem("CSG"));
370	755	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	757	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	759	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
377	765	if (Globals.ADVANCED)
378	766	{
379	767	menu.add("-");
380	768	linkerItem = menu.add(new MenuItem("Linker"));
381	769	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	770	templateItem = menu.add(new MenuItem("Template"));
385	771	templateItem.addActionListener(this);
386	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +795,7 @@
409	795	genNormalsMESHItem.addActionListener(this);
410	796	if (Globals.ADVANCED)
411	797	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	799	genNormalsMINEItem.addActionListener(this);
414	800	}
415	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -469,6 +855,14 @@
469	855	markleavesItem.addActionListener(this);
470	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	857	unmarkleavesItem.addActionListener(this);
	858	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	859	+ rewindleavesItem.addActionListener(this);
	860	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	861	+ unrewindleavesItem.addActionListener(this);
	862	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	863	+ randomleavesItem.addActionListener(this);
	864	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	865	+ unrandomleavesItem.addActionListener(this);
472	866	menu.add("-");
473	867	flipVItem = menu.add(new MenuItem("Flip V"));
474	868	flipVItem.addActionListener(this);
..	..	@@ -494,10 +888,15 @@
494	888	attachBumpItem.addActionListener(this);
495	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
496	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
497	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
498	893	detachPigmentItem.addActionListener(this);
499	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
500	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
501	900	menu.add("-");
502	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
503	902	sortbysizeItem.addActionListener(this);
..	..	@@ -508,6 +907,9 @@
508	907	shareGeometriesItem.addActionListener(this);
509	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
510	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
511	913	if (Globals.ADVANCED)
512	914	{
513	915	// Pretty much the same as duplicate and clone.
..	..	@@ -524,16 +926,91 @@
524	926	buildToolsMenu(menu);
525	927	}
526	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
	996	+
527	997	void SetupUI2(ObjEditor oe)
528	998	{
	999	+ // June 2019
	1000	+ if (oe == null)
	1001	+ {
	1002	+ //super.SetupUI2(this);
	1003	+ //return;
	1004	+ }
	1005	+
	1006	+ if (copy != group)
	1007	+ {
	1008	+ //super.SetupUI2(this);
	1009	+ }
	1010	+
529	1011	//new Exception().printStackTrace();
530	1012
531	1013	oe.radioPanel = new JPanel(new GridBagLayout());
532		- oe.aConstraints.weightx = 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
535		- oe.aConstraints.gridwidth = 100;
536		- oe.aConstraints.gridheight = 1;
537	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
538	1015
539	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -554,27 +1031,122 @@
554	1031	oe.radioPanel.add(dummyButton);
555	1032	oe.buttonGroup.add(dummyButton);
556	1033	*/
	1034	+ cGridBag copyOptionsPanel = new cGridBag();
	1035	+
	1036	+ copyOptionsPanel.preferredHeight = 2;
	1037	+
557	1038	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	1039
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
560		- liveCB.setToolTipText("Enable animation");
561		- liveCB.addItemListener(this);
	1040	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ //minButton.setToolTipText("Minimize window");
	1042	+ //minButton.addActionListener(this);
	1043	+
	1044	+ if (Globals.ADVANCED)
	1045	+ {
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
	1049	+ }
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
	1089	+
	1090	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ fullButton.setToolTipText("Full-screen window");
	1092	+ fullButton.addActionListener(this);
	1093	+
	1094	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ screenfitButton.setToolTipText("Screen fit");
	1096	+ screenfitButton.addActionListener(this);
562	1097
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1100	+ restoreCameraButton.addActionListener(this);
	1101	+
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
	1105	+
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
	1114	+
	1115	+ cGridBag updown = new cGridBag().setVertical(true);
	1116	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
	1118	+ restoreButton.addActionListener(this);
	1119	+ //restoreButton.setEnabled(false);
	1120	+
	1121	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
	1123	+ replaceButton.addActionListener(this);
	1124	+ //replaceButton.setEnabled(false);
	1125	+
	1126	+ copyOptionsPanel.add(updown);
	1127	+
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	1134	oneStepButton.setToolTipText("Animate one step forward");
565	1135	oneStepButton.addActionListener(this);
566	1136
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
	1141	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	1142	fastCB.setToolTipText("Fast mode");
569	1143	fastCB.addItemListener(this);
570	1144
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- screenfitButton.addActionListener(this);
	1145	+ //oe.toolboxPanel.Return();
	1146	+
	1147	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1148	+// trackCB.setToolTipText("Enable tracking");
	1149	+// trackCB.addItemListener(this);
578	1150
579	1151	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	1152	// screenfitpointButton.addActionListener(this);
..	..	@@ -584,67 +1156,137 @@
584	1156	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	1157	snapobjectButton.addActionListener(this);
586	1158	snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1161	+ fourButton.addActionListener(this);
	1162	+ fourButton.setToolTipText("Show control panel only");
587	1163	}
588	1164
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	1165	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	1166
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- twoButton.setToolTipText("Show center view only");
597		- twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599		- fourButton.addActionListener(this);
600		- fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- sixButton.setToolTipText("2-column layout left");
603		- sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605		- threeButton.setToolTipText("2-column layout right");
606		- threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- sevenButton.setToolTipText("3-column layout");
609		- sevenButton.addActionListener(this);
610		- //
611	1167
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613		- rootButton.setToolTipText("Edit selection in new tab");
	1168	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ rootButton.setToolTipText("Open selection in new tab");
614	1170	rootButton.addActionListener(this);
615	1171
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	1173	closeButton.setToolTipText("Close tab");
618	1174	closeButton.addActionListener(this);
619	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	1176	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	1177	+
	1178	+ cGridBag row1 = new cGridBag();
623	1179
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	1180	+ // INSERT
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
	1183	+ gridButton.addActionListener(this);
	1184	+
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ boxButton.setToolTipText("Create box");
	1187	+ boxButton.addActionListener(this);
	1188	+
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ sphereButton.setToolTipText("Create sphere");
	1191	+ sphereButton.addActionListener(this);
	1192	+
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ coneButton.setToolTipText("Create cone");
	1195	+ coneButton.addActionListener(this);
	1196	+
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ torusButton.setToolTipText("Create torus");
	1199	+ torusButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ if (Globals.ADVANCED)
	1206	+ {
	1207	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ kleinButton.setToolTipText("Create Klein bottle");
	1209	+ kleinButton.addActionListener(this);
	1210	+ }
	1211	+
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ particlesButton.setToolTipText("Create particle system");
	1214	+ particlesButton.addActionListener(this);
	1215	+
	1216	+ oe.toolboxPanel.add(row1);
	1217	+
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ groupButton.setToolTipText("Create group");
	1222	+ groupButton.addActionListener(this);
	1223	+
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ compositeButton.setToolTipText("Create composite");
	1226	+ compositeButton.addActionListener(this);
	1227	+
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ switchButton.setToolTipText("Create item switcher");
	1230	+ switchButton.addActionListener(this);
	1231	+
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ loopButton.setToolTipText("Create loop");
	1234	+ loopButton.addActionListener(this);
	1235	+
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ textureButton.setToolTipText("Create texture");
	1238	+ textureButton.addActionListener(this);
	1239	+
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ overlayButton.setToolTipText("Create overlay");
	1242	+ overlayButton.addActionListener(this);
	1243	+
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ lightButton.setToolTipText("Create light");
	1246	+ lightButton.addActionListener(this);
	1247	+
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
	1259	+
	1260	+ // EDIT panel
	1261	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ editButton.setToolTipText("Pin selection controls");
626	1263	editButton.addActionListener(this);
627	1264
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	1265	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
630	1267	uneditButton.addActionListener(this);
631	1268
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	1269	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1270	+ allParamsButton.setToolTipText("Show all controls");
634	1271	allParamsButton.addActionListener(this);
635	1272
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- clearPanelButton.setToolTipText("Clear edit panel");
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
638	1275	clearPanelButton.addActionListener(this);
639	1276
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- unselectButton.setToolTipText("Unselect");
642		- unselectButton.addActionListener(this);
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
643	1280
644		- commandsPanel.preferredHeight = 1;
	1281	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ flashSelectionButton.setToolTipText("Highlight selection");
	1283	+ flashSelectionButton.addActionListener(this);
645	1284
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	1285	+ editCommandsPanel.preferredHeight = 1;
	1286	+
	1287	+ SetPinStates(false);
	1288	+// oe.treePanel.add(commandsPanel);
	1289	+// oe.treePanel.Return();
648	1290
649	1291	// oe.aConstraints.gridx += 1;
650	1292	// oe.aConstraints.weighty = 0;
..	..	@@ -661,32 +1303,20 @@
661	1303
662	1304	JScrollPane jSP;
663	1305	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1306	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	1307	ResetModel();
666	1308
667	1309	oe.treePanel.add(jSPPanel);
668	1310	oe.treePanel.Return();
669	1311
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	1312	oe.treePanel.add(copyOptionsPanel);
686	1313	oe.treePanel.Return();
	1314	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1315	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1316	+ sliderPane.preferredHeight = 1;
687	1317
688		-// mainPanel.setDividerLocation(0.5); //1.0);
689		-// mainPanel.setResizeWeight(0.5);
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
690	1320
691	1321	//jList.addListSelectionListener(this);
692	1322	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -694,7 +1324,7 @@
694	1324	//jTree.setEditable(true);
695	1325	oe.jTree.setDragEnabled(true);
696	1326	//jTree.setPreferredSize(new Dimension(10,10));
697		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
698	1328
699	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
700	1330
..	..	@@ -706,29 +1336,49 @@
706	1336	dgr.addDragGestureListener(this);
707	1337	}catch(Exception e) {}
708	1338	*/
709		- radio.layout = sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
710	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
711	1341	}
712	1342
713	1343	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	1344	{
	1345	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1346	+ colorCB.setToolTipText("Copy color when dropped");
	1347	+ colorCB.addItemListener(this);
	1348	+
	1349	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1350	+ materialCB.setToolTipText("Copy material when dropped");
	1351	+ materialCB.addItemListener(this);
	1352	+
	1353	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1354	+ textureCB.setToolTipText("Copy texture when dropped");
	1355	+ textureCB.addItemListener(this);
	1356	+
	1357	+ panel.Return();
	1358	+
715	1359	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	1360	boxCB.setToolTipText("Display bounding boxes");
717	1361	boxCB.addItemListener(this);
718	1362
719	1363	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1364	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	1365	zoomBoxCB.addItemListener(this);
722	1366
723	1367	if (true) // Globals.ADVANCED)
724	1368	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	1369	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1370	+// supportCB.setToolTipText("Enable rigging");
	1371	+// supportCB.addItemListener(this);
	1372	+
	1373	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1374	+ freezeCB.setToolTipText("Fast moving camera");
	1375	+ freezeCB.addItemListener(this);
728	1376
729	1377	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	1378	// localCB.addItemListener(this);
731	1379
	1380	+ panel.Return();
	1381	+
732	1382	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	1383	crowdCB.setToolTipText("Used for crowds");
734	1384	crowdCB.addItemListener(this);
..	..	@@ -737,14 +1387,19 @@
737	1387	smoothCB.setToolTipText("Snapping delay");
738	1388	smoothCB.addItemListener(this);
739	1389
740		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
741		- slowCB.setToolTipText("Smooth interpolation");
742		- slowCB.addItemListener(this);
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
743	1396
744	1397	// constraints.gridy += 1;
745	1398	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	1399	// speakerMocapCB.addItemListener(this);
747	1400
	1401	+ panel.Return();
	1402	+
748	1403	if (false)
749	1404	{
750	1405	// handled in scripts
..	..	@@ -759,34 +1414,82 @@
759	1414	//constraints.gridy += 1;
760	1415	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	1416	smoothfocusCB.addItemListener(this);
	1417	+ panel.Return();
762	1418	}
763	1419
764	1420	//constraints.gridx += 1;
765	1421	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	1422	// debugCB.addItemListener(this);
767	1423
	1424	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1425	+ trackCB.setToolTipText("Enable tracking target");
	1426	+ trackCB.addItemListener(this);
	1427	+
768	1428	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1429	+ oeilCB.setToolTipText("Move camera when tracking");
769	1430	oeilCB.addItemListener(this);
770	1431
	1432	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1433	+ shadowCB.setToolTipText("When live compute shadows");
	1434	+ shadowCB.addItemListener(this);
	1435	+
	1436	+ panel.Return();
	1437	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1438	+ toggleTextureCB.setToolTipText("Load textures");
	1439	+ toggleTextureCB.addItemListener(this);
	1440	+
	1441	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1442	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1443	+ toggleSwitchCB.addItemListener(this);
	1444	+
	1445	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1446	+ autokeepCB.setToolTipText("On structure change");
	1447	+ autokeepCB.addItemListener(this);
	1448	+
	1449	+ panel.Return();
	1450	+ if (Globals.ADVANCED)
	1451	+ {
771	1452	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	1453	lookAtCB.setToolTipText("Look-at target");
773	1454	lookAtCB.addItemListener(this);
	1455	+ }
774	1456
775	1457	}
776	1458
777	1459	cGridBag fill = new cGridBag();
778		-
779	1460	fill.preferredHeight = 200;
	1461	+ cGridBag fill2 = new cGridBag();
	1462	+ fill2.preferredHeight = 200;
	1463	+ cGridBag fill3 = new cGridBag();
	1464	+ fill3.preferredHeight = 200;
780	1465
781	1466	panel.add(fill);
	1467	+ panel.add(fill2);
	1468	+ panel.add(fill3);
782	1469
783	1470	}
784	1471
785	1472	void EditObject(Object3D obj)
786	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
787	1482	cRadio radioButton = new cRadio(obj.name);
	1483	+
	1484	+ // June 2019. Patch to avoid bug with transparency.
	1485	+ radioButton.hadMaterial = obj.material != null;
	1486	+ if (!radioButton.hadMaterial)
	1487	+ {
	1488	+ obj.material = new cMaterial();
	1489	+ }
	1490	+
788	1491	radioButton.SetObject(obj);
789		- radioButton.layout = sevenButton;
	1492	+ radioButton.layout = threeButton; // sixButton;
790	1493	radioButton.SetCamera(cameraView.renderCamera, false);
791	1494	radioButton.addActionListener(this);
792	1495	radioPanel.add(radioButton);
..	..	@@ -796,6 +1499,8 @@
796	1499
797	1500	void SetupViews(ObjEditor oe)
798	1501	{
	1502	+ theFrame = this;
	1503	+
799	1504	oe.SetupViews();
800	1505
801	1506	System.out.println("SetupViews");
..	..	@@ -804,23 +1509,30 @@
804	1509	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1510	}
806	1511
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- JCheckBox smoothfocusCB;
	1512	+ cToggleButton liveCB;
	1513	+ cCheckBox supportCB;
	1514	+ cCheckBox localCB;
	1515	+ cCheckBox crowdCB;
	1516	+ cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
	1519	+ cToggleButton fastCB;
	1520	+ cCheckBox slowCB;
	1521	+ cCheckBox boxCB;
	1522	+ cCheckBox zoomBoxCB;
	1523	+ cCheckBox freezeCB;
	1524	+ //cToggleButton trackCB;
	1525	+ cCheckBox trackCB;
	1526	+ cCheckBox smoothfocusCB;
818	1527	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1528	+ cCheckBox speakerCameraCB;
	1529	+ cCheckBox speakerFocusCB;
	1530	+ cCheckBox debugCB;
	1531	+
	1532	+ cCheckBox oeilCB;
	1533	+ cCheckBox shadowCB;
	1534	+ cCheckBox autokeepCB;
	1535	+ cCheckBox lookAtCB;
824	1536
825	1537	// static int COLOR = 1;
826	1538	// static int MATERIAL = 2;
..	..	@@ -828,9 +1540,9 @@
828	1540
829	1541	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1542
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1543	+ cCheckBox colorCB;
	1544	+ cCheckBox materialCB;
	1545	+ cCheckBox textureCB;
834	1546
835	1547	public void itemStateChanged(ItemEvent e)
836	1548	{
..	..	@@ -858,6 +1570,7 @@
858	1570	} else if(e.getSource() == liveCB)
859	1571	{
860	1572	cameraView.ToggleLive();
	1573	+ refreshContents(false);
861	1574	}
862	1575	else if(e.getSource() == supportCB)
863	1576	{
..	..	@@ -873,6 +1586,12 @@
873	1586	{
874	1587	cameraView.ToggleInertia();
875	1588	cameraView.repaint();
	1589	+ }
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
876	1595	}
877	1596	else if(e.getSource() == localCB)
878	1597	{
..	..	@@ -922,6 +1641,18 @@
922	1641	{
923	1642	cameraView.ToggleOeil();
924	1643	}
	1644	+ else if(e.getSource() == shadowCB)
	1645	+ {
	1646	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1647	+ }
	1648	+ else if(e.getSource() == freezeCB)
	1649	+ {
	1650	+ Globals.FREEZEONMOVE ^= true;
	1651	+ }
	1652	+ else if(e.getSource() == autokeepCB)
	1653	+ {
	1654	+ Globals.REPLACEONMAKE ^= true;
	1655	+ }
925	1656	else if(e.getSource() == lookAtCB)
926	1657	{
927	1658	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1669,8 @@
938	1669
939	1670	/**/
940	1671	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1672	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1674	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1675	// We can't move the root node or an empty selection
944	1676	return;
..	..	@@ -1001,8 +1733,6 @@
1001	1733	}
1002	1734	}
1003	1735
1004		- String string = (String) object;
1005		-
1006	1736	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1737	// if( object instanceof java.io.File[])
1008	1738	// {
..	..	@@ -1010,6 +1740,8 @@
1010	1740	// objEditor.DropFile((java.io.File[]) object, true);
1011	1741	// return;
1012	1742	// }
	1743	+
	1744	+ String string = object.toString();
1013	1745
1014	1746	// File path for Mac and Windows
1015	1747	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1787,33 @@
1055	1787
1056	1788	assert target == objEditor.jTree;
1057	1789	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1790	+ Object3D destinationLeaf;
1058	1791	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1792	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1793	} catch (Exception e) {
1061	1794	System.out.println("destinationPath : " + destinationPath);
1062	1795	return;
1063	1796	}
1064	1797
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1798	+ for (int i=group.selection.size(); --i>=0;)
1066	1799	{
	1800	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1801	+
	1802	+ // Cannot move into itself
	1803	+ if (child == destinationLeaf)
	1804	+ return;
	1805	+ }
	1806	+
	1807	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1808	+// {
1067	1809	loadClipboard(true);
1068	1810	objEditor.jTree.setSelectionPath(destinationPath);
1069	1811	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1812	+// } else {
	1813	+// loadClipboard(false);
	1814	+// objEditor.jTree.setSelectionPath(destinationPath);
	1815	+// pasteInto(false, false); // true); // ???
	1816	+// }
1075	1817	}
1076	1818	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1819	// Called if the user has modified the current drop gesture
..	..	@@ -1127,7 +1869,12 @@
1127	1869	TreePath path;
1128	1870
1129	1871	public TransferableTreePath(TreePath tp) {
1130		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1131	1878	}
1132	1879
1133	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1176,22 +1923,30 @@
1176	1923	{
1177	1924	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1925	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- superItem.addActionListener(this);
	1926	+// gridItem = menu.add(new MenuItem("Grid"));
	1927	+// gridItem.addActionListener(this);
	1928	+// rectoidItem = menu.add(new MenuItem("Box"));
	1929	+// rectoidItem.addActionListener(this);
	1930	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1931	+// ellipsoidItem.addActionListener(this);
	1932	+// coneItem = menu.add(new MenuItem("Cone"));
	1933	+// coneItem.addActionListener(this);
	1934	+// torusItem = menu.add(new MenuItem("Torus"));
	1935	+// torusItem.addActionListener(this);
	1936	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1937	+// superItem.addActionListener(this);
	1938	+
	1939	+ cameraItem = menu.add(new MenuItem("Camera"));
	1940	+ cameraItem.addActionListener(this);
	1941	+
	1942	+ if (!Globals.ADVANCED)
	1943	+ {
1191	1944	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1945	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1946	+ }
	1947	+
	1948	+// particleItem = menu.add(new MenuItem("Particle system"));
	1949	+// particleItem.addActionListener(this);
1195	1950	if (Globals.ADVANCED)
1196	1951	{
1197	1952	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1972,15 @@
1217	1972	}
1218	1973	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1974	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- lightItem.addActionListener(this);
	1975	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1976	+// overlayItem.addActionListener(this);
	1977	+// lightItem = menu.add(new MenuItem("Light"));
	1978	+// lightItem.addActionListener(this);
1224	1979	menu.add("-");
1225	1980	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1981	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1982	+// loopItem = menu.add(new MenuItem("Loop"));
	1983	+// loopItem.addActionListener(this);
1229	1984	doubleItem = menu.add(new MenuItem("Fork"));
1230	1985	doubleItem.addActionListener(this);
1231	1986	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1996,9 @@
1241	1996	animationItem.addItemListener(this);
1242	1997	animationItem.setState(Globals.ANIMATION);
1243	1998
	1999	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2000	+ archiveItem.addActionListener(this);
	2001	+
1244	2002	menu.add("-");
1245	2003	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	2004	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +2011,8 @@
1253	2011	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	2012	reduce34MorphItem.addActionListener(this);
1255	2013	menu.add("-");
	2014	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2015	+ memoryItem.addActionListener(this);
1256	2016	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	2017	computeAOItem.addActionListener(this);
1258	2018
..	..	@@ -1261,11 +2021,9 @@
1261	2021	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	2022	mirrorItem.addActionListener(this);
1263	2023	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	2024	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	2025	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	2026	+ menu.add(dumpItem = new MenuItem("Print"));
1269	2027	dumpItem.addActionListener(this);
1270	2028	// menu.add(pathItem = new MenuItem("From-to path"));
1271	2029	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +2164,34 @@
1406	2164	shadow.material = new cMaterial(obj.material);
1407	2165	shadow.material.diffuse = 0.0001f;
1408	2166	shadow.material.specular = 0.0001f;
	2167	+ //shadow.projectedVertices[1].x = 300;
1409	2168
1410	2169	makeSomething(shadow);
1411	2170	}
	2171	+
	2172	+ private void ClearUnpinned()
	2173	+ {
	2174	+ //for (Object3D obj : listUI)
	2175	+ for (int i=listUI.size(); --i>=0;)
	2176	+ {
	2177	+ Object3D obj = listUI.elementAt(i);
	2178	+ if (!obj.pinned)
	2179	+ {
	2180	+ obj.CloseUI();
	2181	+ listUI.remove(i);
	2182	+ }
	2183	+ }
	2184	+ }
	2185	+
	2186	+ private void EditElement(Object3D elem, boolean newWindow)
	2187	+ {
	2188	+ // if (!(elem instanceof Composite))
	2189	+ // newWindow = false;
	2190	+ listUI.add(elem);
	2191	+ elem.openEditWindow(this, newWindow); //, false);
	2192	+ System.out.println("edit : " + elem);
	2193	+ elem.editWindow.refreshContents(true); // ? new
	2194	+ }
1412	2195
1413	2196	/**
1414	2197	* applyExample
..	..	@@ -1653,7 +2436,7 @@
1653	2436	{
1654	2437	ScreenFit();
1655	2438	} else
1656		- if (source == switchItem)
	2439	+ if (source == switchViewItem)
1657	2440	{
1658	2441	cVector v1 = new cVector();
1659	2442	cVector v2 = new cVector();
..	..	@@ -1662,11 +2445,11 @@
1662	2445	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	2446	objEditor.cameraView.repaint();
1664	2447	} else
1665		- if (source == rectoidItem)
	2448	+ if (source == rectoidItem \|\| source == boxButton)
1666	2449	{
1667	2450	makeSomething(new Box());
1668	2451	} else
1669		- if (source == particleItem)
	2452	+ if (source == particleItem \|\| source == particlesButton)
1670	2453	{
1671	2454	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	2455	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2528,27 @@
1745	2528
1746	2529	makeSomething(obj);
1747	2530	} else
1748		- if (source == gridItem)
	2531	+ if (source == gridItem \|\| source == gridButton)
1749	2532	{
1750	2533	makeSomething(new Grid());
1751	2534	} else
1752		- if (source == ellipsoidItem)
	2535	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2536	{
1754	2537	makeSomething(new Sphere());
1755	2538	} else
1756		- if (source == coneItem)
	2539	+ if (source == coneItem \|\| source == coneButton)
1757	2540	{
1758	2541	makeSomething(new Cone());
1759	2542	} else
1760		- if (source == torusItem)
	2543	+ if (source == torusItem \|\| source == torusButton)
1761	2544	{
1762	2545	makeSomething(new Torus());
1763	2546	} else
1764		- if (source == superItem)
	2547	+ if (source == superItem \|\| source == superButton)
1765	2548	{
1766	2549	makeSomething(new Superellipsoid());
1767	2550	} else
1768		- if (source == kleinItem)
	2551	+ if (source == kleinItem \|\| source == kleinButton)
1769	2552	{
1770	2553	makeSomething(new Klein());
1771	2554	} else
..	..	@@ -1785,7 +2568,7 @@
1785	2568	{
1786	2569	makeSomething(new BezierSurface());
1787	2570	} else
1788		- if (source == overlayItem)
	2571	+ if (source == overlayItem \|\| source == overlayButton)
1789	2572	{
1790	2573	/*
1791	2574	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,10 +2616,27 @@
1833	2616	s.setup();
1834	2617	makeSomething(s);
1835	2618	} else
1836		- if (source == lightItem)
	2619	+ if (source == lightItem \|\| source == lightButton)
1837	2620	{
1838	2621	makeSomething(new Light());
1839	2622	} else
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
1840	2640	if (source == csgItem)
1841	2641	{
1842	2642	group(new CSG());
..	..	@@ -1883,30 +2683,38 @@
1883	2683
1884	2684	group(g);
1885	2685	} else
1886		- if (source == loopItem)
	2686	+ if (source == loopItem \|\| source == loopButton)
1887	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
1888	2690	Composite csg = new GroupLeaf();
1889	2691	csg.count = 5;
1890		- group(csg);
1891		- Composite child = new cGroup();
	2692	+ Composite child = new cGroup("Branch");
1892	2693	csg.addChild(child);
1893	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
1894	2697	} else
1895	2698	if (source == doubleItem)
1896	2699	{
1897		- Composite csg = new GroupLeaf();
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
	2702	+ Composite csg = new GroupLeaf("Fork");
1898	2703	csg.count = 5;
	2704	+ Composite child = new cGroup("Branch A");
	2705	+ csg.addChild(child);
	2706	+ child.addChild(csg);
	2707	+ child = new cGroup("Branch B");
	2708	+ csg.addChild(child);
	2709	+ child.addChild(csg);
1899	2710	group(csg);
1900		- Composite child = new cGroup();
1901		- csg.addChild(child);
1902		- child.addChild(csg);
1903		- child = new cGroup();
1904		- csg.addChild(child);
1905		- child.addChild(csg);
	2711	+ }
1906	2712	} else
1907	2713	if (source == tripleItem)
1908	2714	{
1909		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Trident");
1910	2718	csg.count = 4;
1911	2719	group(csg);
1912	2720	Composite child = new cGroup();
..	..	@@ -1918,11 +2726,12 @@
1918	2726	child = new cGroup();
1919	2727	csg.addChild(child);
1920	2728	child.addChild(csg);
	2729	+ }
1921	2730	} else
1922	2731	if (source == computeAOItem)
1923	2732	{
1924	2733	Globals.drawMode = CameraPane.OCCLUSION;
1925		- Globals.theRenderer.repaint();
	2734	+ cameraView.repaint();
1926	2735	} else
1927	2736	if (source == recompileItem)
1928	2737	{
..	..	@@ -1937,7 +2746,7 @@
1937	2746	if (source == invariantsItem)
1938	2747	{
1939	2748	System.out.println("Invariants:");
1940		- Grafreed.grafreeD.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
1941	2750	} else
1942	2751	if (source == memoryItem)
1943	2752	{
..	..	@@ -1956,6 +2765,65 @@
1956	2765	{
1957	2766	DumpObject();
1958	2767	} else
	2768	+ if (source == minButton)
	2769	+ {
	2770	+ Minimize();
	2771	+ } else
	2772	+ if (source == maxButton)
	2773	+ {
	2774	+ Maximize();
	2775	+ } else
	2776	+ if (source == fullButton)
	2777	+ {
	2778	+ ToggleFullScreen();
	2779	+ } else
	2780	+ if (source == collapseButton)
	2781	+ {
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
	2784	+ } else
	2785	+ if (source == maximize3DButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
	2791	+ } else
	2792	+ if (source == previousVersionButton)
	2793	+ {
	2794	+ // Go to previous version
	2795	+ //if (!Undo())
	2796	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2797	+ PreviousVersion();
	2798	+ } else
	2799	+ if (source == restoreButton)
	2800	+ {
	2801	+ // Restore current version
	2802	+ Restore();
	2803	+ //restoreButton.setEnabled(false);
	2804	+ } else
	2805	+ if (source == replaceButton)
	2806	+ {
	2807	+ // Overwrite current version
	2808	+ Replace();
	2809	+ //replaceButton.setEnabled(false);
	2810	+ } else
	2811	+ if (source == nextVersionButton)
	2812	+ {
	2813	+ // Go to next version
	2814	+ NextVersion();
	2815	+ } else
	2816	+ if (source == saveVersionButton)
	2817	+ {
	2818	+ // Save a new version
	2819	+ if (!Save(true))
	2820	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
	2826	+ } else
1959	2827	if (source == oneStepButton)
1960	2828	{
1961	2829	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2831,14 @@
1963	2831	} else
1964	2832	if (source == screenfitButton)
1965	2833	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2834	ScreenFit();
1968	2835	} else
1969	2836	if (source == screenfitpointButton)
1970	2837	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2838	ScreenFitPoint();
1973	2839	} else
1974	2840	if (source == snapobjectButton)
1975	2841	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2842	SnapObject();
1978	2843	} else
1979	2844	// if (event.getSource() == recompileButton)
..	..	@@ -2012,11 +2877,11 @@
2012	2877	} else
2013	2878	if (source == undoItem)
2014	2879	{
2015		- Undo();
	2880	+ PreviousVersion();
2016	2881	} else
2017	2882	if (source == redoItem)
2018	2883	{
2019		- Redo();
	2884	+ NextVersion();
2020	2885	} else
2021	2886	if (source == duplicateItem)
2022	2887	{
..	..	@@ -2337,7 +3202,7 @@
2337	3202	{
2338	3203	StepAll();
2339	3204	} else
2340		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3205	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2341	3206	{
2342	3207	//int indices[] = jList.getSelectedIndices();
2343	3208	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2349,9 +3214,9 @@
2349	3214	{
2350	3215	ClearSelection(true);
2351	3216	} else
2352		- if (source == grabItem)
	3217	+ if (source == grabItem \|\| source == groupButton)
2353	3218	{
2354		- group(new cGroup(), true);
	3219	+ group(new cGroup(), false); // true);
2355	3220	} else
2356	3221	if (source == hideItem)
2357	3222	{
..	..	@@ -2369,11 +3234,11 @@
2369	3234	{
2370	3235	makeSomething(new Camera());
2371	3236	} else
2372		- if (source == compositeItem)
	3237	+ if (source == compositeItem \|\| source == compositeButton)
2373	3238	{
2374	3239	group(new Composite());
2375	3240	} else
2376		- if (source == randomItem)
	3241	+ if (source == switchItem \|\| source == switchButton)
2377	3242	{
2378	3243	RandomNode random = new RandomNode();
2379	3244	group(random);
..	..	@@ -2475,7 +3340,7 @@
2475	3340	{
2476	3341	group(new cLinker());
2477	3342	} else
2478		- if (source == textureItem)
	3343	+ if (source == textureItem \|\| source == textureButton)
2479	3344	{
2480	3345	group(new TextureNode());
2481	3346	} else
..	..	@@ -2495,17 +3360,42 @@
2495	3360	{
2496	3361	CastShadow(2);
2497	3362	} else
2498		- if (source == ungroupItem)
	3363	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	3364	{
2500		- //ungroup();
	3365	+ boolean canUngroup = true;
	3366	+
2501	3367	for (int i=0; i<group.selection.size(); i++)
2502	3368	{
2503		- Ungroup(group.selection.get(i));
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
	3372	+ {
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
	3382	+ break;
	3383	+ }
2504	3384	}
2505	3385
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	3386	+ if (canUngroup)
	3387	+ {
	3388	+ for (int i=0; i<group.selection.size(); i++)
	3389	+ {
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
	3393	+ }
	3394	+
	3395	+ ClearSelection(false);
	3396	+
	3397	+ refreshContents();
	3398	+ }
2509	3399	} else
2510	3400	if (source == genUVItem)
2511	3401	{
..	..	@@ -2517,7 +3407,7 @@
2517	3407	} else
2518	3408	if (source == genNormalsMESHItem)
2519	3409	{
2520		- GenNormals(true); // TODO
	3410	+ GenNormalsMESH();
2521	3411	} else
2522	3412	if (source == genNormalsORGANItem)
2523	3413	{
..	..	@@ -2582,6 +3472,22 @@
2582	3472	if (source == unmarkleavesItem)
2583	3473	{
2584	3474	MarkLeaves(false);
	3475	+ } else
	3476	+ if (source == rewindleavesItem)
	3477	+ {
	3478	+ RewindLeaves(true);
	3479	+ } else
	3480	+ if (source == unrewindleavesItem)
	3481	+ {
	3482	+ RewindLeaves(false);
	3483	+ } else
	3484	+ if (source == randomleavesItem)
	3485	+ {
	3486	+ RandomLeaves(true);
	3487	+ } else
	3488	+ if (source == unrandomleavesItem)
	3489	+ {
	3490	+ RandomLeaves(false);
2585	3491	} else
2586	3492	if (source == flipVItem)
2587	3493	{
..	..	@@ -2790,7 +3696,7 @@
2790	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2791	3697	{
2792	3698	obj = (Object3D)e.nextElement();
2793		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
2794	3700	}
2795	3701
2796	3702	refreshContents();
..	..	@@ -2806,6 +3712,31 @@
2806	3712
2807	3713	refreshContents();
2808	3714	} else
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
	3738	+ refreshContents();
	3739	+ } else
2809	3740	if (source == flashSelectionButton)
2810	3741	{
2811	3742	CameraPane.flash = true;
..	..	@@ -2817,42 +3748,36 @@
2817	3748	if (source == twoButton)
2818	3749	{
2819	3750	radio.layout = twoButton;
2820		- // bug
2821		- //gridPanel.setDividerLocation(1.0);
2822		- //bigPanel.setDividerLocation(0.0);
2823		-// bigThree.remove(scenePanel);
2824		-// bigThree.remove(centralPanel);
2825		-// bigThree.remove(XYZPanel);
2826		-// aWindowConstraints.gridx = 0;
2827		-// aWindowConstraints.gridy = 0;
2828		-// aWindowConstraints.gridwidth = 1;
2829		-// // aConstraints.gridheight = 3;
2830		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2831		-// aWindowConstraints.weightx = 0;
2832		-// aWindowConstraints.weighty = 1;
2833		-// //bigThree.add(jtp, aWindowConstraints);
2834		-// aWindowConstraints.weightx = 1;
2835		-// aWindowConstraints.gridwidth = 3;
2836		-// // aConstraints.gridheight = 3;
2837		-// aWindowConstraints.gridx = 1;
2838		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2839		-// bigThree.add(centralPanel, aWindowConstraints);
2840		-// aWindowConstraints.weightx = 0;
2841		-// aWindowConstraints.gridx = 4;
2842		-// aWindowConstraints.gridwidth = 1;
2843		-// // aConstraints.gridheight = 3;
2844		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2845		-// //bigThree.add(XYZPanel, aWindowConstraints);
2846		-// scenePanel.setVisible(false);
2847		-// centralPanel.setVisible(true);
2848		-// XYZPanel.setVisible(false);
2849		- bigThree.ClearUI();
2850		- bigThree.add(centralPanel);
2851		- bigThree.FlushUI();
	3751	+
	3752	+ if (CameraPane.FULLSCREEN)
	3753	+ fullscreenLayout = radio.layout;
	3754	+
	3755	+ Show3DView();
	3756	+
	3757	+ cameraView.requestFocusInWindow();
	3758	+
	3759	+// refreshContents(true);
	3760	+//
	3761	+// try
	3762	+// {
	3763	+// java.awt.Robot bot = new java.awt.Robot();
	3764	+// int mask = InputEvent.BUTTON1_MASK;
	3765	+// bot.mouseMove(100, 100);
	3766	+// bot.mousePress(mask);
	3767	+// bot.mouseRelease(mask);
	3768	+// }
	3769	+// catch (Exception e)
	3770	+// {
	3771	+//
	3772	+// }
	3773	+
2852	3774	} else
2853	3775	if (source == threeButton)
2854	3776	{
2855	3777	radio.layout = threeButton;
	3778	+
	3779	+ if (CameraPane.FULLSCREEN)
	3780	+ fullscreenLayout = radio.layout;
2856	3781
2857	3782	// bigThree.remove(scenePanel);
2858	3783	// bigThree.remove(centralPanel);
..	..	@@ -2882,13 +3807,18 @@
2882	3807	// centralPanel.setVisible(true);
2883	3808	// XYZPanel.setVisible(true);
2884	3809	bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
2885	3811	bigThree.add(centralPanel);
2886		- bigThree.add(XYZPanel);
2887	3812	bigThree.FlushUI();
	3813	+
	3814	+ cameraView.requestFocusInWindow();
2888	3815	} else
2889	3816	if (source == fourButton)
2890	3817	{
2891	3818	radio.layout = fourButton;
	3819	+
	3820	+ if (CameraPane.FULLSCREEN)
	3821	+ fullscreenLayout = radio.layout;
2892	3822
2893	3823	// bigThree.remove(scenePanel);
2894	3824	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3850,15 @@
2920	3850	bigThree.ClearUI();
2921	3851	bigThree.add(scenePanel);
2922	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2923	3855	} else
2924	3856	if (source == sixButton)
2925	3857	{
2926	3858	radio.layout = sixButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2927	3862
2928	3863	// bigThree.remove(scenePanel);
2929	3864	// bigThree.remove(centralPanel);
..	..	@@ -2953,13 +3888,18 @@
2953	3888	// centralPanel.setVisible(true);
2954	3889	// XYZPanel.setVisible(false);
2955	3890	bigThree.ClearUI();
2956		- bigThree.add(scenePanel);
2957	3891	bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
2958	3893	bigThree.FlushUI();
	3894	+
	3895	+ cameraView.requestFocusInWindow();
2959	3896	} else
2960	3897	if (source == sevenButton)
2961	3898	{
2962	3899	radio.layout = sevenButton;
	3900	+
	3901	+ if (CameraPane.FULLSCREEN)
	3902	+ fullscreenLayout = radio.layout;
2963	3903
2964	3904	// bigThree.remove(scenePanel);
2965	3905	// bigThree.remove(centralPanel);
..	..	@@ -2993,9 +3933,12 @@
2993	3933	bigThree.add(centralPanel);
2994	3934	bigThree.add(XYZPanel);
2995	3935	bigThree.FlushUI();
	3936	+
	3937	+ cameraView.requestFocusInWindow();
2996	3938	} else
2997	3939	if (source == rootButton)
2998	3940	{
	3941	+ Replace();
2999	3942	Object3D obj;
3000	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3001	3944	{
..	..	@@ -3004,6 +3947,7 @@
3004	3947	EditObject(obj);
3005	3948	}
3006	3949
	3950	+ cameraView.requestFocusInWindow();
3007	3951	refreshContents(true);
3008	3952	} else
3009	3953	if (source == closeButton)
..	..	@@ -3013,22 +3957,37 @@
3013	3957	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3958	{
3015	3959	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3960	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3961	{
	3962	+ // Patch to avoid bug with transparency.
	3963	+ if (!ab.hadMaterial)
	3964	+ {
	3965	+ ab.object.material = null;
	3966	+ }
	3967	+
3018	3968	buttonGroup.remove(ab);
3019	3969	radioPanel.remove(ab);
3020	3970
3021		- ab.GetObject().editWindow = null;
	3971	+ //ab.GetObject().editWindow = null;
	3972	+ ab.GetObject().manipWindow = null;
3022	3973	// ab.GetObject().objectUI = null; // ?????????
3023	3974
3024	3975	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3976	break;
3026	3977	}
3027	3978	}
	3979	+
	3980	+ cameraView.requestFocusInWindow();
3028	3981	refreshContents(true);
3029	3982	} else
3030	3983	if (source == editItem \|\| source == editButton)
3031	3984	{
	3985	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3986	+ {
	3987	+ Object3D child = (Object3D)e.nextElement();
	3988	+ child.pinned = true;
	3989	+ }
	3990	+
3032	3991	EditSelection(false);
3033	3992	} else
3034	3993	if (source == uneditButton)
..	..	@@ -3037,11 +3996,12 @@
3037	3996	{
3038	3997	Object3D child = (Object3D)e.nextElement();
3039	3998	if(child.editWindow != null)
3040		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3999	+ child.pinned = false;
3041	4000	child.CloseUI();
3042	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3043	4003
3044		- child.editWindow = null; // ???????????
	4004	+ //child.editWindow = null; // ???????????
3045	4005	}
3046	4006	objEditor.ctrlPanel.FlushUI();
3047	4007	//objEditor.jTree.clearSelection();
..	..	@@ -3054,16 +4014,18 @@
3054	4014	//copy.ClearUI();
3055	4015	for (Object3D obj : listUI)
3056	4016	{
	4017	+ obj.pinned = false;
3057	4018	obj.CloseUI();
3058	4019	}
3059	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
3060	4022	refreshContents(true);
3061	4023	} else
3062	4024	if (source == allParamsButton)
3063	4025	{
3064	4026	assert(copy == group);
3065	4027
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4028	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	4029
3068	4030	for (Object3D obj : listUI)
3069	4031	{
..	..	@@ -3112,6 +4074,7 @@
3112	4074	}
3113	4075
3114	4076	copy = group;
	4077	+
3115	4078	//Globals.theRenderer.object = group;
3116	4079	if(!useclient)
3117	4080	{
..	..	@@ -3128,7 +4091,9 @@
3128	4091	sideView.object = group;
3129	4092	}
3130	4093
3131		-// fix "+" issue group.editWindow = this;
	4094	+// fix "+" issue
	4095	+ //group.editWindow = this;
	4096	+ group.manipWindow = this;
3132	4097
3133	4098	/*
3134	4099	currentLayout = radio.layout;
..	..	@@ -3136,20 +4101,44 @@
3136	4101	currentLayout = sevenButton;
3137	4102	*/
3138	4103	radio.layout.doClick();
	4104	+
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
	4117	+ ClearUnpinned();
	4118	+
	4119	+ //Grafreed.Assert(group != null);
	4120	+ //Grafreed.Assert(group.selection != null);
	4121	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4122	+ if (group.selection == null \|\| group.selection.size() == 1)
	4123	+ EditSelection(false);
3139	4124	keepparent = group.parent;
3140	4125	// PARENT = NULL or not???
3141	4126	//group.parent = null; // ROOT
3142	4127	//group.attributes = -1;
3143	4128	ResetModel();
	4129	+
	4130	+ cameraView.requestFocusInWindow();
3144	4131	refreshContents(true);
3145	4132	} else if (event.getSource() == editCameraItem)
3146	4133	{
3147	4134	cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
3148	4136	cameraView.repaint();
3149	4137	return;
3150		- } else if (event.getSource() == revertCameraItem)
	4138	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	4139	{
3152	4140	cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
3153	4142	cameraView.repaint();
3154	4143	return;
3155	4144	// } else if (event.getSource() == textureButton)
..	..	@@ -3164,7 +4153,6 @@
3164	4153	}
3165	4154
3166	4155	boolean useclient = false;
3167		- cRadio radio;
3168	4156
3169	4157	void ToggleRoot()
3170	4158	{
..	..	@@ -3403,7 +4391,8 @@
3403	4391
3404	4392	int size = obj.MemorySize();
3405	4393
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	4394	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	4396	}
3408	4397	}
3409	4398	catch (Exception e)
..	..	@@ -3484,6 +4473,13 @@
3484	4473	void GenNormals(boolean crease)
3485	4474	{
3486	4475	group.GenNormalsS(crease);
	4476	+
	4477	+ refreshContents();
	4478	+ }
	4479	+
	4480	+ void GenNormalsMESH()
	4481	+ {
	4482	+ group.GenNormalsMeshS();
3487	4483
3488	4484	refreshContents();
3489	4485	}
..	..	@@ -3719,7 +4715,7 @@
3719	4715
3720	4716	try
3721	4717	{
3722		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3723	4719	}
3724	4720	catch (Exception e)
3725	4721	{
..	..	@@ -4111,6 +5107,18 @@
4111	5107	refreshContents();
4112	5108	}
4113	5109
	5110	+ void RewindLeaves(boolean hide)
	5111	+ {
	5112	+ group.selection.RewindLeaves(hide);
	5113	+ refreshContents();
	5114	+ }
	5115	+
	5116	+ void RandomLeaves(boolean hide)
	5117	+ {
	5118	+ group.selection.RandomLeaves(hide);
	5119	+ refreshContents();
	5120	+ }
	5121	+
4114	5122	void SetTexRes(int tr)
4115	5123	{
4116	5124	group.selection.SetTexRes(tr);
..	..	@@ -4182,28 +5190,25 @@
4182	5190	// }
4183	5191	// }
4184	5192
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	5193	void EditSelection(boolean newWindow)
4190	5194	{
	5195	+ if (group.selection == null)
	5196	+ {
	5197	+ EditElement(group, newWindow); // ? new
	5198	+ return;
	5199	+ }
	5200	+
4191	5201	// aConstraints.gridy = 0;
4192	5202	for (int i=0; i<group.selection.size(); i++)
4193	5203	{
4194	5204	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	5205	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5206	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	5207
4198	5208	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	5209	if(elem != group \|\| !newWindow)
4200	5210	{
4201		- // if (!(elem instanceof Composite))
4202		- // newWindow = false;
4203		- listUI.add(elem);
4204		- elem.openEditWindow(this, newWindow); //, false);
4205		- System.out.println("edit : " + elem);
4206		- elem.editWindow.refreshContents(true); // ? new
	5211	+ EditElement(elem, newWindow); // ? new
4207	5212	}
4208	5213	}
4209	5214	}
..	..	@@ -4266,9 +5271,7 @@
4266	5271
4267	5272	freezemodel = false;
4268	5273	}
4269		-
4270		- boolean flashIt = true;
4271		-
	5274	+
4272	5275	public void valueChanged(TreeSelectionEvent e)
4273	5276	//public boolean handleEvent(Event event)
4274	5277	{
..	..	@@ -4278,7 +5281,8 @@
4278	5281	//new Exception().printStackTrace();
4279	5282
4280	5283	freezemodel = true;
4281		-
	5284	+ ClearUnpinned();
	5285	+
4282	5286	/**/
4283	5287	//switch (event.id)
4284	5288	{
..	..	@@ -4286,7 +5290,6 @@
4286	5290	//case 702: // Event.LIST_DESELECT
4287	5291	group.deselectAll();
4288	5292	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	5293	if (tps != null)
4291	5294	{
4292	5295	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +5298,8 @@
4295	5298
4296	5299	//if (child.parent != null)
4297	5300	//child.parent.addSelectee(child);
	5301	+ objEditor.SetMaterial(child);
4298	5302	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	5303	}
4303	5304	}
4304	5305	// else
..	..	@@ -4308,17 +5309,13 @@
4308	5309	// System.err.println("info : " + group.GetPath());
4309	5310	// }
4310	5311
4311		- objEditor.SetText(); // jan 2014
4312		-
4313		- Object3D object = (Object3D) tps[0].getLastPathComponent();
4314		-
4315		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
	5312	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	5313	CameraPane.flash = true;
4317	5314
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	5315	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	5316	// a camera
4320	5317	{
4321		- if (object != Globals.theRenderer.LightCamera())
	5318	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4322	5319	{
4323	5320	CameraPane.camerachangeframe = 0; // don't refuse it
4324	5321	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4327,6 +5324,13 @@
4327	5324	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4328	5325	}
4329	5326
	5327	+ if (tps != null && tps.length == 1)
	5328	+ {
	5329	+ EditSelection(false);
	5330	+ }
	5331	+
	5332	+ SetPinStates(tps != null && tps.length > 0);
	5333	+
4330	5334	refreshContents();
4331	5335	//return true;
4332	5336	}
..	..	@@ -4335,6 +5339,51 @@
4335	5339
4336	5340	freezemodel = false;
4337	5341	}
	5342	+
	5343	+ void SetPinStates(boolean enabled)
	5344	+ {
	5345	+ editButton.setEnabled(enabled);
	5346	+ uneditButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
	5348	+ flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
	5365	+ }
	5366	+
	5367	+ void refreshContents(boolean cp)
	5368	+ {
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5371	+ {
	5372	+ objEditor.ClearInfo(); // .GetMaterial());
	5373	+
	5374	+ for (int i=0; i < group.selection.Size(); i++)
	5375	+ {
	5376	+ Object3D child = (Object3D) group.selection.get(i);
	5377	+
	5378	+ objEditor.AddInfo(child, this, true);
	5379	+// System.err.println("info : " + child.GetPath());
	5380	+ }
	5381	+
	5382	+ objEditor.SetText(); // jan 2014
	5383	+ }
	5384	+
	5385	+ super.refreshContents(cp);
	5386	+ }
4338	5387
4339	5388	void linkSomething(Object3D thing)
4340	5389	{
..	..	@@ -4406,6 +5455,7 @@
4406	5455	{
4407	5456	if (group.selection.isEmpty())
4408	5457	return;
	5458	+
4409	5459	Grafreed.clipboardIsTempGroup = false;
4410	5460	Composite tGroup = null;
4411	5461	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +5466,8 @@
4416	5466
4417	5467	if (cut)
4418	5468	{
	5469	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5470	+// Save();
4419	5471	//int indices[] = jList.getSelectedIndices();
4420	5472	//for (int i = indices.length - 1; i >= 0; i--)
4421	5473	//jList.remove(indices[i]);
..	..	@@ -4505,8 +5557,10 @@
4505	5557	}
4506	5558
4507	5559	}
	5560	+
4508	5561	if (Grafreed.clipboardIsTempGroup)
4509	5562	Grafreed.clipboard = tGroup;
	5563	+
4510	5564	if (cut)
4511	5565	{
4512	5566	ResetModel();
..	..	@@ -4516,6 +5570,10 @@
4516	5570
4517	5571	void paste(boolean expand)
4518	5572	{
	5573	+ if (Globals.REPLACEONMAKE)
	5574	+ Save();
	5575	+ boolean keep = Globals.REPLACEONMAKE;
	5576	+ Globals.REPLACEONMAKE = false;
4519	5577	// if (GrafreeD.clipboard == null)
4520	5578	// return;
4521	5579	boolean first = true;
..	..	@@ -4575,6 +5633,7 @@
4575	5633	Grafreed.clipboard.get(0).parent = keepparent;
4576	5634	}
4577	5635
	5636	+ Globals.REPLACEONMAKE = keep;
4578	5637	ResetModel();
4579	5638	refreshContents();
4580	5639	}
..	..	@@ -4710,6 +5769,10 @@
4710	5769
4711	5770	void group(Object3D csg, boolean grab)
4712	5771	{
	5772	+ if (Globals.REPLACEONMAKE)
	5773	+ Save();
	5774	+ boolean keep = Globals.REPLACEONMAKE;
	5775	+ Globals.REPLACEONMAKE = false;
4713	5776	if (//false) // why??
4714	5777	!group.selection.isEmpty())
4715	5778	{
..	..	@@ -4823,10 +5886,15 @@
4823	5886	//node.add(csg);
4824	5887	//makeSomething(node);
4825	5888	makeSomething(csg);
	5889	+ Globals.REPLACEONMAKE = keep;
4826	5890	}
4827	5891
4828	5892	void Ungroup(Object3D g)
4829	5893	{
	5894	+ if (Globals.REPLACEONMAKE)
	5895	+ Save();
	5896	+ boolean keep = Globals.REPLACEONMAKE;
	5897	+ Globals.REPLACEONMAKE = false;
4830	5898	if (g instanceof HiddenObject)
4831	5899	{
4832	5900	HiddenObject h = (HiddenObject) g;
..	..	@@ -4843,6 +5911,7 @@
4843	5911	objEditor.makeSomething(g.get(i), false);
4844	5912	}
4845	5913	}
	5914	+ Globals.REPLACEONMAKE = keep;
4846	5915	}
4847	5916
4848	5917	void ungroup()
..	..	@@ -5131,7 +6200,43 @@
5131	6200	cButton clearpanelButton;
5132	6201	cButton unselectButton;
5133	6202
	6203	+ cButton restoreCameraButton;
	6204	+
5134	6205	cButton oneStepButton;
	6206	+
	6207	+ cButton groupButton;
	6208	+ cButton ungroupButton;
	6209	+ cButton compositeButton;
	6210	+ cButton switchButton;
	6211	+ cButton loopButton;
	6212	+ cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
	6229	+
	6230	+ cButton gridButton;
	6231	+ cButton boxButton;
	6232	+ cButton sphereButton;
	6233	+ cButton coneButton;
	6234	+ cButton torusButton;
	6235	+ cButton superButton;
	6236	+ cButton kleinButton;
	6237	+ cButton particlesButton;
	6238	+ cButton overlayButton;
	6239	+ cButton lightButton;
5135	6240
5136	6241	cButton screenfitButton;
5137	6242	cButton screenfitpointButton;
..	..	@@ -5144,14 +6249,6 @@
5144	6249
5145	6250	cButton setsupportButton;
5146	6251
5147		- cButton twoButton;
5148		- cButton sixButton;
5149		- cButton threeButton;
5150		- cButton sevenButton;
5151		- cButton fourButton; // full panel
5152		- cButton oneButton; // full XYZ
5153		- //cButton currentLayout;
5154		-
5155	6252	//
5156	6253	//Composite
5157	6254	Object3D // to do !!
..	..	@@ -5161,12 +6258,12 @@
5161	6258	//JTree jTree;
5162	6259	private MenuItem lookAtItem;
5163	6260	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
5165		- private MenuItem cutItem;
	6261	+ private MenuItem switchViewItem;
	6262	+ private JMenuItem cutItem;
5166	6263	private MenuItem undoItem;
5167	6264	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
5169		- private MenuItem cloneItem;
	6265	+ private JMenuItem duplicateItem;
	6266	+ private JMenuItem cloneItem;
5170	6267	private MenuItem cloneSupportItem;
5171	6268	private MenuItem overwriteGeoItem;
5172	6269	private MenuItem overwriteMatItem;
..	..	@@ -5187,13 +6284,13 @@
5187	6284	private MenuItem cloneGeometriesItem;
5188	6285	private MenuItem shareGeometriesItem;
5189	6286	private MenuItem mergeGeometriesItem;
5190		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
5191	6288	private MenuItem pasteItem;
5192		- private MenuItem pasteIntoItem;
5193		- private MenuItem pasteLinkItem;
5194		- private MenuItem pasteCloneItem;
5195		- private MenuItem pasteExpandItem;
5196		- private MenuItem clearItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
5197	6294	private MenuItem clearAllItem;
5198	6295	private MenuItem genUVItem;
5199	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -5228,6 +6325,10 @@
5228	6325	private MenuItem showleavesItem;
5229	6326	private MenuItem markleavesItem;
5230	6327	private MenuItem unmarkleavesItem;
	6328	+ private MenuItem rewindleavesItem;
	6329	+ private MenuItem unrewindleavesItem;
	6330	+ private MenuItem randomleavesItem;
	6331	+ private MenuItem unrandomleavesItem;
5231	6332
5232	6333	private MenuItem flipVItem;
5233	6334	private MenuItem unflipVItem;
..	..	@@ -5249,7 +6350,7 @@
5249	6350	private MenuItem frontItem;
5250	6351	private MenuItem cameraItem;
5251	6352	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	6353	+ private MenuItem switchItem;
5253	6354	private MenuItem physicsItem;
5254	6355	private MenuItem frameselectorItem;
5255	6356	private MenuItem scriptNodeItem;
..	..	@@ -5257,7 +6358,7 @@
5257	6358	private MenuItem switchTransfoItem;
5258	6359	private MenuItem morphItem;
5259	6360	private MenuItem linkerItem;
5260		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
5261	6362	private MenuItem editItem;
5262	6363	private MenuItem openWindowItem;
5263	6364	private MenuItem editLeafItem;
..	..	@@ -5273,6 +6374,8 @@
5273	6374	private MenuItem attachBumpItem;
5274	6375	private MenuItem detachBumpItem;
5275	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
5276	6379
5277	6380	private MenuItem particleItem;
5278	6381	private MenuItem ragdollItem;
..	..	@@ -5323,5 +6426,5 @@
5323	6426
5324	6427	Menu cameraMenu;
5325	6428	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	6429	+ MenuItem restoreCameraItem;
5327	6430	}