~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,36 +538,40 @@
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		- menu.add("-");
180	559
181		- menu.add("-");
182		- 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"));
183	563	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	565	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	567	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	569	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
193	575
194	576	if (Globals.ADVANCED)
195	577	{
..	..	@@ -203,23 +585,23 @@
203	585	//zBufferItem.addActionListener(this);
204	586	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	587	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
208	590
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	603
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	605	toggleHandleItem.addItemListener(this);
224	606	toggleHandleItem.setState(CameraPane.HANDLES);
225	607
..	..	@@ -274,15 +656,13 @@
274	656	{
275	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	660	oe.cameraMenu.add("-");
280	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	662	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	663	lookAtItem.addActionListener(this);
284	664	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	665	+ //switchViewItem.addActionListener(this);
286	666	}
287	667
288	668	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +707,29 @@
327	707	}
328	708
329	709	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
332	712	backItem = menu.add(new MenuItem("Back"));
333	713	backItem.addActionListener(this);
334	714	frontItem = menu.add(new MenuItem("Front"));
335	715	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
338	721	hideItem = menu.add(new MenuItem("Hidden Group"));
339	722	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	725	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
345	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	734	switchGeoItem.addActionListener(this);
347	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +737,6 @@
349	737	morphItem = menu.add(new MenuItem("Morph Group"));
350	738	morphItem.addActionListener(this);
351	739
352		- if (Globals.ADVANCED)
353		- {
354	740	menu.add("-");
355	741	physicsItem = menu.add(new MenuItem("Physics"));
356	742	physicsItem.addActionListener(this);
..	..	@@ -358,30 +744,29 @@
358	744	frameselectorItem.addActionListener(this);
359	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	746	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	747	}
364	748
365	749	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
368	752	billboardItem = menu.add(new MenuItem("Billboard"));
369	753	billboardItem.addActionListener(this);
370	754	csgItem = menu.add(new MenuItem("CSG"));
371	755	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	757	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	759	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
378	765	if (Globals.ADVANCED)
379	766	{
380	767	menu.add("-");
381	768	linkerItem = menu.add(new MenuItem("Linker"));
382	769	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	770	templateItem = menu.add(new MenuItem("Template"));
386	771	templateItem.addActionListener(this);
387	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +795,7 @@
410	795	genNormalsMESHItem.addActionListener(this);
411	796	if (Globals.ADVANCED)
412	797	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	799	genNormalsMINEItem.addActionListener(this);
415	800	}
416	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +888,15 @@
503	888	attachBumpItem.addActionListener(this);
504	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
506	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	893	detachPigmentItem.addActionListener(this);
508	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
510	900	menu.add("-");
511	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	902	sortbysizeItem.addActionListener(this);
..	..	@@ -517,6 +907,9 @@
517	907	shareGeometriesItem.addActionListener(this);
518	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
520	913	if (Globals.ADVANCED)
521	914	{
522	915	// Pretty much the same as duplicate and clone.
..	..	@@ -533,6 +926,75 @@
533	926	buildToolsMenu(menu);
534	927	}
535	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
536	998	void SetupUI2(ObjEditor oe)
537	999	{
538	1000	// June 2019
..	..	@@ -550,11 +1012,6 @@
550	1012	//new Exception().printStackTrace();
551	1013
552	1014	oe.radioPanel = new JPanel(new GridBagLayout());
553		- oe.aConstraints.weightx = 1;
554		- oe.aConstraints.weighty = 0;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridwidth = 100;
557		- oe.aConstraints.gridheight = 1;
558	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
559	1016
560	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -575,51 +1032,122 @@
575	1032	oe.radioPanel.add(dummyButton);
576	1033	oe.buttonGroup.add(dummyButton);
577	1034	*/
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
	1038	+
578	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	1040
580	1041	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	1042	//minButton.setToolTipText("Minimize window");
582	1043	//minButton.addActionListener(this);
583	1044
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	1050	+ }
587	1051
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
	1090	+
	1091	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	1092	fullButton.setToolTipText("Full-screen window");
590	1093	fullButton.addActionListener(this);
591	1094
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
595		-
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
602		- saveButton.addActionListener(this);
603		-
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
605		- liveCB.setToolTipText("Enable animation");
606		- liveCB.addItemListener(this);
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
607	1098
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1101	+ restoreCameraButton.addActionListener(this);
	1102	+
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
	1115	+
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
	1121	+
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
	1126	+
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	1135	oneStepButton.setToolTipText("Animate one step forward");
610	1136	oneStepButton.addActionListener(this);
611	1137
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
	1140	+ liveCB.addItemListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	1143	fastCB.setToolTipText("Fast mode");
614	1144	fastCB.addItemListener(this);
615	1145
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- screenfitButton.addActionListener(this);
	1146	+ //oe.toolboxPanel.Return();
	1147	+
	1148	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1149	+// trackCB.setToolTipText("Enable tracking");
	1150	+// trackCB.addItemListener(this);
623	1151
624	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	1153	// screenfitpointButton.addActionListener(this);
..	..	@@ -629,67 +1157,137 @@
629	1157	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1158	snapobjectButton.addActionListener(this);
631	1159	snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ fourButton.addActionListener(this);
	1163	+ fourButton.setToolTipText("Show control panel only");
632	1164	}
633	1165
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	1166	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	1167
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
642		- twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- fourButton.addActionListener(this);
645		- fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- sixButton.setToolTipText("2-column layout left");
648		- sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
651		- threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
655		- //
656	1168
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
659	1171	rootButton.addActionListener(this);
660	1172
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	1174	closeButton.setToolTipText("Close tab");
663	1175	closeButton.addActionListener(this);
664	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	1177	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	1178	+
	1179	+ cGridBag row1 = new cGridBag();
668	1180
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	1181	+ // INSERT
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
	1184	+ gridButton.addActionListener(this);
	1185	+
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ boxButton.setToolTipText("Create box");
	1188	+ boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ sphereButton.setToolTipText("Create sphere");
	1192	+ sphereButton.addActionListener(this);
	1193	+
	1194	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ coneButton.setToolTipText("Create cone");
	1196	+ coneButton.addActionListener(this);
	1197	+
	1198	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ torusButton.setToolTipText("Create torus");
	1200	+ torusButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ if (Globals.ADVANCED)
	1207	+ {
	1208	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ kleinButton.setToolTipText("Create Klein bottle");
	1210	+ kleinButton.addActionListener(this);
	1211	+ }
	1212	+
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ particlesButton.setToolTipText("Create particle system");
	1215	+ particlesButton.addActionListener(this);
	1216	+
	1217	+ oe.toolboxPanel.add(row1);
	1218	+
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ groupButton.setToolTipText("Create group");
	1223	+ groupButton.addActionListener(this);
	1224	+
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ compositeButton.setToolTipText("Create composite");
	1227	+ compositeButton.addActionListener(this);
	1228	+
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ switchButton.setToolTipText("Create item switcher");
	1231	+ switchButton.addActionListener(this);
	1232	+
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ loopButton.setToolTipText("Create loop");
	1235	+ loopButton.addActionListener(this);
	1236	+
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ textureButton.setToolTipText("Create texture");
	1239	+ textureButton.addActionListener(this);
	1240	+
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ overlayButton.setToolTipText("Create overlay");
	1243	+ overlayButton.addActionListener(this);
	1244	+
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ lightButton.setToolTipText("Create light");
	1247	+ lightButton.addActionListener(this);
	1248	+
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
	1260	+
	1261	+ // EDIT panel
	1262	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ editButton.setToolTipText("Pin selection controls");
671	1264	editButton.addActionListener(this);
672	1265
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1266	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
675	1268	uneditButton.addActionListener(this);
676	1269
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1270	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1271	+ allParamsButton.setToolTipText("Show all controls");
679	1272	allParamsButton.addActionListener(this);
680	1273
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
683	1276	clearPanelButton.addActionListener(this);
684	1277
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- unselectButton.setToolTipText("Unselect");
687		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
688	1281
689		- commandsPanel.preferredHeight = 1;
	1282	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ flashSelectionButton.setToolTipText("Highlight selection");
	1284	+ flashSelectionButton.addActionListener(this);
690	1285
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1286	+ editCommandsPanel.preferredHeight = 1;
	1287	+
	1288	+ SetPinStates(false);
	1289	+// oe.treePanel.add(commandsPanel);
	1290	+// oe.treePanel.Return();
693	1291
694	1292	// oe.aConstraints.gridx += 1;
695	1293	// oe.aConstraints.weighty = 0;
..	..	@@ -706,32 +1304,20 @@
706	1304
707	1305	JScrollPane jSP;
708	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1308	ResetModel();
711	1309
712	1310	oe.treePanel.add(jSPPanel);
713	1311	oe.treePanel.Return();
714	1312
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	1313	oe.treePanel.add(copyOptionsPanel);
731	1314	oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
732	1318
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
735	1321
736	1322	//jList.addListSelectionListener(this);
737	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1325,7 @@
739	1325	//jTree.setEditable(true);
740	1326	oe.jTree.setDragEnabled(true);
741	1327	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1329
744	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1331
..	..	@@ -751,29 +1337,49 @@
751	1337	dgr.addDragGestureListener(this);
752	1338	}catch(Exception e) {}
753	1339	*/
754		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
755	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1342	}
757	1343
758	1344	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1345	{
	1346	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1347	+ colorCB.setToolTipText("Copy color when dropped");
	1348	+ colorCB.addItemListener(this);
	1349	+
	1350	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1351	+ materialCB.setToolTipText("Copy material when dropped");
	1352	+ materialCB.addItemListener(this);
	1353	+
	1354	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1355	+ textureCB.setToolTipText("Copy texture when dropped");
	1356	+ textureCB.addItemListener(this);
	1357	+
	1358	+ panel.Return();
	1359	+
760	1360	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1361	boxCB.setToolTipText("Display bounding boxes");
762	1362	boxCB.addItemListener(this);
763	1363
764	1364	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1365	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1366	zoomBoxCB.addItemListener(this);
767	1367
768	1368	if (true) // Globals.ADVANCED)
769	1369	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1370	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1371	+// supportCB.setToolTipText("Enable rigging");
	1372	+// supportCB.addItemListener(this);
	1373	+
	1374	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1375	+ freezeCB.setToolTipText("Fast moving camera");
	1376	+ freezeCB.addItemListener(this);
773	1377
774	1378	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1379	// localCB.addItemListener(this);
776	1380
	1381	+ panel.Return();
	1382	+
777	1383	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1384	crowdCB.setToolTipText("Used for crowds");
779	1385	crowdCB.addItemListener(this);
..	..	@@ -782,14 +1388,19 @@
782	1388	smoothCB.setToolTipText("Snapping delay");
783	1389	smoothCB.addItemListener(this);
784	1390
785		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786		- slowCB.setToolTipText("Smooth interpolation");
787		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
788	1397
789	1398	// constraints.gridy += 1;
790	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1400	// speakerMocapCB.addItemListener(this);
792	1401
	1402	+ panel.Return();
	1403	+
793	1404	if (false)
794	1405	{
795	1406	// handled in scripts
..	..	@@ -804,34 +1415,82 @@
804	1415	//constraints.gridy += 1;
805	1416	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1417	smoothfocusCB.addItemListener(this);
	1418	+ panel.Return();
807	1419	}
808	1420
809	1421	//constraints.gridx += 1;
810	1422	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1423	// debugCB.addItemListener(this);
812	1424
	1425	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1426	+ trackCB.setToolTipText("Enable tracking target");
	1427	+ trackCB.addItemListener(this);
	1428	+
813	1429	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1430	+ oeilCB.setToolTipText("Move camera when tracking");
814	1431	oeilCB.addItemListener(this);
815	1432
	1433	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1434	+ shadowCB.setToolTipText("When live compute shadows");
	1435	+ shadowCB.addItemListener(this);
	1436	+
	1437	+ panel.Return();
	1438	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1439	+ toggleTextureCB.setToolTipText("Load textures");
	1440	+ toggleTextureCB.addItemListener(this);
	1441	+
	1442	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1443	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1444	+ toggleSwitchCB.addItemListener(this);
	1445	+
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
	1449	+
	1450	+ panel.Return();
	1451	+ if (Globals.ADVANCED)
	1452	+ {
816	1453	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1454	lookAtCB.setToolTipText("Look-at target");
818	1455	lookAtCB.addItemListener(this);
	1456	+ }
819	1457
820	1458	}
821	1459
822	1460	cGridBag fill = new cGridBag();
823		-
824	1461	fill.preferredHeight = 200;
	1462	+ cGridBag fill2 = new cGridBag();
	1463	+ fill2.preferredHeight = 200;
	1464	+ cGridBag fill3 = new cGridBag();
	1465	+ fill3.preferredHeight = 200;
825	1466
826	1467	panel.add(fill);
	1468	+ panel.add(fill2);
	1469	+ panel.add(fill3);
827	1470
828	1471	}
829	1472
830	1473	void EditObject(Object3D obj)
831	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
832	1483	cRadio radioButton = new cRadio(obj.name);
	1484	+
	1485	+ // June 2019. Patch to avoid bug with transparency.
	1486	+ radioButton.hadMaterial = obj.material != null;
	1487	+ if (!radioButton.hadMaterial)
	1488	+ {
	1489	+ obj.material = new cMaterial();
	1490	+ }
	1491	+
833	1492	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
835	1494	radioButton.SetCamera(cameraView.renderCamera, false);
836	1495	radioButton.addActionListener(this);
837	1496	radioPanel.add(radioButton);
..	..	@@ -851,23 +1510,30 @@
851	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1511	}
853	1512
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	1513	+ cToggleButton liveCB;
	1514	+ cCheckBox supportCB;
	1515	+ cCheckBox localCB;
	1516	+ cCheckBox crowdCB;
	1517	+ cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
	1520	+ cToggleButton fastCB;
	1521	+ cCheckBox slowCB;
	1522	+ cCheckBox boxCB;
	1523	+ cCheckBox zoomBoxCB;
	1524	+ cCheckBox freezeCB;
	1525	+ //cToggleButton trackCB;
	1526	+ cCheckBox trackCB;
	1527	+ cCheckBox smoothfocusCB;
865	1528	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
871	1537
872	1538	// static int COLOR = 1;
873	1539	// static int MATERIAL = 2;
..	..	@@ -875,9 +1541,9 @@
875	1541
876	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1543
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
881	1547
882	1548	public void itemStateChanged(ItemEvent e)
883	1549	{
..	..	@@ -921,6 +1587,12 @@
921	1587	{
922	1588	cameraView.ToggleInertia();
923	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
924	1596	}
925	1597	else if(e.getSource() == localCB)
926	1598	{
..	..	@@ -970,6 +1642,18 @@
970	1642	{
971	1643	cameraView.ToggleOeil();
972	1644	}
	1645	+ else if(e.getSource() == shadowCB)
	1646	+ {
	1647	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1648	+ }
	1649	+ else if(e.getSource() == freezeCB)
	1650	+ {
	1651	+ Globals.FREEZEONMOVE ^= true;
	1652	+ }
	1653	+ else if(e.getSource() == autokeepCB)
	1654	+ {
	1655	+ Globals.REPLACEONMAKE ^= true;
	1656	+ }
973	1657	else if(e.getSource() == lookAtCB)
974	1658	{
975	1659	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1670,8 @@
986	1670
987	1671	/**/
988	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1676	// We can't move the root node or an empty selection
992	1677	return;
..	..	@@ -1049,8 +1734,6 @@
1049	1734	}
1050	1735	}
1051	1736
1052		- String string = (String) object;
1053		-
1054	1737	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1738	// if( object instanceof java.io.File[])
1056	1739	// {
..	..	@@ -1058,6 +1741,8 @@
1058	1741	// objEditor.DropFile((java.io.File[]) object, true);
1059	1742	// return;
1060	1743	// }
	1744	+
	1745	+ String string = object.toString();
1061	1746
1062	1747	// File path for Mac and Windows
1063	1748	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1788,33 @@
1103	1788
1104	1789	assert target == objEditor.jTree;
1105	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
1106	1792	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1794	} catch (Exception e) {
1109	1795	System.out.println("destinationPath : " + destinationPath);
1110	1796	return;
1111	1797	}
1112	1798
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
1114	1800	{
	1801	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1802	+
	1803	+ // Cannot move into itself
	1804	+ if (child == destinationLeaf)
	1805	+ return;
	1806	+ }
	1807	+
	1808	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+// {
1115	1810	loadClipboard(true);
1116	1811	objEditor.jTree.setSelectionPath(destinationPath);
1117	1812	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
1123	1818	}
1124	1819	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1820	// Called if the user has modified the current drop gesture
..	..	@@ -1175,7 +1870,12 @@
1175	1870	TreePath path;
1176	1871
1177	1872	public TransferableTreePath(TreePath tp) {
1178		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1179	1879	}
1180	1880
1181	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1224,22 +1924,30 @@
1224	1924	{
1225	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1926	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1927	+// gridItem = menu.add(new MenuItem("Grid"));
	1928	+// gridItem.addActionListener(this);
	1929	+// rectoidItem = menu.add(new MenuItem("Box"));
	1930	+// rectoidItem.addActionListener(this);
	1931	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1932	+// ellipsoidItem.addActionListener(this);
	1933	+// coneItem = menu.add(new MenuItem("Cone"));
	1934	+// coneItem.addActionListener(this);
	1935	+// torusItem = menu.add(new MenuItem("Torus"));
	1936	+// torusItem.addActionListener(this);
	1937	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1938	+// superItem.addActionListener(this);
	1939	+
	1940	+ cameraItem = menu.add(new MenuItem("Camera"));
	1941	+ cameraItem.addActionListener(this);
	1942	+
	1943	+ if (!Globals.ADVANCED)
	1944	+ {
1239	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1946	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
1243	1951	if (Globals.ADVANCED)
1244	1952	{
1245	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1973,15 @@
1265	1973	}
1266	1974	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1975	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1976	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1977	+// overlayItem.addActionListener(this);
	1978	+// lightItem = menu.add(new MenuItem("Light"));
	1979	+// lightItem.addActionListener(this);
1272	1980	menu.add("-");
1273	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1982	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1277	1985	doubleItem = menu.add(new MenuItem("Fork"));
1278	1986	doubleItem.addActionListener(this);
1279	1987	if (Globals.ADVANCED)
..	..	@@ -1289,6 +1997,9 @@
1289	1997	animationItem.addItemListener(this);
1290	1998	animationItem.setState(Globals.ANIMATION);
1291	1999
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
	2002	+
1292	2003	menu.add("-");
1293	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	2005	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +2012,8 @@
1301	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	2013	reduce34MorphItem.addActionListener(this);
1303	2014	menu.add("-");
	2015	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2016	+ memoryItem.addActionListener(this);
1304	2017	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	2018	computeAOItem.addActionListener(this);
1306	2019
..	..	@@ -1309,8 +2022,6 @@
1309	2022	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	2023	mirrorItem.addActionListener(this);
1311	2024	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	2026	analyzeItem.addActionListener(this);
1316	2027	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +2165,34 @@
1454	2165	shadow.material = new cMaterial(obj.material);
1455	2166	shadow.material.diffuse = 0.0001f;
1456	2167	shadow.material.specular = 0.0001f;
	2168	+ //shadow.projectedVertices[1].x = 300;
1457	2169
1458	2170	makeSomething(shadow);
1459	2171	}
	2172	+
	2173	+ private void ClearUnpinned()
	2174	+ {
	2175	+ //for (Object3D obj : listUI)
	2176	+ for (int i=listUI.size(); --i>=0;)
	2177	+ {
	2178	+ Object3D obj = listUI.elementAt(i);
	2179	+ if (!obj.pinned)
	2180	+ {
	2181	+ obj.CloseUI();
	2182	+ listUI.remove(i);
	2183	+ }
	2184	+ }
	2185	+ }
	2186	+
	2187	+ private void EditElement(Object3D elem, boolean newWindow)
	2188	+ {
	2189	+ // if (!(elem instanceof Composite))
	2190	+ // newWindow = false;
	2191	+ listUI.add(elem);
	2192	+ elem.openEditWindow(this, newWindow); //, false);
	2193	+ System.out.println("edit : " + elem);
	2194	+ elem.editWindow.refreshContents(true); // ? new
	2195	+ }
1460	2196
1461	2197	/**
1462	2198	* applyExample
..	..	@@ -1701,7 +2437,7 @@
1701	2437	{
1702	2438	ScreenFit();
1703	2439	} else
1704		- if (source == switchItem)
	2440	+ if (source == switchViewItem)
1705	2441	{
1706	2442	cVector v1 = new cVector();
1707	2443	cVector v2 = new cVector();
..	..	@@ -1710,11 +2446,11 @@
1710	2446	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2447	objEditor.cameraView.repaint();
1712	2448	} else
1713		- if (source == rectoidItem)
	2449	+ if (source == rectoidItem \|\| source == boxButton)
1714	2450	{
1715	2451	makeSomething(new Box());
1716	2452	} else
1717		- if (source == particleItem)
	2453	+ if (source == particleItem \|\| source == particlesButton)
1718	2454	{
1719	2455	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2456	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2529,27 @@
1793	2529
1794	2530	makeSomething(obj);
1795	2531	} else
1796		- if (source == gridItem)
	2532	+ if (source == gridItem \|\| source == gridButton)
1797	2533	{
1798	2534	makeSomething(new Grid());
1799	2535	} else
1800		- if (source == ellipsoidItem)
	2536	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2537	{
1802	2538	makeSomething(new Sphere());
1803	2539	} else
1804		- if (source == coneItem)
	2540	+ if (source == coneItem \|\| source == coneButton)
1805	2541	{
1806	2542	makeSomething(new Cone());
1807	2543	} else
1808		- if (source == torusItem)
	2544	+ if (source == torusItem \|\| source == torusButton)
1809	2545	{
1810	2546	makeSomething(new Torus());
1811	2547	} else
1812		- if (source == superItem)
	2548	+ if (source == superItem \|\| source == superButton)
1813	2549	{
1814	2550	makeSomething(new Superellipsoid());
1815	2551	} else
1816		- if (source == kleinItem)
	2552	+ if (source == kleinItem \|\| source == kleinButton)
1817	2553	{
1818	2554	makeSomething(new Klein());
1819	2555	} else
..	..	@@ -1833,7 +2569,7 @@
1833	2569	{
1834	2570	makeSomething(new BezierSurface());
1835	2571	} else
1836		- if (source == overlayItem)
	2572	+ if (source == overlayItem \|\| source == overlayButton)
1837	2573	{
1838	2574	/*
1839	2575	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2617,27 @@
1881	2617	s.setup();
1882	2618	makeSomething(s);
1883	2619	} else
1884		- if (source == lightItem)
	2620	+ if (source == lightItem \|\| source == lightButton)
1885	2621	{
1886	2622	makeSomething(new Light());
1887	2623	} else
	2624	+// if (source == skybox1Button \|\|
	2625	+// source == skybox2Button \|\|
	2626	+// source == skybox3Button \|\|
	2627	+// source == skybox4Button \|\|
	2628	+// source == skybox5Button \|\|
	2629	+// source == skybox6Button \|\|
	2630	+// source == skybox7Button \|\|
	2631	+// source == skybox11Button \|\|
	2632	+// source == skybox12Button \|\|
	2633	+// source == skybox13Button \|\|
	2634	+// source == skybox14Button \|\|
	2635	+// source == skybox15Button \|\|
	2636	+// source == skybox16Button \|\|
	2637	+// source == skybox17Button)
	2638	+// {
	2639	+// ChangeSkybox(source);
	2640	+// } else
1888	2641	if (source == csgItem)
1889	2642	{
1890	2643	group(new CSG());
..	..	@@ -1931,30 +2684,38 @@
1931	2684
1932	2685	group(g);
1933	2686	} else
1934		- if (source == loopItem)
	2687	+ if (source == loopItem \|\| source == loopButton)
1935	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
1936	2691	Composite csg = new GroupLeaf();
1937	2692	csg.count = 5;
1938		- group(csg);
1939		- Composite child = new cGroup();
	2693	+ Composite child = new cGroup("Branch");
1940	2694	csg.addChild(child);
1941	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
1942	2698	} else
1943	2699	if (source == doubleItem)
1944	2700	{
1945		- Composite csg = new GroupLeaf();
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
	2703	+ Composite csg = new GroupLeaf("Fork");
1946	2704	csg.count = 5;
	2705	+ Composite child = new cGroup("Branch A");
	2706	+ csg.addChild(child);
	2707	+ child.addChild(csg);
	2708	+ child = new cGroup("Branch B");
	2709	+ csg.addChild(child);
	2710	+ child.addChild(csg);
1947	2711	group(csg);
1948		- Composite child = new cGroup();
1949		- csg.addChild(child);
1950		- child.addChild(csg);
1951		- child = new cGroup();
1952		- csg.addChild(child);
1953		- child.addChild(csg);
	2712	+ }
1954	2713	} else
1955	2714	if (source == tripleItem)
1956	2715	{
1957		- Composite csg = new GroupLeaf();
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
	2718	+ Composite csg = new GroupLeaf("Trident");
1958	2719	csg.count = 4;
1959	2720	group(csg);
1960	2721	Composite child = new cGroup();
..	..	@@ -1966,11 +2727,12 @@
1966	2727	child = new cGroup();
1967	2728	csg.addChild(child);
1968	2729	child.addChild(csg);
	2730	+ }
1969	2731	} else
1970	2732	if (source == computeAOItem)
1971	2733	{
1972	2734	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2735	+ cameraView.repaint();
1974	2736	} else
1975	2737	if (source == recompileItem)
1976	2738	{
..	..	@@ -1985,7 +2747,7 @@
1985	2747	if (source == invariantsItem)
1986	2748	{
1987	2749	System.out.println("Invariants:");
1988		- Grafreed.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
1989	2751	} else
1990	2752	if (source == memoryItem)
1991	2753	{
..	..	@@ -2016,17 +2778,52 @@
2016	2778	{
2017	2779	ToggleFullScreen();
2018	2780	} else
2019		- if (source == undoButton)
	2781	+ if (source == collapseButton)
2020	2782	{
2021		- Undo();
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
2022	2785	} else
2023		- if (source == redoButton)
	2786	+ if (source == maximize3DButton)
2024	2787	{
2025		- Redo();
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
2026	2792	} else
2027		- if (source == saveButton)
	2793	+ if (source == previousVersionButton)
2028	2794	{
2029		- Save();
	2795	+ // Go to previous version
	2796	+ //if (!Undo())
	2797	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ PreviousVersion();
	2799	+ } else
	2800	+ if (source == restoreButton)
	2801	+ {
	2802	+ // Restore current version
	2803	+ Restore();
	2804	+ //restoreButton.setEnabled(false);
	2805	+ } else
	2806	+ if (source == replaceButton)
	2807	+ {
	2808	+ // Overwrite current version
	2809	+ Replace();
	2810	+ //replaceButton.setEnabled(false);
	2811	+ } else
	2812	+ if (source == nextVersionButton)
	2813	+ {
	2814	+ // Go to next version
	2815	+ NextVersion();
	2816	+ } else
	2817	+ if (source == saveVersionButton)
	2818	+ {
	2819	+ // Save a new version
	2820	+ if (!Save(true))
	2821	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
2030	2827	} else
2031	2828	if (source == oneStepButton)
2032	2829	{
..	..	@@ -2035,17 +2832,14 @@
2035	2832	} else
2036	2833	if (source == screenfitButton)
2037	2834	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2835	ScreenFit();
2040	2836	} else
2041	2837	if (source == screenfitpointButton)
2042	2838	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2839	ScreenFitPoint();
2045	2840	} else
2046	2841	if (source == snapobjectButton)
2047	2842	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2843	SnapObject();
2050	2844	} else
2051	2845	// if (event.getSource() == recompileButton)
..	..	@@ -2084,11 +2878,11 @@
2084	2878	} else
2085	2879	if (source == undoItem)
2086	2880	{
2087		- Undo();
	2881	+ PreviousVersion();
2088	2882	} else
2089	2883	if (source == redoItem)
2090	2884	{
2091		- Redo();
	2885	+ NextVersion();
2092	2886	} else
2093	2887	if (source == duplicateItem)
2094	2888	{
..	..	@@ -2409,7 +3203,7 @@
2409	3203	{
2410	3204	StepAll();
2411	3205	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3206	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	3207	{
2414	3208	//int indices[] = jList.getSelectedIndices();
2415	3209	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +3215,9 @@
2421	3215	{
2422	3216	ClearSelection(true);
2423	3217	} else
2424		- if (source == grabItem)
	3218	+ if (source == grabItem \|\| source == groupButton)
2425	3219	{
2426		- group(new cGroup(), true);
	3220	+ group(new cGroup(), false); // true);
2427	3221	} else
2428	3222	if (source == hideItem)
2429	3223	{
..	..	@@ -2441,11 +3235,11 @@
2441	3235	{
2442	3236	makeSomething(new Camera());
2443	3237	} else
2444		- if (source == compositeItem)
	3238	+ if (source == compositeItem \|\| source == compositeButton)
2445	3239	{
2446	3240	group(new Composite());
2447	3241	} else
2448		- if (source == randomItem)
	3242	+ if (source == switchItem \|\| source == switchButton)
2449	3243	{
2450	3244	RandomNode random = new RandomNode();
2451	3245	group(random);
..	..	@@ -2547,7 +3341,7 @@
2547	3341	{
2548	3342	group(new cLinker());
2549	3343	} else
2550		- if (source == textureItem)
	3344	+ if (source == textureItem \|\| source == textureButton)
2551	3345	{
2552	3346	group(new TextureNode());
2553	3347	} else
..	..	@@ -2567,17 +3361,42 @@
2567	3361	{
2568	3362	CastShadow(2);
2569	3363	} else
2570		- if (source == ungroupItem)
	3364	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3365	{
2572		- //ungroup();
	3366	+ boolean canUngroup = true;
	3367	+
2573	3368	for (int i=0; i<group.selection.size(); i++)
2574	3369	{
2575		- Ungroup(group.selection.get(i));
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
	3373	+ {
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
	3383	+ break;
	3384	+ }
2576	3385	}
2577	3386
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3387	+ if (canUngroup)
	3388	+ {
	3389	+ for (int i=0; i<group.selection.size(); i++)
	3390	+ {
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
	3394	+ }
	3395	+
	3396	+ ClearSelection(false);
	3397	+
	3398	+ refreshContents();
	3399	+ }
2581	3400	} else
2582	3401	if (source == genUVItem)
2583	3402	{
..	..	@@ -2878,7 +3697,7 @@
2878	3697	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3698	{
2880	3699	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3700	+ obj.ResetBumpTexture();
2882	3701	}
2883	3702
2884	3703	refreshContents();
..	..	@@ -2894,6 +3713,31 @@
2894	3713
2895	3714	refreshContents();
2896	3715	} else
	3716	+ if (source == embedTexturesItem)
	3717	+ {
	3718	+ Object3D obj;
	3719	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3720	+ {
	3721	+ obj = (Object3D)e.nextElement();
	3722	+ obj.EmbedTextures(true);
	3723	+ }
	3724	+
	3725	+ refreshContents();
	3726	+ } else
	3727	+ if (source == deEmbedTexturesItem)
	3728	+ {
	3729	+ Object3D obj;
	3730	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3731	+ {
	3732	+ obj = (Object3D)e.nextElement();
	3733	+ obj.EmbedTextures(false);
	3734	+ }
	3735	+
	3736	+ CameraPane.texturepigment.clear();
	3737	+ CameraPane.texturebump.clear();
	3738	+
	3739	+ refreshContents();
	3740	+ } else
2897	3741	if (source == flashSelectionButton)
2898	3742	{
2899	3743	CameraPane.flash = true;
..	..	@@ -2905,38 +3749,11 @@
2905	3749	if (source == twoButton)
2906	3750	{
2907	3751	radio.layout = twoButton;
2908		- // bug
2909		- //gridPanel.setDividerLocation(1.0);
2910		- //bigPanel.setDividerLocation(0.0);
2911		-// bigThree.remove(scenePanel);
2912		-// bigThree.remove(centralPanel);
2913		-// bigThree.remove(XYZPanel);
2914		-// aWindowConstraints.gridx = 0;
2915		-// aWindowConstraints.gridy = 0;
2916		-// aWindowConstraints.gridwidth = 1;
2917		-// // aConstraints.gridheight = 3;
2918		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2919		-// aWindowConstraints.weightx = 0;
2920		-// aWindowConstraints.weighty = 1;
2921		-// //bigThree.add(jtp, aWindowConstraints);
2922		-// aWindowConstraints.weightx = 1;
2923		-// aWindowConstraints.gridwidth = 3;
2924		-// // aConstraints.gridheight = 3;
2925		-// aWindowConstraints.gridx = 1;
2926		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2927		-// bigThree.add(centralPanel, aWindowConstraints);
2928		-// aWindowConstraints.weightx = 0;
2929		-// aWindowConstraints.gridx = 4;
2930		-// aWindowConstraints.gridwidth = 1;
2931		-// // aConstraints.gridheight = 3;
2932		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2933		-// //bigThree.add(XYZPanel, aWindowConstraints);
2934		-// scenePanel.setVisible(false);
2935		-// centralPanel.setVisible(true);
2936		-// XYZPanel.setVisible(false);
2937		- bigThree.ClearUI();
2938		- bigThree.add(centralPanel);
2939		- bigThree.FlushUI();
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
	3755	+
	3756	+ Show3DView();
2940	3757
2941	3758	cameraView.requestFocusInWindow();
2942	3759
..	..	@@ -2959,6 +3776,9 @@
2959	3776	if (source == threeButton)
2960	3777	{
2961	3778	radio.layout = threeButton;
	3779	+
	3780	+ if (CameraPane.FULLSCREEN)
	3781	+ fullscreenLayout = radio.layout;
2962	3782
2963	3783	// bigThree.remove(scenePanel);
2964	3784	// bigThree.remove(centralPanel);
..	..	@@ -2988,8 +3808,8 @@
2988	3808	// centralPanel.setVisible(true);
2989	3809	// XYZPanel.setVisible(true);
2990	3810	bigThree.ClearUI();
	3811	+ bigThree.add(scenePanel);
2991	3812	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3813	bigThree.FlushUI();
2994	3814
2995	3815	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3817,9 @@
2997	3817	if (source == fourButton)
2998	3818	{
2999	3819	radio.layout = fourButton;
	3820	+
	3821	+ if (CameraPane.FULLSCREEN)
	3822	+ fullscreenLayout = radio.layout;
3000	3823
3001	3824	// bigThree.remove(scenePanel);
3002	3825	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3858,9 @@
3035	3858	{
3036	3859	radio.layout = sixButton;
3037	3860
	3861	+ if (CameraPane.FULLSCREEN)
	3862	+ fullscreenLayout = radio.layout;
	3863	+
3038	3864	// bigThree.remove(scenePanel);
3039	3865	// bigThree.remove(centralPanel);
3040	3866	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3889,8 @@
3063	3889	// centralPanel.setVisible(true);
3064	3890	// XYZPanel.setVisible(false);
3065	3891	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3892	bigThree.add(centralPanel);
	3893	+ bigThree.add(scenePanel);
3068	3894	bigThree.FlushUI();
3069	3895
3070	3896	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3898,9 @@
3072	3898	if (source == sevenButton)
3073	3899	{
3074	3900	radio.layout = sevenButton;
	3901	+
	3902	+ if (CameraPane.FULLSCREEN)
	3903	+ fullscreenLayout = radio.layout;
3075	3904
3076	3905	// bigThree.remove(scenePanel);
3077	3906	// bigThree.remove(centralPanel);
..	..	@@ -3110,6 +3939,7 @@
3110	3939	} else
3111	3940	if (source == rootButton)
3112	3941	{
	3942	+ Replace();
3113	3943	Object3D obj;
3114	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3115	3945	{
..	..	@@ -3128,12 +3958,19 @@
3128	3958	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3959	{
3130	3960	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3961	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3962	{
	3963	+ // Patch to avoid bug with transparency.
	3964	+ if (!ab.hadMaterial)
	3965	+ {
	3966	+ ab.object.material = null;
	3967	+ }
	3968	+
3133	3969	buttonGroup.remove(ab);
3134	3970	radioPanel.remove(ab);
3135	3971
3136		- ab.GetObject().editWindow = null;
	3972	+ //ab.GetObject().editWindow = null;
	3973	+ ab.GetObject().manipWindow = null;
3137	3974	// ab.GetObject().objectUI = null; // ?????????
3138	3975
3139	3976	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3983,12 @@
3146	3983	} else
3147	3984	if (source == editItem \|\| source == editButton)
3148	3985	{
	3986	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3987	+ {
	3988	+ Object3D child = (Object3D)e.nextElement();
	3989	+ child.pinned = true;
	3990	+ }
	3991	+
3149	3992	EditSelection(false);
3150	3993	} else
3151	3994	if (source == uneditButton)
..	..	@@ -3154,9 +3997,10 @@
3154	3997	{
3155	3998	Object3D child = (Object3D)e.nextElement();
3156	3999	if(child.editWindow != null)
3157		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4000	+ child.pinned = false;
3158	4001	child.CloseUI();
3159	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3160	4004
3161	4005	//child.editWindow = null; // ???????????
3162	4006	}
..	..	@@ -3171,16 +4015,18 @@
3171	4015	//copy.ClearUI();
3172	4016	for (Object3D obj : listUI)
3173	4017	{
	4018	+ obj.pinned = false;
3174	4019	obj.CloseUI();
3175	4020	}
3176	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
3177	4023	refreshContents(true);
3178	4024	} else
3179	4025	if (source == allParamsButton)
3180	4026	{
3181	4027	assert(copy == group);
3182	4028
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4029	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	4030
3185	4031	for (Object3D obj : listUI)
3186	4032	{
..	..	@@ -3229,6 +4075,7 @@
3229	4075	}
3230	4076
3231	4077	copy = group;
	4078	+
3232	4079	//Globals.theRenderer.object = group;
3233	4080	if(!useclient)
3234	4081	{
..	..	@@ -3247,6 +4094,7 @@
3247	4094
3248	4095	// fix "+" issue
3249	4096	//group.editWindow = this;
	4097	+ group.manipWindow = this;
3250	4098
3251	4099	/*
3252	4100	currentLayout = radio.layout;
..	..	@@ -3254,6 +4102,26 @@
3254	4102	currentLayout = sevenButton;
3255	4103	*/
3256	4104	radio.layout.doClick();
	4105	+
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
	4118	+ ClearUnpinned();
	4119	+
	4120	+ //Grafreed.Assert(group != null);
	4121	+ //Grafreed.Assert(group.selection != null);
	4122	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4123	+ if (group.selection == null \|\| group.selection.size() == 1)
	4124	+ EditSelection(false);
3257	4125	keepparent = group.parent;
3258	4126	// PARENT = NULL or not???
3259	4127	//group.parent = null; // ROOT
..	..	@@ -3265,11 +4133,13 @@
3265	4133	} else if (event.getSource() == editCameraItem)
3266	4134	{
3267	4135	cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
3268	4137	cameraView.repaint();
3269	4138	return;
3270		- } else if (event.getSource() == revertCameraItem)
	4139	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	4140	{
3272	4141	cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
3273	4143	cameraView.repaint();
3274	4144	return;
3275	4145	// } else if (event.getSource() == textureButton)
..	..	@@ -3846,7 +4716,7 @@
3846	4716
3847	4717	try
3848	4718	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4719	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4720	}
3851	4721	catch (Exception e)
3852	4722	{
..	..	@@ -4321,28 +5191,25 @@
4321	5191	// }
4322	5192	// }
4323	5193
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	5194	void EditSelection(boolean newWindow)
4329	5195	{
	5196	+ if (group.selection == null)
	5197	+ {
	5198	+ EditElement(group, newWindow); // ? new
	5199	+ return;
	5200	+ }
	5201	+
4330	5202	// aConstraints.gridy = 0;
4331	5203	for (int i=0; i<group.selection.size(); i++)
4332	5204	{
4333	5205	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	5206	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5207	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	5208
4337	5209	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	5210	if(elem != group \|\| !newWindow)
4339	5211	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	5212	+ EditElement(elem, newWindow); // ? new
4346	5213	}
4347	5214	}
4348	5215	}
..	..	@@ -4405,9 +5272,7 @@
4405	5272
4406	5273	freezemodel = false;
4407	5274	}
4408		-
4409		- boolean flashIt = true;
4410		-
	5275	+
4411	5276	public void valueChanged(TreeSelectionEvent e)
4412	5277	//public boolean handleEvent(Event event)
4413	5278	{
..	..	@@ -4417,7 +5282,8 @@
4417	5282	//new Exception().printStackTrace();
4418	5283
4419	5284	freezemodel = true;
4420		-
	5285	+ ClearUnpinned();
	5286	+
4421	5287	/**/
4422	5288	//switch (event.id)
4423	5289	{
..	..	@@ -4450,7 +5316,7 @@
4450	5316	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5317	// a camera
4452	5318	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5320	{
4455	5321	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5322	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5325,13 @@
4459	5325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5326	}
4461	5327
	5328	+ if (tps != null && tps.length == 1)
	5329	+ {
	5330	+ EditSelection(false);
	5331	+ }
	5332	+
	5333	+ SetPinStates(tps != null && tps.length > 0);
	5334	+
4462	5335	refreshContents();
4463	5336	//return true;
4464	5337	}
..	..	@@ -4468,9 +5341,34 @@
4468	5341	freezemodel = false;
4469	5342	}
4470	5343
	5344	+ void SetPinStates(boolean enabled)
	5345	+ {
	5346	+ editButton.setEnabled(enabled);
	5347	+ uneditButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
	5349	+ flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
	5366	+ }
	5367	+
4471	5368	void refreshContents(boolean cp)
4472	5369	{
4473		- if (!Globals.MOUSEDRAGGED)
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5371	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5372	{
4475	5373	objEditor.ClearInfo(); // .GetMaterial());
4476	5374
..	..	@@ -4479,7 +5377,7 @@
4479	5377	Object3D child = (Object3D) group.selection.get(i);
4480	5378
4481	5379	objEditor.AddInfo(child, this, true);
4482		- System.err.println("info : " + child.GetPath());
	5380	+// System.err.println("info : " + child.GetPath());
4483	5381	}
4484	5382
4485	5383	objEditor.SetText(); // jan 2014
..	..	@@ -4569,7 +5467,8 @@
4569	5467
4570	5468	if (cut)
4571	5469	{
4572		- Save();
	5470	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5471	+// Save();
4573	5472	//int indices[] = jList.getSelectedIndices();
4574	5473	//for (int i = indices.length - 1; i >= 0; i--)
4575	5474	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5571,10 @@
4672	5571
4673	5572	void paste(boolean expand)
4674	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4675	5578	// if (GrafreeD.clipboard == null)
4676	5579	// return;
4677	5580	boolean first = true;
..	..	@@ -4731,6 +5634,7 @@
4731	5634	Grafreed.clipboard.get(0).parent = keepparent;
4732	5635	}
4733	5636
	5637	+ Globals.REPLACEONMAKE = keep;
4734	5638	ResetModel();
4735	5639	refreshContents();
4736	5640	}
..	..	@@ -4866,6 +5770,10 @@
4866	5770
4867	5771	void group(Object3D csg, boolean grab)
4868	5772	{
	5773	+ if (Globals.REPLACEONMAKE)
	5774	+ Save();
	5775	+ boolean keep = Globals.REPLACEONMAKE;
	5776	+ Globals.REPLACEONMAKE = false;
4869	5777	if (//false) // why??
4870	5778	!group.selection.isEmpty())
4871	5779	{
..	..	@@ -4979,10 +5887,15 @@
4979	5887	//node.add(csg);
4980	5888	//makeSomething(node);
4981	5889	makeSomething(csg);
	5890	+ Globals.REPLACEONMAKE = keep;
4982	5891	}
4983	5892
4984	5893	void Ungroup(Object3D g)
4985	5894	{
	5895	+ if (Globals.REPLACEONMAKE)
	5896	+ Save();
	5897	+ boolean keep = Globals.REPLACEONMAKE;
	5898	+ Globals.REPLACEONMAKE = false;
4986	5899	if (g instanceof HiddenObject)
4987	5900	{
4988	5901	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5912,7 @@
4999	5912	objEditor.makeSomething(g.get(i), false);
5000	5913	}
5001	5914	}
	5915	+ Globals.REPLACEONMAKE = keep;
5002	5916	}
5003	5917
5004	5918	void ungroup()
..	..	@@ -5287,13 +6201,43 @@
5287	6201	cButton clearpanelButton;
5288	6202	cButton unselectButton;
5289	6203
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
5295		- cButton saveButton;
	6204	+ cButton restoreCameraButton;
	6205	+
5296	6206	cButton oneStepButton;
	6207	+
	6208	+ cButton groupButton;
	6209	+ cButton ungroupButton;
	6210	+ cButton compositeButton;
	6211	+ cButton switchButton;
	6212	+ cButton loopButton;
	6213	+ cButton textureButton;
	6214	+
	6215	+ cButton skybox1Button;
	6216	+ cButton skybox2Button;
	6217	+ cButton skybox3Button;
	6218	+ cButton skybox4Button;
	6219	+ cButton skybox5Button;
	6220	+ cButton skybox6Button;
	6221	+ cButton skybox7Button;
	6222	+
	6223	+ cButton skybox11Button;
	6224	+ cButton skybox12Button;
	6225	+ cButton skybox13Button;
	6226	+ cButton skybox14Button;
	6227	+ cButton skybox15Button;
	6228	+ cButton skybox16Button;
	6229	+ cButton skybox17Button;
	6230	+
	6231	+ cButton gridButton;
	6232	+ cButton boxButton;
	6233	+ cButton sphereButton;
	6234	+ cButton coneButton;
	6235	+ cButton torusButton;
	6236	+ cButton superButton;
	6237	+ cButton kleinButton;
	6238	+ cButton particlesButton;
	6239	+ cButton overlayButton;
	6240	+ cButton lightButton;
5297	6241
5298	6242	cButton screenfitButton;
5299	6243	cButton screenfitpointButton;
..	..	@@ -5315,12 +6259,12 @@
5315	6259	//JTree jTree;
5316	6260	private MenuItem lookAtItem;
5317	6261	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
5319		- private MenuItem cutItem;
	6262	+ private MenuItem switchViewItem;
	6263	+ private JMenuItem cutItem;
5320	6264	private MenuItem undoItem;
5321	6265	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
5323		- private MenuItem cloneItem;
	6266	+ private JMenuItem duplicateItem;
	6267	+ private JMenuItem cloneItem;
5324	6268	private MenuItem cloneSupportItem;
5325	6269	private MenuItem overwriteGeoItem;
5326	6270	private MenuItem overwriteMatItem;
..	..	@@ -5341,13 +6285,13 @@
5341	6285	private MenuItem cloneGeometriesItem;
5342	6286	private MenuItem shareGeometriesItem;
5343	6287	private MenuItem mergeGeometriesItem;
5344		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
5345	6289	private MenuItem pasteItem;
5346		- private MenuItem pasteIntoItem;
5347		- private MenuItem pasteLinkItem;
5348		- private MenuItem pasteCloneItem;
5349		- private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
5351	6295	private MenuItem clearAllItem;
5352	6296	private MenuItem genUVItem;
5353	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -5407,7 +6351,7 @@
5407	6351	private MenuItem frontItem;
5408	6352	private MenuItem cameraItem;
5409	6353	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6354	+ private MenuItem switchItem;
5411	6355	private MenuItem physicsItem;
5412	6356	private MenuItem frameselectorItem;
5413	6357	private MenuItem scriptNodeItem;
..	..	@@ -5415,7 +6359,7 @@
5415	6359	private MenuItem switchTransfoItem;
5416	6360	private MenuItem morphItem;
5417	6361	private MenuItem linkerItem;
5418		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
5419	6363	private MenuItem editItem;
5420	6364	private MenuItem openWindowItem;
5421	6365	private MenuItem editLeafItem;
..	..	@@ -5431,6 +6375,8 @@
5431	6375	private MenuItem attachBumpItem;
5432	6376	private MenuItem detachBumpItem;
5433	6377	private MenuItem pigmentBumpItem;
	6378	+ private MenuItem embedTexturesItem;
	6379	+ private MenuItem deEmbedTexturesItem;
5434	6380
5435	6381	private MenuItem particleItem;
5436	6382	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6427,5 @@
5481	6427
5482	6428	Menu cameraMenu;
5483	6429	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6430	+ MenuItem restoreCameraItem;
5485	6431	}