~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,40 +518,49 @@
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"));
156	526	//editItem.addActionListener(this);
157		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	527	+
	528	+// undoItem = menu.add(new MenuItem("Undo"));
	529	+// undoItem.addActionListener(this);
	530	+// redoItem = menu.add(new MenuItem("Redo"));
	531	+// redoItem.addActionListener(this);
	532	+// menu.add("-");
	533	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158	534	duplicateItem.addActionListener(this);
159		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
160	537	cloneItem.addActionListener(this);
161		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
162	539	{
163	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
164	541	cloneSupportItem.addActionListener(this);
165	542	}
	543	+ oe.jTree.popup.addSeparator();
166	544	menu.add("-");
167		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
168	546	cutItem.addActionListener(this);
169		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
170	548	copyItem.addActionListener(this);
171	549	pasteItem = menu.add(new MenuItem("Paste"));
172	550	pasteItem.addActionListener(this);
173		- menu.add("-");
174	551
175		- menu.add("-");
176		- 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"));
177	555	pasteIntoItem.addActionListener(this);
178		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
179	557	pasteLinkItem.addActionListener(this);
180		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
181	559	pasteCloneItem.addActionListener(this);
182		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
183	561	// pasteExpandItem.addActionListener(this);
184		- menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
187	564
188	565	if (Globals.ADVANCED)
189	566	{
..	..	@@ -197,23 +574,23 @@
197	574	//zBufferItem.addActionListener(this);
198	575	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	576	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
202	579
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- 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);
207	592
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	594	toggleHandleItem.addItemListener(this);
218	595	toggleHandleItem.setState(CameraPane.HANDLES);
219	596
..	..	@@ -240,7 +617,7 @@
240	617
241	618	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	619	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	620	+ toggleDebugItem.setState(Globals.DEBUG);
244	621
245	622	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	623	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,22 +638,20 @@
261	638	// animationItem.addItemListener(this);
262	639	// animationItem.setState(CameraPane.ANIMATION);
263	640	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	641	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	642	editCameraItem.addActionListener(this);
266	643
267	644	if (Globals.ADVANCED)
268	645	{
269	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
272		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
273	649	oe.cameraMenu.add("-");
274	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
275	651	openWindowItem.addActionListener(this);
276		- editLeafItem.addActionListener(this);
277	652	lookAtItem.addActionListener(this);
278	653	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	654	+ //switchViewItem.addActionListener(this);
280	655	}
281	656
282	657	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -320,22 +695,37 @@
320	695	setMasterItem.addActionListener(this);
321	696	}
322	697
323		- oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
326	700	backItem = menu.add(new MenuItem("Back"));
327	701	backItem.addActionListener(this);
328	702	frontItem = menu.add(new MenuItem("Front"));
329	703	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- 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	+ {
332	712	hideItem = menu.add(new MenuItem("Hidden Group"));
333	713	hideItem.addActionListener(this);
334		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
335	716	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	730	switchGeoItem.addActionListener(this);
341	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +733,6 @@
343	733	morphItem = menu.add(new MenuItem("Morph Group"));
344	734	morphItem.addActionListener(this);
345	735
346		- if (Globals.ADVANCED)
347		- {
348	736	menu.add("-");
349	737	physicsItem = menu.add(new MenuItem("Physics"));
350	738	physicsItem.addActionListener(this);
..	..	@@ -352,41 +740,47 @@
352	740	frameselectorItem.addActionListener(this);
353	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	742	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	743	}
358	744
359	745	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
362	748	billboardItem = menu.add(new MenuItem("Billboard"));
363	749	billboardItem.addActionListener(this);
364	750	csgItem = menu.add(new MenuItem("CSG"));
365	751	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	753	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	755	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
372	761	if (Globals.ADVANCED)
373	762	{
374	763	menu.add("-");
375	764	linkerItem = menu.add(new MenuItem("Linker"));
376	765	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	766	templateItem = menu.add(new MenuItem("Template"));
380	767	templateItem.addActionListener(this);
381	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
382	769	pointflowItem.addActionListener(this);
383	770	}
384	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("-");
385	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
386	780	resetTransformItem.addActionListener(this);
387	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
388	782	resetCentroidItem.addActionListener(this);
389		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
390	784	resetCentroidXZItem.addActionListener(this);
391	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
392	786	transformGeometryItem.addActionListener(this);
..	..	@@ -404,7 +798,7 @@
404	798	genNormalsMESHItem.addActionListener(this);
405	799	if (Globals.ADVANCED)
406	800	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	802	genNormalsMINEItem.addActionListener(this);
409	803	}
410	804	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -438,6 +832,8 @@
438	832	}
439	833
440	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
441	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
442	838	clearMaterialsItem.addActionListener(this);
443	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -460,10 +856,18 @@
460	856	hideleavesItem.addActionListener(this);
461	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
462	858	showleavesItem.addActionListener(this);
463		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
464	860	markleavesItem.addActionListener(this);
465		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
466	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);
467	871	menu.add("-");
468	872	flipVItem = menu.add(new MenuItem("Flip V"));
469	873	flipVItem.addActionListener(this);
..	..	@@ -489,10 +893,15 @@
489	893	attachBumpItem.addActionListener(this);
490	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
492	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	898	detachPigmentItem.addActionListener(this);
494	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	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);
496	905	menu.add("-");
497	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	907	sortbysizeItem.addActionListener(this);
..	..	@@ -503,6 +912,9 @@
503	912	shareGeometriesItem.addActionListener(this);
504	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
506	918	if (Globals.ADVANCED)
507	919	{
508	920	// Pretty much the same as duplicate and clone.
..	..	@@ -519,16 +931,97 @@
519	931	buildToolsMenu(menu);
520	932	}
521	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	+
522	1008	void SetupUI2(ObjEditor oe)
523	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	+
524	1022	//new Exception().printStackTrace();
525	1023
526	1024	oe.radioPanel = new JPanel(new GridBagLayout());
527		- oe.aConstraints.weightx = 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
530		- oe.aConstraints.gridwidth = 100;
531		- oe.aConstraints.gridheight = 1;
532	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
533	1026
534	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -549,97 +1042,268 @@
549	1042	oe.radioPanel.add(dummyButton);
550	1043	oe.buttonGroup.add(dummyButton);
551	1044	*/
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
	1048	+
552	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	1050
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555		- liveCB.setToolTipText("Enable animation");
556		- liveCB.addItemListener(this);
	1051	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //minButton.setToolTipText("Minimize window");
	1053	+ //minButton.addActionListener(this);
	1054	+
	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	+ }
	1061	+
	1062	+ cButton gcButton;
	1063	+
	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);
557	1108
558		- 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);
559	1146	oneStepButton.setToolTipText("Animate one step forward");
560	1147	oneStepButton.addActionListener(this);
561	1148
562		- 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);
563	1154	fastCB.setToolTipText("Fast mode");
564	1155	fastCB.addItemListener(this);
565	1156
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- 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);
573	1162
574	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	1164	// screenfitpointButton.addActionListener(this);
576	1165
577	1166	if (Globals.ADVANCED)
578	1167	{
579		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
580	1169	snapobjectButton.addActionListener(this);
581	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");
582	1175	}
583	1176
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	1178
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- twoButton.setToolTipText("Show center view only");
592		- twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- fourButton.addActionListener(this);
595		- fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
598		- sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- threeButton.setToolTipText("2-column layout right");
601		- threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- sevenButton.addActionListener(this);
605		- //
606	1179
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- 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");
609	1182	rootButton.addActionListener(this);
610	1183
611		- 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);
612	1185	closeButton.setToolTipText("Close tab");
613	1186	closeButton.addActionListener(this);
614	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	1188	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	1189	+
	1190	+ cGridBag row1 = new cGridBag();
618	1191
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- 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");
621	1280	editButton.addActionListener(this);
622	1281
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
625	1284	uneditButton.addActionListener(this);
626	1285
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	1286	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1287	+ allParamsButton.setToolTipText("Show all controls");
629	1288	allParamsButton.addActionListener(this);
630	1289
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
633	1292	clearPanelButton.addActionListener(this);
634	1293
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636		- unselectButton.setToolTipText("Unselect");
637		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
638	1297
639		- 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);
640	1301
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	1302	+ editCommandsPanel.preferredHeight = 1;
	1303	+
	1304	+ SetPinStates(false);
	1305	+// oe.treePanel.add(commandsPanel);
	1306	+// oe.treePanel.Return();
643	1307
644	1308	// oe.aConstraints.gridx += 1;
645	1309	// oe.aConstraints.weighty = 0;
..	..	@@ -654,34 +1318,24 @@
654	1318
655	1319	cGridBag jSPPanel = new cGridBag();
656	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
657	1323	JScrollPane jSP;
658	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	1326	ResetModel();
661	1327
662	1328	oe.treePanel.add(jSPPanel);
663	1329	oe.treePanel.Return();
664	1330
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
681	1332	oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
682	1336
683		-// mainPanel.setDividerLocation(0.5); //1.0);
684		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
685	1339
686	1340	//jList.addListSelectionListener(this);
687	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -689,7 +1343,7 @@
689	1343	//jTree.setEditable(true);
690	1344	oe.jTree.setDragEnabled(true);
691	1345	//jTree.setPreferredSize(new Dimension(10,10));
692		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
693	1347
694	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
695	1349
..	..	@@ -701,29 +1355,49 @@
701	1355	dgr.addDragGestureListener(this);
702	1356	}catch(Exception e) {}
703	1357	*/
704		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
705	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	1360	}
707	1361
708	1362	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	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	+
710	1378	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	1379	boxCB.setToolTipText("Display bounding boxes");
712	1380	boxCB.addItemListener(this);
713	1381
714	1382	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	1384	zoomBoxCB.addItemListener(this);
717	1385
718	1386	if (true) // Globals.ADVANCED)
719	1387	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- 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);
723	1395
724	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	1397	// localCB.addItemListener(this);
726	1398
	1399	+ panel.Return();
	1400	+
727	1401	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	1402	crowdCB.setToolTipText("Used for crowds");
729	1403	crowdCB.addItemListener(this);
..	..	@@ -732,14 +1406,19 @@
732	1406	smoothCB.setToolTipText("Snapping delay");
733	1407	smoothCB.addItemListener(this);
734	1408
735		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736		- slowCB.setToolTipText("Smooth interpolation");
737		- 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);
738	1415
739	1416	// constraints.gridy += 1;
740	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	1418	// speakerMocapCB.addItemListener(this);
742	1419
	1420	+ panel.Return();
	1421	+
743	1422	if (false)
744	1423	{
745	1424	// handled in scripts
..	..	@@ -754,34 +1433,82 @@
754	1433	//constraints.gridy += 1;
755	1434	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
757	1437	}
758	1438
759	1439	//constraints.gridx += 1;
760	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	1441	// debugCB.addItemListener(this);
762	1442
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
763	1447	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
764	1449	oeilCB.addItemListener(this);
765	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	+ {
766	1471	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	1472	lookAtCB.setToolTipText("Look-at target");
768	1473	lookAtCB.addItemListener(this);
	1474	+ }
769	1475
770	1476	}
771	1477
772	1478	cGridBag fill = new cGridBag();
773		-
774	1479	fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
775	1484
776	1485	panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
777	1488
778	1489	}
779	1490
780	1491	void EditObject(Object3D obj)
781	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	+
782	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	+
783	1510	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
785	1512	radioButton.SetCamera(cameraView.renderCamera, false);
786	1513	radioButton.addActionListener(this);
787	1514	radioPanel.add(radioButton);
..	..	@@ -791,31 +1518,41 @@
791	1518
792	1519	void SetupViews(ObjEditor oe)
793	1520	{
	1521	+ theFrame = this;
	1522	+
794	1523	oe.SetupViews();
795	1524
	1525	+ if (Globals.DEBUG)
796	1526	System.out.println("SetupViews");
797	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
798	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
799	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1530	}
801	1531
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- 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;
813	1547	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
819	1556
820	1557	// static int COLOR = 1;
821	1558	// static int MATERIAL = 2;
..	..	@@ -823,9 +1560,9 @@
823	1560
824	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1562
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
829	1566
830	1567	public void itemStateChanged(ItemEvent e)
831	1568	{
..	..	@@ -853,6 +1590,7 @@
853	1590	} else if(e.getSource() == liveCB)
854	1591	{
855	1592	cameraView.ToggleLive();
	1593	+ refreshContents(false);
856	1594	}
857	1595	else if(e.getSource() == supportCB)
858	1596	{
..	..	@@ -868,6 +1606,12 @@
868	1606	{
869	1607	cameraView.ToggleInertia();
870	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
871	1615	}
872	1616	else if(e.getSource() == localCB)
873	1617	{
..	..	@@ -917,6 +1661,18 @@
917	1661	{
918	1662	cameraView.ToggleOeil();
919	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	+ }
920	1676	else if(e.getSource() == lookAtCB)
921	1677	{
922	1678	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1689,8 @@
933	1689
934	1690	/**/
935	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1695	// We can't move the root node or an empty selection
939	1696	return;
..	..	@@ -996,8 +1753,6 @@
996	1753	}
997	1754	}
998	1755
999		- String string = (String) object;
1000		-
1001	1756	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1757	// if( object instanceof java.io.File[])
1003	1758	// {
..	..	@@ -1005,6 +1760,8 @@
1005	1760	// objEditor.DropFile((java.io.File[]) object, true);
1006	1761	// return;
1007	1762	// }
	1763	+
	1764	+ String string = object.toString();
1008	1765
1009	1766	// File path for Mac and Windows
1010	1767	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1807,33 @@
1050	1807
1051	1808	assert target == objEditor.jTree;
1052	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
1053	1811	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1813	} catch (Exception e) {
1056	1814	System.out.println("destinationPath : " + destinationPath);
1057	1815	return;
1058	1816	}
1059	1817
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
1061	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	+// {
1062	1829	loadClipboard(true);
1063	1830	objEditor.jTree.setSelectionPath(destinationPath);
1064	1831	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
1070	1837	}
1071	1838	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1839	// Called if the user has modified the current drop gesture
..	..	@@ -1122,7 +1889,12 @@
1122	1889	TreePath path;
1123	1890
1124	1891	public TransferableTreePath(TreePath tp) {
1125		- 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);
1126	1898	}
1127	1899
1128	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1171,22 +1943,30 @@
1171	1943	{
1172	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1945	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- 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	+ {
1186	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1965	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
1190	1970	if (Globals.ADVANCED)
1191	1971	{
1192	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1992,15 @@
1212	1992	}
1213	1993	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1994	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- 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);
1219	1999	menu.add("-");
1220	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	2001	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1224	2004	doubleItem = menu.add(new MenuItem("Fork"));
1225	2005	doubleItem.addActionListener(this);
1226	2006	if (Globals.ADVANCED)
..	..	@@ -1236,6 +2016,9 @@
1236	2016	animationItem.addItemListener(this);
1237	2017	animationItem.setState(Globals.ANIMATION);
1238	2018
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
	2021	+
1239	2022	menu.add("-");
1240	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	2024	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +2031,8 @@
1248	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	2032	reduce34MorphItem.addActionListener(this);
1250	2033	menu.add("-");
	2034	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2035	+ memoryItem.addActionListener(this);
1251	2036	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	2037	computeAOItem.addActionListener(this);
1253	2038
..	..	@@ -1256,11 +2041,9 @@
1256	2041	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	2042	mirrorItem.addActionListener(this);
1258	2043	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	2045	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	2046	+ menu.add(dumpItem = new MenuItem("Print"));
1264	2047	dumpItem.addActionListener(this);
1265	2048	// menu.add(pathItem = new MenuItem("From-to path"));
1266	2049	// pathItem.addActionListener(this);
..	..	@@ -1343,24 +2126,24 @@
1343	2126	switch(axis)
1344	2127	{
1345	2128	case 0 :
1346		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1347		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1348		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1349		- 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;
1350	2133	norm = cVector.X;
1351	2134	break;
1352	2135	case 1 :
1353		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1354		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1355		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1356		- 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;
1357	2140	norm = cVector.Y;
1358	2141	break;
1359	2142	case 2 :
1360		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1361		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1362		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1363		- 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;
1364	2147	norm = cVector.Z;
1365	2148	break;
1366	2149	}
..	..	@@ -1401,9 +2184,38 @@
1401	2184	shadow.material = new cMaterial(obj.material);
1402	2185	shadow.material.diffuse = 0.0001f;
1403	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1404	2192
1405	2193	makeSomething(shadow);
1406	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	+ }
1407	2219
1408	2220	/**
1409	2221	* applyExample
..	..	@@ -1648,7 +2460,7 @@
1648	2460	{
1649	2461	ScreenFit();
1650	2462	} else
1651		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1652	2464	{
1653	2465	cVector v1 = new cVector();
1654	2466	cVector v2 = new cVector();
..	..	@@ -1657,11 +2469,11 @@
1657	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	2470	objEditor.cameraView.repaint();
1659	2471	} else
1660		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1661	2473	{
1662	2474	makeSomething(new Box());
1663	2475	} else
1664		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1665	2477	{
1666	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2552,27 @@
1740	2552
1741	2553	makeSomething(obj);
1742	2554	} else
1743		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1744	2556	{
1745	2557	makeSomething(new Grid());
1746	2558	} else
1747		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2560	{
1749	2561	makeSomething(new Sphere());
1750	2562	} else
1751		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1752	2564	{
1753	2565	makeSomething(new Cone());
1754	2566	} else
1755		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1756	2568	{
1757	2569	makeSomething(new Torus());
1758	2570	} else
1759		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1760	2572	{
1761	2573	makeSomething(new Superellipsoid());
1762	2574	} else
1763		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1764	2576	{
1765	2577	makeSomething(new Klein());
1766	2578	} else
..	..	@@ -1780,7 +2592,7 @@
1780	2592	{
1781	2593	makeSomething(new BezierSurface());
1782	2594	} else
1783		- if (source == overlayItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1784	2596	{
1785	2597	/*
1786	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,10 +2640,27 @@
1828	2640	s.setup();
1829	2641	makeSomething(s);
1830	2642	} else
1831		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1832	2644	{
1833	2645	makeSomething(new Light());
1834	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
1835	2664	if (source == csgItem)
1836	2665	{
1837	2666	group(new CSG());
..	..	@@ -1878,30 +2707,38 @@
1878	2707
1879	2708	group(g);
1880	2709	} else
1881		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1882	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1883	2714	Composite csg = new GroupLeaf();
1884		- csg.count = 5;
1885	2715	group(csg);
1886		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1887	2718	csg.addChild(child);
1888	2719	child.addChild(csg);
	2720	+ }
1889	2721	} else
1890	2722	if (source == doubleItem)
1891	2723	{
1892		- Composite csg = new GroupLeaf();
1893		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1894	2727	group(csg);
1895		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1896	2730	csg.addChild(child);
1897	2731	child.addChild(csg);
1898		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1899	2733	csg.addChild(child);
1900	2734	child.addChild(csg);
	2735	+ }
1901	2736	} else
1902	2737	if (source == tripleItem)
1903	2738	{
1904		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1905	2742	csg.count = 4;
1906	2743	group(csg);
1907	2744	Composite child = new cGroup();
..	..	@@ -1913,11 +2750,12 @@
1913	2750	child = new cGroup();
1914	2751	csg.addChild(child);
1915	2752	child.addChild(csg);
	2753	+ }
1916	2754	} else
1917	2755	if (source == computeAOItem)
1918	2756	{
1919	2757	Globals.drawMode = CameraPane.OCCLUSION;
1920		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1921	2759	} else
1922	2760	if (source == recompileItem)
1923	2761	{
..	..	@@ -1932,7 +2770,7 @@
1932	2770	if (source == invariantsItem)
1933	2771	{
1934	2772	System.out.println("Invariants:");
1935		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1936	2774	} else
1937	2775	if (source == memoryItem)
1938	2776	{
..	..	@@ -1951,6 +2789,65 @@
1951	2789	{
1952	2790	DumpObject();
1953	2791	} else
	2792	+ if (source == minButton)
	2793	+ {
	2794	+ Minimize();
	2795	+ } else
	2796	+ if (source == maxButton)
	2797	+ {
	2798	+ Maximize();
	2799	+ } else
	2800	+ if (source == fullScreenButton)
	2801	+ {
	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();
	2850	+ } else
1954	2851	if (source == oneStepButton)
1955	2852	{
1956	2853	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2855,14 @@
1958	2855	} else
1959	2856	if (source == screenfitButton)
1960	2857	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2858	ScreenFit();
1963	2859	} else
1964	2860	if (source == screenfitpointButton)
1965	2861	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2862	ScreenFitPoint();
1968	2863	} else
1969	2864	if (source == snapobjectButton)
1970	2865	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2866	SnapObject();
1973	2867	} else
1974	2868	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2898,14 @@
2004	2898	if (source == cutItem \|\| source == clearButton)
2005	2899	{
2006	2900	loadClipboard(true);
	2901	+ } else
	2902	+ if (source == undoItem)
	2903	+ {
	2904	+ PreviousVersion();
	2905	+ } else
	2906	+ if (source == redoItem)
	2907	+ {
	2908	+ NextVersion();
2007	2909	} else
2008	2910	if (source == duplicateItem)
2009	2911	{
..	..	@@ -2324,7 +3226,7 @@
2324	3226	{
2325	3227	StepAll();
2326	3228	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	3230	{
2329	3231	//int indices[] = jList.getSelectedIndices();
2330	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +3238,9 @@
2336	3238	{
2337	3239	ClearSelection(true);
2338	3240	} else
2339		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2340	3242	{
2341		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2342	3244	} else
2343	3245	if (source == hideItem)
2344	3246	{
..	..	@@ -2356,11 +3258,11 @@
2356	3258	{
2357	3259	makeSomething(new Camera());
2358	3260	} else
2359		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2360	3262	{
2361	3263	group(new Composite());
2362	3264	} else
2363		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2364	3266	{
2365	3267	RandomNode random = new RandomNode();
2366	3268	group(random);
..	..	@@ -2462,7 +3364,7 @@
2462	3364	{
2463	3365	group(new cLinker());
2464	3366	} else
2465		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2466	3368	{
2467	3369	group(new TextureNode());
2468	3370	} else
..	..	@@ -2482,17 +3384,42 @@
2482	3384	{
2483	3385	CastShadow(2);
2484	3386	} else
2485		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	3388	{
2487		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2488	3391	for (int i=0; i<group.selection.size(); i++)
2489	3392	{
2490		- 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	+ }
2491	3408	}
2492	3409
2493		- ClearSelection(false);
2494		-
2495		- 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	+ }
2496	3423	} else
2497	3424	if (source == genUVItem)
2498	3425	{
..	..	@@ -2504,7 +3431,7 @@
2504	3431	} else
2505	3432	if (source == genNormalsMESHItem)
2506	3433	{
2507		- GenNormals(true); // TODO
	3434	+ GenNormalsMESH();
2508	3435	} else
2509	3436	if (source == genNormalsORGANItem)
2510	3437	{
..	..	@@ -2538,6 +3465,10 @@
2538	3465	{
2539	3466	ClearMaterials();
2540	3467	} else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
2541	3472	if (source == liveleavesItem)
2542	3473	{
2543	3474	LiveLeaves(true);
..	..	@@ -2569,6 +3500,22 @@
2569	3500	if (source == unmarkleavesItem)
2570	3501	{
2571	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);
2572	3519	} else
2573	3520	if (source == flipVItem)
2574	3521	{
..	..	@@ -2661,6 +3608,18 @@
2661	3608	if (source == transformChildrenItem)
2662	3609	{
2663	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);
2664	3623	} else
2665	3624	if (source == resetTransformItem)
2666	3625	{
..	..	@@ -2777,7 +3736,7 @@
2777	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3737	{
2779	3738	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2781	3740	}
2782	3741
2783	3742	refreshContents();
..	..	@@ -2793,6 +3752,31 @@
2793	3752
2794	3753	refreshContents();
2795	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
2796	3780	if (source == flashSelectionButton)
2797	3781	{
2798	3782	CameraPane.flash = true;
..	..	@@ -2804,42 +3788,36 @@
2804	3788	if (source == twoButton)
2805	3789	{
2806	3790	radio.layout = twoButton;
2807		- // bug
2808		- //gridPanel.setDividerLocation(1.0);
2809		- //bigPanel.setDividerLocation(0.0);
2810		-// bigThree.remove(scenePanel);
2811		-// bigThree.remove(centralPanel);
2812		-// bigThree.remove(XYZPanel);
2813		-// aWindowConstraints.gridx = 0;
2814		-// aWindowConstraints.gridy = 0;
2815		-// aWindowConstraints.gridwidth = 1;
2816		-// // aConstraints.gridheight = 3;
2817		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2818		-// aWindowConstraints.weightx = 0;
2819		-// aWindowConstraints.weighty = 1;
2820		-// //bigThree.add(jtp, aWindowConstraints);
2821		-// aWindowConstraints.weightx = 1;
2822		-// aWindowConstraints.gridwidth = 3;
2823		-// // aConstraints.gridheight = 3;
2824		-// aWindowConstraints.gridx = 1;
2825		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2826		-// bigThree.add(centralPanel, aWindowConstraints);
2827		-// aWindowConstraints.weightx = 0;
2828		-// aWindowConstraints.gridx = 4;
2829		-// aWindowConstraints.gridwidth = 1;
2830		-// // aConstraints.gridheight = 3;
2831		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2832		-// //bigThree.add(XYZPanel, aWindowConstraints);
2833		-// scenePanel.setVisible(false);
2834		-// centralPanel.setVisible(true);
2835		-// XYZPanel.setVisible(false);
2836		- bigThree.ClearUI();
2837		- bigThree.add(centralPanel);
2838		- 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	+
2839	3814	} else
2840	3815	if (source == threeButton)
2841	3816	{
2842	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2843	3821
2844	3822	// bigThree.remove(scenePanel);
2845	3823	// bigThree.remove(centralPanel);
..	..	@@ -2869,13 +3847,18 @@
2869	3847	// centralPanel.setVisible(true);
2870	3848	// XYZPanel.setVisible(true);
2871	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2872	3851	bigThree.add(centralPanel);
2873		- bigThree.add(XYZPanel);
2874	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2875	3855	} else
2876	3856	if (source == fourButton)
2877	3857	{
2878	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2879	3862
2880	3863	// bigThree.remove(scenePanel);
2881	3864	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3890,15 @@
2907	3890	bigThree.ClearUI();
2908	3891	bigThree.add(scenePanel);
2909	3892	bigThree.FlushUI();
	3893	+
	3894	+ cameraView.requestFocusInWindow();
2910	3895	} else
2911	3896	if (source == sixButton)
2912	3897	{
2913	3898	radio.layout = sixButton;
	3899	+
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
2914	3902
2915	3903	// bigThree.remove(scenePanel);
2916	3904	// bigThree.remove(centralPanel);
..	..	@@ -2940,13 +3928,18 @@
2940	3928	// centralPanel.setVisible(true);
2941	3929	// XYZPanel.setVisible(false);
2942	3930	bigThree.ClearUI();
2943		- bigThree.add(scenePanel);
2944	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
2945	3933	bigThree.FlushUI();
	3934	+
	3935	+ cameraView.requestFocusInWindow();
2946	3936	} else
2947	3937	if (source == sevenButton)
2948	3938	{
2949	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
2950	3943
2951	3944	// bigThree.remove(scenePanel);
2952	3945	// bigThree.remove(centralPanel);
..	..	@@ -2980,9 +3973,12 @@
2980	3973	bigThree.add(centralPanel);
2981	3974	bigThree.add(XYZPanel);
2982	3975	bigThree.FlushUI();
	3976	+
	3977	+ cameraView.requestFocusInWindow();
2983	3978	} else
2984	3979	if (source == rootButton)
2985	3980	{
	3981	+ Replace();
2986	3982	Object3D obj;
2987	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2988	3984	{
..	..	@@ -2991,31 +3987,50 @@
2991	3987	EditObject(obj);
2992	3988	}
2993	3989
	3990	+ cameraView.requestFocusInWindow();
2994	3991	refreshContents(true);
2995	3992	} else
2996	3993	if (source == closeButton)
2997	3994	{
2998	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
2999	3999	cRadio ab;
3000	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	4001	{
3002	4002	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
3005	4011	buttonGroup.remove(ab);
3006	4012	radioPanel.remove(ab);
3007	4013
3008		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
3009	4016	// ab.GetObject().objectUI = null; // ?????????
3010	4017
3011	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	4019	break;
3013	4020	}
3014	4021	}
	4022	+
	4023	+ cameraView.requestFocusInWindow();
3015	4024	refreshContents(true);
3016	4025	} else
3017	4026	if (source == editItem \|\| source == editButton)
3018	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
3019	4034	EditSelection(false);
3020	4035	} else
3021	4036	if (source == uneditButton)
..	..	@@ -3024,11 +4039,12 @@
3024	4039	{
3025	4040	Object3D child = (Object3D)e.nextElement();
3026	4041	if(child.editWindow != null)
3027		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
3028	4043	child.CloseUI();
3029	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3030	4046
3031		- child.editWindow = null; // ???????????
	4047	+ //child.editWindow = null; // ???????????
3032	4048	}
3033	4049	objEditor.ctrlPanel.FlushUI();
3034	4050	//objEditor.jTree.clearSelection();
..	..	@@ -3041,16 +4057,18 @@
3041	4057	//copy.ClearUI();
3042	4058	for (Object3D obj : listUI)
3043	4059	{
	4060	+ obj.pinned = false;
3044	4061	obj.CloseUI();
3045	4062	}
3046	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3047	4065	refreshContents(true);
3048	4066	} else
3049	4067	if (source == allParamsButton)
3050	4068	{
3051	4069	assert(copy == group);
3052	4070
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	4072
3055	4073	for (Object3D obj : listUI)
3056	4074	{
..	..	@@ -3076,6 +4094,9 @@
3076	4094	} else
3077	4095	if(source instanceof cRadio)
3078	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3079	4100	group.parent = keepparent;
3080	4101	group.attributes = 0;
3081	4102	//group.editWindow = null;
..	..	@@ -3099,6 +4120,7 @@
3099	4120	}
3100	4121
3101	4122	copy = group;
	4123	+
3102	4124	//Globals.theRenderer.object = group;
3103	4125	if(!useclient)
3104	4126	{
..	..	@@ -3115,7 +4137,9 @@
3115	4137	sideView.object = group;
3116	4138	}
3117	4139
3118		-// fix "+" issue group.editWindow = this;
	4140	+// fix "+" issue
	4141	+ //group.editWindow = this;
	4142	+ group.manipWindow = this;
3119	4143
3120	4144	/*
3121	4145	currentLayout = radio.layout;
..	..	@@ -3123,20 +4147,58 @@
3123	4147	currentLayout = sevenButton;
3124	4148	*/
3125	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);
3126	4184	keepparent = group.parent;
3127	4185	// PARENT = NULL or not???
3128	4186	//group.parent = null; // ROOT
3129	4187	//group.attributes = -1;
3130	4188	ResetModel();
	4189	+
	4190	+ cameraView.requestFocusInWindow();
3131	4191	refreshContents(true);
3132	4192	} else if (event.getSource() == editCameraItem)
3133	4193	{
3134	4194	cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
3135	4196	cameraView.repaint();
3136	4197	return;
3137		- } else if (event.getSource() == revertCameraItem)
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	4199	{
3139	4200	cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
3140	4202	cameraView.repaint();
3141	4203	return;
3142	4204	// } else if (event.getSource() == textureButton)
..	..	@@ -3151,7 +4213,6 @@
3151	4213	}
3152	4214
3153	4215	boolean useclient = false;
3154		- cRadio radio;
3155	4216
3156	4217	void ToggleRoot()
3157	4218	{
..	..	@@ -3226,6 +4287,18 @@
3226	4287	refreshContents();
3227	4288	}
3228	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	+
3229	4302	void ResetTransform()
3230	4303	{
3231	4304	ResetTransform(-1);
..	..	@@ -3241,42 +4314,8 @@
3241	4314	if (obj.toParent == null)
3242	4315	continue;
3243	4316
3244		- if (mask == -1)
3245		- {
3246		- if (obj instanceof Camera) // jan 2014
3247		- {
3248		- LA.matIdentity(obj.toParent);
3249		- LA.matIdentity(obj.fromParent);
3250		- }
3251		- else
3252		- {
3253		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3254		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3255		- }
3256		- TouchTransform(obj);
3257		- continue;
3258		- }
3259		- if ((mask&2) != 0) // Scale
3260		- {
3261		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3262		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3263		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3264		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3265		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3266		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3267		- }
3268		- if ((mask&4) != 0) // Rotation
3269		- {
3270		- // ?
3271		- }
3272		- if ((mask&1) != 0) // Translation
3273		- {
3274		- if (obj.toParent != null)
3275		- {
3276		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3277		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3278		- }
3279		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3280	4319	if (obj.parent == null)
3281	4320	{
3282	4321	System.out.println("NULL PARENT!");
..	..	@@ -3390,7 +4429,8 @@
3390	4429
3391	4430	int size = obj.MemorySize();
3392	4431
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	4432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	4434	}
3395	4435	}
3396	4436	catch (Exception e)
..	..	@@ -3471,6 +4511,13 @@
3471	4511	void GenNormals(boolean crease)
3472	4512	{
3473	4513	group.GenNormalsS(crease);
	4514	+
	4515	+ refreshContents();
	4516	+ }
	4517	+
	4518	+ void GenNormalsMESH()
	4519	+ {
	4520	+ group.GenNormalsMeshS();
3474	4521
3475	4522	refreshContents();
3476	4523	}
..	..	@@ -3706,7 +4753,7 @@
3706	4753
3707	4754	try
3708	4755	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4757	}
3711	4758	catch (Exception e)
3712	4759	{
..	..	@@ -3776,6 +4823,12 @@
3776	4823	for (int i=0; i<group.selection.size(); i++)
3777	4824	{
3778	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	+ }
3779	4832
3780	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3781	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4068,6 +5121,12 @@
4068	5121	refreshContents();
4069	5122	}
4070	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4071	5130	void FlipV(boolean flip)
4072	5131	{
4073	5132	group.selection.FlipV(flip);
..	..	@@ -4095,6 +5154,18 @@
4095	5154	void MarkLeaves(boolean hide)
4096	5155	{
4097	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);
4098	5169	refreshContents();
4099	5170	}
4100	5171
..	..	@@ -4169,28 +5240,25 @@
4169	5240	// }
4170	5241	// }
4171	5242
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	5243	void EditSelection(boolean newWindow)
4177	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4178	5251	// aConstraints.gridy = 0;
4179	5252	for (int i=0; i<group.selection.size(); i++)
4180	5253	{
4181	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	5257
4185	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	5259	if(elem != group \|\| !newWindow)
4187	5260	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4194	5262	}
4195	5263	}
4196	5264	}
..	..	@@ -4253,9 +5321,7 @@
4253	5321
4254	5322	freezemodel = false;
4255	5323	}
4256		-
4257		- boolean flashIt = true;
4258		-
	5324	+
4259	5325	public void valueChanged(TreeSelectionEvent e)
4260	5326	//public boolean handleEvent(Event event)
4261	5327	{
..	..	@@ -4265,7 +5331,8 @@
4265	5331	//new Exception().printStackTrace();
4266	5332
4267	5333	freezemodel = true;
4268		-
	5334	+ ClearUnpinned();
	5335	+
4269	5336	/**/
4270	5337	//switch (event.id)
4271	5338	{
..	..	@@ -4273,7 +5340,6 @@
4273	5340	//case 702: // Event.LIST_DESELECT
4274	5341	group.deselectAll();
4275	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	5343	if (tps != null)
4278	5344	{
4279	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +5348,8 @@
4282	5348
4283	5349	//if (child.parent != null)
4284	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
4285	5352	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	5353	}
4290	5354	}
4291	5355	// else
..	..	@@ -4295,20 +5359,28 @@
4295	5359	// System.err.println("info : " + group.GetPath());
4296	5360	// }
4297	5361
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5362	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	5363	CameraPane.flash = true;
4302	5364
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5365	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	5366	// a camera
4305	5367	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5369	+ {
	5370	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5371	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5372	+ }
4308	5373	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	5375	}
4311	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4312	5384	refreshContents();
4313	5385	//return true;
4314	5386	}
..	..	@@ -4317,6 +5389,53 @@
4317	5389
4318	5390	freezemodel = false;
4319	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	+ }
4320	5439
4321	5440	void linkSomething(Object3D thing)
4322	5441	{
..	..	@@ -4388,6 +5507,7 @@
4388	5507	{
4389	5508	if (group.selection.isEmpty())
4390	5509	return;
	5510	+
4391	5511	Grafreed.clipboardIsTempGroup = false;
4392	5512	Composite tGroup = null;
4393	5513	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +5518,8 @@
4398	5518
4399	5519	if (cut)
4400	5520	{
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4401	5523	//int indices[] = jList.getSelectedIndices();
4402	5524	//for (int i = indices.length - 1; i >= 0; i--)
4403	5525	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5609,10 @@
4487	5609	}
4488	5610
4489	5611	}
	5612	+
4490	5613	if (Grafreed.clipboardIsTempGroup)
4491	5614	Grafreed.clipboard = tGroup;
	5615	+
4492	5616	if (cut)
4493	5617	{
4494	5618	ResetModel();
..	..	@@ -4498,6 +5622,10 @@
4498	5622
4499	5623	void paste(boolean expand)
4500	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4501	5629	// if (GrafreeD.clipboard == null)
4502	5630	// return;
4503	5631	boolean first = true;
..	..	@@ -4557,6 +5685,7 @@
4557	5685	Grafreed.clipboard.get(0).parent = keepparent;
4558	5686	}
4559	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4560	5689	ResetModel();
4561	5690	refreshContents();
4562	5691	}
..	..	@@ -4692,6 +5821,10 @@
4692	5821
4693	5822	void group(Object3D csg, boolean grab)
4694	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4695	5828	if (//false) // why??
4696	5829	!group.selection.isEmpty())
4697	5830	{
..	..	@@ -4805,10 +5938,15 @@
4805	5938	//node.add(csg);
4806	5939	//makeSomething(node);
4807	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4808	5942	}
4809	5943
4810	5944	void Ungroup(Object3D g)
4811	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4812	5950	if (g instanceof HiddenObject)
4813	5951	{
4814	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5963,7 @@
4825	5963	objEditor.makeSomething(g.get(i), false);
4826	5964	}
4827	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4828	5967	}
4829	5968
4830	5969	void ungroup()
..	..	@@ -5113,7 +6252,43 @@
5113	6252	cButton clearpanelButton;
5114	6253	cButton unselectButton;
5115	6254
	6255	+ cButton restoreCameraButton;
	6256	+
5116	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;
5117	6292
5118	6293	cButton screenfitButton;
5119	6294	cButton screenfitpointButton;
..	..	@@ -5126,14 +6301,6 @@
5126	6301
5127	6302	cButton setsupportButton;
5128	6303
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	6304	//
5138	6305	//Composite
5139	6306	Object3D // to do !!
..	..	@@ -5143,10 +6310,12 @@
5143	6310	//JTree jTree;
5144	6311	private MenuItem lookAtItem;
5145	6312	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
5147		- private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
5149		- private MenuItem cloneItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
	6315	+ private MenuItem undoItem;
	6316	+ private MenuItem redoItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5150	6319	private MenuItem cloneSupportItem;
5151	6320	private MenuItem overwriteGeoItem;
5152	6321	private MenuItem overwriteMatItem;
..	..	@@ -5167,13 +6336,13 @@
5167	6336	private MenuItem cloneGeometriesItem;
5168	6337	private MenuItem shareGeometriesItem;
5169	6338	private MenuItem mergeGeometriesItem;
5170		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5171	6340	private MenuItem pasteItem;
5172		- private MenuItem pasteIntoItem;
5173		- private MenuItem pasteLinkItem;
5174		- private MenuItem pasteCloneItem;
5175		- private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5177	6346	private MenuItem clearAllItem;
5178	6347	private MenuItem genUVItem;
5179	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5199,6 +6368,7 @@
5199	6368	private MenuItem clipMeshItem;
5200	6369	private MenuItem smoothMeshItem;
5201	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5202	6372
5203	6373	private MenuItem liveleavesItem;
5204	6374	private MenuItem unliveleavesItem;
..	..	@@ -5208,6 +6378,10 @@
5208	6378	private MenuItem showleavesItem;
5209	6379	private MenuItem markleavesItem;
5210	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
5211	6385
5212	6386	private MenuItem flipVItem;
5213	6387	private MenuItem unflipVItem;
..	..	@@ -5218,18 +6392,21 @@
5218	6392	private MenuItem maxTexturesItem;
5219	6393	private MenuItem panoTexturesItem;
5220	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5221	6398	private MenuItem resetCentroidItem;
5222	6399	private MenuItem resetCentroidXZItem;
5223	6400	private MenuItem resetTransformItem;
5224	6401	private MenuItem transformGeometryItem;
5225	6402	private MenuItem transformChildrenItem;
5226	6403	private MenuItem hideItem;
5227		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5228	6405	private MenuItem backItem;
5229	6406	private MenuItem frontItem;
5230	6407	private MenuItem cameraItem;
5231	6408	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5233	6410	private MenuItem physicsItem;
5234	6411	private MenuItem frameselectorItem;
5235	6412	private MenuItem scriptNodeItem;
..	..	@@ -5237,7 +6414,7 @@
5237	6414	private MenuItem switchTransfoItem;
5238	6415	private MenuItem morphItem;
5239	6416	private MenuItem linkerItem;
5240		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5241	6418	private MenuItem editItem;
5242	6419	private MenuItem openWindowItem;
5243	6420	private MenuItem editLeafItem;
..	..	@@ -5253,6 +6430,8 @@
5253	6430	private MenuItem attachBumpItem;
5254	6431	private MenuItem detachBumpItem;
5255	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5256	6435
5257	6436	private MenuItem particleItem;
5258	6437	private MenuItem ragdollItem;
..	..	@@ -5303,5 +6482,5 @@
5303	6482
5304	6483	Menu cameraMenu;
5305	6484	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	6485	+ MenuItem restoreCameraItem;
5307	6486	}