~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,350 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -80,10 +435,22 @@
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +461,7 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +518,8 @@
150	518
151	519	void SetupMenu2(GroupEditor oe)
152	520	{
	521	+ oe.jTree = new cTree();
	522	+
153	523	Menu menu;
154	524	oe.menuBar.add(menu = new Menu("Edit"));
155	525	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,36 +530,37 @@
160	530	// redoItem = menu.add(new MenuItem("Redo"));
161	531	// redoItem.addActionListener(this);
162	532	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	533	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	534	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	537	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
168	539	{
169	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	541	cloneSupportItem.addActionListener(this);
171	542	}
	543	+ oe.jTree.popup.addSeparator();
172	544	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	546	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	548	copyItem.addActionListener(this);
177	549	pasteItem = menu.add(new MenuItem("Paste"));
178	550	pasteItem.addActionListener(this);
179		- menu.add("-");
180	551
181		- menu.add("-");
182		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
183	555	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	557	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	559	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	561	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
193	564
194	565	if (Globals.ADVANCED)
195	566	{
..	..	@@ -203,23 +574,23 @@
203	574	//zBufferItem.addActionListener(this);
204	575	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	576	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
208	579
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	580	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	581	+// toggleFullScreenItem.addItemListener(this);
	582	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	583	+// cameraMenu.add("-");
	584	+//
	585	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	586	+// toggleTextureItem.addItemListener(this);
	587	+// toggleTextureItem.setState(CameraPane.textureon);
	588	+//
	589	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	590	+// toggleSwitchItem.addItemListener(this);
	591	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	592
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	594	toggleHandleItem.addItemListener(this);
224	595	toggleHandleItem.setState(CameraPane.HANDLES);
225	596
..	..	@@ -246,7 +617,7 @@
246	617
247	618	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	619	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	620	+ toggleDebugItem.setState(Globals.DEBUG);
250	621
251	622	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	623	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,15 +645,13 @@
274	645	{
275	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	649	oe.cameraMenu.add("-");
280	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	651	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	652	lookAtItem.addActionListener(this);
284	653	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	654	+ //switchViewItem.addActionListener(this);
286	655	}
287	656
288	657	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,22 +695,37 @@
326	695	setMasterItem.addActionListener(this);
327	696	}
328	697
329		- oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
332	700	backItem = menu.add(new MenuItem("Back"));
333	701	backItem.addActionListener(this);
334	702	frontItem = menu.add(new MenuItem("Front"));
335	703	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	704	+// compositeItem = menu.add(new MenuItem("Composite"));
	705	+// compositeItem.addActionListener(this);
	706	+
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
338	712	hideItem = menu.add(new MenuItem("Hidden Group"));
339	713	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	716	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
	722	+
	723	+// menu.add("-");
	724	+//
	725	+// switchItem = menu.add(new MenuItem("Switch node"));
	726	+// switchItem.addActionListener(this);
	727	+ if (Globals.ADVANCED)
	728	+ {
345	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	730	switchGeoItem.addActionListener(this);
347	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +733,6 @@
349	733	morphItem = menu.add(new MenuItem("Morph Group"));
350	734	morphItem.addActionListener(this);
351	735
352		- if (Globals.ADVANCED)
353		- {
354	736	menu.add("-");
355	737	physicsItem = menu.add(new MenuItem("Physics"));
356	738	physicsItem.addActionListener(this);
..	..	@@ -358,41 +740,47 @@
358	740	frameselectorItem.addActionListener(this);
359	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	742	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	743	}
364	744
365	745	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
368	748	billboardItem = menu.add(new MenuItem("Billboard"));
369	749	billboardItem.addActionListener(this);
370	750	csgItem = menu.add(new MenuItem("CSG"));
371	751	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	753	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	755	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
378	761	if (Globals.ADVANCED)
379	762	{
380	763	menu.add("-");
381	764	linkerItem = menu.add(new MenuItem("Linker"));
382	765	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	766	templateItem = menu.add(new MenuItem("Template"));
386	767	templateItem.addActionListener(this);
387	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
388	769	pointflowItem.addActionListener(this);
389	770	}
390	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
391	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
392	780	resetTransformItem.addActionListener(this);
393	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
394	782	resetCentroidItem.addActionListener(this);
395		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
396	784	resetCentroidXZItem.addActionListener(this);
397	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
398	786	transformGeometryItem.addActionListener(this);
..	..	@@ -410,7 +798,7 @@
410	798	genNormalsMESHItem.addActionListener(this);
411	799	if (Globals.ADVANCED)
412	800	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	802	genNormalsMINEItem.addActionListener(this);
415	803	}
416	804	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -444,6 +832,8 @@
444	832	}
445	833
446	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
447	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
448	838	clearMaterialsItem.addActionListener(this);
449	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -466,10 +856,18 @@
466	856	hideleavesItem.addActionListener(this);
467	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
468	858	showleavesItem.addActionListener(this);
469		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470	860	markleavesItem.addActionListener(this);
471		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472	862	unmarkleavesItem.addActionListener(this);
	863	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	864	+ rewindleavesItem.addActionListener(this);
	865	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	866	+ unrewindleavesItem.addActionListener(this);
	867	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	868	+ randomleavesItem.addActionListener(this);
	869	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	870	+ unrandomleavesItem.addActionListener(this);
473	871	menu.add("-");
474	872	flipVItem = menu.add(new MenuItem("Flip V"));
475	873	flipVItem.addActionListener(this);
..	..	@@ -495,10 +893,15 @@
495	893	attachBumpItem.addActionListener(this);
496	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
498	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	898	detachPigmentItem.addActionListener(this);
500	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	900	detachBumpItem.addActionListener(this);
	901	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	902	+ embedTexturesItem.addActionListener(this);
	903	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	904	+ deEmbedTexturesItem.addActionListener(this);
502	905	menu.add("-");
503	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	907	sortbysizeItem.addActionListener(this);
..	..	@@ -509,6 +912,9 @@
509	912	shareGeometriesItem.addActionListener(this);
510	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
511	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
512	918	if (Globals.ADVANCED)
513	919	{
514	920	// Pretty much the same as duplicate and clone.
..	..	@@ -525,16 +931,97 @@
525	931	buildToolsMenu(menu);
526	932	}
527	933
	934	+ JTabbedPane resourcecontainer;
	935	+ cGridBag currenttab;
	936	+ //boolean added; // patch for jar
	937	+
	938	+ int totalcount = 0;
	939	+
	940	+ int tabcount = 0;
	941	+ int colcount = 0;
	942	+ int rowcount = 0;
	943	+ int texturecount = 0;
	944	+
	945	+ int columns = 5;
	946	+ int rows = 7;
	947	+
	948	+ public void ResourceCallBack(String[] path)
	949	+ {
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	956	+ {
	957	+ currenttab = new cGridBag();
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	959	+ currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	963	+ rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
	966	+ }
	967	+
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	969	+ {
	970	+ //if (!added)
	971	+ {
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	975	+ }
	976	+
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
	980	+ if (++colcount >= columns)
	981	+ {
	982	+ colcount = 0;
	983	+ currenttab.Return();
	984	+
	985	+ if (rowcount++ >= rows)
	986	+ {
	987	+ rowcount = 0;
	988	+ }
	989	+ }
	990	+ }
	991	+ else
	992	+ {
	993	+// if (!path[path.length-1].equals("icons"))
	994	+// resourcecontainer.Return();
	995	+ }
	996	+ }
	997	+
	998	+ void CreateTexturePanel(cGridBag container)
	999	+ {
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1001	+ container.add(resourcecontainer);
	1002	+
	1003	+ Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
	1006	+ }
	1007	+
528	1008	void SetupUI2(ObjEditor oe)
529	1009	{
	1010	+ // June 2019
	1011	+ if (oe == null)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ //return;
	1015	+ }
	1016	+
	1017	+ if (copy != group)
	1018	+ {
	1019	+ //super.SetupUI2(this);
	1020	+ }
	1021	+
530	1022	//new Exception().printStackTrace();
531	1023
532	1024	oe.radioPanel = new JPanel(new GridBagLayout());
533		- oe.aConstraints.weightx = 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
536		- oe.aConstraints.gridwidth = 100;
537		- oe.aConstraints.gridheight = 1;
538	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
539	1026
540	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -555,109 +1042,268 @@
555	1042	oe.radioPanel.add(dummyButton);
556	1043	oe.buttonGroup.add(dummyButton);
557	1044	*/
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
	1048	+
558	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	1050
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	1051	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //minButton.setToolTipText("Minimize window");
	1053	+ //minButton.addActionListener(this);
563	1054
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	1055	+ if (Globals.ADVANCED)
	1056	+ {
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
	1060	+ }
567	1061
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
570		- saveButton.addActionListener(this);
	1062	+ cButton gcButton;
571	1063
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573		- liveCB.setToolTipText("Enable animation");
574		- liveCB.addItemListener(this);
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
	1073	+
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
	1081	+
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ screenfitButton.setToolTipText("Screen fit");
	1107	+ screenfitButton.addActionListener(this);
575	1108
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1111	+ restoreCameraButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
	1116	+
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ deleteVersionButton.setToolTipText("Delete current version");
	1119	+ deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
	1121	+
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ previousVersionButton.setToolTipText("Previous version");
	1124	+ previousVersionButton.addActionListener(this);
	1125	+ previousVersionButton.setEnabled(false);
	1126	+
	1127	+ cGridBag updown = new cGridBag().setVertical(true);
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
	1130	+ restoreButton.addActionListener(this);
	1131	+ restoreButton.setEnabled(false);
	1132	+
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
	1135	+ replaceButton.addActionListener(this);
	1136	+ replaceButton.setEnabled(false);
	1137	+
	1138	+ versionManagerPanel.add(updown);
	1139	+
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ nextVersionButton.setToolTipText("Next version");
	1142	+ nextVersionButton.addActionListener(this);
	1143	+ nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
577	1146	oneStepButton.setToolTipText("Animate one step forward");
578	1147	oneStepButton.addActionListener(this);
579	1148
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1149	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1150	+ liveCB.setToolTipText("Enable animation");
	1151	+ liveCB.addItemListener(this);
	1152	+
	1153	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	1154	fastCB.setToolTipText("Fast mode");
582	1155	fastCB.addItemListener(this);
583	1156
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	1157	+ //oe.toolboxPanel.Return();
	1158	+
	1159	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1160	+// trackCB.setToolTipText("Enable tracking");
	1161	+// trackCB.addItemListener(this);
591	1162
592	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	1164	// screenfitpointButton.addActionListener(this);
594	1165
595	1166	if (Globals.ADVANCED)
596	1167	{
597		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
598	1169	snapobjectButton.addActionListener(this);
599	1170	snapobjectButton.setToolTipText("Snap Object");
	1171	+
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ fourButton.addActionListener(this);
	1174	+ fourButton.setToolTipText("Show control panel only");
600	1175	}
601	1176
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	1178
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
610		- twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
619		- threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
623		- //
624	1179
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ rootButton.setToolTipText("Open selection in new tab");
627	1182	rootButton.addActionListener(this);
628	1183
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
630	1185	closeButton.setToolTipText("Close tab");
631	1186	closeButton.addActionListener(this);
632	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1188	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1189	+
	1190	+ cGridBag row1 = new cGridBag();
636	1191
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1192	+ // INSERT
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
	1195	+ gridButton.addActionListener(this);
	1196	+
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ boxButton.setToolTipText("Create box");
	1199	+ boxButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
	1218	+ {
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ kleinButton.setToolTipText("Create Klein bottle");
	1221	+ kleinButton.addActionListener(this);
	1222	+ }
	1223	+
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ particlesButton.setToolTipText("Create particle system");
	1226	+ particlesButton.addActionListener(this);
	1227	+
	1228	+ oe.toolboxPanel.add(row1);
	1229	+
	1230	+ cGridBag row2 = new cGridBag();
	1231	+
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ groupButton.setToolTipText("Create group");
	1234	+ groupButton.addActionListener(this);
	1235	+
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ compositeButton.setToolTipText("Create composite");
	1238	+ compositeButton.addActionListener(this);
	1239	+
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ switchButton.setToolTipText("Create item switcher");
	1242	+ switchButton.addActionListener(this);
	1243	+
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ loopButton.setToolTipText("Create loop");
	1246	+ loopButton.addActionListener(this);
	1247	+
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ textureButton.setToolTipText("Create texture");
	1250	+ textureButton.addActionListener(this);
	1251	+
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ overlayButton.setToolTipText("Create overlay");
	1254	+ overlayButton.addActionListener(this);
	1255	+
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ lightButton.setToolTipText("Create light");
	1258	+ lightButton.addActionListener(this);
	1259	+
	1260	+ oe.toolboxPanel.add(row2);
	1261	+
	1262	+ cGridBag textures = new cGridBag();
	1263	+
	1264	+ CreateTexturePanel(textures);
	1265	+
	1266	+ int tabCount = resourcecontainer.getTabCount();
	1267	+
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
	1271	+ oe.toolboxPanel.add(textures);
	1272	+
	1273	+ textures.preferredHeight = 100;
	1274	+
	1275	+ CreateSkyboxPanel(oe.skyboxPanel);
	1276	+
	1277	+ // EDIT panel
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editButton.setToolTipText("Pin selection controls");
639	1280	editButton.addActionListener(this);
640	1281
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
643	1284	uneditButton.addActionListener(this);
644	1285
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1286	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1287	+ allParamsButton.setToolTipText("Show all controls");
647	1288	allParamsButton.addActionListener(this);
648	1289
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
651	1292	clearPanelButton.addActionListener(this);
652	1293
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- unselectButton.setToolTipText("Unselect");
655		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
656	1297
657		- commandsPanel.preferredHeight = 1;
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ flashSelectionButton.setToolTipText("Highlight selection");
	1300	+ flashSelectionButton.addActionListener(this);
658	1301
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1302	+ editCommandsPanel.preferredHeight = 1;
	1303	+
	1304	+ SetPinStates(false);
	1305	+// oe.treePanel.add(commandsPanel);
	1306	+// oe.treePanel.Return();
661	1307
662	1308	// oe.aConstraints.gridx += 1;
663	1309	// oe.aConstraints.weighty = 0;
..	..	@@ -672,34 +1318,24 @@
672	1318
673	1319	cGridBag jSPPanel = new cGridBag();
674	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
675	1323	JScrollPane jSP;
676	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1326	ResetModel();
679	1327
680	1328	oe.treePanel.add(jSPPanel);
681	1329	oe.treePanel.Return();
682	1330
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
699	1332	oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
700	1336
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
703	1339
704	1340	//jList.addListSelectionListener(this);
705	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1343,7 @@
707	1343	//jTree.setEditable(true);
708	1344	oe.jTree.setDragEnabled(true);
709	1345	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1347
712	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1349
..	..	@@ -719,29 +1355,49 @@
719	1355	dgr.addDragGestureListener(this);
720	1356	}catch(Exception e) {}
721	1357	*/
722		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
723	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1360	}
725	1361
726	1362	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1363	{
	1364	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1365	+ colorCB.setToolTipText("Copy color when dropped");
	1366	+ colorCB.addItemListener(this);
	1367	+
	1368	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1369	+ materialCB.setToolTipText("Copy material when dropped");
	1370	+ materialCB.addItemListener(this);
	1371	+
	1372	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1373	+ textureCB.setToolTipText("Copy texture when dropped");
	1374	+ textureCB.addItemListener(this);
	1375	+
	1376	+ panel.Return();
	1377	+
728	1378	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1379	boxCB.setToolTipText("Display bounding boxes");
730	1380	boxCB.addItemListener(this);
731	1381
732	1382	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1384	zoomBoxCB.addItemListener(this);
735	1385
736	1386	if (true) // Globals.ADVANCED)
737	1387	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1388	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1389	+// supportCB.setToolTipText("Enable rigging");
	1390	+// supportCB.addItemListener(this);
	1391	+
	1392	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1393	+ freezeCB.setToolTipText("Fast moving camera");
	1394	+ freezeCB.addItemListener(this);
741	1395
742	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1397	// localCB.addItemListener(this);
744	1398
	1399	+ panel.Return();
	1400	+
745	1401	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1402	crowdCB.setToolTipText("Used for crowds");
747	1403	crowdCB.addItemListener(this);
..	..	@@ -750,14 +1406,19 @@
750	1406	smoothCB.setToolTipText("Snapping delay");
751	1407	smoothCB.addItemListener(this);
752	1408
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1409	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1410	+// slowCB.setToolTipText("Smooth interpolation");
	1411	+// slowCB.addItemListener(this);
	1412	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1413	+ minshaderCB.setToolTipText("Minimal fast shader");
	1414	+ minshaderCB.addItemListener(this);
756	1415
757	1416	// constraints.gridy += 1;
758	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1418	// speakerMocapCB.addItemListener(this);
760	1419
	1420	+ panel.Return();
	1421	+
761	1422	if (false)
762	1423	{
763	1424	// handled in scripts
..	..	@@ -772,34 +1433,82 @@
772	1433	//constraints.gridy += 1;
773	1434	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
775	1437	}
776	1438
777	1439	//constraints.gridx += 1;
778	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1441	// debugCB.addItemListener(this);
780	1442
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
781	1447	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
782	1449	oeilCB.addItemListener(this);
783	1450
	1451	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1452	+ shadowCB.setToolTipText("When live compute shadows");
	1453	+ shadowCB.addItemListener(this);
	1454	+
	1455	+ panel.Return();
	1456	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1457	+ toggleTextureCB.setToolTipText("Load textures");
	1458	+ toggleTextureCB.addItemListener(this);
	1459	+
	1460	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1461	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1462	+ toggleSwitchCB.addItemListener(this);
	1463	+
	1464	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1465	+ autokeepCB.setToolTipText("On structure change");
	1466	+ autokeepCB.addItemListener(this);
	1467	+
	1468	+ panel.Return();
	1469	+ if (Globals.ADVANCED)
	1470	+ {
784	1471	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1472	lookAtCB.setToolTipText("Look-at target");
786	1473	lookAtCB.addItemListener(this);
	1474	+ }
787	1475
788	1476	}
789	1477
790	1478	cGridBag fill = new cGridBag();
791		-
792	1479	fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
793	1484
794	1485	panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
795	1488
796	1489	}
797	1490
798	1491	void EditObject(Object3D obj)
799	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
800	1501	cRadio radioButton = new cRadio(obj.name);
	1502	+
	1503	+ // June 2019. Patch to avoid bug with transparency.
	1504	+ radioButton.hadMaterial = obj.material != null;
	1505	+ if (!radioButton.hadMaterial)
	1506	+ {
	1507	+ obj.material = new cMaterial();
	1508	+ }
	1509	+
801	1510	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
803	1512	radioButton.SetCamera(cameraView.renderCamera, false);
804	1513	radioButton.addActionListener(this);
805	1514	radioPanel.add(radioButton);
..	..	@@ -809,31 +1518,41 @@
809	1518
810	1519	void SetupViews(ObjEditor oe)
811	1520	{
	1521	+ theFrame = this;
	1522	+
812	1523	oe.SetupViews();
813	1524
	1525	+ if (Globals.DEBUG)
814	1526	System.out.println("SetupViews");
815	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
816	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
817	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1530	}
819	1531
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1532	+ cToggleButton liveCB;
	1533	+ cCheckBox supportCB;
	1534	+ cCheckBox localCB;
	1535	+ cCheckBox crowdCB;
	1536	+ cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
	1539	+ cToggleButton fastCB;
	1540	+ cCheckBox slowCB;
	1541	+ cCheckBox boxCB;
	1542	+ cCheckBox zoomBoxCB;
	1543	+ cCheckBox freezeCB;
	1544	+ //cToggleButton trackCB;
	1545	+ cCheckBox trackCB;
	1546	+ cCheckBox smoothfocusCB;
831	1547	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
837	1556
838	1557	// static int COLOR = 1;
839	1558	// static int MATERIAL = 2;
..	..	@@ -841,9 +1560,9 @@
841	1560
842	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1562
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
847	1566
848	1567	public void itemStateChanged(ItemEvent e)
849	1568	{
..	..	@@ -871,6 +1590,7 @@
871	1590	} else if(e.getSource() == liveCB)
872	1591	{
873	1592	cameraView.ToggleLive();
	1593	+ refreshContents(false);
874	1594	}
875	1595	else if(e.getSource() == supportCB)
876	1596	{
..	..	@@ -886,6 +1606,12 @@
886	1606	{
887	1607	cameraView.ToggleInertia();
888	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
889	1615	}
890	1616	else if(e.getSource() == localCB)
891	1617	{
..	..	@@ -935,6 +1661,18 @@
935	1661	{
936	1662	cameraView.ToggleOeil();
937	1663	}
	1664	+ else if(e.getSource() == shadowCB)
	1665	+ {
	1666	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == freezeCB)
	1669	+ {
	1670	+ Globals.FREEZEONMOVE ^= true;
	1671	+ }
	1672	+ else if(e.getSource() == autokeepCB)
	1673	+ {
	1674	+ Globals.REPLACEONMAKE ^= true;
	1675	+ }
938	1676	else if(e.getSource() == lookAtCB)
939	1677	{
940	1678	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1689,8 @@
951	1689
952	1690	/**/
953	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1695	// We can't move the root node or an empty selection
957	1696	return;
..	..	@@ -1014,8 +1753,6 @@
1014	1753	}
1015	1754	}
1016	1755
1017		- String string = (String) object;
1018		-
1019	1756	System.out.println("Transfer = " + object + "; drop : " + target);
1020	1757	// if( object instanceof java.io.File[])
1021	1758	// {
..	..	@@ -1023,6 +1760,8 @@
1023	1760	// objEditor.DropFile((java.io.File[]) object, true);
1024	1761	// return;
1025	1762	// }
	1763	+
	1764	+ String string = object.toString();
1026	1765
1027	1766	// File path for Mac and Windows
1028	1767	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1068,23 +1807,33 @@
1068	1807
1069	1808	assert target == objEditor.jTree;
1070	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
1071	1811	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1813	} catch (Exception e) {
1074	1814	System.out.println("destinationPath : " + destinationPath);
1075	1815	return;
1076	1816	}
1077	1817
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
1079	1819	{
	1820	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1821	+
	1822	+ // Cannot move into itself
	1823	+ if (child == destinationLeaf)
	1824	+ return;
	1825	+ }
	1826	+
	1827	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+// {
1080	1829	loadClipboard(true);
1081	1830	objEditor.jTree.setSelectionPath(destinationPath);
1082	1831	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
1088	1837	}
1089	1838	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1839	// Called if the user has modified the current drop gesture
..	..	@@ -1140,7 +1889,12 @@
1140	1889	TreePath path;
1141	1890
1142	1891	public TransferableTreePath(TreePath tp) {
1143		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1144	1898	}
1145	1899
1146	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1189,22 +1943,30 @@
1189	1943	{
1190	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1945	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1946	+// gridItem = menu.add(new MenuItem("Grid"));
	1947	+// gridItem.addActionListener(this);
	1948	+// rectoidItem = menu.add(new MenuItem("Box"));
	1949	+// rectoidItem.addActionListener(this);
	1950	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1951	+// ellipsoidItem.addActionListener(this);
	1952	+// coneItem = menu.add(new MenuItem("Cone"));
	1953	+// coneItem.addActionListener(this);
	1954	+// torusItem = menu.add(new MenuItem("Torus"));
	1955	+// torusItem.addActionListener(this);
	1956	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1957	+// superItem.addActionListener(this);
	1958	+
	1959	+ cameraItem = menu.add(new MenuItem("Camera"));
	1960	+ cameraItem.addActionListener(this);
	1961	+
	1962	+ if (!Globals.ADVANCED)
	1963	+ {
1204	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1965	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
1208	1970	if (Globals.ADVANCED)
1209	1971	{
1210	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1992,15 @@
1230	1992	}
1231	1993	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1994	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	1995	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1996	+// overlayItem.addActionListener(this);
	1997	+// lightItem = menu.add(new MenuItem("Light"));
	1998	+// lightItem.addActionListener(this);
1237	1999	menu.add("-");
1238	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	2001	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1242	2004	doubleItem = menu.add(new MenuItem("Fork"));
1243	2005	doubleItem.addActionListener(this);
1244	2006	if (Globals.ADVANCED)
..	..	@@ -1254,6 +2016,9 @@
1254	2016	animationItem.addItemListener(this);
1255	2017	animationItem.setState(Globals.ANIMATION);
1256	2018
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
	2021	+
1257	2022	menu.add("-");
1258	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1259	2024	parseverticesItem.addActionListener(this);
..	..	@@ -1266,6 +2031,8 @@
1266	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1267	2032	reduce34MorphItem.addActionListener(this);
1268	2033	menu.add("-");
	2034	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2035	+ memoryItem.addActionListener(this);
1269	2036	menu.add(computeAOItem = new MenuItem("Compute AO"));
1270	2037	computeAOItem.addActionListener(this);
1271	2038
..	..	@@ -1274,11 +2041,9 @@
1274	2041	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1275	2042	mirrorItem.addActionListener(this);
1276	2043	menu.add("-");
1277		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1278		- memoryItem.addActionListener(this);
1279	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	2045	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	2046	+ menu.add(dumpItem = new MenuItem("Print"));
1282	2047	dumpItem.addActionListener(this);
1283	2048	// menu.add(pathItem = new MenuItem("From-to path"));
1284	2049	// pathItem.addActionListener(this);
..	..	@@ -1361,24 +2126,24 @@
1361	2126	switch(axis)
1362	2127	{
1363	2128	case 0 :
1364		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1365		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1366		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1367		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1368	2133	norm = cVector.X;
1369	2134	break;
1370	2135	case 1 :
1371		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1372		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1373		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1374		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1375	2140	norm = cVector.Y;
1376	2141	break;
1377	2142	case 2 :
1378		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1379		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1380		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1381		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1382	2147	norm = cVector.Z;
1383	2148	break;
1384	2149	}
..	..	@@ -1419,9 +2184,38 @@
1419	2184	shadow.material = new cMaterial(obj.material);
1420	2185	shadow.material.diffuse = 0.0001f;
1421	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1422	2192
1423	2193	makeSomething(shadow);
1424	2194	}
	2195	+
	2196	+ private void ClearUnpinned()
	2197	+ {
	2198	+ //for (Object3D obj : listUI)
	2199	+ for (int i=listUI.size(); --i>=0;)
	2200	+ {
	2201	+ Object3D obj = listUI.elementAt(i);
	2202	+ if (!obj.pinned)
	2203	+ {
	2204	+ obj.CloseUI();
	2205	+ listUI.remove(i);
	2206	+ }
	2207	+ }
	2208	+ }
	2209	+
	2210	+ private void EditElement(Object3D elem, boolean newWindow)
	2211	+ {
	2212	+ // if (!(elem instanceof Composite))
	2213	+ // newWindow = false;
	2214	+ listUI.add(elem);
	2215	+ elem.openEditWindow(this, newWindow); //, false);
	2216	+ System.out.println("edit : " + elem);
	2217	+ elem.editWindow.refreshContents(true); // ? new
	2218	+ }
1425	2219
1426	2220	/**
1427	2221	* applyExample
..	..	@@ -1666,7 +2460,7 @@
1666	2460	{
1667	2461	ScreenFit();
1668	2462	} else
1669		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1670	2464	{
1671	2465	cVector v1 = new cVector();
1672	2466	cVector v2 = new cVector();
..	..	@@ -1675,11 +2469,11 @@
1675	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	2470	objEditor.cameraView.repaint();
1677	2471	} else
1678		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1679	2473	{
1680	2474	makeSomething(new Box());
1681	2475	} else
1682		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1683	2477	{
1684	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +2552,27 @@
1758	2552
1759	2553	makeSomething(obj);
1760	2554	} else
1761		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1762	2556	{
1763	2557	makeSomething(new Grid());
1764	2558	} else
1765		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	2560	{
1767	2561	makeSomething(new Sphere());
1768	2562	} else
1769		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1770	2564	{
1771	2565	makeSomething(new Cone());
1772	2566	} else
1773		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1774	2568	{
1775	2569	makeSomething(new Torus());
1776	2570	} else
1777		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1778	2572	{
1779	2573	makeSomething(new Superellipsoid());
1780	2574	} else
1781		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1782	2576	{
1783	2577	makeSomething(new Klein());
1784	2578	} else
..	..	@@ -1798,7 +2592,7 @@
1798	2592	{
1799	2593	makeSomething(new BezierSurface());
1800	2594	} else
1801		- if (source == overlayItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1802	2596	{
1803	2597	/*
1804	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,10 +2640,27 @@
1846	2640	s.setup();
1847	2641	makeSomething(s);
1848	2642	} else
1849		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1850	2644	{
1851	2645	makeSomething(new Light());
1852	2646	} else
	2647	+// if (source == skybox1Button \|\|
	2648	+// source == skybox2Button \|\|
	2649	+// source == skybox3Button \|\|
	2650	+// source == skybox4Button \|\|
	2651	+// source == skybox5Button \|\|
	2652	+// source == skybox6Button \|\|
	2653	+// source == skybox7Button \|\|
	2654	+// source == skybox11Button \|\|
	2655	+// source == skybox12Button \|\|
	2656	+// source == skybox13Button \|\|
	2657	+// source == skybox14Button \|\|
	2658	+// source == skybox15Button \|\|
	2659	+// source == skybox16Button \|\|
	2660	+// source == skybox17Button)
	2661	+// {
	2662	+// ChangeSkybox(source);
	2663	+// } else
1853	2664	if (source == csgItem)
1854	2665	{
1855	2666	group(new CSG());
..	..	@@ -1896,30 +2707,38 @@
1896	2707
1897	2708	group(g);
1898	2709	} else
1899		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1900	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1901	2714	Composite csg = new GroupLeaf();
1902		- csg.count = 5;
1903	2715	group(csg);
1904		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1905	2718	csg.addChild(child);
1906	2719	child.addChild(csg);
	2720	+ }
1907	2721	} else
1908	2722	if (source == doubleItem)
1909	2723	{
1910		- Composite csg = new GroupLeaf();
1911		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1912	2727	group(csg);
1913		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1914	2730	csg.addChild(child);
1915	2731	child.addChild(csg);
1916		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1917	2733	csg.addChild(child);
1918	2734	child.addChild(csg);
	2735	+ }
1919	2736	} else
1920	2737	if (source == tripleItem)
1921	2738	{
1922		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1923	2742	csg.count = 4;
1924	2743	group(csg);
1925	2744	Composite child = new cGroup();
..	..	@@ -1931,11 +2750,12 @@
1931	2750	child = new cGroup();
1932	2751	csg.addChild(child);
1933	2752	child.addChild(csg);
	2753	+ }
1934	2754	} else
1935	2755	if (source == computeAOItem)
1936	2756	{
1937	2757	Globals.drawMode = CameraPane.OCCLUSION;
1938		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1939	2759	} else
1940	2760	if (source == recompileItem)
1941	2761	{
..	..	@@ -1950,7 +2770,7 @@
1950	2770	if (source == invariantsItem)
1951	2771	{
1952	2772	System.out.println("Invariants:");
1953		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1954	2774	} else
1955	2775	if (source == memoryItem)
1956	2776	{
..	..	@@ -1969,17 +2789,64 @@
1969	2789	{
1970	2790	DumpObject();
1971	2791	} else
1972		- if (source == undoButton)
	2792	+ if (source == minButton)
1973	2793	{
1974		- Undo();
	2794	+ Minimize();
1975	2795	} else
1976		- if (source == redoButton)
	2796	+ if (source == maxButton)
1977	2797	{
1978		- Redo();
	2798	+ Maximize();
1979	2799	} else
1980		- if (source == saveButton)
	2800	+ if (source == fullScreenButton)
1981	2801	{
1982		- Save();
	2802	+ ToggleFullScreen();
	2803	+ } else
	2804	+ if (source == collapseButton)
	2805	+ {
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
	2816	+ if (source == previousVersionButton)
	2817	+ {
	2818	+ // Go to previous version
	2819	+ //if (!Undo())
	2820	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ PreviousVersion();
	2822	+ } else
	2823	+ if (source == restoreButton)
	2824	+ {
	2825	+ // Restore current version
	2826	+ Restore();
	2827	+ //restoreButton.setEnabled(false);
	2828	+ } else
	2829	+ if (source == replaceButton)
	2830	+ {
	2831	+ // Overwrite current version
	2832	+ Replace();
	2833	+ //replaceButton.setEnabled(false);
	2834	+ } else
	2835	+ if (source == nextVersionButton)
	2836	+ {
	2837	+ // Go to next version
	2838	+ NextVersion();
	2839	+ } else
	2840	+ if (source == saveVersionButton)
	2841	+ {
	2842	+ // Save a new version
	2843	+ if (!Save(true))
	2844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
1983	2850	} else
1984	2851	if (source == oneStepButton)
1985	2852	{
..	..	@@ -1988,17 +2855,14 @@
1988	2855	} else
1989	2856	if (source == screenfitButton)
1990	2857	{
1991		- //Reload(lastConverter, lastFilename, true);
1992	2858	ScreenFit();
1993	2859	} else
1994	2860	if (source == screenfitpointButton)
1995	2861	{
1996		- //Reload(lastConverter, lastFilename, true);
1997	2862	ScreenFitPoint();
1998	2863	} else
1999	2864	if (source == snapobjectButton)
2000	2865	{
2001		- //Reload(lastConverter, lastFilename, true);
2002	2866	SnapObject();
2003	2867	} else
2004	2868	// if (event.getSource() == recompileButton)
..	..	@@ -2037,11 +2901,11 @@
2037	2901	} else
2038	2902	if (source == undoItem)
2039	2903	{
2040		- Undo();
	2904	+ PreviousVersion();
2041	2905	} else
2042	2906	if (source == redoItem)
2043	2907	{
2044		- Redo();
	2908	+ NextVersion();
2045	2909	} else
2046	2910	if (source == duplicateItem)
2047	2911	{
..	..	@@ -2362,7 +3226,7 @@
2362	3226	{
2363	3227	StepAll();
2364	3228	} else
2365		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2366	3230	{
2367	3231	//int indices[] = jList.getSelectedIndices();
2368	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2374,9 +3238,9 @@
2374	3238	{
2375	3239	ClearSelection(true);
2376	3240	} else
2377		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2378	3242	{
2379		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2380	3244	} else
2381	3245	if (source == hideItem)
2382	3246	{
..	..	@@ -2394,11 +3258,11 @@
2394	3258	{
2395	3259	makeSomething(new Camera());
2396	3260	} else
2397		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2398	3262	{
2399	3263	group(new Composite());
2400	3264	} else
2401		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2402	3266	{
2403	3267	RandomNode random = new RandomNode();
2404	3268	group(random);
..	..	@@ -2500,7 +3364,7 @@
2500	3364	{
2501	3365	group(new cLinker());
2502	3366	} else
2503		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2504	3368	{
2505	3369	group(new TextureNode());
2506	3370	} else
..	..	@@ -2520,17 +3384,42 @@
2520	3384	{
2521	3385	CastShadow(2);
2522	3386	} else
2523		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	3388	{
2525		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2526	3391	for (int i=0; i<group.selection.size(); i++)
2527	3392	{
2528		- Ungroup(group.selection.get(i));
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
	3396	+ {
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
	3406	+ break;
	3407	+ }
2529	3408	}
2530	3409
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	3410	+ if (canUngroup)
	3411	+ {
	3412	+ for (int i=0; i<group.selection.size(); i++)
	3413	+ {
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
	3417	+ }
	3418	+
	3419	+ ClearSelection(false);
	3420	+
	3421	+ refreshContents();
	3422	+ }
2534	3423	} else
2535	3424	if (source == genUVItem)
2536	3425	{
..	..	@@ -2576,6 +3465,10 @@
2576	3465	{
2577	3466	ClearMaterials();
2578	3467	} else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
2579	3472	if (source == liveleavesItem)
2580	3473	{
2581	3474	LiveLeaves(true);
..	..	@@ -2607,6 +3500,22 @@
2607	3500	if (source == unmarkleavesItem)
2608	3501	{
2609	3502	MarkLeaves(false);
	3503	+ } else
	3504	+ if (source == rewindleavesItem)
	3505	+ {
	3506	+ RewindLeaves(true);
	3507	+ } else
	3508	+ if (source == unrewindleavesItem)
	3509	+ {
	3510	+ RewindLeaves(false);
	3511	+ } else
	3512	+ if (source == randomleavesItem)
	3513	+ {
	3514	+ RandomLeaves(true);
	3515	+ } else
	3516	+ if (source == unrandomleavesItem)
	3517	+ {
	3518	+ RandomLeaves(false);
2610	3519	} else
2611	3520	if (source == flipVItem)
2612	3521	{
..	..	@@ -2699,6 +3608,18 @@
2699	3608	if (source == transformChildrenItem)
2700	3609	{
2701	3610	TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
2702	3623	} else
2703	3624	if (source == resetTransformItem)
2704	3625	{
..	..	@@ -2815,7 +3736,7 @@
2815	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2816	3737	{
2817	3738	obj = (Object3D)e.nextElement();
2818		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2819	3740	}
2820	3741
2821	3742	refreshContents();
..	..	@@ -2831,6 +3752,31 @@
2831	3752
2832	3753	refreshContents();
2833	3754	} else
	3755	+ if (source == embedTexturesItem)
	3756	+ {
	3757	+ Object3D obj;
	3758	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3759	+ {
	3760	+ obj = (Object3D)e.nextElement();
	3761	+ obj.EmbedTextures(true);
	3762	+ }
	3763	+
	3764	+ refreshContents();
	3765	+ } else
	3766	+ if (source == deEmbedTexturesItem)
	3767	+ {
	3768	+ Object3D obj;
	3769	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3770	+ {
	3771	+ obj = (Object3D)e.nextElement();
	3772	+ obj.EmbedTextures(false);
	3773	+ }
	3774	+
	3775	+ CameraPane.texturepigment.clear();
	3776	+ CameraPane.texturebump.clear();
	3777	+
	3778	+ refreshContents();
	3779	+ } else
2834	3780	if (source == flashSelectionButton)
2835	3781	{
2836	3782	CameraPane.flash = true;
..	..	@@ -2842,42 +3788,36 @@
2842	3788	if (source == twoButton)
2843	3789	{
2844	3790	radio.layout = twoButton;
2845		- // bug
2846		- //gridPanel.setDividerLocation(1.0);
2847		- //bigPanel.setDividerLocation(0.0);
2848		-// bigThree.remove(scenePanel);
2849		-// bigThree.remove(centralPanel);
2850		-// bigThree.remove(XYZPanel);
2851		-// aWindowConstraints.gridx = 0;
2852		-// aWindowConstraints.gridy = 0;
2853		-// aWindowConstraints.gridwidth = 1;
2854		-// // aConstraints.gridheight = 3;
2855		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2856		-// aWindowConstraints.weightx = 0;
2857		-// aWindowConstraints.weighty = 1;
2858		-// //bigThree.add(jtp, aWindowConstraints);
2859		-// aWindowConstraints.weightx = 1;
2860		-// aWindowConstraints.gridwidth = 3;
2861		-// // aConstraints.gridheight = 3;
2862		-// aWindowConstraints.gridx = 1;
2863		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2864		-// bigThree.add(centralPanel, aWindowConstraints);
2865		-// aWindowConstraints.weightx = 0;
2866		-// aWindowConstraints.gridx = 4;
2867		-// aWindowConstraints.gridwidth = 1;
2868		-// // aConstraints.gridheight = 3;
2869		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2870		-// //bigThree.add(XYZPanel, aWindowConstraints);
2871		-// scenePanel.setVisible(false);
2872		-// centralPanel.setVisible(true);
2873		-// XYZPanel.setVisible(false);
2874		- bigThree.ClearUI();
2875		- bigThree.add(centralPanel);
2876		- bigThree.FlushUI();
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
	3794	+
	3795	+ Show3DView();
	3796	+
	3797	+ cameraView.requestFocusInWindow();
	3798	+
	3799	+// refreshContents(true);
	3800	+//
	3801	+// try
	3802	+// {
	3803	+// java.awt.Robot bot = new java.awt.Robot();
	3804	+// int mask = InputEvent.BUTTON1_MASK;
	3805	+// bot.mouseMove(100, 100);
	3806	+// bot.mousePress(mask);
	3807	+// bot.mouseRelease(mask);
	3808	+// }
	3809	+// catch (Exception e)
	3810	+// {
	3811	+//
	3812	+// }
	3813	+
2877	3814	} else
2878	3815	if (source == threeButton)
2879	3816	{
2880	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2881	3821
2882	3822	// bigThree.remove(scenePanel);
2883	3823	// bigThree.remove(centralPanel);
..	..	@@ -2907,13 +3847,18 @@
2907	3847	// centralPanel.setVisible(true);
2908	3848	// XYZPanel.setVisible(true);
2909	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2910	3851	bigThree.add(centralPanel);
2911		- bigThree.add(XYZPanel);
2912	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2913	3855	} else
2914	3856	if (source == fourButton)
2915	3857	{
2916	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2917	3862
2918	3863	// bigThree.remove(scenePanel);
2919	3864	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3890,15 @@
2945	3890	bigThree.ClearUI();
2946	3891	bigThree.add(scenePanel);
2947	3892	bigThree.FlushUI();
	3893	+
	3894	+ cameraView.requestFocusInWindow();
2948	3895	} else
2949	3896	if (source == sixButton)
2950	3897	{
2951	3898	radio.layout = sixButton;
	3899	+
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
2952	3902
2953	3903	// bigThree.remove(scenePanel);
2954	3904	// bigThree.remove(centralPanel);
..	..	@@ -2978,13 +3928,18 @@
2978	3928	// centralPanel.setVisible(true);
2979	3929	// XYZPanel.setVisible(false);
2980	3930	bigThree.ClearUI();
2981		- bigThree.add(scenePanel);
2982	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
2983	3933	bigThree.FlushUI();
	3934	+
	3935	+ cameraView.requestFocusInWindow();
2984	3936	} else
2985	3937	if (source == sevenButton)
2986	3938	{
2987	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
2988	3943
2989	3944	// bigThree.remove(scenePanel);
2990	3945	// bigThree.remove(centralPanel);
..	..	@@ -3018,9 +3973,12 @@
3018	3973	bigThree.add(centralPanel);
3019	3974	bigThree.add(XYZPanel);
3020	3975	bigThree.FlushUI();
	3976	+
	3977	+ cameraView.requestFocusInWindow();
3021	3978	} else
3022	3979	if (source == rootButton)
3023	3980	{
	3981	+ Replace();
3024	3982	Object3D obj;
3025	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3026	3984	{
..	..	@@ -3029,31 +3987,50 @@
3029	3987	EditObject(obj);
3030	3988	}
3031	3989
	3990	+ cameraView.requestFocusInWindow();
3032	3991	refreshContents(true);
3033	3992	} else
3034	3993	if (source == closeButton)
3035	3994	{
3036	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
3037	3999	cRadio ab;
3038	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	4001	{
3040	4002	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
3043	4011	buttonGroup.remove(ab);
3044	4012	radioPanel.remove(ab);
3045	4013
3046		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
3047	4016	// ab.GetObject().objectUI = null; // ?????????
3048	4017
3049	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	4019	break;
3051	4020	}
3052	4021	}
	4022	+
	4023	+ cameraView.requestFocusInWindow();
3053	4024	refreshContents(true);
3054	4025	} else
3055	4026	if (source == editItem \|\| source == editButton)
3056	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
3057	4034	EditSelection(false);
3058	4035	} else
3059	4036	if (source == uneditButton)
..	..	@@ -3062,9 +4039,10 @@
3062	4039	{
3063	4040	Object3D child = (Object3D)e.nextElement();
3064	4041	if(child.editWindow != null)
3065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
3066	4043	child.CloseUI();
3067	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3068	4046
3069	4047	//child.editWindow = null; // ???????????
3070	4048	}
..	..	@@ -3079,16 +4057,18 @@
3079	4057	//copy.ClearUI();
3080	4058	for (Object3D obj : listUI)
3081	4059	{
	4060	+ obj.pinned = false;
3082	4061	obj.CloseUI();
3083	4062	}
3084	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3085	4065	refreshContents(true);
3086	4066	} else
3087	4067	if (source == allParamsButton)
3088	4068	{
3089	4069	assert(copy == group);
3090	4070
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	4072
3093	4073	for (Object3D obj : listUI)
3094	4074	{
..	..	@@ -3114,6 +4094,9 @@
3114	4094	} else
3115	4095	if(source instanceof cRadio)
3116	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3117	4100	group.parent = keepparent;
3118	4101	group.attributes = 0;
3119	4102	//group.editWindow = null;
..	..	@@ -3137,6 +4120,7 @@
3137	4120	}
3138	4121
3139	4122	copy = group;
	4123	+
3140	4124	//Globals.theRenderer.object = group;
3141	4125	if(!useclient)
3142	4126	{
..	..	@@ -3154,7 +4138,8 @@
3154	4138	}
3155	4139
3156	4140	// fix "+" issue
3157		- group.editWindow = this;
	4141	+ //group.editWindow = this;
	4142	+ group.manipWindow = this;
3158	4143
3159	4144	/*
3160	4145	currentLayout = radio.layout;
..	..	@@ -3162,20 +4147,58 @@
3162	4147	currentLayout = sevenButton;
3163	4148	*/
3164	4149	radio.layout.doClick();
	4150	+
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
	4177	+ ClearUnpinned();
	4178	+
	4179	+ //Grafreed.Assert(group != null);
	4180	+ //Grafreed.Assert(group.selection != null);
	4181	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4182	+ if (group.selection == null \|\| group.selection.size() == 1)
	4183	+ EditSelection(false);
3165	4184	keepparent = group.parent;
3166	4185	// PARENT = NULL or not???
3167	4186	//group.parent = null; // ROOT
3168	4187	//group.attributes = -1;
3169	4188	ResetModel();
	4189	+
	4190	+ cameraView.requestFocusInWindow();
3170	4191	refreshContents(true);
3171	4192	} else if (event.getSource() == editCameraItem)
3172	4193	{
3173	4194	cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
3174	4196	cameraView.repaint();
3175	4197	return;
3176		- } else if (event.getSource() == revertCameraItem)
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	4199	{
3178	4200	cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
3179	4202	cameraView.repaint();
3180	4203	return;
3181	4204	// } else if (event.getSource() == textureButton)
..	..	@@ -3190,7 +4213,6 @@
3190	4213	}
3191	4214
3192	4215	boolean useclient = false;
3193		- cRadio radio;
3194	4216
3195	4217	void ToggleRoot()
3196	4218	{
..	..	@@ -3265,6 +4287,18 @@
3265	4287	refreshContents();
3266	4288	}
3267	4289
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
	4301	+
3268	4302	void ResetTransform()
3269	4303	{
3270	4304	ResetTransform(-1);
..	..	@@ -3280,42 +4314,8 @@
3280	4314	if (obj.toParent == null)
3281	4315	continue;
3282	4316
3283		- if (mask == -1)
3284		- {
3285		- if (obj instanceof Camera) // jan 2014
3286		- {
3287		- LA.matIdentity(obj.toParent);
3288		- LA.matIdentity(obj.fromParent);
3289		- }
3290		- else
3291		- {
3292		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3293		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3294		- }
3295		- TouchTransform(obj);
3296		- continue;
3297		- }
3298		- if ((mask&2) != 0) // Scale
3299		- {
3300		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3301		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3302		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3303		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3304		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3305		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3306		- }
3307		- if ((mask&4) != 0) // Rotation
3308		- {
3309		- // ?
3310		- }
3311		- if ((mask&1) != 0) // Translation
3312		- {
3313		- if (obj.toParent != null)
3314		- {
3315		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3316		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3317		- }
3318		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3319	4319	if (obj.parent == null)
3320	4320	{
3321	4321	System.out.println("NULL PARENT!");
..	..	@@ -3753,7 +4753,7 @@
3753	4753
3754	4754	try
3755	4755	{
3756		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3757	4757	}
3758	4758	catch (Exception e)
3759	4759	{
..	..	@@ -3823,6 +4823,12 @@
3823	4823	for (int i=0; i<group.selection.size(); i++)
3824	4824	{
3825	4825	Object3D obj = group.selection.get(i);
	4826	+
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
3826	4832
3827	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3828	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4115,6 +5121,12 @@
4115	5121	refreshContents();
4116	5122	}
4117	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4118	5130	void FlipV(boolean flip)
4119	5131	{
4120	5132	group.selection.FlipV(flip);
..	..	@@ -4142,6 +5154,18 @@
4142	5154	void MarkLeaves(boolean hide)
4143	5155	{
4144	5156	group.selection.MarkLeaves(hide);
	5157	+ refreshContents();
	5158	+ }
	5159	+
	5160	+ void RewindLeaves(boolean hide)
	5161	+ {
	5162	+ group.selection.RewindLeaves(hide);
	5163	+ refreshContents();
	5164	+ }
	5165	+
	5166	+ void RandomLeaves(boolean hide)
	5167	+ {
	5168	+ group.selection.RandomLeaves(hide);
4145	5169	refreshContents();
4146	5170	}
4147	5171
..	..	@@ -4216,28 +5240,25 @@
4216	5240	// }
4217	5241	// }
4218	5242
4219		- static boolean allparams = true;
4220		-
4221		- static Vector<Object3D> listUI = new Vector<Object3D>();
4222		-
4223	5243	void EditSelection(boolean newWindow)
4224	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4225	5251	// aConstraints.gridy = 0;
4226	5252	for (int i=0; i<group.selection.size(); i++)
4227	5253	{
4228	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4229	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4230		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4231	5257
4232	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4233	5259	if(elem != group \|\| !newWindow)
4234	5260	{
4235		- // if (!(elem instanceof Composite))
4236		- // newWindow = false;
4237		- listUI.add(elem);
4238		- elem.openEditWindow(this, newWindow); //, false);
4239		- System.out.println("edit : " + elem);
4240		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4241	5262	}
4242	5263	}
4243	5264	}
..	..	@@ -4300,9 +5321,7 @@
4300	5321
4301	5322	freezemodel = false;
4302	5323	}
4303		-
4304		- boolean flashIt = true;
4305		-
	5324	+
4306	5325	public void valueChanged(TreeSelectionEvent e)
4307	5326	//public boolean handleEvent(Event event)
4308	5327	{
..	..	@@ -4312,7 +5331,8 @@
4312	5331	//new Exception().printStackTrace();
4313	5332
4314	5333	freezemodel = true;
4315		-
	5334	+ ClearUnpinned();
	5335	+
4316	5336	/**/
4317	5337	//switch (event.id)
4318	5338	{
..	..	@@ -4320,7 +5340,6 @@
4320	5340	//case 702: // Event.LIST_DESELECT
4321	5341	group.deselectAll();
4322	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4323		- objEditor.ClearInfo(); // .GetMaterial());
4324	5343	if (tps != null)
4325	5344	{
4326	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -4329,10 +5348,8 @@
4329	5348
4330	5349	//if (child.parent != null)
4331	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
4332	5352	group.addSelectee(child);
4333		- objEditor.SetMaterial(child); // .GetMaterial());
4334		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4335		- System.err.println("info : " + child.GetPath());
4336	5353	}
4337	5354	}
4338	5355	// else
..	..	@@ -4342,15 +5359,13 @@
4342	5359	// System.err.println("info : " + group.GetPath());
4343	5360	// }
4344	5361
4345		- objEditor.SetText(); // jan 2014
4346		-
4347	5362	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4348	5363	CameraPane.flash = true;
4349	5364
4350	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4351	5366	// a camera
4352	5367	{
4353		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4354	5369	{
4355	5370	CameraPane.camerachangeframe = 0; // don't refuse it
4356	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4359,6 +5374,13 @@
4359	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4360	5375	}
4361	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4362	5384	refreshContents();
4363	5385	//return true;
4364	5386	}
..	..	@@ -4367,6 +5389,53 @@
4367	5389
4368	5390	freezemodel = false;
4369	5391	}
	5392	+
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
	5416	+ }
	5417	+
	5418	+ void refreshContents(boolean cp)
	5419	+ {
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5423	+ {
	5424	+ objEditor.ClearInfo(); // .GetMaterial());
	5425	+
	5426	+ for (int i=0; i < group.selection.Size(); i++)
	5427	+ {
	5428	+ Object3D child = (Object3D) group.selection.get(i);
	5429	+
	5430	+ objEditor.AddInfo(child, this, true);
	5431	+// System.err.println("info : " + child.GetPath());
	5432	+ }
	5433	+
	5434	+ objEditor.SetText(); // jan 2014
	5435	+ }
	5436	+
	5437	+ super.refreshContents(cp);
	5438	+ }
4370	5439
4371	5440	void linkSomething(Object3D thing)
4372	5441	{
..	..	@@ -4449,7 +5518,8 @@
4449	5518
4450	5519	if (cut)
4451	5520	{
4452		- Save();
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4453	5523	//int indices[] = jList.getSelectedIndices();
4454	5524	//for (int i = indices.length - 1; i >= 0; i--)
4455	5525	//jList.remove(indices[i]);
..	..	@@ -4552,6 +5622,10 @@
4552	5622
4553	5623	void paste(boolean expand)
4554	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4555	5629	// if (GrafreeD.clipboard == null)
4556	5630	// return;
4557	5631	boolean first = true;
..	..	@@ -4611,6 +5685,7 @@
4611	5685	Grafreed.clipboard.get(0).parent = keepparent;
4612	5686	}
4613	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4614	5689	ResetModel();
4615	5690	refreshContents();
4616	5691	}
..	..	@@ -4746,6 +5821,10 @@
4746	5821
4747	5822	void group(Object3D csg, boolean grab)
4748	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4749	5828	if (//false) // why??
4750	5829	!group.selection.isEmpty())
4751	5830	{
..	..	@@ -4859,10 +5938,15 @@
4859	5938	//node.add(csg);
4860	5939	//makeSomething(node);
4861	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4862	5942	}
4863	5943
4864	5944	void Ungroup(Object3D g)
4865	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4866	5950	if (g instanceof HiddenObject)
4867	5951	{
4868	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4879,6 +5963,7 @@
4879	5963	objEditor.makeSomething(g.get(i), false);
4880	5964	}
4881	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4882	5967	}
4883	5968
4884	5969	void ungroup()
..	..	@@ -5167,10 +6252,43 @@
5167	6252	cButton clearpanelButton;
5168	6253	cButton unselectButton;
5169	6254
5170		- cButton saveButton;
5171		- cButton undoButton;
5172		- cButton redoButton;
	6255	+ cButton restoreCameraButton;
	6256	+
5173	6257	cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
5174	6292
5175	6293	cButton screenfitButton;
5176	6294	cButton screenfitpointButton;
..	..	@@ -5183,14 +6301,6 @@
5183	6301
5184	6302	cButton setsupportButton;
5185	6303
5186		- cButton twoButton;
5187		- cButton sixButton;
5188		- cButton threeButton;
5189		- cButton sevenButton;
5190		- cButton fourButton; // full panel
5191		- cButton oneButton; // full XYZ
5192		- //cButton currentLayout;
5193		-
5194	6304	//
5195	6305	//Composite
5196	6306	Object3D // to do !!
..	..	@@ -5200,12 +6310,12 @@
5200	6310	//JTree jTree;
5201	6311	private MenuItem lookAtItem;
5202	6312	private MenuItem lookFromItem;
5203		- private MenuItem switchItem;
5204		- private MenuItem cutItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
5205	6315	private MenuItem undoItem;
5206	6316	private MenuItem redoItem;
5207		- private MenuItem duplicateItem;
5208		- private MenuItem cloneItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5209	6319	private MenuItem cloneSupportItem;
5210	6320	private MenuItem overwriteGeoItem;
5211	6321	private MenuItem overwriteMatItem;
..	..	@@ -5226,13 +6336,13 @@
5226	6336	private MenuItem cloneGeometriesItem;
5227	6337	private MenuItem shareGeometriesItem;
5228	6338	private MenuItem mergeGeometriesItem;
5229		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5230	6340	private MenuItem pasteItem;
5231		- private MenuItem pasteIntoItem;
5232		- private MenuItem pasteLinkItem;
5233		- private MenuItem pasteCloneItem;
5234		- private MenuItem pasteExpandItem;
5235		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5236	6346	private MenuItem clearAllItem;
5237	6347	private MenuItem genUVItem;
5238	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5258,6 +6368,7 @@
5258	6368	private MenuItem clipMeshItem;
5259	6369	private MenuItem smoothMeshItem;
5260	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5261	6372
5262	6373	private MenuItem liveleavesItem;
5263	6374	private MenuItem unliveleavesItem;
..	..	@@ -5267,6 +6378,10 @@
5267	6378	private MenuItem showleavesItem;
5268	6379	private MenuItem markleavesItem;
5269	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
5270	6385
5271	6386	private MenuItem flipVItem;
5272	6387	private MenuItem unflipVItem;
..	..	@@ -5277,18 +6392,21 @@
5277	6392	private MenuItem maxTexturesItem;
5278	6393	private MenuItem panoTexturesItem;
5279	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5280	6398	private MenuItem resetCentroidItem;
5281	6399	private MenuItem resetCentroidXZItem;
5282	6400	private MenuItem resetTransformItem;
5283	6401	private MenuItem transformGeometryItem;
5284	6402	private MenuItem transformChildrenItem;
5285	6403	private MenuItem hideItem;
5286		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5287	6405	private MenuItem backItem;
5288	6406	private MenuItem frontItem;
5289	6407	private MenuItem cameraItem;
5290	6408	private MenuItem compositeItem;
5291		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5292	6410	private MenuItem physicsItem;
5293	6411	private MenuItem frameselectorItem;
5294	6412	private MenuItem scriptNodeItem;
..	..	@@ -5296,7 +6414,7 @@
5296	6414	private MenuItem switchTransfoItem;
5297	6415	private MenuItem morphItem;
5298	6416	private MenuItem linkerItem;
5299		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5300	6418	private MenuItem editItem;
5301	6419	private MenuItem openWindowItem;
5302	6420	private MenuItem editLeafItem;
..	..	@@ -5312,6 +6430,8 @@
5312	6430	private MenuItem attachBumpItem;
5313	6431	private MenuItem detachBumpItem;
5314	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5315	6435
5316	6436	private MenuItem particleItem;
5317	6437	private MenuItem ragdollItem;
..	..	@@ -5362,5 +6482,5 @@
5362	6482
5363	6483	Menu cameraMenu;
5364	6484	MenuItem editCameraItem;
5365		- MenuItem revertCameraItem;
	6485	+ MenuItem restoreCameraItem;
5366	6486	}