~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +526,8 @@
150	526
151	527	void SetupMenu2(GroupEditor oe)
152	528	{
	529	+ oe.jTree = new cTree();
	530	+
153	531	Menu menu;
154	532	oe.menuBar.add(menu = new Menu("Edit"));
155	533	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,35 +538,37 @@
160	538	// redoItem = menu.add(new MenuItem("Redo"));
161	539	// redoItem.addActionListener(this);
162	540	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	542	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	545	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
168	547	{
169	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	549	cloneSupportItem.addActionListener(this);
171	550	}
	551	+ oe.jTree.popup.addSeparator();
172	552	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	554	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	556	copyItem.addActionListener(this);
177	557	pasteItem = menu.add(new MenuItem("Paste"));
178	558	pasteItem.addActionListener(this);
179	559
180		- menu.add("-");
181		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
182	563	pasteIntoItem.addActionListener(this);
183		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184	565	pasteLinkItem.addActionListener(this);
185		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186	567	pasteCloneItem.addActionListener(this);
187		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
188	569	// pasteExpandItem.addActionListener(this);
189		- menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
192	572
193	573	if (Globals.ADVANCED)
194	574	{
..	..	@@ -202,23 +582,23 @@
202	582	//zBufferItem.addActionListener(this);
203	583	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	584	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	585	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	586	+ restoreCameraItem.addActionListener(this);
207	587
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	588	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	589	+// toggleFullScreenItem.addItemListener(this);
	590	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	591	+// cameraMenu.add("-");
	592	+//
	593	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	594	+// toggleTextureItem.addItemListener(this);
	595	+// toggleTextureItem.setState(CameraPane.textureon);
	596	+//
	597	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	598	+// toggleSwitchItem.addItemListener(this);
	599	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	600
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	601	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	602	toggleHandleItem.addItemListener(this);
223	603	toggleHandleItem.setState(CameraPane.HANDLES);
224	604
..	..	@@ -273,15 +653,13 @@
273	653	{
274	654	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	655	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	656	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	657	oe.cameraMenu.add("-");
279	658	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280	659	openWindowItem.addActionListener(this);
281		- editLeafItem.addActionListener(this);
282	660	lookAtItem.addActionListener(this);
283	661	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	662	+ //switchViewItem.addActionListener(this);
285	663	}
286	664
287	665	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -325,22 +703,37 @@
325	703	setMasterItem.addActionListener(this);
326	704	}
327	705
328		- oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
331	708	backItem = menu.add(new MenuItem("Back"));
332	709	backItem.addActionListener(this);
333	710	frontItem = menu.add(new MenuItem("Front"));
334	711	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	712	+// compositeItem = menu.add(new MenuItem("Composite"));
	713	+// compositeItem.addActionListener(this);
	714	+
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
	718	+ if (Globals.ADVANCED)
	719	+ {
337	720	hideItem = menu.add(new MenuItem("Hidden Group"));
338	721	hideItem.addActionListener(this);
339		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ }
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340	724	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
	730	+
	731	+// menu.add("-");
	732	+//
	733	+// switchItem = menu.add(new MenuItem("Switch node"));
	734	+// switchItem.addActionListener(this);
	735	+ if (Globals.ADVANCED)
	736	+ {
344	737	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	738	switchGeoItem.addActionListener(this);
346	739	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +741,6 @@
348	741	morphItem = menu.add(new MenuItem("Morph Group"));
349	742	morphItem.addActionListener(this);
350	743
351		- if (Globals.ADVANCED)
352		- {
353	744	menu.add("-");
354	745	physicsItem = menu.add(new MenuItem("Physics"));
355	746	physicsItem.addActionListener(this);
..	..	@@ -357,13 +748,11 @@
357	748	frameselectorItem.addActionListener(this);
358	749	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	750	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	751	}
363	752
364	753	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	754	+// textureItem = menu.add(new MenuItem("Texture"));
	755	+// textureItem.addActionListener(this);
367	756	billboardItem = menu.add(new MenuItem("Billboard"));
368	757	billboardItem.addActionListener(this);
369	758	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +763,14 @@
374	763	shadowYItem.addActionListener(this);
375	764	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	765	shadowZItem.addActionListener(this);
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
	768	+
377	769	if (Globals.ADVANCED)
378	770	{
379	771	menu.add("-");
380	772	linkerItem = menu.add(new MenuItem("Linker"));
381	773	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	774	templateItem = menu.add(new MenuItem("Template"));
385	775	templateItem.addActionListener(this);
386	776	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +799,7 @@
409	799	genNormalsMESHItem.addActionListener(this);
410	800	if (Globals.ADVANCED)
411	801	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	803	genNormalsMINEItem.addActionListener(this);
414	804	}
415	805	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -502,10 +892,15 @@
502	892	attachBumpItem.addActionListener(this);
503	893	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	894	pigmentBumpItem.addActionListener(this);
	895	+ //embedTexturesItem
505	896	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	897	detachPigmentItem.addActionListener(this);
507	898	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	899	detachBumpItem.addActionListener(this);
	900	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	901	+ embedTexturesItem.addActionListener(this);
	902	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	903	+ deEmbedTexturesItem.addActionListener(this);
509	904	menu.add("-");
510	905	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	906	sortbysizeItem.addActionListener(this);
..	..	@@ -516,6 +911,9 @@
516	911	shareGeometriesItem.addActionListener(this);
517	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
519	917	if (Globals.ADVANCED)
520	918	{
521	919	// Pretty much the same as duplicate and clone.
..	..	@@ -532,6 +930,75 @@
532	930	buildToolsMenu(menu);
533	931	}
534	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
	1001	+
535	1002	void SetupUI2(ObjEditor oe)
536	1003	{
537	1004	// June 2019
..	..	@@ -549,11 +1016,6 @@
549	1016	//new Exception().printStackTrace();
550	1017
551	1018	oe.radioPanel = new JPanel(new GridBagLayout());
552		- oe.aConstraints.weightx = 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
555		- oe.aConstraints.gridwidth = 100;
556		- oe.aConstraints.gridheight = 1;
557	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
558	1020
559	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -574,51 +1036,122 @@
574	1036	oe.radioPanel.add(dummyButton);
575	1037	oe.buttonGroup.add(dummyButton);
576	1038	*/
	1039	+ cGridBag copyOptionsPanel = new cGridBag();
	1040	+
	1041	+ copyOptionsPanel.preferredHeight = 2;
	1042	+
577	1043	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	1044
579	1045	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1046	//minButton.setToolTipText("Minimize window");
581	1047	//minButton.addActionListener(this);
582	1048
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	1049	+ if (Globals.ADVANCED)
	1050	+ {
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
	1054	+ }
586	1055
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
	1094	+
	1095	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	1096	fullButton.setToolTipText("Full-screen window");
589	1097	fullButton.addActionListener(this);
590	1098
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
594		-
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
601		- saveButton.addActionListener(this);
602		-
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
604		- liveCB.setToolTipText("Enable animation");
605		- liveCB.addItemListener(this);
	1099	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ screenfitButton.setToolTipText("Screen fit");
	1101	+ screenfitButton.addActionListener(this);
606	1102
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1105	+ restoreCameraButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
	1119	+
	1120	+ cGridBag updown = new cGridBag().setVertical(true);
	1121	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
	1123	+ restoreButton.addActionListener(this);
	1124	+ //restoreButton.setEnabled(false);
	1125	+
	1126	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
	1128	+ replaceButton.addActionListener(this);
	1129	+ //replaceButton.setEnabled(false);
	1130	+
	1131	+ copyOptionsPanel.add(updown);
	1132	+
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	1139	oneStepButton.setToolTipText("Animate one step forward");
609	1140	oneStepButton.addActionListener(this);
610	1141
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1142	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1143	+ liveCB.setToolTipText("Enable animation");
	1144	+ liveCB.addItemListener(this);
	1145	+
	1146	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	1147	fastCB.setToolTipText("Fast mode");
613	1148	fastCB.addItemListener(this);
614	1149
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	1150	+ //oe.toolboxPanel.Return();
	1151	+
	1152	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1153	+// trackCB.setToolTipText("Enable tracking");
	1154	+// trackCB.addItemListener(this);
622	1155
623	1156	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	1157	// screenfitpointButton.addActionListener(this);
..	..	@@ -628,63 +1161,135 @@
628	1161	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	1162	snapobjectButton.addActionListener(this);
630	1163	snapobjectButton.setToolTipText("Snap Object");
	1164	+
	1165	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ fourButton.addActionListener(this);
	1167	+ fourButton.setToolTipText("Show control panel only");
631	1168	}
632	1169
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	1170	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	1171
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638		-
639		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640		- twoButton.setToolTipText("Show center view only");
641		- twoButton.addActionListener(this);
642		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- fourButton.addActionListener(this);
644		- fourButton.setToolTipText("Show left panel only");
645		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
647		- sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
650		- threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
654		- //
655	1172
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	1173	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ rootButton.setToolTipText("Open selection in new tab");
658	1175	rootButton.addActionListener(this);
659	1176
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	1178	closeButton.setToolTipText("Close tab");
662	1179	closeButton.addActionListener(this);
663	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1181	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1182	+
	1183	+ cGridBag row1 = new cGridBag();
	1184	+
	1185	+ // INSERT
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
	1188	+ gridButton.addActionListener(this);
	1189	+
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ boxButton.setToolTipText("Create box");
	1192	+ boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
	1198	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ sphereButton.setToolTipText("Create sphere");
	1200	+ sphereButton.addActionListener(this);
	1201	+
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ coneButton.setToolTipText("Create cone");
	1204	+ coneButton.addActionListener(this);
	1205	+
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ torusButton.setToolTipText("Create torus");
	1208	+ torusButton.addActionListener(this);
	1209	+
	1210	+ if (Globals.ADVANCED)
	1211	+ {
	1212	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ kleinButton.setToolTipText("Create Klein bottle");
	1214	+ kleinButton.addActionListener(this);
	1215	+ }
	1216	+
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ particlesButton.setToolTipText("Create particle system");
	1219	+ particlesButton.addActionListener(this);
	1220	+
	1221	+ oe.toolboxPanel.add(row1);
	1222	+
	1223	+ cGridBag row2 = new cGridBag();
	1224	+
	1225	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ groupButton.setToolTipText("Create group");
	1227	+ groupButton.addActionListener(this);
	1228	+
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ compositeButton.setToolTipText("Create composite");
	1231	+ compositeButton.addActionListener(this);
	1232	+
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ switchButton.setToolTipText("Create item switcher");
	1235	+ switchButton.addActionListener(this);
	1236	+
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ loopButton.setToolTipText("Create loop");
	1239	+ loopButton.addActionListener(this);
	1240	+
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ textureButton.setToolTipText("Create texture");
	1243	+ textureButton.addActionListener(this);
	1244	+
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ overlayButton.setToolTipText("Create overlay");
	1247	+ overlayButton.addActionListener(this);
	1248	+
	1249	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ lightButton.setToolTipText("Create light");
	1251	+ lightButton.addActionListener(this);
	1252	+
	1253	+ oe.toolboxPanel.add(row2);
	1254	+
	1255	+ cGridBag textures = new cGridBag();
	1256	+
	1257	+ CreateTexturePanel(textures);
	1258	+
	1259	+ oe.toolboxPanel.add(textures);
	1260	+
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
	1264	+
	1265	+ // EDIT panel
	1266	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ editButton.setToolTipText("Pin selection controls");
668	1268	editButton.addActionListener(this);
669	1269
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1270	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
672	1272	uneditButton.addActionListener(this);
673	1273
674	1274	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1275	+ allParamsButton.setToolTipText("Show all controls");
676	1276	allParamsButton.addActionListener(this);
677	1277
678		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- clearPanelButton.setToolTipText("Clear edit panel");
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
680	1280	clearPanelButton.addActionListener(this);
681	1281
682		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683		- unselectButton.setToolTipText("Unselect");
684		- unselectButton.addActionListener(this);
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
685	1285
	1286	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ flashSelectionButton.setToolTipText("Highlight selection");
	1288	+ flashSelectionButton.addActionListener(this);
	1289	+
686	1290	editCommandsPanel.preferredHeight = 1;
687	1291
	1292	+ SetPinStates(false);
688	1293	// oe.treePanel.add(commandsPanel);
689	1294	// oe.treePanel.Return();
690	1295
..	..	@@ -703,32 +1308,20 @@
703	1308
704	1309	JScrollPane jSP;
705	1310	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1311	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1312	ResetModel();
708	1313
709	1314	oe.treePanel.add(jSPPanel);
710	1315	oe.treePanel.Return();
711	1316
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	1317	oe.treePanel.add(copyOptionsPanel);
728	1318	oe.treePanel.Return();
	1319	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1320	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1321	+ sliderPane.preferredHeight = 1;
729	1322
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
732	1325
733	1326	//jList.addListSelectionListener(this);
734	1327	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1329,7 @@
736	1329	//jTree.setEditable(true);
737	1330	oe.jTree.setDragEnabled(true);
738	1331	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1333
741	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1335
..	..	@@ -748,29 +1341,49 @@
748	1341	dgr.addDragGestureListener(this);
749	1342	}catch(Exception e) {}
750	1343	*/
751		- radio.layout = sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
752	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1346	}
754	1347
755	1348	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1349	{
	1350	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1351	+ colorCB.setToolTipText("Copy color when dropped");
	1352	+ colorCB.addItemListener(this);
	1353	+
	1354	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1355	+ materialCB.setToolTipText("Copy material when dropped");
	1356	+ materialCB.addItemListener(this);
	1357	+
	1358	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1359	+ textureCB.setToolTipText("Copy texture when dropped");
	1360	+ textureCB.addItemListener(this);
	1361	+
	1362	+ panel.Return();
	1363	+
757	1364	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1365	boxCB.setToolTipText("Display bounding boxes");
759	1366	boxCB.addItemListener(this);
760	1367
761	1368	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1369	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1370	zoomBoxCB.addItemListener(this);
764	1371
765	1372	if (true) // Globals.ADVANCED)
766	1373	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1374	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1375	+// supportCB.setToolTipText("Enable rigging");
	1376	+// supportCB.addItemListener(this);
	1377	+
	1378	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1379	+ freezeCB.setToolTipText("Fast moving camera");
	1380	+ freezeCB.addItemListener(this);
770	1381
771	1382	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1383	// localCB.addItemListener(this);
773	1384
	1385	+ panel.Return();
	1386	+
774	1387	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1388	crowdCB.setToolTipText("Used for crowds");
776	1389	crowdCB.addItemListener(this);
..	..	@@ -779,14 +1392,19 @@
779	1392	smoothCB.setToolTipText("Snapping delay");
780	1393	smoothCB.addItemListener(this);
781	1394
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- slowCB.addItemListener(this);
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
785	1401
786	1402	// constraints.gridy += 1;
787	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1404	// speakerMocapCB.addItemListener(this);
789	1405
	1406	+ panel.Return();
	1407	+
790	1408	if (false)
791	1409	{
792	1410	// handled in scripts
..	..	@@ -801,34 +1419,82 @@
801	1419	//constraints.gridy += 1;
802	1420	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1421	smoothfocusCB.addItemListener(this);
	1422	+ panel.Return();
804	1423	}
805	1424
806	1425	//constraints.gridx += 1;
807	1426	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1427	// debugCB.addItemListener(this);
809	1428
	1429	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1430	+ trackCB.setToolTipText("Enable tracking target");
	1431	+ trackCB.addItemListener(this);
	1432	+
810	1433	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1434	+ oeilCB.setToolTipText("Move camera when tracking");
811	1435	oeilCB.addItemListener(this);
812	1436
	1437	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1438	+ shadowCB.setToolTipText("When live compute shadows");
	1439	+ shadowCB.addItemListener(this);
	1440	+
	1441	+ panel.Return();
	1442	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1443	+ toggleTextureCB.setToolTipText("Load textures");
	1444	+ toggleTextureCB.addItemListener(this);
	1445	+
	1446	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1447	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1448	+ toggleSwitchCB.addItemListener(this);
	1449	+
	1450	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1451	+ autokeepCB.setToolTipText("On structure change");
	1452	+ autokeepCB.addItemListener(this);
	1453	+
	1454	+ panel.Return();
	1455	+ if (Globals.ADVANCED)
	1456	+ {
813	1457	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	1458	lookAtCB.setToolTipText("Look-at target");
815	1459	lookAtCB.addItemListener(this);
	1460	+ }
816	1461
817	1462	}
818	1463
819	1464	cGridBag fill = new cGridBag();
820		-
821	1465	fill.preferredHeight = 200;
	1466	+ cGridBag fill2 = new cGridBag();
	1467	+ fill2.preferredHeight = 200;
	1468	+ cGridBag fill3 = new cGridBag();
	1469	+ fill3.preferredHeight = 200;
822	1470
823	1471	panel.add(fill);
	1472	+ panel.add(fill2);
	1473	+ panel.add(fill3);
824	1474
825	1475	}
826	1476
827	1477	void EditObject(Object3D obj)
828	1478	{
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
829	1487	cRadio radioButton = new cRadio(obj.name);
	1488	+
	1489	+ // June 2019. Patch to avoid bug with transparency.
	1490	+ radioButton.hadMaterial = obj.material != null;
	1491	+ if (!radioButton.hadMaterial)
	1492	+ {
	1493	+ obj.material = new cMaterial();
	1494	+ }
	1495	+
830	1496	radioButton.SetObject(obj);
831		- radioButton.layout = sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
832	1498	radioButton.SetCamera(cameraView.renderCamera, false);
833	1499	radioButton.addActionListener(this);
834	1500	radioPanel.add(radioButton);
..	..	@@ -842,29 +1508,37 @@
842	1508
843	1509	oe.SetupViews();
844	1510
	1511	+ if (Globals.DEBUG)
845	1512	System.out.println("SetupViews");
846	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
847	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
848	1515	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1516	}
850	1517
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	1518	+ cToggleButton liveCB;
	1519	+ cCheckBox supportCB;
	1520	+ cCheckBox localCB;
	1521	+ cCheckBox crowdCB;
	1522	+ cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
	1525	+ cToggleButton fastCB;
	1526	+ cCheckBox slowCB;
	1527	+ cCheckBox boxCB;
	1528	+ cCheckBox zoomBoxCB;
	1529	+ cCheckBox freezeCB;
	1530	+ //cToggleButton trackCB;
	1531	+ cCheckBox trackCB;
	1532	+ cCheckBox smoothfocusCB;
862	1533	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1534	+ cCheckBox speakerCameraCB;
	1535	+ cCheckBox speakerFocusCB;
	1536	+ cCheckBox debugCB;
	1537	+
	1538	+ cCheckBox oeilCB;
	1539	+ cCheckBox shadowCB;
	1540	+ cCheckBox autokeepCB;
	1541	+ cCheckBox lookAtCB;
868	1542
869	1543	// static int COLOR = 1;
870	1544	// static int MATERIAL = 2;
..	..	@@ -872,9 +1546,9 @@
872	1546
873	1547	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1548
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1549	+ cCheckBox colorCB;
	1550	+ cCheckBox materialCB;
	1551	+ cCheckBox textureCB;
878	1552
879	1553	public void itemStateChanged(ItemEvent e)
880	1554	{
..	..	@@ -918,6 +1592,12 @@
918	1592	{
919	1593	cameraView.ToggleInertia();
920	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
921	1601	}
922	1602	else if(e.getSource() == localCB)
923	1603	{
..	..	@@ -967,6 +1647,18 @@
967	1647	{
968	1648	cameraView.ToggleOeil();
969	1649	}
	1650	+ else if(e.getSource() == shadowCB)
	1651	+ {
	1652	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1653	+ }
	1654	+ else if(e.getSource() == freezeCB)
	1655	+ {
	1656	+ Globals.FREEZEONMOVE ^= true;
	1657	+ }
	1658	+ else if(e.getSource() == autokeepCB)
	1659	+ {
	1660	+ Globals.REPLACEONMAKE ^= true;
	1661	+ }
970	1662	else if(e.getSource() == lookAtCB)
971	1663	{
972	1664	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1675,8 @@
983	1675
984	1676	/**/
985	1677	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1678	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1679	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1680	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1681	// We can't move the root node or an empty selection
989	1682	return;
..	..	@@ -1046,8 +1739,6 @@
1046	1739	}
1047	1740	}
1048	1741
1049		- String string = (String) object;
1050		-
1051	1742	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1743	// if( object instanceof java.io.File[])
1053	1744	// {
..	..	@@ -1055,6 +1746,8 @@
1055	1746	// objEditor.DropFile((java.io.File[]) object, true);
1056	1747	// return;
1057	1748	// }
	1749	+
	1750	+ String string = object.toString();
1058	1751
1059	1752	// File path for Mac and Windows
1060	1753	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1793,33 @@
1100	1793
1101	1794	assert target == objEditor.jTree;
1102	1795	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1796	+ Object3D destinationLeaf;
1103	1797	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1798	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1799	} catch (Exception e) {
1106	1800	System.out.println("destinationPath : " + destinationPath);
1107	1801	return;
1108	1802	}
1109	1803
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1804	+ for (int i=group.selection.size(); --i>=0;)
1111	1805	{
	1806	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1807	+
	1808	+ // Cannot move into itself
	1809	+ if (child == destinationLeaf)
	1810	+ return;
	1811	+ }
	1812	+
	1813	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+// {
1112	1815	loadClipboard(true);
1113	1816	objEditor.jTree.setSelectionPath(destinationPath);
1114	1817	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1818	+// } else {
	1819	+// loadClipboard(false);
	1820	+// objEditor.jTree.setSelectionPath(destinationPath);
	1821	+// pasteInto(false, false); // true); // ???
	1822	+// }
1120	1823	}
1121	1824	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1825	// Called if the user has modified the current drop gesture
..	..	@@ -1172,7 +1875,12 @@
1172	1875	TreePath path;
1173	1876
1174	1877	public TransferableTreePath(TreePath tp) {
1175		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
1176	1884	}
1177	1885
1178	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1221,22 +1929,30 @@
1221	1929	{
1222	1930	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1931	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1932	+// gridItem = menu.add(new MenuItem("Grid"));
	1933	+// gridItem.addActionListener(this);
	1934	+// rectoidItem = menu.add(new MenuItem("Box"));
	1935	+// rectoidItem.addActionListener(this);
	1936	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1937	+// ellipsoidItem.addActionListener(this);
	1938	+// coneItem = menu.add(new MenuItem("Cone"));
	1939	+// coneItem.addActionListener(this);
	1940	+// torusItem = menu.add(new MenuItem("Torus"));
	1941	+// torusItem.addActionListener(this);
	1942	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1943	+// superItem.addActionListener(this);
	1944	+
	1945	+ cameraItem = menu.add(new MenuItem("Camera"));
	1946	+ cameraItem.addActionListener(this);
	1947	+
	1948	+ if (!Globals.ADVANCED)
	1949	+ {
1236	1950	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1951	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1952	+ }
	1953	+
	1954	+// particleItem = menu.add(new MenuItem("Particle system"));
	1955	+// particleItem.addActionListener(this);
1240	1956	if (Globals.ADVANCED)
1241	1957	{
1242	1958	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1978,15 @@
1262	1978	}
1263	1979	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1980	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1981	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1982	+// overlayItem.addActionListener(this);
	1983	+// lightItem = menu.add(new MenuItem("Light"));
	1984	+// lightItem.addActionListener(this);
1269	1985	menu.add("-");
1270	1986	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1987	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1988	+// loopItem = menu.add(new MenuItem("Loop"));
	1989	+// loopItem.addActionListener(this);
1274	1990	doubleItem = menu.add(new MenuItem("Fork"));
1275	1991	doubleItem.addActionListener(this);
1276	1992	if (Globals.ADVANCED)
..	..	@@ -1286,6 +2002,9 @@
1286	2002	animationItem.addItemListener(this);
1287	2003	animationItem.setState(Globals.ANIMATION);
1288	2004
	2005	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2006	+ archiveItem.addActionListener(this);
	2007	+
1289	2008	menu.add("-");
1290	2009	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	2010	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +2017,8 @@
1298	2017	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	2018	reduce34MorphItem.addActionListener(this);
1300	2019	menu.add("-");
	2020	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2021	+ memoryItem.addActionListener(this);
1301	2022	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	2023	computeAOItem.addActionListener(this);
1303	2024
..	..	@@ -1306,8 +2027,6 @@
1306	2027	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	2028	mirrorItem.addActionListener(this);
1308	2029	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	2030	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	2031	analyzeItem.addActionListener(this);
1313	2032	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1451,10 +2170,38 @@
1451	2170	shadow.material = new cMaterial(obj.material);
1452	2171	shadow.material.diffuse = 0.0001f;
1453	2172	shadow.material.specular = 0.0001f;
1454		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1455	2178
1456	2179	makeSomething(shadow);
1457	2180	}
	2181	+
	2182	+ private void ClearUnpinned()
	2183	+ {
	2184	+ //for (Object3D obj : listUI)
	2185	+ for (int i=listUI.size(); --i>=0;)
	2186	+ {
	2187	+ Object3D obj = listUI.elementAt(i);
	2188	+ if (!obj.pinned)
	2189	+ {
	2190	+ obj.CloseUI();
	2191	+ listUI.remove(i);
	2192	+ }
	2193	+ }
	2194	+ }
	2195	+
	2196	+ private void EditElement(Object3D elem, boolean newWindow)
	2197	+ {
	2198	+ // if (!(elem instanceof Composite))
	2199	+ // newWindow = false;
	2200	+ listUI.add(elem);
	2201	+ elem.openEditWindow(this, newWindow); //, false);
	2202	+ System.out.println("edit : " + elem);
	2203	+ elem.editWindow.refreshContents(true); // ? new
	2204	+ }
1458	2205
1459	2206	/**
1460	2207	* applyExample
..	..	@@ -1699,7 +2446,7 @@
1699	2446	{
1700	2447	ScreenFit();
1701	2448	} else
1702		- if (source == switchItem)
	2449	+ if (source == switchViewItem)
1703	2450	{
1704	2451	cVector v1 = new cVector();
1705	2452	cVector v2 = new cVector();
..	..	@@ -1708,11 +2455,11 @@
1708	2455	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	2456	objEditor.cameraView.repaint();
1710	2457	} else
1711		- if (source == rectoidItem)
	2458	+ if (source == rectoidItem \|\| source == boxButton)
1712	2459	{
1713	2460	makeSomething(new Box());
1714	2461	} else
1715		- if (source == particleItem)
	2462	+ if (source == particleItem \|\| source == particlesButton)
1716	2463	{
1717	2464	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	2465	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2538,27 @@
1791	2538
1792	2539	makeSomething(obj);
1793	2540	} else
1794		- if (source == gridItem)
	2541	+ if (source == gridItem \|\| source == gridButton)
1795	2542	{
1796	2543	makeSomething(new Grid());
1797	2544	} else
1798		- if (source == ellipsoidItem)
	2545	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2546	{
1800	2547	makeSomething(new Sphere());
1801	2548	} else
1802		- if (source == coneItem)
	2549	+ if (source == coneItem \|\| source == coneButton)
1803	2550	{
1804	2551	makeSomething(new Cone());
1805	2552	} else
1806		- if (source == torusItem)
	2553	+ if (source == torusItem \|\| source == torusButton)
1807	2554	{
1808	2555	makeSomething(new Torus());
1809	2556	} else
1810		- if (source == superItem)
	2557	+ if (source == superItem \|\| source == superButton)
1811	2558	{
1812	2559	makeSomething(new Superellipsoid());
1813	2560	} else
1814		- if (source == kleinItem)
	2561	+ if (source == kleinItem \|\| source == kleinButton)
1815	2562	{
1816	2563	makeSomething(new Klein());
1817	2564	} else
..	..	@@ -1831,7 +2578,7 @@
1831	2578	{
1832	2579	makeSomething(new BezierSurface());
1833	2580	} else
1834		- if (source == overlayItem)
	2581	+ if (source == overlayItem \|\| source == overlayButton)
1835	2582	{
1836	2583	/*
1837	2584	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,10 +2626,27 @@
1879	2626	s.setup();
1880	2627	makeSomething(s);
1881	2628	} else
1882		- if (source == lightItem)
	2629	+ if (source == lightItem \|\| source == lightButton)
1883	2630	{
1884	2631	makeSomething(new Light());
1885	2632	} else
	2633	+// if (source == skybox1Button \|\|
	2634	+// source == skybox2Button \|\|
	2635	+// source == skybox3Button \|\|
	2636	+// source == skybox4Button \|\|
	2637	+// source == skybox5Button \|\|
	2638	+// source == skybox6Button \|\|
	2639	+// source == skybox7Button \|\|
	2640	+// source == skybox11Button \|\|
	2641	+// source == skybox12Button \|\|
	2642	+// source == skybox13Button \|\|
	2643	+// source == skybox14Button \|\|
	2644	+// source == skybox15Button \|\|
	2645	+// source == skybox16Button \|\|
	2646	+// source == skybox17Button)
	2647	+// {
	2648	+// ChangeSkybox(source);
	2649	+// } else
1886	2650	if (source == csgItem)
1887	2651	{
1888	2652	group(new CSG());
..	..	@@ -1929,30 +2693,38 @@
1929	2693
1930	2694	group(g);
1931	2695	} else
1932		- if (source == loopItem)
	2696	+ if (source == loopItem \|\| source == loopButton)
1933	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
1934	2700	Composite csg = new GroupLeaf();
1935	2701	csg.count = 5;
1936		- group(csg);
1937		- Composite child = new cGroup();
	2702	+ Composite child = new cGroup("Branch");
1938	2703	csg.addChild(child);
1939	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
1940	2707	} else
1941	2708	if (source == doubleItem)
1942	2709	{
1943		- Composite csg = new GroupLeaf();
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
	2712	+ Composite csg = new GroupLeaf("Fork");
1944	2713	csg.count = 5;
	2714	+ Composite child = new cGroup("Branch A");
	2715	+ csg.addChild(child);
	2716	+ child.addChild(csg);
	2717	+ child = new cGroup("Branch B");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
1945	2720	group(csg);
1946		- Composite child = new cGroup();
1947		- csg.addChild(child);
1948		- child.addChild(csg);
1949		- child = new cGroup();
1950		- csg.addChild(child);
1951		- child.addChild(csg);
	2721	+ }
1952	2722	} else
1953	2723	if (source == tripleItem)
1954	2724	{
1955		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Trident");
1956	2728	csg.count = 4;
1957	2729	group(csg);
1958	2730	Composite child = new cGroup();
..	..	@@ -1964,11 +2736,12 @@
1964	2736	child = new cGroup();
1965	2737	csg.addChild(child);
1966	2738	child.addChild(csg);
	2739	+ }
1967	2740	} else
1968	2741	if (source == computeAOItem)
1969	2742	{
1970	2743	Globals.drawMode = CameraPane.OCCLUSION;
1971		- Globals.theRenderer.repaint();
	2744	+ cameraView.repaint();
1972	2745	} else
1973	2746	if (source == recompileItem)
1974	2747	{
..	..	@@ -1983,7 +2756,7 @@
1983	2756	if (source == invariantsItem)
1984	2757	{
1985	2758	System.out.println("Invariants:");
1986		- Grafreed.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
1987	2760	} else
1988	2761	if (source == memoryItem)
1989	2762	{
..	..	@@ -2014,17 +2787,52 @@
2014	2787	{
2015	2788	ToggleFullScreen();
2016	2789	} else
2017		- if (source == undoButton)
	2790	+ if (source == collapseButton)
2018	2791	{
2019		- Undo();
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
2020	2794	} else
2021		- if (source == redoButton)
	2795	+ if (source == maximize3DButton)
2022	2796	{
2023		- Redo();
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
2024	2801	} else
2025		- if (source == saveButton)
	2802	+ if (source == previousVersionButton)
2026	2803	{
2027		- Save();
	2804	+ // Go to previous version
	2805	+ //if (!Undo())
	2806	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ PreviousVersion();
	2808	+ } else
	2809	+ if (source == restoreButton)
	2810	+ {
	2811	+ // Restore current version
	2812	+ Restore();
	2813	+ //restoreButton.setEnabled(false);
	2814	+ } else
	2815	+ if (source == replaceButton)
	2816	+ {
	2817	+ // Overwrite current version
	2818	+ Replace();
	2819	+ //replaceButton.setEnabled(false);
	2820	+ } else
	2821	+ if (source == nextVersionButton)
	2822	+ {
	2823	+ // Go to next version
	2824	+ NextVersion();
	2825	+ } else
	2826	+ if (source == saveVersionButton)
	2827	+ {
	2828	+ // Save a new version
	2829	+ if (!Save(true))
	2830	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
2028	2836	} else
2029	2837	if (source == oneStepButton)
2030	2838	{
..	..	@@ -2033,17 +2841,14 @@
2033	2841	} else
2034	2842	if (source == screenfitButton)
2035	2843	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2844	ScreenFit();
2038	2845	} else
2039	2846	if (source == screenfitpointButton)
2040	2847	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2848	ScreenFitPoint();
2043	2849	} else
2044	2850	if (source == snapobjectButton)
2045	2851	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2852	SnapObject();
2048	2853	} else
2049	2854	// if (event.getSource() == recompileButton)
..	..	@@ -2082,11 +2887,11 @@
2082	2887	} else
2083	2888	if (source == undoItem)
2084	2889	{
2085		- Undo();
	2890	+ PreviousVersion();
2086	2891	} else
2087	2892	if (source == redoItem)
2088	2893	{
2089		- Redo();
	2894	+ NextVersion();
2090	2895	} else
2091	2896	if (source == duplicateItem)
2092	2897	{
..	..	@@ -2407,7 +3212,7 @@
2407	3212	{
2408	3213	StepAll();
2409	3214	} else
2410		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3215	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2411	3216	{
2412	3217	//int indices[] = jList.getSelectedIndices();
2413	3218	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2419,9 +3224,9 @@
2419	3224	{
2420	3225	ClearSelection(true);
2421	3226	} else
2422		- if (source == grabItem)
	3227	+ if (source == grabItem \|\| source == groupButton)
2423	3228	{
2424		- group(new cGroup(), true);
	3229	+ group(new cGroup(), false); // true);
2425	3230	} else
2426	3231	if (source == hideItem)
2427	3232	{
..	..	@@ -2439,11 +3244,11 @@
2439	3244	{
2440	3245	makeSomething(new Camera());
2441	3246	} else
2442		- if (source == compositeItem)
	3247	+ if (source == compositeItem \|\| source == compositeButton)
2443	3248	{
2444	3249	group(new Composite());
2445	3250	} else
2446		- if (source == randomItem)
	3251	+ if (source == switchItem \|\| source == switchButton)
2447	3252	{
2448	3253	RandomNode random = new RandomNode();
2449	3254	group(random);
..	..	@@ -2545,7 +3350,7 @@
2545	3350	{
2546	3351	group(new cLinker());
2547	3352	} else
2548		- if (source == textureItem)
	3353	+ if (source == textureItem \|\| source == textureButton)
2549	3354	{
2550	3355	group(new TextureNode());
2551	3356	} else
..	..	@@ -2565,17 +3370,42 @@
2565	3370	{
2566	3371	CastShadow(2);
2567	3372	} else
2568		- if (source == ungroupItem)
	3373	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	3374	{
2570		- //ungroup();
	3375	+ boolean canUngroup = true;
	3376	+
2571	3377	for (int i=0; i<group.selection.size(); i++)
2572	3378	{
2573		- Ungroup(group.selection.get(i));
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
	3382	+ {
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
2574	3394	}
2575	3395
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	3396	+ if (canUngroup)
	3397	+ {
	3398	+ for (int i=0; i<group.selection.size(); i++)
	3399	+ {
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
	3403	+ }
	3404	+
	3405	+ ClearSelection(false);
	3406	+
	3407	+ refreshContents();
	3408	+ }
2579	3409	} else
2580	3410	if (source == genUVItem)
2581	3411	{
..	..	@@ -2876,7 +3706,7 @@
2876	3706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2877	3707	{
2878	3708	obj = (Object3D)e.nextElement();
2879		- obj.SetBumpTexture(null);
	3709	+ obj.ResetBumpTexture();
2880	3710	}
2881	3711
2882	3712	refreshContents();
..	..	@@ -2892,6 +3722,31 @@
2892	3722
2893	3723	refreshContents();
2894	3724	} else
	3725	+ if (source == embedTexturesItem)
	3726	+ {
	3727	+ Object3D obj;
	3728	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3729	+ {
	3730	+ obj = (Object3D)e.nextElement();
	3731	+ obj.EmbedTextures(true);
	3732	+ }
	3733	+
	3734	+ refreshContents();
	3735	+ } else
	3736	+ if (source == deEmbedTexturesItem)
	3737	+ {
	3738	+ Object3D obj;
	3739	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3740	+ {
	3741	+ obj = (Object3D)e.nextElement();
	3742	+ obj.EmbedTextures(false);
	3743	+ }
	3744	+
	3745	+ CameraPane.texturepigment.clear();
	3746	+ CameraPane.texturebump.clear();
	3747	+
	3748	+ refreshContents();
	3749	+ } else
2895	3750	if (source == flashSelectionButton)
2896	3751	{
2897	3752	CameraPane.flash = true;
..	..	@@ -2903,38 +3758,11 @@
2903	3758	if (source == twoButton)
2904	3759	{
2905	3760	radio.layout = twoButton;
2906		- // bug
2907		- //gridPanel.setDividerLocation(1.0);
2908		- //bigPanel.setDividerLocation(0.0);
2909		-// bigThree.remove(scenePanel);
2910		-// bigThree.remove(centralPanel);
2911		-// bigThree.remove(XYZPanel);
2912		-// aWindowConstraints.gridx = 0;
2913		-// aWindowConstraints.gridy = 0;
2914		-// aWindowConstraints.gridwidth = 1;
2915		-// // aConstraints.gridheight = 3;
2916		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2917		-// aWindowConstraints.weightx = 0;
2918		-// aWindowConstraints.weighty = 1;
2919		-// //bigThree.add(jtp, aWindowConstraints);
2920		-// aWindowConstraints.weightx = 1;
2921		-// aWindowConstraints.gridwidth = 3;
2922		-// // aConstraints.gridheight = 3;
2923		-// aWindowConstraints.gridx = 1;
2924		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2925		-// bigThree.add(centralPanel, aWindowConstraints);
2926		-// aWindowConstraints.weightx = 0;
2927		-// aWindowConstraints.gridx = 4;
2928		-// aWindowConstraints.gridwidth = 1;
2929		-// // aConstraints.gridheight = 3;
2930		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2931		-// //bigThree.add(XYZPanel, aWindowConstraints);
2932		-// scenePanel.setVisible(false);
2933		-// centralPanel.setVisible(true);
2934		-// XYZPanel.setVisible(false);
2935		- bigThree.ClearUI();
2936		- bigThree.add(centralPanel);
2937		- bigThree.FlushUI();
	3761	+
	3762	+ if (CameraPane.FULLSCREEN)
	3763	+ fullscreenLayout = radio.layout;
	3764	+
	3765	+ Show3DView();
2938	3766
2939	3767	cameraView.requestFocusInWindow();
2940	3768
..	..	@@ -2957,6 +3785,9 @@
2957	3785	if (source == threeButton)
2958	3786	{
2959	3787	radio.layout = threeButton;
	3788	+
	3789	+ if (CameraPane.FULLSCREEN)
	3790	+ fullscreenLayout = radio.layout;
2960	3791
2961	3792	// bigThree.remove(scenePanel);
2962	3793	// bigThree.remove(centralPanel);
..	..	@@ -2986,8 +3817,8 @@
2986	3817	// centralPanel.setVisible(true);
2987	3818	// XYZPanel.setVisible(true);
2988	3819	bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
2989	3821	bigThree.add(centralPanel);
2990		- bigThree.add(XYZPanel);
2991	3822	bigThree.FlushUI();
2992	3823
2993	3824	cameraView.requestFocusInWindow();
..	..	@@ -2995,6 +3826,9 @@
2995	3826	if (source == fourButton)
2996	3827	{
2997	3828	radio.layout = fourButton;
	3829	+
	3830	+ if (CameraPane.FULLSCREEN)
	3831	+ fullscreenLayout = radio.layout;
2998	3832
2999	3833	// bigThree.remove(scenePanel);
3000	3834	// bigThree.remove(centralPanel);
..	..	@@ -3033,6 +3867,9 @@
3033	3867	{
3034	3868	radio.layout = sixButton;
3035	3869
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
	3872	+
3036	3873	// bigThree.remove(scenePanel);
3037	3874	// bigThree.remove(centralPanel);
3038	3875	// bigThree.remove(XYZPanel);
..	..	@@ -3061,8 +3898,8 @@
3061	3898	// centralPanel.setVisible(true);
3062	3899	// XYZPanel.setVisible(false);
3063	3900	bigThree.ClearUI();
3064		- bigThree.add(scenePanel);
3065	3901	bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
3066	3903	bigThree.FlushUI();
3067	3904
3068	3905	cameraView.requestFocusInWindow();
..	..	@@ -3070,6 +3907,9 @@
3070	3907	if (source == sevenButton)
3071	3908	{
3072	3909	radio.layout = sevenButton;
	3910	+
	3911	+ if (CameraPane.FULLSCREEN)
	3912	+ fullscreenLayout = radio.layout;
3073	3913
3074	3914	// bigThree.remove(scenePanel);
3075	3915	// bigThree.remove(centralPanel);
..	..	@@ -3108,6 +3948,7 @@
3108	3948	} else
3109	3949	if (source == rootButton)
3110	3950	{
	3951	+ Replace();
3111	3952	Object3D obj;
3112	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3113	3954	{
..	..	@@ -3126,12 +3967,19 @@
3126	3967	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3968	{
3128	3969	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3970	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3971	{
	3972	+ // Patch to avoid bug with transparency.
	3973	+ if (!ab.hadMaterial)
	3974	+ {
	3975	+ ab.object.material = null;
	3976	+ }
	3977	+
3131	3978	buttonGroup.remove(ab);
3132	3979	radioPanel.remove(ab);
3133	3980
3134		- ab.GetObject().editWindow = null;
	3981	+ //ab.GetObject().editWindow = null;
	3982	+ ab.GetObject().manipWindow = null;
3135	3983	// ab.GetObject().objectUI = null; // ?????????
3136	3984
3137	3985	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3992,12 @@
3144	3992	} else
3145	3993	if (source == editItem \|\| source == editButton)
3146	3994	{
	3995	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3996	+ {
	3997	+ Object3D child = (Object3D)e.nextElement();
	3998	+ child.pinned = true;
	3999	+ }
	4000	+
3147	4001	EditSelection(false);
3148	4002	} else
3149	4003	if (source == uneditButton)
..	..	@@ -3152,9 +4006,10 @@
3152	4006	{
3153	4007	Object3D child = (Object3D)e.nextElement();
3154	4008	if(child.editWindow != null)
3155		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4009	+ child.pinned = false;
3156	4010	child.CloseUI();
3157	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3158	4013
3159	4014	//child.editWindow = null; // ???????????
3160	4015	}
..	..	@@ -3169,16 +4024,18 @@
3169	4024	//copy.ClearUI();
3170	4025	for (Object3D obj : listUI)
3171	4026	{
	4027	+ obj.pinned = false;
3172	4028	obj.CloseUI();
3173	4029	}
3174	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
3175	4032	refreshContents(true);
3176	4033	} else
3177	4034	if (source == allParamsButton)
3178	4035	{
3179	4036	assert(copy == group);
3180	4037
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4038	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	4039
3183	4040	for (Object3D obj : listUI)
3184	4041	{
..	..	@@ -3227,6 +4084,7 @@
3227	4084	}
3228	4085
3229	4086	copy = group;
	4087	+
3230	4088	//Globals.theRenderer.object = group;
3231	4089	if(!useclient)
3232	4090	{
..	..	@@ -3245,6 +4103,7 @@
3245	4103
3246	4104	// fix "+" issue
3247	4105	//group.editWindow = this;
	4106	+ group.manipWindow = this;
3248	4107
3249	4108	/*
3250	4109	currentLayout = radio.layout;
..	..	@@ -3252,6 +4111,29 @@
3252	4111	currentLayout = sevenButton;
3253	4112	*/
3254	4113	radio.layout.doClick();
	4114	+
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
	4130	+ ClearUnpinned();
	4131	+
	4132	+ //Grafreed.Assert(group != null);
	4133	+ //Grafreed.Assert(group.selection != null);
	4134	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4135	+ if (group.selection == null \|\| group.selection.size() == 1)
	4136	+ EditSelection(false);
3255	4137	keepparent = group.parent;
3256	4138	// PARENT = NULL or not???
3257	4139	//group.parent = null; // ROOT
..	..	@@ -3263,11 +4145,13 @@
3263	4145	} else if (event.getSource() == editCameraItem)
3264	4146	{
3265	4147	cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
3266	4149	cameraView.repaint();
3267	4150	return;
3268		- } else if (event.getSource() == revertCameraItem)
	4151	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	4152	{
3270	4153	cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
3271	4155	cameraView.repaint();
3272	4156	return;
3273	4157	// } else if (event.getSource() == textureButton)
..	..	@@ -3844,7 +4728,7 @@
3844	4728
3845	4729	try
3846	4730	{
3847		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4731	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3848	4732	}
3849	4733	catch (Exception e)
3850	4734	{
..	..	@@ -4319,28 +5203,25 @@
4319	5203	// }
4320	5204	// }
4321	5205
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	5206	void EditSelection(boolean newWindow)
4327	5207	{
	5208	+ if (group.selection == null)
	5209	+ {
	5210	+ EditElement(group, newWindow); // ? new
	5211	+ return;
	5212	+ }
	5213	+
4328	5214	// aConstraints.gridy = 0;
4329	5215	for (int i=0; i<group.selection.size(); i++)
4330	5216	{
4331	5217	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	5218	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5219	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	5220
4335	5221	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	5222	if(elem != group \|\| !newWindow)
4337	5223	{
4338		- // if (!(elem instanceof Composite))
4339		- // newWindow = false;
4340		- listUI.add(elem);
4341		- elem.openEditWindow(this, newWindow); //, false);
4342		- System.out.println("edit : " + elem);
4343		- elem.editWindow.refreshContents(true); // ? new
	5224	+ EditElement(elem, newWindow); // ? new
4344	5225	}
4345	5226	}
4346	5227	}
..	..	@@ -4403,9 +5284,7 @@
4403	5284
4404	5285	freezemodel = false;
4405	5286	}
4406		-
4407		- boolean flashIt = true;
4408		-
	5287	+
4409	5288	public void valueChanged(TreeSelectionEvent e)
4410	5289	//public boolean handleEvent(Event event)
4411	5290	{
..	..	@@ -4415,7 +5294,8 @@
4415	5294	//new Exception().printStackTrace();
4416	5295
4417	5296	freezemodel = true;
4418		-
	5297	+ ClearUnpinned();
	5298	+
4419	5299	/**/
4420	5300	//switch (event.id)
4421	5301	{
..	..	@@ -4448,7 +5328,7 @@
4448	5328	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	5329	// a camera
4450	5330	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5331	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	5332	{
4453	5333	CameraPane.camerachangeframe = 0; // don't refuse it
4454	5334	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +5337,13 @@
4457	5337	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	5338	}
4459	5339
	5340	+ if (tps != null && tps.length == 1)
	5341	+ {
	5342	+ EditSelection(false);
	5343	+ }
	5344	+
	5345	+ SetPinStates(tps != null && tps.length > 0);
	5346	+
4460	5347	refreshContents();
4461	5348	//return true;
4462	5349	}
..	..	@@ -4466,9 +5353,35 @@
4466	5353	freezemodel = false;
4467	5354	}
4468	5355
	5356	+ void SetPinStates(boolean enabled)
	5357	+ {
	5358	+ editButton.setEnabled(enabled);
	5359	+ uneditButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
	5361	+ flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
	5379	+ }
	5380	+
4469	5381	void refreshContents(boolean cp)
4470	5382	{
4471		- if (!Globals.MOUSEDRAGGED)
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5384	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	5385	{
4473	5386	objEditor.ClearInfo(); // .GetMaterial());
4474	5387
..	..	@@ -4477,7 +5390,7 @@
4477	5390	Object3D child = (Object3D) group.selection.get(i);
4478	5391
4479	5392	objEditor.AddInfo(child, this, true);
4480		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
4481	5394	}
4482	5395
4483	5396	objEditor.SetText(); // jan 2014
..	..	@@ -4567,7 +5480,8 @@
4567	5480
4568	5481	if (cut)
4569	5482	{
4570		- Save();
	5483	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5484	+// Save();
4571	5485	//int indices[] = jList.getSelectedIndices();
4572	5486	//for (int i = indices.length - 1; i >= 0; i--)
4573	5487	//jList.remove(indices[i]);
..	..	@@ -4670,6 +5584,10 @@
4670	5584
4671	5585	void paste(boolean expand)
4672	5586	{
	5587	+ if (Globals.REPLACEONMAKE)
	5588	+ Save();
	5589	+ boolean keep = Globals.REPLACEONMAKE;
	5590	+ Globals.REPLACEONMAKE = false;
4673	5591	// if (GrafreeD.clipboard == null)
4674	5592	// return;
4675	5593	boolean first = true;
..	..	@@ -4729,6 +5647,7 @@
4729	5647	Grafreed.clipboard.get(0).parent = keepparent;
4730	5648	}
4731	5649
	5650	+ Globals.REPLACEONMAKE = keep;
4732	5651	ResetModel();
4733	5652	refreshContents();
4734	5653	}
..	..	@@ -4864,6 +5783,10 @@
4864	5783
4865	5784	void group(Object3D csg, boolean grab)
4866	5785	{
	5786	+ if (Globals.REPLACEONMAKE)
	5787	+ Save();
	5788	+ boolean keep = Globals.REPLACEONMAKE;
	5789	+ Globals.REPLACEONMAKE = false;
4867	5790	if (//false) // why??
4868	5791	!group.selection.isEmpty())
4869	5792	{
..	..	@@ -4977,10 +5900,15 @@
4977	5900	//node.add(csg);
4978	5901	//makeSomething(node);
4979	5902	makeSomething(csg);
	5903	+ Globals.REPLACEONMAKE = keep;
4980	5904	}
4981	5905
4982	5906	void Ungroup(Object3D g)
4983	5907	{
	5908	+ if (Globals.REPLACEONMAKE)
	5909	+ Save();
	5910	+ boolean keep = Globals.REPLACEONMAKE;
	5911	+ Globals.REPLACEONMAKE = false;
4984	5912	if (g instanceof HiddenObject)
4985	5913	{
4986	5914	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5925,7 @@
4997	5925	objEditor.makeSomething(g.get(i), false);
4998	5926	}
4999	5927	}
	5928	+ Globals.REPLACEONMAKE = keep;
5000	5929	}
5001	5930
5002	5931	void ungroup()
..	..	@@ -5285,13 +6214,43 @@
5285	6214	cButton clearpanelButton;
5286	6215	cButton unselectButton;
5287	6216
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
5293		- cButton saveButton;
	6217	+ cButton restoreCameraButton;
	6218	+
5294	6219	cButton oneStepButton;
	6220	+
	6221	+ cButton groupButton;
	6222	+ cButton ungroupButton;
	6223	+ cButton compositeButton;
	6224	+ cButton switchButton;
	6225	+ cButton loopButton;
	6226	+ cButton textureButton;
	6227	+
	6228	+ cButton skybox1Button;
	6229	+ cButton skybox2Button;
	6230	+ cButton skybox3Button;
	6231	+ cButton skybox4Button;
	6232	+ cButton skybox5Button;
	6233	+ cButton skybox6Button;
	6234	+ cButton skybox7Button;
	6235	+
	6236	+ cButton skybox11Button;
	6237	+ cButton skybox12Button;
	6238	+ cButton skybox13Button;
	6239	+ cButton skybox14Button;
	6240	+ cButton skybox15Button;
	6241	+ cButton skybox16Button;
	6242	+ cButton skybox17Button;
	6243	+
	6244	+ cButton gridButton;
	6245	+ cButton boxButton;
	6246	+ cButton sphereButton;
	6247	+ cButton coneButton;
	6248	+ cButton torusButton;
	6249	+ cButton superButton;
	6250	+ cButton kleinButton;
	6251	+ cButton particlesButton;
	6252	+ cButton overlayButton;
	6253	+ cButton lightButton;
5295	6254
5296	6255	cButton screenfitButton;
5297	6256	cButton screenfitpointButton;
..	..	@@ -5313,12 +6272,12 @@
5313	6272	//JTree jTree;
5314	6273	private MenuItem lookAtItem;
5315	6274	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
5317		- private MenuItem cutItem;
	6275	+ private MenuItem switchViewItem;
	6276	+ private JMenuItem cutItem;
5318	6277	private MenuItem undoItem;
5319	6278	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
5321		- private MenuItem cloneItem;
	6279	+ private JMenuItem duplicateItem;
	6280	+ private JMenuItem cloneItem;
5322	6281	private MenuItem cloneSupportItem;
5323	6282	private MenuItem overwriteGeoItem;
5324	6283	private MenuItem overwriteMatItem;
..	..	@@ -5339,13 +6298,13 @@
5339	6298	private MenuItem cloneGeometriesItem;
5340	6299	private MenuItem shareGeometriesItem;
5341	6300	private MenuItem mergeGeometriesItem;
5342		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
5343	6302	private MenuItem pasteItem;
5344		- private MenuItem pasteIntoItem;
5345		- private MenuItem pasteLinkItem;
5346		- private MenuItem pasteCloneItem;
5347		- private MenuItem pasteExpandItem;
5348		- private MenuItem clearItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
5349	6308	private MenuItem clearAllItem;
5350	6309	private MenuItem genUVItem;
5351	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -5400,12 +6359,12 @@
5400	6359	private MenuItem transformGeometryItem;
5401	6360	private MenuItem transformChildrenItem;
5402	6361	private MenuItem hideItem;
5403		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
5404	6363	private MenuItem backItem;
5405	6364	private MenuItem frontItem;
5406	6365	private MenuItem cameraItem;
5407	6366	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	6367	+ private MenuItem switchItem;
5409	6368	private MenuItem physicsItem;
5410	6369	private MenuItem frameselectorItem;
5411	6370	private MenuItem scriptNodeItem;
..	..	@@ -5413,7 +6372,7 @@
5413	6372	private MenuItem switchTransfoItem;
5414	6373	private MenuItem morphItem;
5415	6374	private MenuItem linkerItem;
5416		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5417	6376	private MenuItem editItem;
5418	6377	private MenuItem openWindowItem;
5419	6378	private MenuItem editLeafItem;
..	..	@@ -5429,6 +6388,8 @@
5429	6388	private MenuItem attachBumpItem;
5430	6389	private MenuItem detachBumpItem;
5431	6390	private MenuItem pigmentBumpItem;
	6391	+ private MenuItem embedTexturesItem;
	6392	+ private MenuItem deEmbedTexturesItem;
5432	6393
5433	6394	private MenuItem particleItem;
5434	6395	private MenuItem ragdollItem;
..	..	@@ -5479,5 +6440,5 @@
5479	6440
5480	6441	Menu cameraMenu;
5481	6442	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	6443	+ MenuItem restoreCameraItem;
5483	6444	}