~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,92 @@
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 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
527	998	void SetupUI2(ObjEditor oe)
528	999	{
	1000	+ // June 2019
	1001	+ if (oe == null)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ //return;
	1005	+ }
	1006	+
	1007	+ if (copy != group)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ }
	1011	+
529	1012	//new Exception().printStackTrace();
530	1013
531	1014	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	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
538	1016
539	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -554,27 +1032,122 @@
554	1032	oe.radioPanel.add(dummyButton);
555	1033	oe.buttonGroup.add(dummyButton);
556	1034	*/
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
	1038	+
557	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	1040
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
560		- liveCB.setToolTipText("Enable animation");
561		- liveCB.addItemListener(this);
	1041	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ //minButton.setToolTipText("Minimize window");
	1043	+ //minButton.addActionListener(this);
	1044	+
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	1050	+ }
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
	1090	+
	1091	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ fullButton.setToolTipText("Full-screen window");
	1093	+ fullButton.addActionListener(this);
	1094	+
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
562	1098
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1101	+ restoreCameraButton.addActionListener(this);
	1102	+
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
	1115	+
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
	1121	+
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
	1126	+
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	1135	oneStepButton.setToolTipText("Animate one step forward");
565	1136	oneStepButton.addActionListener(this);
566	1137
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
	1140	+ liveCB.addItemListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	1143	fastCB.setToolTipText("Fast mode");
569	1144	fastCB.addItemListener(this);
570	1145
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);
	1146	+ //oe.toolboxPanel.Return();
	1147	+
	1148	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1149	+// trackCB.setToolTipText("Enable tracking");
	1150	+// trackCB.addItemListener(this);
578	1151
579	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	1153	// screenfitpointButton.addActionListener(this);
..	..	@@ -584,67 +1157,137 @@
584	1157	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	1158	snapobjectButton.addActionListener(this);
586	1159	snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ fourButton.addActionListener(this);
	1163	+ fourButton.setToolTipText("Show control panel only");
587	1164	}
588	1165
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	1166	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	1167
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	1168
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613		- rootButton.setToolTipText("Edit selection in new tab");
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
614	1171	rootButton.addActionListener(this);
615	1172
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	1174	closeButton.setToolTipText("Close tab");
618	1175	closeButton.addActionListener(this);
619	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	1177	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	1178	+
	1179	+ cGridBag row1 = new cGridBag();
623	1180
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	1181	+ // INSERT
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
	1184	+ gridButton.addActionListener(this);
	1185	+
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ boxButton.setToolTipText("Create box");
	1188	+ boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ sphereButton.setToolTipText("Create sphere");
	1192	+ sphereButton.addActionListener(this);
	1193	+
	1194	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ coneButton.setToolTipText("Create cone");
	1196	+ coneButton.addActionListener(this);
	1197	+
	1198	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ torusButton.setToolTipText("Create torus");
	1200	+ torusButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ if (Globals.ADVANCED)
	1207	+ {
	1208	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ kleinButton.setToolTipText("Create Klein bottle");
	1210	+ kleinButton.addActionListener(this);
	1211	+ }
	1212	+
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ particlesButton.setToolTipText("Create particle system");
	1215	+ particlesButton.addActionListener(this);
	1216	+
	1217	+ oe.toolboxPanel.add(row1);
	1218	+
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ groupButton.setToolTipText("Create group");
	1223	+ groupButton.addActionListener(this);
	1224	+
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ compositeButton.setToolTipText("Create composite");
	1227	+ compositeButton.addActionListener(this);
	1228	+
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ switchButton.setToolTipText("Create item switcher");
	1231	+ switchButton.addActionListener(this);
	1232	+
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ loopButton.setToolTipText("Create loop");
	1235	+ loopButton.addActionListener(this);
	1236	+
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ textureButton.setToolTipText("Create texture");
	1239	+ textureButton.addActionListener(this);
	1240	+
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ overlayButton.setToolTipText("Create overlay");
	1243	+ overlayButton.addActionListener(this);
	1244	+
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ lightButton.setToolTipText("Create light");
	1247	+ lightButton.addActionListener(this);
	1248	+
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
	1260	+
	1261	+ // EDIT panel
	1262	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ editButton.setToolTipText("Pin selection controls");
626	1264	editButton.addActionListener(this);
627	1265
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	1266	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
630	1268	uneditButton.addActionListener(this);
631	1269
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	1270	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1271	+ allParamsButton.setToolTipText("Show all controls");
634	1272	allParamsButton.addActionListener(this);
635	1273
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
638	1276	clearPanelButton.addActionListener(this);
639	1277
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- unselectButton.setToolTipText("Unselect");
642		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
643	1281
644		- commandsPanel.preferredHeight = 1;
	1282	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ flashSelectionButton.setToolTipText("Highlight selection");
	1284	+ flashSelectionButton.addActionListener(this);
645	1285
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	1286	+ editCommandsPanel.preferredHeight = 1;
	1287	+
	1288	+ SetPinStates(false);
	1289	+// oe.treePanel.add(commandsPanel);
	1290	+// oe.treePanel.Return();
648	1291
649	1292	// oe.aConstraints.gridx += 1;
650	1293	// oe.aConstraints.weighty = 0;
..	..	@@ -661,32 +1304,20 @@
661	1304
662	1305	JScrollPane jSP;
663	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	1308	ResetModel();
666	1309
667	1310	oe.treePanel.add(jSPPanel);
668	1311	oe.treePanel.Return();
669	1312
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	1313	oe.treePanel.add(copyOptionsPanel);
686	1314	oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
687	1318
688		-// mainPanel.setDividerLocation(0.5); //1.0);
689		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
690	1321
691	1322	//jList.addListSelectionListener(this);
692	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -694,7 +1325,7 @@
694	1325	//jTree.setEditable(true);
695	1326	oe.jTree.setDragEnabled(true);
696	1327	//jTree.setPreferredSize(new Dimension(10,10));
697		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
698	1329
699	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
700	1331
..	..	@@ -706,29 +1337,49 @@
706	1337	dgr.addDragGestureListener(this);
707	1338	}catch(Exception e) {}
708	1339	*/
709		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
710	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
711	1342	}
712	1343
713	1344	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	1345	{
	1346	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1347	+ colorCB.setToolTipText("Copy color when dropped");
	1348	+ colorCB.addItemListener(this);
	1349	+
	1350	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1351	+ materialCB.setToolTipText("Copy material when dropped");
	1352	+ materialCB.addItemListener(this);
	1353	+
	1354	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1355	+ textureCB.setToolTipText("Copy texture when dropped");
	1356	+ textureCB.addItemListener(this);
	1357	+
	1358	+ panel.Return();
	1359	+
715	1360	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	1361	boxCB.setToolTipText("Display bounding boxes");
717	1362	boxCB.addItemListener(this);
718	1363
719	1364	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1365	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	1366	zoomBoxCB.addItemListener(this);
722	1367
723	1368	if (true) // Globals.ADVANCED)
724	1369	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	1370	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1371	+// supportCB.setToolTipText("Enable rigging");
	1372	+// supportCB.addItemListener(this);
	1373	+
	1374	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1375	+ freezeCB.setToolTipText("Fast moving camera");
	1376	+ freezeCB.addItemListener(this);
728	1377
729	1378	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	1379	// localCB.addItemListener(this);
731	1380
	1381	+ panel.Return();
	1382	+
732	1383	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	1384	crowdCB.setToolTipText("Used for crowds");
734	1385	crowdCB.addItemListener(this);
..	..	@@ -737,14 +1388,19 @@
737	1388	smoothCB.setToolTipText("Snapping delay");
738	1389	smoothCB.addItemListener(this);
739	1390
740		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
741		- slowCB.setToolTipText("Smooth interpolation");
742		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
743	1397
744	1398	// constraints.gridy += 1;
745	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	1400	// speakerMocapCB.addItemListener(this);
747	1401
	1402	+ panel.Return();
	1403	+
748	1404	if (false)
749	1405	{
750	1406	// handled in scripts
..	..	@@ -759,34 +1415,82 @@
759	1415	//constraints.gridy += 1;
760	1416	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	1417	smoothfocusCB.addItemListener(this);
	1418	+ panel.Return();
762	1419	}
763	1420
764	1421	//constraints.gridx += 1;
765	1422	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	1423	// debugCB.addItemListener(this);
767	1424
	1425	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1426	+ trackCB.setToolTipText("Enable tracking target");
	1427	+ trackCB.addItemListener(this);
	1428	+
768	1429	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1430	+ oeilCB.setToolTipText("Move camera when tracking");
769	1431	oeilCB.addItemListener(this);
770	1432
	1433	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1434	+ shadowCB.setToolTipText("When live compute shadows");
	1435	+ shadowCB.addItemListener(this);
	1436	+
	1437	+ panel.Return();
	1438	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1439	+ toggleTextureCB.setToolTipText("Load textures");
	1440	+ toggleTextureCB.addItemListener(this);
	1441	+
	1442	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1443	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1444	+ toggleSwitchCB.addItemListener(this);
	1445	+
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
	1449	+
	1450	+ panel.Return();
	1451	+ if (Globals.ADVANCED)
	1452	+ {
771	1453	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	1454	lookAtCB.setToolTipText("Look-at target");
773	1455	lookAtCB.addItemListener(this);
	1456	+ }
774	1457
775	1458	}
776	1459
777	1460	cGridBag fill = new cGridBag();
778		-
779	1461	fill.preferredHeight = 200;
	1462	+ cGridBag fill2 = new cGridBag();
	1463	+ fill2.preferredHeight = 200;
	1464	+ cGridBag fill3 = new cGridBag();
	1465	+ fill3.preferredHeight = 200;
780	1466
781	1467	panel.add(fill);
	1468	+ panel.add(fill2);
	1469	+ panel.add(fill3);
782	1470
783	1471	}
784	1472
785	1473	void EditObject(Object3D obj)
786	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
787	1483	cRadio radioButton = new cRadio(obj.name);
	1484	+
	1485	+ // June 2019. Patch to avoid bug with transparency.
	1486	+ radioButton.hadMaterial = obj.material != null;
	1487	+ if (!radioButton.hadMaterial)
	1488	+ {
	1489	+ obj.material = new cMaterial();
	1490	+ }
	1491	+
788	1492	radioButton.SetObject(obj);
789		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
790	1494	radioButton.SetCamera(cameraView.renderCamera, false);
791	1495	radioButton.addActionListener(this);
792	1496	radioPanel.add(radioButton);
..	..	@@ -796,6 +1500,8 @@
796	1500
797	1501	void SetupViews(ObjEditor oe)
798	1502	{
	1503	+ theFrame = this;
	1504	+
799	1505	oe.SetupViews();
800	1506
801	1507	System.out.println("SetupViews");
..	..	@@ -804,23 +1510,30 @@
804	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1511	}
806	1512
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;
	1513	+ cToggleButton liveCB;
	1514	+ cCheckBox supportCB;
	1515	+ cCheckBox localCB;
	1516	+ cCheckBox crowdCB;
	1517	+ cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
	1520	+ cToggleButton fastCB;
	1521	+ cCheckBox slowCB;
	1522	+ cCheckBox boxCB;
	1523	+ cCheckBox zoomBoxCB;
	1524	+ cCheckBox freezeCB;
	1525	+ //cToggleButton trackCB;
	1526	+ cCheckBox trackCB;
	1527	+ cCheckBox smoothfocusCB;
818	1528	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
824	1537
825	1538	// static int COLOR = 1;
826	1539	// static int MATERIAL = 2;
..	..	@@ -828,9 +1541,9 @@
828	1541
829	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1543
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
834	1547
835	1548	public void itemStateChanged(ItemEvent e)
836	1549	{
..	..	@@ -858,6 +1571,7 @@
858	1571	} else if(e.getSource() == liveCB)
859	1572	{
860	1573	cameraView.ToggleLive();
	1574	+ refreshContents(false);
861	1575	}
862	1576	else if(e.getSource() == supportCB)
863	1577	{
..	..	@@ -873,6 +1587,12 @@
873	1587	{
874	1588	cameraView.ToggleInertia();
875	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
876	1596	}
877	1597	else if(e.getSource() == localCB)
878	1598	{
..	..	@@ -922,6 +1642,18 @@
922	1642	{
923	1643	cameraView.ToggleOeil();
924	1644	}
	1645	+ else if(e.getSource() == shadowCB)
	1646	+ {
	1647	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1648	+ }
	1649	+ else if(e.getSource() == freezeCB)
	1650	+ {
	1651	+ Globals.FREEZEONMOVE ^= true;
	1652	+ }
	1653	+ else if(e.getSource() == autokeepCB)
	1654	+ {
	1655	+ Globals.REPLACEONMAKE ^= true;
	1656	+ }
925	1657	else if(e.getSource() == lookAtCB)
926	1658	{
927	1659	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1670,8 @@
938	1670
939	1671	/**/
940	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1676	// We can't move the root node or an empty selection
944	1677	return;
..	..	@@ -1001,8 +1734,6 @@
1001	1734	}
1002	1735	}
1003	1736
1004		- String string = (String) object;
1005		-
1006	1737	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1738	// if( object instanceof java.io.File[])
1008	1739	// {
..	..	@@ -1010,6 +1741,8 @@
1010	1741	// objEditor.DropFile((java.io.File[]) object, true);
1011	1742	// return;
1012	1743	// }
	1744	+
	1745	+ String string = object.toString();
1013	1746
1014	1747	// File path for Mac and Windows
1015	1748	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1788,33 @@
1055	1788
1056	1789	assert target == objEditor.jTree;
1057	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
1058	1792	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1794	} catch (Exception e) {
1061	1795	System.out.println("destinationPath : " + destinationPath);
1062	1796	return;
1063	1797	}
1064	1798
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
1066	1800	{
	1801	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1802	+
	1803	+ // Cannot move into itself
	1804	+ if (child == destinationLeaf)
	1805	+ return;
	1806	+ }
	1807	+
	1808	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+// {
1067	1810	loadClipboard(true);
1068	1811	objEditor.jTree.setSelectionPath(destinationPath);
1069	1812	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
1075	1818	}
1076	1819	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1820	// Called if the user has modified the current drop gesture
..	..	@@ -1127,7 +1870,12 @@
1127	1870	TreePath path;
1128	1871
1129	1872	public TransferableTreePath(TreePath tp) {
1130		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1131	1879	}
1132	1880
1133	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1176,22 +1924,30 @@
1176	1924	{
1177	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1926	//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);
	1927	+// gridItem = menu.add(new MenuItem("Grid"));
	1928	+// gridItem.addActionListener(this);
	1929	+// rectoidItem = menu.add(new MenuItem("Box"));
	1930	+// rectoidItem.addActionListener(this);
	1931	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1932	+// ellipsoidItem.addActionListener(this);
	1933	+// coneItem = menu.add(new MenuItem("Cone"));
	1934	+// coneItem.addActionListener(this);
	1935	+// torusItem = menu.add(new MenuItem("Torus"));
	1936	+// torusItem.addActionListener(this);
	1937	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1938	+// superItem.addActionListener(this);
	1939	+
	1940	+ cameraItem = menu.add(new MenuItem("Camera"));
	1941	+ cameraItem.addActionListener(this);
	1942	+
	1943	+ if (!Globals.ADVANCED)
	1944	+ {
1191	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1946	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
1195	1951	if (Globals.ADVANCED)
1196	1952	{
1197	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1973,15 @@
1217	1973	}
1218	1974	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1975	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);
	1976	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1977	+// overlayItem.addActionListener(this);
	1978	+// lightItem = menu.add(new MenuItem("Light"));
	1979	+// lightItem.addActionListener(this);
1224	1980	menu.add("-");
1225	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1982	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1229	1985	doubleItem = menu.add(new MenuItem("Fork"));
1230	1986	doubleItem.addActionListener(this);
1231	1987	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1997,9 @@
1241	1997	animationItem.addItemListener(this);
1242	1998	animationItem.setState(Globals.ANIMATION);
1243	1999
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
	2002	+
1244	2003	menu.add("-");
1245	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	2005	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +2012,8 @@
1253	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	2013	reduce34MorphItem.addActionListener(this);
1255	2014	menu.add("-");
	2015	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2016	+ memoryItem.addActionListener(this);
1256	2017	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	2018	computeAOItem.addActionListener(this);
1258	2019
..	..	@@ -1261,11 +2022,9 @@
1261	2022	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	2023	mirrorItem.addActionListener(this);
1263	2024	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	2026	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	2027	+ menu.add(dumpItem = new MenuItem("Print"));
1269	2028	dumpItem.addActionListener(this);
1270	2029	// menu.add(pathItem = new MenuItem("From-to path"));
1271	2030	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +2165,34 @@
1406	2165	shadow.material = new cMaterial(obj.material);
1407	2166	shadow.material.diffuse = 0.0001f;
1408	2167	shadow.material.specular = 0.0001f;
	2168	+ //shadow.projectedVertices[1].x = 300;
1409	2169
1410	2170	makeSomething(shadow);
1411	2171	}
	2172	+
	2173	+ private void ClearUnpinned()
	2174	+ {
	2175	+ //for (Object3D obj : listUI)
	2176	+ for (int i=listUI.size(); --i>=0;)
	2177	+ {
	2178	+ Object3D obj = listUI.elementAt(i);
	2179	+ if (!obj.pinned)
	2180	+ {
	2181	+ obj.CloseUI();
	2182	+ listUI.remove(i);
	2183	+ }
	2184	+ }
	2185	+ }
	2186	+
	2187	+ private void EditElement(Object3D elem, boolean newWindow)
	2188	+ {
	2189	+ // if (!(elem instanceof Composite))
	2190	+ // newWindow = false;
	2191	+ listUI.add(elem);
	2192	+ elem.openEditWindow(this, newWindow); //, false);
	2193	+ System.out.println("edit : " + elem);
	2194	+ elem.editWindow.refreshContents(true); // ? new
	2195	+ }
1412	2196
1413	2197	/**
1414	2198	* applyExample
..	..	@@ -1653,7 +2437,7 @@
1653	2437	{
1654	2438	ScreenFit();
1655	2439	} else
1656		- if (source == switchItem)
	2440	+ if (source == switchViewItem)
1657	2441	{
1658	2442	cVector v1 = new cVector();
1659	2443	cVector v2 = new cVector();
..	..	@@ -1662,11 +2446,11 @@
1662	2446	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	2447	objEditor.cameraView.repaint();
1664	2448	} else
1665		- if (source == rectoidItem)
	2449	+ if (source == rectoidItem \|\| source == boxButton)
1666	2450	{
1667	2451	makeSomething(new Box());
1668	2452	} else
1669		- if (source == particleItem)
	2453	+ if (source == particleItem \|\| source == particlesButton)
1670	2454	{
1671	2455	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	2456	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2529,27 @@
1745	2529
1746	2530	makeSomething(obj);
1747	2531	} else
1748		- if (source == gridItem)
	2532	+ if (source == gridItem \|\| source == gridButton)
1749	2533	{
1750	2534	makeSomething(new Grid());
1751	2535	} else
1752		- if (source == ellipsoidItem)
	2536	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2537	{
1754	2538	makeSomething(new Sphere());
1755	2539	} else
1756		- if (source == coneItem)
	2540	+ if (source == coneItem \|\| source == coneButton)
1757	2541	{
1758	2542	makeSomething(new Cone());
1759	2543	} else
1760		- if (source == torusItem)
	2544	+ if (source == torusItem \|\| source == torusButton)
1761	2545	{
1762	2546	makeSomething(new Torus());
1763	2547	} else
1764		- if (source == superItem)
	2548	+ if (source == superItem \|\| source == superButton)
1765	2549	{
1766	2550	makeSomething(new Superellipsoid());
1767	2551	} else
1768		- if (source == kleinItem)
	2552	+ if (source == kleinItem \|\| source == kleinButton)
1769	2553	{
1770	2554	makeSomething(new Klein());
1771	2555	} else
..	..	@@ -1785,7 +2569,7 @@
1785	2569	{
1786	2570	makeSomething(new BezierSurface());
1787	2571	} else
1788		- if (source == overlayItem)
	2572	+ if (source == overlayItem \|\| source == overlayButton)
1789	2573	{
1790	2574	/*
1791	2575	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,10 +2617,27 @@
1833	2617	s.setup();
1834	2618	makeSomething(s);
1835	2619	} else
1836		- if (source == lightItem)
	2620	+ if (source == lightItem \|\| source == lightButton)
1837	2621	{
1838	2622	makeSomething(new Light());
1839	2623	} else
	2624	+// if (source == skybox1Button \|\|
	2625	+// source == skybox2Button \|\|
	2626	+// source == skybox3Button \|\|
	2627	+// source == skybox4Button \|\|
	2628	+// source == skybox5Button \|\|
	2629	+// source == skybox6Button \|\|
	2630	+// source == skybox7Button \|\|
	2631	+// source == skybox11Button \|\|
	2632	+// source == skybox12Button \|\|
	2633	+// source == skybox13Button \|\|
	2634	+// source == skybox14Button \|\|
	2635	+// source == skybox15Button \|\|
	2636	+// source == skybox16Button \|\|
	2637	+// source == skybox17Button)
	2638	+// {
	2639	+// ChangeSkybox(source);
	2640	+// } else
1840	2641	if (source == csgItem)
1841	2642	{
1842	2643	group(new CSG());
..	..	@@ -1883,30 +2684,38 @@
1883	2684
1884	2685	group(g);
1885	2686	} else
1886		- if (source == loopItem)
	2687	+ if (source == loopItem \|\| source == loopButton)
1887	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
1888	2691	Composite csg = new GroupLeaf();
1889	2692	csg.count = 5;
1890		- group(csg);
1891		- Composite child = new cGroup();
	2693	+ Composite child = new cGroup("Branch");
1892	2694	csg.addChild(child);
1893	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
1894	2698	} else
1895	2699	if (source == doubleItem)
1896	2700	{
1897		- Composite csg = new GroupLeaf();
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
	2703	+ Composite csg = new GroupLeaf("Fork");
1898	2704	csg.count = 5;
	2705	+ Composite child = new cGroup("Branch A");
	2706	+ csg.addChild(child);
	2707	+ child.addChild(csg);
	2708	+ child = new cGroup("Branch B");
	2709	+ csg.addChild(child);
	2710	+ child.addChild(csg);
1899	2711	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);
	2712	+ }
1906	2713	} else
1907	2714	if (source == tripleItem)
1908	2715	{
1909		- Composite csg = new GroupLeaf();
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
	2718	+ Composite csg = new GroupLeaf("Trident");
1910	2719	csg.count = 4;
1911	2720	group(csg);
1912	2721	Composite child = new cGroup();
..	..	@@ -1918,11 +2727,12 @@
1918	2727	child = new cGroup();
1919	2728	csg.addChild(child);
1920	2729	child.addChild(csg);
	2730	+ }
1921	2731	} else
1922	2732	if (source == computeAOItem)
1923	2733	{
1924	2734	Globals.drawMode = CameraPane.OCCLUSION;
1925		- Globals.theRenderer.repaint();
	2735	+ cameraView.repaint();
1926	2736	} else
1927	2737	if (source == recompileItem)
1928	2738	{
..	..	@@ -1937,7 +2747,7 @@
1937	2747	if (source == invariantsItem)
1938	2748	{
1939	2749	System.out.println("Invariants:");
1940		- Grafreed.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
1941	2751	} else
1942	2752	if (source == memoryItem)
1943	2753	{
..	..	@@ -1956,6 +2766,65 @@
1956	2766	{
1957	2767	DumpObject();
1958	2768	} else
	2769	+ if (source == minButton)
	2770	+ {
	2771	+ Minimize();
	2772	+ } else
	2773	+ if (source == maxButton)
	2774	+ {
	2775	+ Maximize();
	2776	+ } else
	2777	+ if (source == fullButton)
	2778	+ {
	2779	+ ToggleFullScreen();
	2780	+ } else
	2781	+ if (source == collapseButton)
	2782	+ {
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
	2785	+ } else
	2786	+ if (source == maximize3DButton)
	2787	+ {
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
	2792	+ } else
	2793	+ if (source == previousVersionButton)
	2794	+ {
	2795	+ // Go to previous version
	2796	+ //if (!Undo())
	2797	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ PreviousVersion();
	2799	+ } else
	2800	+ if (source == restoreButton)
	2801	+ {
	2802	+ // Restore current version
	2803	+ Restore();
	2804	+ //restoreButton.setEnabled(false);
	2805	+ } else
	2806	+ if (source == replaceButton)
	2807	+ {
	2808	+ // Overwrite current version
	2809	+ Replace();
	2810	+ //replaceButton.setEnabled(false);
	2811	+ } else
	2812	+ if (source == nextVersionButton)
	2813	+ {
	2814	+ // Go to next version
	2815	+ NextVersion();
	2816	+ } else
	2817	+ if (source == saveVersionButton)
	2818	+ {
	2819	+ // Save a new version
	2820	+ if (!Save(true))
	2821	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
	2827	+ } else
1959	2828	if (source == oneStepButton)
1960	2829	{
1961	2830	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2832,14 @@
1963	2832	} else
1964	2833	if (source == screenfitButton)
1965	2834	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2835	ScreenFit();
1968	2836	} else
1969	2837	if (source == screenfitpointButton)
1970	2838	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2839	ScreenFitPoint();
1973	2840	} else
1974	2841	if (source == snapobjectButton)
1975	2842	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2843	SnapObject();
1978	2844	} else
1979	2845	// if (event.getSource() == recompileButton)
..	..	@@ -2012,11 +2878,11 @@
2012	2878	} else
2013	2879	if (source == undoItem)
2014	2880	{
2015		- Undo();
	2881	+ PreviousVersion();
2016	2882	} else
2017	2883	if (source == redoItem)
2018	2884	{
2019		- Redo();
	2885	+ NextVersion();
2020	2886	} else
2021	2887	if (source == duplicateItem)
2022	2888	{
..	..	@@ -2337,7 +3203,7 @@
2337	3203	{
2338	3204	StepAll();
2339	3205	} else
2340		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3206	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2341	3207	{
2342	3208	//int indices[] = jList.getSelectedIndices();
2343	3209	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2349,9 +3215,9 @@
2349	3215	{
2350	3216	ClearSelection(true);
2351	3217	} else
2352		- if (source == grabItem)
	3218	+ if (source == grabItem \|\| source == groupButton)
2353	3219	{
2354		- group(new cGroup(), true);
	3220	+ group(new cGroup(), false); // true);
2355	3221	} else
2356	3222	if (source == hideItem)
2357	3223	{
..	..	@@ -2369,11 +3235,11 @@
2369	3235	{
2370	3236	makeSomething(new Camera());
2371	3237	} else
2372		- if (source == compositeItem)
	3238	+ if (source == compositeItem \|\| source == compositeButton)
2373	3239	{
2374	3240	group(new Composite());
2375	3241	} else
2376		- if (source == randomItem)
	3242	+ if (source == switchItem \|\| source == switchButton)
2377	3243	{
2378	3244	RandomNode random = new RandomNode();
2379	3245	group(random);
..	..	@@ -2475,7 +3341,7 @@
2475	3341	{
2476	3342	group(new cLinker());
2477	3343	} else
2478		- if (source == textureItem)
	3344	+ if (source == textureItem \|\| source == textureButton)
2479	3345	{
2480	3346	group(new TextureNode());
2481	3347	} else
..	..	@@ -2495,17 +3361,42 @@
2495	3361	{
2496	3362	CastShadow(2);
2497	3363	} else
2498		- if (source == ungroupItem)
	3364	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	3365	{
2500		- //ungroup();
	3366	+ boolean canUngroup = true;
	3367	+
2501	3368	for (int i=0; i<group.selection.size(); i++)
2502	3369	{
2503		- Ungroup(group.selection.get(i));
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
	3373	+ {
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
	3383	+ break;
	3384	+ }
2504	3385	}
2505	3386
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	3387	+ if (canUngroup)
	3388	+ {
	3389	+ for (int i=0; i<group.selection.size(); i++)
	3390	+ {
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
	3394	+ }
	3395	+
	3396	+ ClearSelection(false);
	3397	+
	3398	+ refreshContents();
	3399	+ }
2509	3400	} else
2510	3401	if (source == genUVItem)
2511	3402	{
..	..	@@ -2517,7 +3408,7 @@
2517	3408	} else
2518	3409	if (source == genNormalsMESHItem)
2519	3410	{
2520		- GenNormals(true); // TODO
	3411	+ GenNormalsMESH();
2521	3412	} else
2522	3413	if (source == genNormalsORGANItem)
2523	3414	{
..	..	@@ -2582,6 +3473,22 @@
2582	3473	if (source == unmarkleavesItem)
2583	3474	{
2584	3475	MarkLeaves(false);
	3476	+ } else
	3477	+ if (source == rewindleavesItem)
	3478	+ {
	3479	+ RewindLeaves(true);
	3480	+ } else
	3481	+ if (source == unrewindleavesItem)
	3482	+ {
	3483	+ RewindLeaves(false);
	3484	+ } else
	3485	+ if (source == randomleavesItem)
	3486	+ {
	3487	+ RandomLeaves(true);
	3488	+ } else
	3489	+ if (source == unrandomleavesItem)
	3490	+ {
	3491	+ RandomLeaves(false);
2585	3492	} else
2586	3493	if (source == flipVItem)
2587	3494	{
..	..	@@ -2790,7 +3697,7 @@
2790	3697	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2791	3698	{
2792	3699	obj = (Object3D)e.nextElement();
2793		- obj.SetBumpTexture(null);
	3700	+ obj.ResetBumpTexture();
2794	3701	}
2795	3702
2796	3703	refreshContents();
..	..	@@ -2806,6 +3713,31 @@
2806	3713
2807	3714	refreshContents();
2808	3715	} else
	3716	+ if (source == embedTexturesItem)
	3717	+ {
	3718	+ Object3D obj;
	3719	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3720	+ {
	3721	+ obj = (Object3D)e.nextElement();
	3722	+ obj.EmbedTextures(true);
	3723	+ }
	3724	+
	3725	+ refreshContents();
	3726	+ } else
	3727	+ if (source == deEmbedTexturesItem)
	3728	+ {
	3729	+ Object3D obj;
	3730	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3731	+ {
	3732	+ obj = (Object3D)e.nextElement();
	3733	+ obj.EmbedTextures(false);
	3734	+ }
	3735	+
	3736	+ CameraPane.texturepigment.clear();
	3737	+ CameraPane.texturebump.clear();
	3738	+
	3739	+ refreshContents();
	3740	+ } else
2809	3741	if (source == flashSelectionButton)
2810	3742	{
2811	3743	CameraPane.flash = true;
..	..	@@ -2817,42 +3749,36 @@
2817	3749	if (source == twoButton)
2818	3750	{
2819	3751	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();
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
	3755	+
	3756	+ Show3DView();
	3757	+
	3758	+ cameraView.requestFocusInWindow();
	3759	+
	3760	+// refreshContents(true);
	3761	+//
	3762	+// try
	3763	+// {
	3764	+// java.awt.Robot bot = new java.awt.Robot();
	3765	+// int mask = InputEvent.BUTTON1_MASK;
	3766	+// bot.mouseMove(100, 100);
	3767	+// bot.mousePress(mask);
	3768	+// bot.mouseRelease(mask);
	3769	+// }
	3770	+// catch (Exception e)
	3771	+// {
	3772	+//
	3773	+// }
	3774	+
2852	3775	} else
2853	3776	if (source == threeButton)
2854	3777	{
2855	3778	radio.layout = threeButton;
	3779	+
	3780	+ if (CameraPane.FULLSCREEN)
	3781	+ fullscreenLayout = radio.layout;
2856	3782
2857	3783	// bigThree.remove(scenePanel);
2858	3784	// bigThree.remove(centralPanel);
..	..	@@ -2882,13 +3808,18 @@
2882	3808	// centralPanel.setVisible(true);
2883	3809	// XYZPanel.setVisible(true);
2884	3810	bigThree.ClearUI();
	3811	+ bigThree.add(scenePanel);
2885	3812	bigThree.add(centralPanel);
2886		- bigThree.add(XYZPanel);
2887	3813	bigThree.FlushUI();
	3814	+
	3815	+ cameraView.requestFocusInWindow();
2888	3816	} else
2889	3817	if (source == fourButton)
2890	3818	{
2891	3819	radio.layout = fourButton;
	3820	+
	3821	+ if (CameraPane.FULLSCREEN)
	3822	+ fullscreenLayout = radio.layout;
2892	3823
2893	3824	// bigThree.remove(scenePanel);
2894	3825	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3851,15 @@
2920	3851	bigThree.ClearUI();
2921	3852	bigThree.add(scenePanel);
2922	3853	bigThree.FlushUI();
	3854	+
	3855	+ cameraView.requestFocusInWindow();
2923	3856	} else
2924	3857	if (source == sixButton)
2925	3858	{
2926	3859	radio.layout = sixButton;
	3860	+
	3861	+ if (CameraPane.FULLSCREEN)
	3862	+ fullscreenLayout = radio.layout;
2927	3863
2928	3864	// bigThree.remove(scenePanel);
2929	3865	// bigThree.remove(centralPanel);
..	..	@@ -2953,13 +3889,18 @@
2953	3889	// centralPanel.setVisible(true);
2954	3890	// XYZPanel.setVisible(false);
2955	3891	bigThree.ClearUI();
2956		- bigThree.add(scenePanel);
2957	3892	bigThree.add(centralPanel);
	3893	+ bigThree.add(scenePanel);
2958	3894	bigThree.FlushUI();
	3895	+
	3896	+ cameraView.requestFocusInWindow();
2959	3897	} else
2960	3898	if (source == sevenButton)
2961	3899	{
2962	3900	radio.layout = sevenButton;
	3901	+
	3902	+ if (CameraPane.FULLSCREEN)
	3903	+ fullscreenLayout = radio.layout;
2963	3904
2964	3905	// bigThree.remove(scenePanel);
2965	3906	// bigThree.remove(centralPanel);
..	..	@@ -2993,9 +3934,12 @@
2993	3934	bigThree.add(centralPanel);
2994	3935	bigThree.add(XYZPanel);
2995	3936	bigThree.FlushUI();
	3937	+
	3938	+ cameraView.requestFocusInWindow();
2996	3939	} else
2997	3940	if (source == rootButton)
2998	3941	{
	3942	+ Replace();
2999	3943	Object3D obj;
3000	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3001	3945	{
..	..	@@ -3004,6 +3948,7 @@
3004	3948	EditObject(obj);
3005	3949	}
3006	3950
	3951	+ cameraView.requestFocusInWindow();
3007	3952	refreshContents(true);
3008	3953	} else
3009	3954	if (source == closeButton)
..	..	@@ -3013,22 +3958,37 @@
3013	3958	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3959	{
3015	3960	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3961	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3962	{
	3963	+ // Patch to avoid bug with transparency.
	3964	+ if (!ab.hadMaterial)
	3965	+ {
	3966	+ ab.object.material = null;
	3967	+ }
	3968	+
3018	3969	buttonGroup.remove(ab);
3019	3970	radioPanel.remove(ab);
3020	3971
3021		- ab.GetObject().editWindow = null;
	3972	+ //ab.GetObject().editWindow = null;
	3973	+ ab.GetObject().manipWindow = null;
3022	3974	// ab.GetObject().objectUI = null; // ?????????
3023	3975
3024	3976	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3977	break;
3026	3978	}
3027	3979	}
	3980	+
	3981	+ cameraView.requestFocusInWindow();
3028	3982	refreshContents(true);
3029	3983	} else
3030	3984	if (source == editItem \|\| source == editButton)
3031	3985	{
	3986	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3987	+ {
	3988	+ Object3D child = (Object3D)e.nextElement();
	3989	+ child.pinned = true;
	3990	+ }
	3991	+
3032	3992	EditSelection(false);
3033	3993	} else
3034	3994	if (source == uneditButton)
..	..	@@ -3037,9 +3997,10 @@
3037	3997	{
3038	3998	Object3D child = (Object3D)e.nextElement();
3039	3999	if(child.editWindow != null)
3040		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4000	+ child.pinned = false;
3041	4001	child.CloseUI();
3042	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3043	4004
3044	4005	//child.editWindow = null; // ???????????
3045	4006	}
..	..	@@ -3054,16 +4015,18 @@
3054	4015	//copy.ClearUI();
3055	4016	for (Object3D obj : listUI)
3056	4017	{
	4018	+ obj.pinned = false;
3057	4019	obj.CloseUI();
3058	4020	}
3059	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
3060	4023	refreshContents(true);
3061	4024	} else
3062	4025	if (source == allParamsButton)
3063	4026	{
3064	4027	assert(copy == group);
3065	4028
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4029	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	4030
3068	4031	for (Object3D obj : listUI)
3069	4032	{
..	..	@@ -3112,6 +4075,7 @@
3112	4075	}
3113	4076
3114	4077	copy = group;
	4078	+
3115	4079	//Globals.theRenderer.object = group;
3116	4080	if(!useclient)
3117	4081	{
..	..	@@ -3128,7 +4092,9 @@
3128	4092	sideView.object = group;
3129	4093	}
3130	4094
3131		-// fix "+" issue group.editWindow = this;
	4095	+// fix "+" issue
	4096	+ //group.editWindow = this;
	4097	+ group.manipWindow = this;
3132	4098
3133	4099	/*
3134	4100	currentLayout = radio.layout;
..	..	@@ -3136,20 +4102,44 @@
3136	4102	currentLayout = sevenButton;
3137	4103	*/
3138	4104	radio.layout.doClick();
	4105	+
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
	4118	+ ClearUnpinned();
	4119	+
	4120	+ //Grafreed.Assert(group != null);
	4121	+ //Grafreed.Assert(group.selection != null);
	4122	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4123	+ if (group.selection == null \|\| group.selection.size() == 1)
	4124	+ EditSelection(false);
3139	4125	keepparent = group.parent;
3140	4126	// PARENT = NULL or not???
3141	4127	//group.parent = null; // ROOT
3142	4128	//group.attributes = -1;
3143	4129	ResetModel();
	4130	+
	4131	+ cameraView.requestFocusInWindow();
3144	4132	refreshContents(true);
3145	4133	} else if (event.getSource() == editCameraItem)
3146	4134	{
3147	4135	cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
3148	4137	cameraView.repaint();
3149	4138	return;
3150		- } else if (event.getSource() == revertCameraItem)
	4139	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	4140	{
3152	4141	cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
3153	4143	cameraView.repaint();
3154	4144	return;
3155	4145	// } else if (event.getSource() == textureButton)
..	..	@@ -3164,7 +4154,6 @@
3164	4154	}
3165	4155
3166	4156	boolean useclient = false;
3167		- cRadio radio;
3168	4157
3169	4158	void ToggleRoot()
3170	4159	{
..	..	@@ -3403,7 +4392,8 @@
3403	4392
3404	4393	int size = obj.MemorySize();
3405	4394
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4396	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	4397	}
3408	4398	}
3409	4399	catch (Exception e)
..	..	@@ -3484,6 +4474,13 @@
3484	4474	void GenNormals(boolean crease)
3485	4475	{
3486	4476	group.GenNormalsS(crease);
	4477	+
	4478	+ refreshContents();
	4479	+ }
	4480	+
	4481	+ void GenNormalsMESH()
	4482	+ {
	4483	+ group.GenNormalsMeshS();
3487	4484
3488	4485	refreshContents();
3489	4486	}
..	..	@@ -3719,7 +4716,7 @@
3719	4716
3720	4717	try
3721	4718	{
3722		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4719	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3723	4720	}
3724	4721	catch (Exception e)
3725	4722	{
..	..	@@ -4111,6 +5108,18 @@
4111	5108	refreshContents();
4112	5109	}
4113	5110
	5111	+ void RewindLeaves(boolean hide)
	5112	+ {
	5113	+ group.selection.RewindLeaves(hide);
	5114	+ refreshContents();
	5115	+ }
	5116	+
	5117	+ void RandomLeaves(boolean hide)
	5118	+ {
	5119	+ group.selection.RandomLeaves(hide);
	5120	+ refreshContents();
	5121	+ }
	5122	+
4114	5123	void SetTexRes(int tr)
4115	5124	{
4116	5125	group.selection.SetTexRes(tr);
..	..	@@ -4182,28 +5191,25 @@
4182	5191	// }
4183	5192	// }
4184	5193
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	5194	void EditSelection(boolean newWindow)
4190	5195	{
	5196	+ if (group.selection == null)
	5197	+ {
	5198	+ EditElement(group, newWindow); // ? new
	5199	+ return;
	5200	+ }
	5201	+
4191	5202	// aConstraints.gridy = 0;
4192	5203	for (int i=0; i<group.selection.size(); i++)
4193	5204	{
4194	5205	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	5206	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5207	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	5208
4198	5209	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	5210	if(elem != group \|\| !newWindow)
4200	5211	{
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
	5212	+ EditElement(elem, newWindow); // ? new
4207	5213	}
4208	5214	}
4209	5215	}
..	..	@@ -4266,9 +5272,7 @@
4266	5272
4267	5273	freezemodel = false;
4268	5274	}
4269		-
4270		- boolean flashIt = true;
4271		-
	5275	+
4272	5276	public void valueChanged(TreeSelectionEvent e)
4273	5277	//public boolean handleEvent(Event event)
4274	5278	{
..	..	@@ -4278,7 +5282,8 @@
4278	5282	//new Exception().printStackTrace();
4279	5283
4280	5284	freezemodel = true;
4281		-
	5285	+ ClearUnpinned();
	5286	+
4282	5287	/**/
4283	5288	//switch (event.id)
4284	5289	{
..	..	@@ -4286,7 +5291,6 @@
4286	5291	//case 702: // Event.LIST_DESELECT
4287	5292	group.deselectAll();
4288	5293	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	5294	if (tps != null)
4291	5295	{
4292	5296	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +5299,8 @@
4295	5299
4296	5300	//if (child.parent != null)
4297	5301	//child.parent.addSelectee(child);
	5302	+ objEditor.SetMaterial(child);
4298	5303	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	5304	}
4303	5305	}
4304	5306	// else
..	..	@@ -4308,15 +5310,13 @@
4308	5310	// System.err.println("info : " + group.GetPath());
4309	5311	// }
4310	5312
4311		- objEditor.SetText(); // jan 2014
4312		-
4313	5313	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4314	5314	CameraPane.flash = true;
4315	5315
4316	5316	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4317	5317	// a camera
4318	5318	{
4319		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4320	5320	{
4321	5321	CameraPane.camerachangeframe = 0; // don't refuse it
4322	5322	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4325,6 +5325,13 @@
4325	5325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4326	5326	}
4327	5327
	5328	+ if (tps != null && tps.length == 1)
	5329	+ {
	5330	+ EditSelection(false);
	5331	+ }
	5332	+
	5333	+ SetPinStates(tps != null && tps.length > 0);
	5334	+
4328	5335	refreshContents();
4329	5336	//return true;
4330	5337	}
..	..	@@ -4333,6 +5340,51 @@
4333	5340
4334	5341	freezemodel = false;
4335	5342	}
	5343	+
	5344	+ void SetPinStates(boolean enabled)
	5345	+ {
	5346	+ editButton.setEnabled(enabled);
	5347	+ uneditButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
	5349	+ flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
	5366	+ }
	5367	+
	5368	+ void refreshContents(boolean cp)
	5369	+ {
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5371	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5372	+ {
	5373	+ objEditor.ClearInfo(); // .GetMaterial());
	5374	+
	5375	+ for (int i=0; i < group.selection.Size(); i++)
	5376	+ {
	5377	+ Object3D child = (Object3D) group.selection.get(i);
	5378	+
	5379	+ objEditor.AddInfo(child, this, true);
	5380	+// System.err.println("info : " + child.GetPath());
	5381	+ }
	5382	+
	5383	+ objEditor.SetText(); // jan 2014
	5384	+ }
	5385	+
	5386	+ super.refreshContents(cp);
	5387	+ }
4336	5388
4337	5389	void linkSomething(Object3D thing)
4338	5390	{
..	..	@@ -4404,6 +5456,7 @@
4404	5456	{
4405	5457	if (group.selection.isEmpty())
4406	5458	return;
	5459	+
4407	5460	Grafreed.clipboardIsTempGroup = false;
4408	5461	Composite tGroup = null;
4409	5462	if (group.selection.size() > 0) // 1)
..	..	@@ -4414,6 +5467,8 @@
4414	5467
4415	5468	if (cut)
4416	5469	{
	5470	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5471	+// Save();
4417	5472	//int indices[] = jList.getSelectedIndices();
4418	5473	//for (int i = indices.length - 1; i >= 0; i--)
4419	5474	//jList.remove(indices[i]);
..	..	@@ -4503,8 +5558,10 @@
4503	5558	}
4504	5559
4505	5560	}
	5561	+
4506	5562	if (Grafreed.clipboardIsTempGroup)
4507	5563	Grafreed.clipboard = tGroup;
	5564	+
4508	5565	if (cut)
4509	5566	{
4510	5567	ResetModel();
..	..	@@ -4514,6 +5571,10 @@
4514	5571
4515	5572	void paste(boolean expand)
4516	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4517	5578	// if (GrafreeD.clipboard == null)
4518	5579	// return;
4519	5580	boolean first = true;
..	..	@@ -4573,6 +5634,7 @@
4573	5634	Grafreed.clipboard.get(0).parent = keepparent;
4574	5635	}
4575	5636
	5637	+ Globals.REPLACEONMAKE = keep;
4576	5638	ResetModel();
4577	5639	refreshContents();
4578	5640	}
..	..	@@ -4708,6 +5770,10 @@
4708	5770
4709	5771	void group(Object3D csg, boolean grab)
4710	5772	{
	5773	+ if (Globals.REPLACEONMAKE)
	5774	+ Save();
	5775	+ boolean keep = Globals.REPLACEONMAKE;
	5776	+ Globals.REPLACEONMAKE = false;
4711	5777	if (//false) // why??
4712	5778	!group.selection.isEmpty())
4713	5779	{
..	..	@@ -4821,10 +5887,15 @@
4821	5887	//node.add(csg);
4822	5888	//makeSomething(node);
4823	5889	makeSomething(csg);
	5890	+ Globals.REPLACEONMAKE = keep;
4824	5891	}
4825	5892
4826	5893	void Ungroup(Object3D g)
4827	5894	{
	5895	+ if (Globals.REPLACEONMAKE)
	5896	+ Save();
	5897	+ boolean keep = Globals.REPLACEONMAKE;
	5898	+ Globals.REPLACEONMAKE = false;
4828	5899	if (g instanceof HiddenObject)
4829	5900	{
4830	5901	HiddenObject h = (HiddenObject) g;
..	..	@@ -4841,6 +5912,7 @@
4841	5912	objEditor.makeSomething(g.get(i), false);
4842	5913	}
4843	5914	}
	5915	+ Globals.REPLACEONMAKE = keep;
4844	5916	}
4845	5917
4846	5918	void ungroup()
..	..	@@ -5129,7 +6201,43 @@
5129	6201	cButton clearpanelButton;
5130	6202	cButton unselectButton;
5131	6203
	6204	+ cButton restoreCameraButton;
	6205	+
5132	6206	cButton oneStepButton;
	6207	+
	6208	+ cButton groupButton;
	6209	+ cButton ungroupButton;
	6210	+ cButton compositeButton;
	6211	+ cButton switchButton;
	6212	+ cButton loopButton;
	6213	+ cButton textureButton;
	6214	+
	6215	+ cButton skybox1Button;
	6216	+ cButton skybox2Button;
	6217	+ cButton skybox3Button;
	6218	+ cButton skybox4Button;
	6219	+ cButton skybox5Button;
	6220	+ cButton skybox6Button;
	6221	+ cButton skybox7Button;
	6222	+
	6223	+ cButton skybox11Button;
	6224	+ cButton skybox12Button;
	6225	+ cButton skybox13Button;
	6226	+ cButton skybox14Button;
	6227	+ cButton skybox15Button;
	6228	+ cButton skybox16Button;
	6229	+ cButton skybox17Button;
	6230	+
	6231	+ cButton gridButton;
	6232	+ cButton boxButton;
	6233	+ cButton sphereButton;
	6234	+ cButton coneButton;
	6235	+ cButton torusButton;
	6236	+ cButton superButton;
	6237	+ cButton kleinButton;
	6238	+ cButton particlesButton;
	6239	+ cButton overlayButton;
	6240	+ cButton lightButton;
5133	6241
5134	6242	cButton screenfitButton;
5135	6243	cButton screenfitpointButton;
..	..	@@ -5142,14 +6250,6 @@
5142	6250
5143	6251	cButton setsupportButton;
5144	6252
5145		- cButton twoButton;
5146		- cButton sixButton;
5147		- cButton threeButton;
5148		- cButton sevenButton;
5149		- cButton fourButton; // full panel
5150		- cButton oneButton; // full XYZ
5151		- //cButton currentLayout;
5152		-
5153	6253	//
5154	6254	//Composite
5155	6255	Object3D // to do !!
..	..	@@ -5159,12 +6259,12 @@
5159	6259	//JTree jTree;
5160	6260	private MenuItem lookAtItem;
5161	6261	private MenuItem lookFromItem;
5162		- private MenuItem switchItem;
5163		- private MenuItem cutItem;
	6262	+ private MenuItem switchViewItem;
	6263	+ private JMenuItem cutItem;
5164	6264	private MenuItem undoItem;
5165	6265	private MenuItem redoItem;
5166		- private MenuItem duplicateItem;
5167		- private MenuItem cloneItem;
	6266	+ private JMenuItem duplicateItem;
	6267	+ private JMenuItem cloneItem;
5168	6268	private MenuItem cloneSupportItem;
5169	6269	private MenuItem overwriteGeoItem;
5170	6270	private MenuItem overwriteMatItem;
..	..	@@ -5185,13 +6285,13 @@
5185	6285	private MenuItem cloneGeometriesItem;
5186	6286	private MenuItem shareGeometriesItem;
5187	6287	private MenuItem mergeGeometriesItem;
5188		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
5189	6289	private MenuItem pasteItem;
5190		- private MenuItem pasteIntoItem;
5191		- private MenuItem pasteLinkItem;
5192		- private MenuItem pasteCloneItem;
5193		- private MenuItem pasteExpandItem;
5194		- private MenuItem clearItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
5195	6295	private MenuItem clearAllItem;
5196	6296	private MenuItem genUVItem;
5197	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -5226,6 +6326,10 @@
5226	6326	private MenuItem showleavesItem;
5227	6327	private MenuItem markleavesItem;
5228	6328	private MenuItem unmarkleavesItem;
	6329	+ private MenuItem rewindleavesItem;
	6330	+ private MenuItem unrewindleavesItem;
	6331	+ private MenuItem randomleavesItem;
	6332	+ private MenuItem unrandomleavesItem;
5229	6333
5230	6334	private MenuItem flipVItem;
5231	6335	private MenuItem unflipVItem;
..	..	@@ -5247,7 +6351,7 @@
5247	6351	private MenuItem frontItem;
5248	6352	private MenuItem cameraItem;
5249	6353	private MenuItem compositeItem;
5250		- private MenuItem randomItem;
	6354	+ private MenuItem switchItem;
5251	6355	private MenuItem physicsItem;
5252	6356	private MenuItem frameselectorItem;
5253	6357	private MenuItem scriptNodeItem;
..	..	@@ -5255,7 +6359,7 @@
5255	6359	private MenuItem switchTransfoItem;
5256	6360	private MenuItem morphItem;
5257	6361	private MenuItem linkerItem;
5258		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
5259	6363	private MenuItem editItem;
5260	6364	private MenuItem openWindowItem;
5261	6365	private MenuItem editLeafItem;
..	..	@@ -5271,6 +6375,8 @@
5271	6375	private MenuItem attachBumpItem;
5272	6376	private MenuItem detachBumpItem;
5273	6377	private MenuItem pigmentBumpItem;
	6378	+ private MenuItem embedTexturesItem;
	6379	+ private MenuItem deEmbedTexturesItem;
5274	6380
5275	6381	private MenuItem particleItem;
5276	6382	private MenuItem ragdollItem;
..	..	@@ -5321,5 +6427,5 @@
5321	6427
5322	6428	Menu cameraMenu;
5323	6429	MenuItem editCameraItem;
5324		- MenuItem revertCameraItem;
	6430	+ MenuItem restoreCameraItem;
5325	6431	}